slice-machine-ui 1.23.2-beta.3 → 1.23.2-beta.5

package/components/DeleteSliceModal/index.tsx

@@ -1,46 +1,54 @@
+import { useState } from "react";
+import { MdOutlineDelete } from "react-icons/md";
+import { Close, Flex, Heading, Paragraph, Text, useThemeUI } from "theme-ui";
+
 import SliceMachineModal from "@components/SliceMachineModal";
-import { useSelector } from "react-redux";
-import { SliceMachineStoreType } from "@src/redux/type";
-import { isModalOpen } from "@src/modules/modal";
-import { ModalKeysEnum } from "@src/modules/modal/types";
 import useSliceMachineActions from "@src/modules/useSliceMachineActions";
-import { Close, Flex, Heading, Paragraph, Text, useThemeUI } from "theme-ui";
 import Card from "@components/Card";
-import { MdOutlineDelete } from "react-icons/md";
 import { Button } from "@components/Button";
-import { LoadingKeysEnum } from "@src/modules/loading/types";
-import { isLoading } from "@src/modules/loading";
+import { deleteSlice } from "@src/features/slices/actions/deleteSlice";
 
 type DeleteSliceModalProps = {
+  isOpen: boolean;
+  libName: string;
   sliceId: string;
   sliceName: string;
-  libName: string;
+  onClose: () => void;
 };
 
 export const DeleteSliceModal: React.FunctionComponent<
   DeleteSliceModalProps
-> = ({ sliceId, sliceName, libName }) => {
-  const { isSliceModalOpen, isDeletingSlice } = useSelector(
-    (store: SliceMachineStoreType) => ({
-      isSliceModalOpen: isModalOpen(store, ModalKeysEnum.DELETE_SLICE),
-      isDeletingSlice: isLoading(store, LoadingKeysEnum.DELETE_SLICE),
-    }),
-  );
+> = ({ sliceId, sliceName, libName, isOpen, onClose }) => {
+  const [isDeleting, setIsDeleting] = useState(false);
+  const { deleteSliceSuccess } = useSliceMachineActions();
+  const { theme } = useThemeUI();
 
-  const { closeModals, deleteSlice } = useSliceMachineActions();
+  const onDelete = async () => {
+    setIsDeleting(true);
 
-  const { theme } = useThemeUI();
+    await deleteSlice({
+      sliceID: sliceId,
+      sliceName,
+      libraryID: libName,
+      onSuccess: () => {
+        deleteSliceSuccess(sliceId, libName);
+      },
+    });
+
+    onClose();
+    setIsDeleting(false);
+  };
 
   return (
     <SliceMachineModal
-      isOpen={isSliceModalOpen}
+      isOpen={isOpen}
       shouldCloseOnOverlayClick={true}
       style={{
         content: {
           maxWidth: 612,
         },
       }}
-      onRequestClose={closeModals}
+      onRequestClose={onClose}
     >
       <Card
         bodySx={{
@@ -79,7 +87,7 @@ export const DeleteSliceModal: React.FunctionComponent<
                 Delete Slice
               </Heading>
             </Flex>
-            <Close type="button" onClick={closeModals} />
+            <Close type="button" onClick={onClose} />
           </Flex>
         )}
         Footer={() => (
@@ -96,7 +104,7 @@ export const DeleteSliceModal: React.FunctionComponent<
             <Button
               label="Cancel"
               variant="secondary"
-              onClick={() => closeModals()}
+              onClick={onClose}
               sx={{
                 mr: "10px",
                 fontWeight: "bold",
@@ -107,9 +115,11 @@ export const DeleteSliceModal: React.FunctionComponent<
             <Button
               label="Delete"
               variant="danger"
-              isLoading={isDeletingSlice}
+              isLoading={isDeleting}
               sx={{ minHeight: 39, minWidth: 78 }}
-              onClick={() => deleteSlice(sliceId, sliceName, libName)}
+              onClick={() => {
+                void onDelete();
+              }}
             />
           </Flex>
         )}

package/components/Forms/CreateCustomTypeModal/CreateCustomTypeModal.tsx

@@ -2,25 +2,28 @@ import { SetStateAction, useState } from "react";
 import { Box } from "theme-ui";
 import { FormikErrors } from "formik";
 import { useSelector } from "react-redux";
+import { useRouter } from "next/router";
 
 import ModalFormCard from "@components/ModalFormCard";
-import { InputBox } from "../components/InputBox";
-import { SelectRepeatable } from "../components/SelectRepeatable";
 import useSliceMachineActions from "@src/modules/useSliceMachineActions";
 import { SliceMachineStoreType } from "@src/redux/type";
 import {
   selectAllCustomTypeIds,
   selectAllCustomTypeLabels,
 } from "@src/modules/availableCustomTypes";
-import { isModalOpen } from "@src/modules/modal";
-import { ModalKeysEnum } from "@src/modules/modal/types";
-import { isLoading } from "@src/modules/loading";
-import { LoadingKeysEnum } from "@src/modules/loading/types";
-import { telemetry } from "@src/apiClient";
 import { slugify } from "@lib/utils/str";
 import { API_ID_REGEX } from "@lib/consts";
 import type { CustomTypeFormat } from "@slicemachine/manager";
 import { CUSTOM_TYPES_MESSAGES } from "@src/features/customTypes/customTypesMessages";
+import {
+  CustomTypeOrigin,
+  createCustomType,
+} from "@src/features/customTypes/actions/createCustomType";
+import { CUSTOM_TYPES_CONFIG } from "@src/features/customTypes/customTypesConfig";
+import { getFormat } from "@src/domain/customType";
+
+import { InputBox } from "../components/InputBox";
+import { SelectRepeatable } from "../components/SelectRepeatable";
 
 interface FormValues {
   id: string;
@@ -30,46 +33,64 @@ interface FormValues {
 
 type CreateCustomTypeModalProps = {
   format: CustomTypeFormat;
-  origin?: "onboarding" | "table";
+  isCreating: boolean;
+  isOpen: boolean;
+  origin?: CustomTypeOrigin;
+  onCreateChange: (isCreating: boolean) => void;
+  onOpenChange: (isOpen: boolean) => void;
 };
 
 export const CreateCustomTypeModal: React.FC<CreateCustomTypeModalProps> = ({
   format,
+  isCreating,
+  isOpen,
   origin = "table",
+  onCreateChange,
+  onOpenChange,
 }) => {
-  const { createCustomType, closeModals } = useSliceMachineActions();
-
-  const {
-    customTypeIds,
-    isCreateCustomTypeModalOpen,
-    isCreatingCustomType,
-    customTypeLabels,
-  } = useSelector((store: SliceMachineStoreType) => ({
-    customTypeIds: selectAllCustomTypeIds(store),
-    customTypeLabels: selectAllCustomTypeLabels(store),
-    isCreateCustomTypeModalOpen: isModalOpen(
-      store,
-      ModalKeysEnum.CREATE_CUSTOM_TYPE,
-    ),
-    isCreatingCustomType: isLoading(store, LoadingKeysEnum.CREATE_CUSTOM_TYPE),
-  }));
+  const { createCustomTypeSuccess } = useSliceMachineActions();
+
+  const { customTypeIds, customTypeLabels } = useSelector(
+    (store: SliceMachineStoreType) => ({
+      customTypeIds: selectAllCustomTypeIds(store),
+      customTypeLabels: selectAllCustomTypeLabels(store),
+    }),
+  );
   const customTypesMessages = CUSTOM_TYPES_MESSAGES[format];
   const [isIdFieldPristine, setIsIdFieldPristine] = useState(true);
+  const router = useRouter();
 
-  const createCustomTypeAndTrack = ({ id, label, repeatable }: FormValues) => {
-    const name = label || id;
+  const onSubmit = async ({ id, label, repeatable }: FormValues) => {
+    onCreateChange(true);
 
-    void telemetry.track({
-      event: "custom-type:created",
-      id,
-      name,
+    await createCustomType({
       format,
-      type: repeatable ? "repeatable" : "single",
+      id,
+      label,
       origin,
+      repeatable,
+      onSuccess: async (newCustomType) => {
+        createCustomTypeSuccess(newCustomType);
+
+        const format = getFormat(newCustomType);
+        const customTypesConfig = CUSTOM_TYPES_CONFIG[format];
+
+        setIsIdFieldPristine(true);
+
+        await router.push({
+          pathname: customTypesConfig.getBuilderPagePathname(id),
+          query:
+            newCustomType.format === "page"
+              ? {
+                  newPageType: true,
+                }
+              : undefined,
+        });
+      },
     });
-    createCustomType(id, name, repeatable, format);
-    closeModals();
-    setIsIdFieldPristine(true);
+
+    onCreateChange(false);
+    onOpenChange(false);
   };
 
   const handleLabelChange = (
@@ -106,16 +127,18 @@ export const CreateCustomTypeModal: React.FC<CreateCustomTypeModalProps> = ({
   return (
     <ModalFormCard
       dataCy="create-ct-modal"
-      isOpen={isCreateCustomTypeModalOpen}
+      isOpen={isOpen}
       widthInPx="530px"
       formId="create-custom-type"
       buttonLabel={"Create"}
       close={() => {
-        closeModals();
+        onOpenChange(false);
         setIsIdFieldPristine(true);
       }}
-      onSubmit={createCustomTypeAndTrack}
-      isLoading={isCreatingCustomType}
+      onSubmit={(values) => {
+        void onSubmit(values);
+      }}
+      isLoading={isCreating}
       initialValues={{
         repeatable: true,
         id: "",

package/components/Forms/RenameCustomTypeModal/RenameCustomTypeModal.tsx

@@ -31,7 +31,7 @@ export const RenameCustomTypeModal: React.FC<RenameCustomTypeModalProps> = ({
 }) => {
   const customTypeName = customType?.label ?? "";
   const customTypeId = customType?.id ?? "";
-  const { renameAvailableCustomTypeSuccess } = useSliceMachineActions();
+  const { renameCustomTypeSuccess } = useSliceMachineActions();
 
   const [isRenaming, setIsRenaming] = useState(false);
 
@@ -46,7 +46,7 @@ export const RenameCustomTypeModal: React.FC<RenameCustomTypeModalProps> = ({
       await renameCustomType({
         model: customType,
         newLabel: values.customTypeName,
-        onSuccess: renameAvailableCustomTypeSuccess,
+        onSuccess: renameCustomTypeSuccess,
       });
     }
     setIsRenaming(false);

package/components/Forms/RenameSliceModal/RenameSliceModal.tsx

@@ -1,50 +1,62 @@
 import { Box } from "theme-ui";
-import useSliceMachineActions from "@src/modules/useSliceMachineActions";
-import ModalFormCard from "../../ModalFormCard";
-import { InputBox } from "../components/InputBox";
 import { useSelector } from "react-redux";
+
+import useSliceMachineActions from "@src/modules/useSliceMachineActions";
 import { SliceMachineStoreType } from "@src/redux/type";
-import { isModalOpen } from "@src/modules/modal";
-import { ModalKeysEnum } from "@src/modules/modal/types";
 import { getLibraries, getRemoteSlices } from "@src/modules/slices";
+import { ComponentUI } from "@lib/models/common/ComponentUI";
+import { renameSlice } from "@src/features/slices/actions/renameSlice";
+
+import { InputBox } from "../components/InputBox";
+import ModalFormCard from "../../ModalFormCard";
 import { SliceModalValues } from "../formsTypes";
 import { validateSliceModalValues } from "../formsValidator";
 
 interface RenameSliceModalProps {
-  sliceName: string;
-  sliceId: string;
-  libName: string;
+  isOpen: boolean;
+  slice?: ComponentUI;
+  onClose: () => void;
 }
 
 export const RenameSliceModal: React.FC<RenameSliceModalProps> = ({
-  sliceName,
-  sliceId,
-  libName,
+  slice,
+  isOpen,
+  onClose,
 }) => {
-  const { renameSlice, closeModals } = useSliceMachineActions();
-  const { isRenameSliceModalOpen, localLibs, remoteLibs } = useSelector(
+  const { renameSliceSuccess } = useSliceMachineActions();
+  const { localLibs, remoteLibs } = useSelector(
     (store: SliceMachineStoreType) => ({
-      isRenameSliceModalOpen: isModalOpen(store, ModalKeysEnum.RENAME_SLICE),
       localLibs: getLibraries(store),
       remoteLibs: getRemoteSlices(store),
     }),
   );
+  const initialSliceName = slice?.model.name ?? "";
+
+  const handleOnSubmit = async (values: SliceModalValues) => {
+    if (slice) {
+      await renameSlice({
+        slice,
+        newSliceName: values.sliceName,
+        onSuccess: (renamedSlice) => {
+          renameSliceSuccess(renamedSlice.from, renamedSlice.model);
+        },
+      });
 
-  const handleOnSubmit = (values: SliceModalValues) => {
-    renameSlice(libName, sliceId, values.sliceName);
+      onClose();
+    }
   };
 
   return (
     <ModalFormCard<SliceModalValues>
       dataCy="rename-slice-modal"
-      isOpen={isRenameSliceModalOpen}
+      isOpen={isOpen}
       widthInPx="530px"
-      formId={`rename-slice-modal-${sliceId}`}
-      close={closeModals}
+      formId={`rename-slice-modal-${slice?.model.id ?? ""}`}
+      close={onClose}
       buttonLabel="Rename"
-      onSubmit={handleOnSubmit}
+      onSubmit={(values) => void handleOnSubmit(values)}
       initialValues={{
-        sliceName: sliceName,
+        sliceName: initialSliceName,
       }}
       content={{
         title: "Rename a slice",

package/components/Navigation/ChangesListItem.tsx

@@ -1,13 +1,9 @@
-import { type FC, useState } from "react";
+import { type FC } from "react";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { SliceMachineStoreType } from "@src/redux/type";
-import { useSelector } from "react-redux";
 
 import { SideNavLink, SideNavListItem } from "@src/components/SideNav";
 import { RadarIcon } from "@src/icons/RadarIcon";
-import { isLoading } from "@src/modules/loading";
-import { LoadingKeysEnum } from "@src/modules/loading/types";
 import {
   HoverCard,
   HoverCardCloseButton,
@@ -15,11 +11,8 @@ import {
   HoverCardMedia,
   HoverCardTitle,
 } from "@src/components/HoverCard";
-import {
-  userHasSeenChangesToolTip,
-  userHasSeenSimulatorToolTip,
-} from "@src/modules/userContext";
 import useSliceMachineActions from "@src/modules/useSliceMachineActions";
+
 import { ChangesRightElement } from "./ChangesRightElement";
 
 export const ChangesListItem: FC = () => {
@@ -63,30 +56,19 @@ export const ChangesListItem: FC = () => {
   );
 };
 
+// TODO(DT-1925): Reactivate this feature
 const useOpenChangesHoverCard = () => {
-  const {
-    hasSeenChangesToolTip,
-    hasSeenSimulatorToolTip,
-    isSavingCustomType,
-    isSavingSlice,
-  } = useSelector((store: SliceMachineStoreType) => ({
-    hasSeenChangesToolTip: userHasSeenChangesToolTip(store),
-    hasSeenSimulatorToolTip: userHasSeenSimulatorToolTip(store),
-    isSavingCustomType: isLoading(store, LoadingKeysEnum.SAVE_CUSTOM_TYPE),
-    isSavingSlice: isLoading(store, LoadingKeysEnum.SAVE_SLICE),
-  }));
-
-  const isSaving = isSavingCustomType || isSavingSlice;
-  const [prevIsSaving, setPrevIsSaving] = useState(isSaving);
+  // const { hasSeenChangesToolTip, hasSeenSimulatorToolTip } = useSelector(
+  //   (store: SliceMachineStoreType) => ({
+  //     hasSeenChangesToolTip: userHasSeenChangesToolTip(store),
+  //     hasSeenSimulatorToolTip: userHasSeenSimulatorToolTip(store),
+  //   }),
+  // );
 
-  if (!prevIsSaving && isSaving) {
-    setPrevIsSaving(isSaving);
-  }
+  // return (
+  //   !hasSeenChangesToolTip &&
+  //   hasSeenSimulatorToolTip
+  // );
 
-  return (
-    !hasSeenChangesToolTip &&
-    hasSeenSimulatorToolTip &&
-    !isSaving &&
-    prevIsSaving
-  );
+  return false;
 };

package/out/404.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="/_next/static/css/200244e3e0463c39.css" as="style"/><link rel="stylesheet" href="/_next/static/css/200244e3e0463c39.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="/_next/static/chunks/webpack-2f903acb0cccbf9e.js" defer=""></script><script src="/_next/static/chunks/framework-cdccea7a52cc6e81.js" defer=""></script><script src="/_next/static/chunks/main-5e6780279ca21cb9.js" defer=""></script><script src="/_next/static/chunks/pages/_app-9f3513533bb2dfb8.js" defer=""></script><script src="/_next/static/chunks/pages/_error-69b4f498bafdd188.js" defer=""></script><script src="/_next/static/RRBm5bm2F__Ws0vsvXhN6/_buildManifest.js" defer=""></script><script src="/_next/static/RRBm5bm2F__Ws0vsvXhN6/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"RRBm5bm2F__Ws0vsvXhN6","runtimeConfig":{"sentryEnvironment":"beta"},"nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
+<!DOCTYPE html><html><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="/_next/static/css/200244e3e0463c39.css" as="style"/><link rel="stylesheet" href="/_next/static/css/200244e3e0463c39.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="/_next/static/chunks/webpack-2f903acb0cccbf9e.js" defer=""></script><script src="/_next/static/chunks/framework-cdccea7a52cc6e81.js" defer=""></script><script src="/_next/static/chunks/main-5e6780279ca21cb9.js" defer=""></script><script src="/_next/static/chunks/pages/_app-a2fa2db79a1e9a1e.js" defer=""></script><script src="/_next/static/chunks/pages/_error-69b4f498bafdd188.js" defer=""></script><script src="/_next/static/W3x14bv5_NtxtSjAB0JUM/_buildManifest.js" defer=""></script><script src="/_next/static/W3x14bv5_NtxtSjAB0JUM/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"W3x14bv5_NtxtSjAB0JUM","runtimeConfig":{"sentryEnvironment":"beta"},"nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>

package/out/_next/static/W3x14bv5_NtxtSjAB0JUM/_buildManifest.js

@@ -0,0 +1 @@
+self.__BUILD_MANIFEST=function(s,c,a,e,t,i,b,f,n,u,d,h,l,k,j,p,g,o,r){return{__rewrites:{beforeFiles:[],afterFiles:[],fallback:[]},"/":[a,j,p,"static/chunks/pages/index-cf93d16e9c63b6db.js"],"/_error":["static/chunks/pages/_error-69b4f498bafdd188.js"],"/changelog":[s,e,"static/chunks/870-0c7a8a9622de78b7.js","static/chunks/pages/changelog-afd18276fe018b24.js"],"/changes":[s,t,"static/chunks/8eec4907-b712959d9f984b68.js",i,"static/chunks/918-5bb55fb464e34768.js",c,f,"static/css/37153180c3b0dd66.css","static/chunks/pages/changes-92c84f6cac0285fd.js"],"/custom-types":[a,j,p,"static/chunks/pages/custom-types-3c8e721ec6802127.js"],"/custom-types/[customTypeId]":[s,n,u,d,h,e,b,i,l,g,c,a,k,o,r,"static/chunks/pages/custom-types/[customTypeId]-97ab3b90b85d645d.js"],"/labs":["static/chunks/pages/labs-ee206005948f8e87.js"],"/page-types/[pageTypeId]":[s,n,u,d,h,e,b,i,l,g,c,a,k,o,r,"static/chunks/pages/page-types/[pageTypeId]-84a22c5e480d3fa9.js"],"/slices":[s,t,b,c,f,"static/css/f8eb526e10bc2441.css","static/chunks/pages/slices-b0b58192a87df822.js"],"/slices/[lib]/[sliceName]/[variation]":[s,t,n,u,d,h,e,b,i,l,c,k,f,"static/css/b22c0750c14cc089.css","static/chunks/pages/slices/[lib]/[sliceName]/[variation]-608d206d10a719e3.js"],"/slices/[lib]/[sliceName]/[variation]/simulator":[t,"static/chunks/72585f70-28b4d7d5384b3703.js","static/chunks/18539003-5cc559566b738915.js","static/chunks/376-7e784d6069e01654.js","static/chunks/pages/slices/[lib]/[sliceName]/[variation]/simulator-52c3e1f9d14160b8.js"],sortedPages:["/","/_app","/_error","/changelog","/changes","/custom-types","/custom-types/[customTypeId]","/labs","/page-types/[pageTypeId]","/slices","/slices/[lib]/[sliceName]/[variation]","/slices/[lib]/[sliceName]/[variation]/simulator"]}}("static/chunks/59b4e022-7a3b5554b806349f.js","static/chunks/25-01f422cea8066349.js","static/chunks/799-d95a93e965557aeb.js","static/chunks/183-4feb6bb3eddbc768.js","static/chunks/c8eae200-966ce352f7b5d2b9.js","static/chunks/543-f8766685f7f451e2.js","static/chunks/50-cfc2514205b86001.js","static/chunks/286-ed90373e9a469944.js","static/chunks/f36c6662-03bb5e9d9aa0b0aa.js","static/chunks/4c744e84-e3161d754618373f.js","static/chunks/065a3ddb-9a38ca0d60f0bf2f.js","static/chunks/1cc2734a-2c5b6c0367fcde86.js","static/chunks/696-b12edad30a3617e5.js","static/chunks/318-34a2dea7cfd4661d.js","static/chunks/727-358d7fae68a880b3.js","static/css/be1f49e49a5aa7eb.css","static/chunks/474-5a072e6fac61f703.js","static/chunks/904-1ff7519adece2b55.js","static/css/72465cc1225f28a2.css"),self.__BUILD_MANIFEST_CB&&self.__BUILD_MANIFEST_CB();