slice-machine-ui 1.23.2-beta.1 → 1.23.2-beta.11

package/.depcheckrc

@@ -6,6 +6,9 @@ ignores:
     "@vitest/coverage-v8",
     "monocle-ts",
     "newtype-ts",
+    "postcss",
+    "postcss-flexbugs-fixes",
+    "postcss-preset-env",
     "semver",
     "start-slicemachine",
     "stylelint-config-css-modules",

package/components/ChangesEmptyState/OfflinePage.tsx

@@ -28,7 +28,7 @@ export const OfflinePage = () => {
         <Text
           sx={{ fontSize: "13px", lineHeight: "24px", textAlign: "center" }}
         >
-          You need a stable internet connection to review and push changes
+          Connect to the internet to sync your changes.
         </Text>
       </Flex>
     </Flex>

package/components/ChangesItems/ChangesItems.tsx

@@ -6,19 +6,23 @@ import { ChangesSectionHeader } from "@components/ChangesSectionHeader";
 import { CustomTypeTable } from "@components/CustomTypeTable/changesPage";
 import Grid from "@components/Grid";
 import { ComponentUI } from "@lib/models/common/ComponentUI";
-import { ModelStatusInformation } from "@src/hooks/useModelStatus";
 import ScreenshotChangesModal from "@components/ScreenshotChangesModal";
 import { countMissingScreenshots } from "@src/domain/slice";
 import { useScreenshotChangesModal } from "@src/hooks/useScreenshotChangesModal";
 import { ModelStatus } from "@lib/models/common/ModelStatus";
 import { LocalOrRemoteCustomType } from "@lib/models/common/ModelData";
 import { SharedSliceCard } from "@src/features/slices/sliceCards/SharedSliceCard";
+import { AuthStatus } from "@src/modules/userContext/types";
+import { ModelsStatuses } from "@src/features/sync/getUnSyncChanges";
 
 import { DevCollaborationExperiment } from "./DevCollaborationExperiment";
 
-interface ChangesItemsProps extends ModelStatusInformation {
+interface ChangesItemsProps {
   unSyncedCustomTypes: LocalOrRemoteCustomType[];
   unSyncedSlices: ComponentUI[];
+  modelsStatuses: ModelsStatuses;
+  authStatus: AuthStatus;
+  isOnline: boolean;
 }
 
 export const ChangesItems: React.FC<ChangesItemsProps> = ({

package/components/CustomTypeTable/changesPage.tsx

@@ -1,7 +1,6 @@
 import Link from "next/link";
 import React from "react";
 import { Box, Text } from "theme-ui";
-import { ModelStatusInformation } from "@src/hooks/useModelStatus";
 import { CustomTypeSM } from "@lib/models/common/CustomType";
 import { ModelStatus } from "@lib/models/common/ModelStatus";
 import {
@@ -10,18 +9,26 @@ import {
 } from "@lib/models/common/ModelData";
 import { StatusBadge } from "@src/features/changes/StatusBadge";
 import { CUSTOM_TYPES_CONFIG } from "@src/features/customTypes/customTypesConfig";
+import { AuthStatus } from "@src/modules/userContext/types";
+import { ModelsStatuses } from "@src/features/sync/getUnSyncChanges";
 
-interface CustomTypeTableProps extends ModelStatusInformation {
+interface CustomTypeTableProps {
   customTypes: LocalOrRemoteCustomType[];
+  modelsStatuses: ModelsStatuses;
+  authStatus: AuthStatus;
+  isOnline: boolean;
 }
 
 const firstColumnWidth = "40%";
 const secondColumnWidth = "40%";
 const thirdColumnWidth = "20%";
 
-const CustomTypeChangeRow: React.FC<
-  { ct: CustomTypeSM; status: ModelStatus } & ModelStatusInformation
-> = ({ ct, status, authStatus, isOnline }) => {
+const CustomTypeChangeRow: React.FC<{
+  ct: CustomTypeSM;
+  status: ModelStatus;
+  authStatus: AuthStatus;
+  isOnline: boolean;
+}> = ({ ct, status, authStatus, isOnline }) => {
   return (
     <>
       <Box as={"td"} style={{ width: firstColumnWidth }}>
@@ -80,7 +87,6 @@ export const CustomTypeTable: React.FC<CustomTypeTableProps> = ({
                   status={modelsStatuses.customTypes[customType.local.id]}
                   authStatus={authStatus}
                   isOnline={isOnline}
-                  modelsStatuses={modelsStatuses}
                   key={customType.local.id}
                 />
               </tr>
@@ -97,7 +103,6 @@ export const CustomTypeTable: React.FC<CustomTypeTableProps> = ({
                 status={modelsStatuses.customTypes[customType.remote.id]}
                 authStatus={authStatus}
                 isOnline={isOnline}
-                modelsStatuses={modelsStatuses}
                 key={customType.remote.id}
               />
             </tr>

package/components/DeleteSliceModal/index.tsx

@@ -1,46 +1,57 @@
+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";
+import { useAutoSync } from "@src/features/sync/AutoSyncProvider";
 
 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 { syncChanges } = useAutoSync();
+  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);
+        syncChanges();
+      },
+    });
+
+    onClose();
+    setIsDeleting(false);
+  };
 
   return (
     <SliceMachineModal
-      isOpen={isSliceModalOpen}
+      isOpen={isOpen}
       shouldCloseOnOverlayClick={true}
       style={{
         content: {
           maxWidth: 612,
         },
       }}
-      onRequestClose={closeModals}
+      onRequestClose={onClose}
     >
       <Card
         bodySx={{
@@ -79,7 +90,7 @@ export const DeleteSliceModal: React.FunctionComponent<
                 Delete Slice
               </Heading>
             </Flex>
-            <Close type="button" onClick={closeModals} />
+            <Close type="button" onClick={onClose} />
           </Flex>
         )}
         Footer={() => (
@@ -96,7 +107,7 @@ export const DeleteSliceModal: React.FunctionComponent<
             <Button
               label="Cancel"
               variant="secondary"
-              onClick={() => closeModals()}
+              onClick={onClose}
               sx={{
                 mr: "10px",
                 fontWeight: "bold",
@@ -107,9 +118,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/DeleteVariationModal/index.tsx

@@ -52,6 +52,7 @@ export const DeleteVariationModal: FC<DeleteVariationModalProps> = ({
           <DialogActions
             ok={{
               text: "Delete",
+              color: "tomato",
               onClick: () => {
                 if (!variation) return;
                 void (async () => {

package/components/Forms/CreateCustomTypeModal/CreateCustomTypeModal.tsx

@@ -2,25 +2,29 @@ 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 { useAutoSync } from "@src/features/sync/AutoSyncProvider";
+
+import { InputBox } from "../components/InputBox";
+import { SelectRepeatable } from "../components/SelectRepeatable";
 
 interface FormValues {
   id: string;
@@ -30,46 +34,67 @@ 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 { syncChanges } = useAutoSync();
+  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,
+        });
+
+        syncChanges();
+      },
     });
-    createCustomType(id, name, repeatable, format);
-    closeModals();
-    setIsIdFieldPristine(true);
+
+    onCreateChange(false);
+    onOpenChange(false);
   };
 
   const handleLabelChange = (
@@ -106,16 +131,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/CreateSliceModal/CreateSliceModal.tsx

@@ -9,6 +9,7 @@ import ModalFormCard from "@components/ModalFormCard";
 import { createSlice } from "@src/features/slices/actions/createSlice";
 import useSliceMachineActions from "@src/modules/useSliceMachineActions";
 import { getState } from "@src/apiClient";
+import { useAutoSync } from "@src/features/sync/AutoSyncProvider";
 
 import { validateSliceModalValues } from "../formsValidator";
 import { InputBox } from "../components/InputBox";
@@ -30,6 +31,7 @@ export const CreateSliceModal: FC<CreateSliceModalProps> = ({
 }) => {
   const { createSliceSuccess } = useSliceMachineActions();
   const [isCreatingSlice, setIsCreatingSlice] = useState(false);
+  const { syncChanges } = useAutoSync();
 
   const onSubmit = async (values: FormValues) => {
     const sliceName = values.sliceName;
@@ -45,8 +47,8 @@ export const CreateSliceModal: FC<CreateSliceModalProps> = ({
         const serverState = await getState();
         // Update Redux store
         createSliceSuccess(serverState.libraries);
-
         onSuccess(newSlice, libraryName);
+        syncChanges();
       },
     });
   };

package/components/Forms/RenameCustomTypeModal/RenameCustomTypeModal.tsx

@@ -13,6 +13,7 @@ import { CustomTypeFormat } from "@slicemachine/manager";
 import { CUSTOM_TYPES_MESSAGES } from "@src/features/customTypes/customTypesMessages";
 
 import { renameCustomType } from "@src/features/customTypes/actions/renameCustomType";
+import { useAutoSync } from "@src/features/sync/AutoSyncProvider";
 
 interface RenameCustomTypeModalProps {
   isChangesLocal: boolean;
@@ -31,7 +32,8 @@ export const RenameCustomTypeModal: React.FC<RenameCustomTypeModalProps> = ({
 }) => {
   const customTypeName = customType?.label ?? "";
   const customTypeId = customType?.id ?? "";
-  const { renameAvailableCustomTypeSuccess } = useSliceMachineActions();
+  const { renameCustomTypeSuccess } = useSliceMachineActions();
+  const { syncChanges } = useAutoSync();
 
   const [isRenaming, setIsRenaming] = useState(false);
 
@@ -46,7 +48,10 @@ export const RenameCustomTypeModal: React.FC<RenameCustomTypeModalProps> = ({
       await renameCustomType({
         model: customType,
         newLabel: values.customTypeName,
-        onSuccess: renameAvailableCustomTypeSuccess,
+        onSuccess: (renamedCustomType) => {
+          renameCustomTypeSuccess(renamedCustomType);
+          syncChanges();
+        },
       });
     }
     setIsRenaming(false);

package/components/Forms/RenameSliceModal/RenameSliceModal.tsx

@@ -1,50 +1,65 @@
 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 { useAutoSync } from "@src/features/sync/AutoSyncProvider";
+
+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 { syncChanges } = useAutoSync();
+  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);
+          syncChanges();
+        },
+      });
 
-  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/Forms/RenameVariationModal/RenameVariationModal.tsx

@@ -45,7 +45,6 @@ export const RenameVariationModal: FC<RenameVariationModalProps> = ({
         <DialogHeader icon="edit" title="Rename variation" />
         <DialogContent>
           <Formik
-            validateOnChange
             validateOnMount
             initialValues={{ variationName: variation?.name ?? "" }}
             validate={(values) => {

package/components/LoginModal/index.tsx

@@ -11,7 +11,7 @@ import {
   Text,
 } from "theme-ui";
 import SliceMachineModal from "@components/SliceMachineModal";
-import { checkAuthStatus, startAuth } from "@src/apiClient";
+import { checkAuthStatus, getState, startAuth } from "@src/apiClient";
 import { buildEndpoints } from "@lib/prismic/endpoints";
 import { startPolling } from "@lib/utils/poll";
 import { CheckAuthStatusResponse } from "@models/common/Auth";
@@ -25,6 +25,12 @@ import { getEnvironment } from "@src/modules/environment";
 import useSliceMachineActions from "@src/modules/useSliceMachineActions";
 import preferWroomBase from "@lib/utils/preferWroomBase";
 import { ToasterType } from "@src/modules/toaster";
+import { getUnSyncedChanges } from "@src/features/sync/getUnSyncChanges";
+import { normalizeFrontendCustomTypes } from "@lib/models/common/normalizers/customType";
+import { normalizeFrontendSlices } from "@lib/models/common/normalizers/slices";
+import { AuthStatus } from "@src/modules/userContext/types";
+import { useAutoSync } from "@src/features/sync/AutoSyncProvider";
+import { getActiveEnvironment } from "@src/features/environments/actions/getActiveEnvironment";
 
 interface ValidAuthStatus extends CheckAuthStatusResponse {
   status: "ok";
@@ -42,7 +48,7 @@ const LoginModal: React.FunctionComponent = () => {
       env: getEnvironment(store),
     }),
   );
-
+  const { syncChanges } = useAutoSync();
   const { closeModals, startLoadingLogin, stopLoadingLogin, openToaster } =
     useSliceMachineActions();
 
@@ -72,6 +78,38 @@ const LoginModal: React.FunctionComponent = () => {
       openToaster("Logged in", ToasterType.SUCCESS);
       stopLoadingLogin();
       closeModals();
+
+      const serverState = await getState();
+      const slices = normalizeFrontendSlices(
+        serverState.libraries,
+        serverState.remoteSlices,
+      );
+      const customTypes = Object.values(
+        normalizeFrontendCustomTypes(
+          serverState.customTypes,
+          serverState.remoteCustomTypes,
+        ),
+      );
+      const { changedCustomTypes, changedSlices } = getUnSyncedChanges({
+        authStatus: AuthStatus.AUTHORIZED,
+        customTypes,
+        isOnline: true,
+        libraries: serverState.libraries,
+        slices,
+      });
+      const { activeEnvironment } = await getActiveEnvironment();
+
+      if (
+        activeEnvironment?.kind === "dev" &&
+        (changedCustomTypes.length > 0 || changedSlices.length > 0)
+      ) {
+        syncChanges({
+          environment: activeEnvironment,
+          loggedIn: true,
+          changedCustomTypes,
+          changedSlices,
+        });
+      }
     } catch (e) {
       stopLoadingLogin();
       openToaster("Login failed", ToasterType.ERROR);

package/components/ModalFormCard/index.tsx

@@ -81,7 +81,6 @@ function ModalCard<Values extends FormikValues>({
       }}
     >
       <Formik
-        validateOnChange
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         initialValues={initialValues}
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return