Rename panel/side panel to match starter brick naming conventions (#8659

)
pixiebrix · Jun 21, 2024 · ebc39a7 · ebc39a7
1 parent 209ab24
commit ebc39a7
Show file tree

Hide file tree

Showing 14 changed files with 139 additions and 136 deletions.
diff --git a/src/components/BrickIcon.tsx b/src/components/BrickIcon.tsx
@@ -32,8 +32,8 @@ import {
 import { TriggerStarterBrickABC } from "@/starterBricks/trigger/triggerStarterBrick";
 import { MenuItemStarterBrickABC } from "@/starterBricks/menuItem/menuItemStarterBrick";
 import { ContextMenuStarterBrickABC } from "@/starterBricks/contextMenu/contextMenu";
-import { PanelStarterBrickABC } from "@/starterBricks/panel/panelExtension";
-import { SidebarStarterBrickABC } from "@/starterBricks/sidebar/sidebarExtension";
+import { PanelStarterBrickABC } from "@/starterBricks/panel/panelStarterBrick";
+import { SidebarStarterBrickABC } from "@/starterBricks/sidebar/sidebarStarterBrick";
 import getType from "@/runtime/getType";
 import { type BrickType } from "@/runtime/runtimeTypes";
 import { type Metadata } from "@/types/registryTypes";

diff --git a/src/contentScript/lifecycle.ts b/src/contentScript/lifecycle.ts
@@ -34,7 +34,7 @@ import { type UUID } from "@/types/stringTypes";
 import { type RegistryId } from "@/types/registryTypes";
 import { RunReason } from "@/types/runtimeTypes";
 import { type ResolvedModComponent } from "@/types/modComponentTypes";
-import { type SidebarStarterBrickABC } from "@/starterBricks/sidebar/sidebarExtension";
+import { type SidebarStarterBrickABC } from "@/starterBricks/sidebar/sidebarStarterBrick";
 import {
   getReloadOnNextNavigate,
   setReloadOnNextNavigate,
@@ -293,7 +293,7 @@ export function clearEditorExtension(
 
       if (extensionPoint.kind === "actionPanel" && preserveSidebar) {
         const sidebar = extensionPoint as SidebarStarterBrickABC;
-        sidebar.HACK_uninstallExceptExtension(extensionId);
+        sidebar.HACK_uninstallExceptModComponent(extensionId);
       } else {
         extensionPoint.uninstall({ global: true });
       }

diff --git a/src/contentScript/pageEditor/types.ts b/src/contentScript/pageEditor/types.ts
@@ -24,7 +24,7 @@ import { type Except } from "type-fest";
 import {
   type PanelConfig,
   type PanelDefinition,
-} from "@/starterBricks/panel/types";
+} from "@/starterBricks/panel/panelStarterBrickTypes";
 import {
   type MenuItemDefinition,
   type MenuItemStarterBrickConfig,

diff --git a/src/pageEditor/starterBricks/formStateTypes.ts b/src/pageEditor/starterBricks/formStateTypes.ts
@@ -25,7 +25,7 @@ import {
   type MenuItemStarterBrickConfig,
   type MenuPosition,
 } from "@/starterBricks/menuItem/menuItemTypes";
-import { type PanelConfig } from "@/starterBricks/panel/types";
+import { type PanelConfig } from "@/starterBricks/panel/panelStarterBrickTypes";
 import {
   type QuickBarConfig,
   type QuickBarDefaultOptions,
@@ -34,7 +34,7 @@ import {
 import {
   type SidebarConfig,
   type Trigger as SidebarTrigger,
-} from "@/starterBricks/sidebar/types";
+} from "@/starterBricks/sidebar/sidebarStarterBrickTypes";
 import {
   type AttachMode,
   type ReportMode,

diff --git a/src/pageEditor/starterBricks/panel.ts b/src/pageEditor/starterBricks/panel.ts
@@ -32,7 +32,7 @@ import {
 } from "@/pageEditor/starterBricks/base";
 import { omitEditorMetadata } from "./pipelineMapping";
 import { type StarterBrickDefinitionLike } from "@/starterBricks/types";
-import { PanelStarterBrickABC } from "@/starterBricks/panel/panelExtension";
+import { PanelStarterBrickABC } from "@/starterBricks/panel/panelStarterBrick";
 import { getDomain } from "@/permissions/patterns";
 import { faWindowMaximize } from "@fortawesome/free-solid-svg-icons";
 import { type ModComponentFormStateAdapter } from "@/pageEditor/starterBricks/modComponentFormStateAdapter";
@@ -46,7 +46,7 @@ import { type PanelFormState, type PanelTraits } from "./formStateTypes";
 import {
   type PanelDefinition,
   type PanelConfig,
-} from "@/starterBricks/panel/types";
+} from "@/starterBricks/panel/panelStarterBrickTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 const DEFAULT_TRAITS: PanelTraits = {

diff --git a/src/pageEditor/starterBricks/sidebar.ts b/src/pageEditor/starterBricks/sidebar.ts
@@ -32,7 +32,7 @@ import {
 } from "@/pageEditor/starterBricks/base";
 import { omitEditorMetadata } from "./pipelineMapping";
 import { type StarterBrickDefinitionLike } from "@/starterBricks/types";
-import { SidebarStarterBrickABC } from "@/starterBricks/sidebar/sidebarExtension";
+import { SidebarStarterBrickABC } from "@/starterBricks/sidebar/sidebarStarterBrick";
 import { getDomain } from "@/permissions/patterns";
 import { faColumns } from "@fortawesome/free-solid-svg-icons";
 import SidebarConfiguration from "@/pageEditor/tabs/sidebar/SidebarConfiguration";
@@ -42,7 +42,7 @@ import { type SidebarFormState } from "./formStateTypes";
 import {
   type SidebarConfig,
   type SidebarDefinition,
-} from "@/starterBricks/sidebar/types";
+} from "@/starterBricks/sidebar/sidebarStarterBrickTypes";
 import { assertNotNullish } from "@/utils/nullishUtils";
 
 function fromNativeElement(url: string, metadata: Metadata): SidebarFormState {

diff --git a/src/pageEditor/tabs/sidebar/SidebarConfiguration.tsx b/src/pageEditor/tabs/sidebar/SidebarConfiguration.tsx
@@ -22,7 +22,7 @@ import { makeLockableFieldProps } from "@/pageEditor/fields/makeLockableFieldPro
 import MatchRulesSection from "@/pageEditor/tabs/MatchRulesSection";
 import { partial } from "lodash";
 import DebounceFieldSet from "@/pageEditor/tabs/trigger/DebounceFieldSet";
-import { type Trigger } from "@/starterBricks/sidebar/types";
+import { type Trigger } from "@/starterBricks/sidebar/sidebarStarterBrickTypes";
 import { useField, useFormikContext } from "formik";
 import { type TriggerFormState } from "@/pageEditor/starterBricks/formStateTypes";
 import { type DebounceOptions } from "@/starterBricks/types";

diff --git a/src/starterBricks/factory.ts b/src/starterBricks/factory.ts
@@ -15,11 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { fromJS as deserializePanel } from "@/starterBricks/panel/panelExtension";
+import { fromJS as deserializePanel } from "@/starterBricks/panel/panelStarterBrick";
 import { fromJS as deserializeMenuItem } from "@/starterBricks/menuItem/menuItemStarterBrick";
 import { fromJS as deserializeTrigger } from "@/starterBricks/trigger/triggerStarterBrick";
 import { fromJS as deserializeContextMenu } from "@/starterBricks/contextMenu/contextMenu";
-import { fromJS as deserializeSidebar } from "@/starterBricks/sidebar/sidebarExtension";
+import { fromJS as deserializeSidebar } from "@/starterBricks/sidebar/sidebarStarterBrick";
 import { fromJS as deserializeQuickBar } from "@/starterBricks/quickBar/quickBarStarterBrick";
 import { fromJS as deserializeQuickBarProvider } from "@/starterBricks/quickBarProvider/quickBarProviderStarterBrick";
 import { fromJS as deserializeTour } from "@/starterBricks/tour/tourExtension";