Merge branch 'main' into release

reearth · Jan 31, 2025 · 265ce30 · 265ce30
2 parents 5d0968b + 8761c46
commit 265ce30
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@reearth/visualizer",
-    "version": "0.21.3",
+    "version": "0.21.4",
     "repository": "https://github.com/reearth/reearth-visualizer.git",
     "author": "Re:Earth contributors <[email protected]>",
     "license": "Apache-2.0",

diff --git a/web/src/classic/components/molecules/Settings/Project/PublishSection/hooks.ts b/web/src/classic/components/molecules/Settings/Project/PublishSection/hooks.ts
@@ -14,12 +14,15 @@ export default (
   publicationStatus?: Status,
   validAlias?: boolean,
   validatingAlias?: boolean,
+  disabledExtensionIds?: string[],
   onAliasValidate?: (alias: string) => void,
   onPublish?: (alias: string | undefined, publicationStatus: Status) => void | Promise<void>,
 ) => {
   const { getAccessToken } = useAuth();
   const url = window.REEARTH_CONFIG?.published?.split("{}");
-  const extensions = window.REEARTH_CONFIG?.extensions?.publication;
+  const extensions = window.REEARTH_CONFIG?.extensions?.publication?.filter(
+    e => !disabledExtensionIds?.includes(e.id),
+  );
 
   const [alias, setAlias] = useState(defaultAlias);
   const [validation, setValidation] = useState<Validation>();

diff --git a/web/src/classic/components/molecules/Settings/Project/PublishSection/index.tsx b/web/src/classic/components/molecules/Settings/Project/PublishSection/index.tsx
@@ -24,6 +24,7 @@ interface Props {
   validatingAlias?: boolean;
   currentLang?: string;
   currentTheme?: string;
+  disabledExtensionIds?: string[];
   onPublish?: (alias: string | undefined, publicationStatus: Status) => void | Promise<void>;
   onAliasValidate?: (alias: string) => void;
   onNotificationChange?: (type: NotificationType, text: string, heading?: string) => void;
@@ -38,6 +39,7 @@ const PublishSection: React.FC<Props> = ({
   validatingAlias,
   currentLang,
   currentTheme,
+  disabledExtensionIds,
   onPublish,
   onAliasValidate,
   onNotificationChange,
@@ -64,6 +66,7 @@ const PublishSection: React.FC<Props> = ({
     publicationStatus,
     validAlias,
     validatingAlias,
+    disabledExtensionIds,
     onAliasValidate,
     onPublish,
   );

diff --git a/web/src/classic/components/organisms/Settings/Project/Public/index.tsx b/web/src/classic/components/organisms/Settings/Project/Public/index.tsx
@@ -12,6 +12,8 @@ import { useT } from "@reearth/services/i18n";
 
 import useHooks from "./hooks";
 
+const DISABLED_EXTENSION_IDS = ["custom-story-domain"];
+
 type Props = {
   projectId: string;
 };
@@ -76,6 +78,7 @@ const Public: React.FC<Props> = ({ projectId }) => {
             validatingAlias={validatingAlias}
             currentLang={currentLang}
             currentTheme={currentTheme}
+            disabledExtensionIds={DISABLED_EXTENSION_IDS}
             onPublish={publishProject}
             onAliasValidate={checkProjectAlias}
             onNotificationChange={handleNotificationChange}