From df854f885185dacaaa2b89f3a949c7e1b71811b0 Mon Sep 17 00:00:00 2001
From: Beatrice Mkumbo <charsbeaty@gmail.com>
Date: Wed, 6 Sep 2023 16:14:21 +0300
Subject: [PATCH] chore(web): publish modal (#658)

---
 .../Editor/tabs/publish/Nav/PublishModal/hooks.ts    |  8 +++++---
 .../Editor/tabs/publish/Nav/PublishModal/index.tsx   | 12 ++++++++----
 .../beta/features/Editor/tabs/publish/Nav/hooks.ts   | 12 +++++++++---
 .../beta/features/Editor/tabs/publish/Nav/index.tsx  | 12 +++++-------
 web/src/services/api/projectApi.ts                   | 10 +++++++---
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/web/src/beta/features/Editor/tabs/publish/Nav/PublishModal/hooks.ts b/web/src/beta/features/Editor/tabs/publish/Nav/PublishModal/hooks.ts
index 2fa4ef5a0..705689f12 100644
--- a/web/src/beta/features/Editor/tabs/publish/Nav/PublishModal/hooks.ts
+++ b/web/src/beta/features/Editor/tabs/publish/Nav/PublishModal/hooks.ts
@@ -15,7 +15,7 @@ export default (
   publishing?: publishingType,
   publishStatus?: PublishStatus,
   defaultAlias?: string,
-  onPublish?: (publishStatus: PublishStatus) => Promise<void>,
+  onPublish?: (alias: string | undefined, publishStatus: PublishStatus) => void | Promise<void>,
   onClose?: () => void,
   onAliasValidate?: (alias: string) => void,
   onCopyToClipBoard?: () => void,
@@ -95,15 +95,17 @@ export default (
 
   const handlePublish = useCallback(async () => {
     if (!publishing) return;
+    const a = publishing !== "unpublishing" ? alias || generateAlias() : undefined;
+
     const mode =
       publishing === "unpublishing" ? "unpublished" : !searchIndex ? "limited" : "published";
-    await onPublish?.(mode);
+    await onPublish?.(a, mode);
     if (publishing === "unpublishing") {
       handleClose?.();
     } else {
       setStatusChange(true);
     }
-  }, [onPublish, publishing, searchIndex, setStatusChange, handleClose]);
+  }, [alias, generateAlias, onPublish, publishing, searchIndex, setStatusChange, handleClose]);
 
   return {
     statusChanged,
diff --git a/web/src/beta/features/Editor/tabs/publish/Nav/PublishModal/index.tsx b/web/src/beta/features/Editor/tabs/publish/Nav/PublishModal/index.tsx
index ddcb77fbc..e377237d7 100644
--- a/web/src/beta/features/Editor/tabs/publish/Nav/PublishModal/index.tsx
+++ b/web/src/beta/features/Editor/tabs/publish/Nav/PublishModal/index.tsx
@@ -23,7 +23,7 @@ type Props = {
   publishing?: publishingType;
   validatingAlias?: boolean;
   url?: string[];
-  onPublish: (publishStatus: PublishStatus) => Promise<void>;
+  onPublish: (alias: string | undefined, publishStatus: PublishStatus) => void | Promise<void>;
   onClose?: () => void;
   onCopyToClipBoard?: () => void;
   onAliasValidate?: (alias: string) => void;
@@ -79,10 +79,9 @@ const PublishModal: React.FC<Props> = ({
   const publishDisabled = useMemo(
     () =>
       loading ||
-      (publishing === "unpublishing" && publishStatus === "unpublished") ||
       ((publishing === "publishing" || publishing === "updating") &&
         (!alias || !!validation || validatingAlias || !validAlias)),
-    [alias, loading, publishStatus, publishing, validation, validAlias, validatingAlias],
+    [alias, loading, publishing, validation, validAlias, validatingAlias],
   );
 
   const modalTitleText = useMemo(() => {
@@ -125,7 +124,12 @@ const PublishModal: React.FC<Props> = ({
       button1={<Button text={secondaryButtonText} buttonType="secondary" onClick={handleClose} />}
       button2={
         !statusChanged && (
-          <Button text={primaryButtonText} disabled={publishDisabled} onClick={handlePublish} />
+          <Button
+            text={primaryButtonText}
+            buttonType="primary"
+            disabled={publishDisabled}
+            onClick={handlePublish}
+          />
         )
       }
       onClose={handleClose}>
diff --git a/web/src/beta/features/Editor/tabs/publish/Nav/hooks.ts b/web/src/beta/features/Editor/tabs/publish/Nav/hooks.ts
index aca67bd43..c3d9e9327 100644
--- a/web/src/beta/features/Editor/tabs/publish/Nav/hooks.ts
+++ b/web/src/beta/features/Editor/tabs/publish/Nav/hooks.ts
@@ -7,7 +7,12 @@ import { publishingType } from "./PublishModal";
 import { type PublishStatus } from "./PublishModal/hooks";
 
 export default ({ projectId }: { projectId?: string }) => {
-  const { useProjectQuery, useProjectAliasCheckLazyQuery, usePublishProject } = useProjectFetcher();
+  const {
+    useProjectQuery,
+    useProjectAliasCheckLazyQuery,
+    usePublishProject,
+    publishProjectLoading,
+  } = useProjectFetcher();
   const { project } = useProjectQuery(projectId);
 
   const [publishing, setPublishing] = useState<publishingType>("unpublishing");
@@ -55,10 +60,10 @@ export default ({ projectId }: { projectId?: string }) => {
   }, [project?.publishmentStatus]);
 
   const handleProjectPublish = useCallback(
-    async (publishStatus: PublishStatus) => {
+    async (alias: string | undefined, publishStatus: PublishStatus) => {
       await usePublishProject(publishStatus, projectId, alias);
     },
-    [projectId, alias, usePublishProject],
+    [projectId, usePublishProject],
   );
 
   const handleOpenProjectSettings = useCallback(() => {
@@ -78,6 +83,7 @@ export default ({ projectId }: { projectId?: string }) => {
   return {
     publishing,
     publishStatus,
+    publishProjectLoading,
     dropdownOpen,
     modalOpen,
     alias,
diff --git a/web/src/beta/features/Editor/tabs/publish/Nav/index.tsx b/web/src/beta/features/Editor/tabs/publish/Nav/index.tsx
index c13a15ea3..4a313848c 100644
--- a/web/src/beta/features/Editor/tabs/publish/Nav/index.tsx
+++ b/web/src/beta/features/Editor/tabs/publish/Nav/index.tsx
@@ -35,6 +35,7 @@ const Nav: React.FC<Props> = ({ projectId, selectedProjectType, onProjectTypeCha
     alias,
     validAlias,
     validatingAlias,
+    publishProjectLoading,
     handleModalOpen,
     handleModalClose,
     setDropdown,
@@ -51,6 +52,7 @@ const Nav: React.FC<Props> = ({ projectId, selectedProjectType, onProjectTypeCha
     [publishStatus, t],
   );
 
+  const checkPublished: boolean = publishStatus === "limited" || publishStatus === "published";
   return (
     <>
       <StyledSecondaryNav>
@@ -90,13 +92,8 @@ const Nav: React.FC<Props> = ({ projectId, selectedProjectType, onProjectTypeCha
                   onClick: () => handleModalOpen("unpublishing"),
                 },
                 {
-                  name: t("Publish"),
-                  onClick: () =>
-                    handleModalOpen(
-                      publishStatus === "limited" || publishStatus === "published"
-                        ? "updating"
-                        : "publishing",
-                    ),
+                  name: checkPublished ? t("Update") : t("Publish"),
+                  onClick: () => handleModalOpen(checkPublished ? "updating" : "publishing"),
                 },
                 {
                   name: t("Publishing Settings"),
@@ -109,6 +106,7 @@ const Nav: React.FC<Props> = ({ projectId, selectedProjectType, onProjectTypeCha
       </StyledSecondaryNav>
       <PublishModal
         isVisible={modalOpen}
+        loading={publishProjectLoading}
         publishing={publishing}
         publishStatus={publishStatus}
         url={config()?.published?.split("{}")}
diff --git a/web/src/services/api/projectApi.ts b/web/src/services/api/projectApi.ts
index 92b45b310..665b5cb53 100644
--- a/web/src/services/api/projectApi.ts
+++ b/web/src/services/api/projectApi.ts
@@ -99,9 +99,12 @@ export default () => {
     [createNewProject, createScene, setNotification, t],
   );
 
-  const [publishProjectMutation] = useMutation(PUBLISH_PROJECT, {
-    refetchQueries: ["GetProject"],
-  });
+  const [publishProjectMutation, { loading: publishProjectLoading }] = useMutation(
+    PUBLISH_PROJECT,
+    {
+      refetchQueries: ["GetProject"],
+    },
+  );
 
   const usePublishProject = useCallback(
     async (s: PublishStatus, projectId?: string, alias?: string) => {
@@ -242,6 +245,7 @@ export default () => {
   );
 
   return {
+    publishProjectLoading,
     useProjectQuery,
     useProjectAliasCheckLazyQuery,
     useCreateProject,