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

package/src/modules/availableCustomTypes/index.ts

@@ -1,21 +1,8 @@
 import { Reducer } from "redux";
 import { AvailableCustomTypesStoreType } from "./types";
-import {
-  ActionType,
-  createAction,
-  createAsyncAction,
-  getType,
-} from "typesafe-actions";
+import { ActionType, createAction, getType } from "typesafe-actions";
 import { SliceMachineStoreType } from "@src/redux/type";
 import { refreshStateCreator } from "@src/modules/environment";
-import { call, fork, put, takeLatest } from "redux-saga/effects";
-import { withLoader } from "@src/modules/loading";
-import { LoadingKeysEnum } from "@src/modules/loading/types";
-import { updateCustomType } from "@src/apiClient";
-import { modalCloseCreator } from "@src/modules/modal";
-import { push } from "connected-next-router";
-import { createCustomType } from "@src/features/customTypes/customTypesTable/createCustomType";
-import { openToasterCreator, ToasterType } from "@src/modules/toaster";
 import { CustomTypeSM } from "@lib/models/common/CustomType";
 import {
   normalizeFrontendCustomType,
@@ -30,62 +17,36 @@ import {
   hasLocal,
   hasLocalAndRemote,
 } from "@lib/models/common/ModelData";
-import { CustomTypeFormat } from "@slicemachine/manager";
-import { CUSTOM_TYPES_CONFIG } from "@src/features/customTypes/customTypesConfig";
-import { CUSTOM_TYPES_MESSAGES } from "@src/features/customTypes/customTypesMessages";
-import { CustomTypes } from "@lib/models/common/CustomType";
-import { ToastMessageWithPath } from "@components/ToasterContainer";
-
-export const saveCustomTypeCreator = createAsyncAction(
-  "CUSTOM_TYPE/SAVE.REQUEST",
-  "CUSTOM_TYPE/SAVE.RESPONSE",
-  "CUSTOM_TYPE/SAVE.FAILURE",
-)<undefined, { customType: CustomTypeSM }>();
 
 // Action Creators
-export const createCustomTypeCreator = createAsyncAction(
-  "CUSTOM_TYPES/CREATE.REQUEST",
-  "CUSTOM_TYPES/CREATE.RESPONSE",
-  "CUSTOM_TYPES/CREATE.FAILURE",
-)<
-  {
-    id: string;
-    label: string;
-    repeatable: boolean;
-    format: CustomTypeFormat;
-  },
-  {
-    newCustomType: CustomTypeSM;
-  }
->();
+export const customTypeSaveSuccess = createAction("CUSTOM_TYPE/SAVE_SUCCESS")<{
+  newCustomType: CustomTypeSM;
+}>();
 
-export const renameAvailableCustomType = createAction(
-  "CUSTOM_TYPES/RENAME_CUSTOM_TYPE",
+export const customTypeCreateSuccess = createAction(
+  "CUSTOM_TYPES/CREATE_SUCCESS",
+)<{
+  newCustomType: CustomTypeSM;
+}>();
+
+export const customTypeRenameSuccess = createAction(
+  "CUSTOM_TYPES/RENAME_SUCCESS",
 )<{
   renamedCustomType: CustomTypeSM;
 }>();
 
-export const deleteCustomTypeCreator = createAsyncAction(
-  "CUSTOM_TYPES/DELETE.REQUEST",
-  "CUSTOM_TYPES/DELETE.RESPONSE",
-  "CUSTOM_TYPES/DELETE.FAILURE",
-)<
-  {
-    customTypeId: string;
-    customTypeName: string;
-    format: CustomTypeFormat;
-  },
-  {
-    customTypeId: string;
-  }
->();
+export const customTypeDeleteSuccess = createAction(
+  "CUSTOM_TYPES/DELETE_SUCCESS",
+)<{
+  customTypeId: string;
+}>();
 
 type CustomTypesActions =
   | ActionType<typeof refreshStateCreator>
-  | ActionType<typeof createCustomTypeCreator>
-  | ActionType<typeof renameAvailableCustomType>
-  | ActionType<typeof saveCustomTypeCreator>
-  | ActionType<typeof deleteCustomTypeCreator>
+  | ActionType<typeof customTypeCreateSuccess>
+  | ActionType<typeof customTypeRenameSuccess>
+  | ActionType<typeof customTypeSaveSuccess>
+  | ActionType<typeof customTypeDeleteSuccess>
   | ActionType<typeof deleteSliceCreator.success>;
 
 // Selectors
@@ -134,7 +95,7 @@ export const availableCustomTypesReducer: Reducer<
         ...normalizedNewCustomType,
       };
     }
-    case getType(createCustomTypeCreator.success): {
+    case getType(customTypeCreateSuccess): {
       const normalizedNewCustomType = normalizeFrontendCustomType(
         action.payload.newCustomType,
       );
@@ -145,8 +106,8 @@ export const availableCustomTypesReducer: Reducer<
       };
     }
 
-    case getType(saveCustomTypeCreator.success): {
-      const localCustomType = action.payload.customType;
+    case getType(customTypeSaveSuccess): {
+      const localCustomType = action.payload.newCustomType;
 
       return {
         ...state,
@@ -157,7 +118,7 @@ export const availableCustomTypesReducer: Reducer<
       };
     }
 
-    case getType(renameAvailableCustomType): {
+    case getType(customTypeRenameSuccess): {
       const id = action.payload.renamedCustomType.id;
       const customType = state[id];
 
@@ -172,7 +133,7 @@ export const availableCustomTypesReducer: Reducer<
       };
     }
 
-    case getType(deleteCustomTypeCreator.success): {
+    case getType(customTypeDeleteSuccess): {
       const customType = state[action.payload.customTypeId];
 
       if (hasLocalAndRemote(customType)) {
@@ -229,70 +190,3 @@ export const availableCustomTypesReducer: Reducer<
       return state;
   }
 };
-
-export function* createCustomTypeSaga({
-  payload,
-}: ReturnType<typeof createCustomTypeCreator.request>) {
-  const customTypesConfig = CUSTOM_TYPES_CONFIG[payload.format];
-  const customTypesMessages = CUSTOM_TYPES_MESSAGES[payload.format];
-
-  try {
-    const newCustomType = CustomTypes.toSM(
-      createCustomType(
-        payload.id,
-        payload.label,
-        payload.repeatable,
-        payload.format,
-      ),
-    );
-    yield call(updateCustomType, CustomTypes.fromSM(newCustomType));
-    yield put(createCustomTypeCreator.success({ newCustomType }));
-    yield put(modalCloseCreator());
-    yield put(
-      push({
-        pathname: customTypesConfig.getBuilderPagePathname(payload.id),
-        query:
-          newCustomType.format === "page"
-            ? {
-                newPageType: true,
-              }
-            : undefined,
-      }),
-    );
-    yield put(
-      openToasterCreator({
-        content: ToastMessageWithPath({
-          message: `${customTypesMessages.name({
-            start: true,
-            plural: false,
-          })} saved successfully at `,
-          path: `./customtypes/${newCustomType.id}/index.json`,
-        }),
-        type: ToasterType.SUCCESS,
-      }),
-    );
-  } catch (e) {
-    yield put(
-      openToasterCreator({
-        content: `Internal Error: ${customTypesMessages.name({
-          start: true,
-          plural: false,
-        })} not saved`,
-        type: ToasterType.ERROR,
-      }),
-    );
-  }
-}
-
-// Saga watchers
-function* handleCustomTypeRequests() {
-  yield takeLatest(
-    getType(createCustomTypeCreator.request),
-    withLoader(createCustomTypeSaga, LoadingKeysEnum.CREATE_CUSTOM_TYPE),
-  );
-}
-
-// Saga Exports
-export function* watchAvailableCustomTypesSagas() {
-  yield fork(handleCustomTypeRequests);
-}

package/src/modules/loading/types.ts

@@ -5,11 +5,8 @@ export enum LoadingKeysEnum {
   REVIEW = "REVIEW",
   CHECK_SIMULATOR = "CHECK_SIMULATOR",
   CHECK_SIMULATOR_IFRAME = "CHECK_SIMULATOR_IFRAME",
-  CREATE_CUSTOM_TYPE = "CREATE_CUSTOM_TYPE",
-  SAVE_CUSTOM_TYPE = "SAVE_CUSTOM_TYPE",
   RENAME_SLICE = "RENAME_SLICE",
   GENERATE_SLICE_CUSTOM_SCREENSHOT = "GENERATE_SLICE_CUSTOM_SCREENSHOT",
-  SAVE_SLICE = "SAVE_SLICE",
   DELETE_SLICE = "DELETE_SLICE",
   SIMULATOR_SAVE_MOCK = "SIMULATOR_SAVE_MOCK",
   CHANGELOG = "CHANGELOG",

package/src/modules/modal/types.ts

@@ -1,6 +1,5 @@
 export enum ModalKeysEnum {
   LOGIN = "LOGIN",
-  CREATE_CUSTOM_TYPE = "CREATE_CUSTOM_TYPE",
   RENAME_SLICE = "RENAME_SLICE",
   SCREENSHOT_PREVIEW = "SCREENSHOT_PREVIEW",
   SCREENSHOTS = "SCREENSHOTS",

package/src/modules/useSliceMachineActions.ts

@@ -10,7 +10,7 @@ import {
   hasSeenTutorialsToolTipCreator,
   hasSeenSimulatorToolTipCreator,
   hasSeenChangesToolTipCreator,
-  changesPushSuccessCreator,
+  changesPushSuccess,
 } from "./userContext";
 import { getChangelogCreator, refreshStateCreator } from "./environment";
 import {
@@ -19,10 +19,10 @@ import {
 } from "./simulator";
 import ServerState from "@models/server/ServerState";
 import {
-  createCustomTypeCreator,
-  deleteCustomTypeCreator,
-  renameAvailableCustomType,
-  saveCustomTypeCreator,
+  customTypeCreateSuccess,
+  customTypeDeleteSuccess,
+  customTypeRenameSuccess,
+  customTypeSaveSuccess,
 } from "./availableCustomTypes";
 import {
   createSlice,
@@ -38,7 +38,6 @@ import { CustomType } from "@prismicio/types-internal/lib/customtypes";
 import { ComponentUI, ScreenshotUI } from "../../lib/models/common/ComponentUI";
 import { saveSliceMockCreator } from "./simulator";
 import { SaveSliceMockRequest } from "@src/apiClient";
-import { CustomTypeFormat } from "@slicemachine/manager";
 import { LibraryUI } from "@lib/models/common/LibraryUI";
 
 const useSliceMachineActions = () => {
@@ -64,8 +63,6 @@ const useSliceMachineActions = () => {
     dispatch(modalOpenCreator({ modalKey: ModalKeysEnum.SCREENSHOTS }));
   const openRenameSliceModal = () =>
     dispatch(modalOpenCreator({ modalKey: ModalKeysEnum.RENAME_SLICE }));
-  const openCreateCustomTypeModal = () =>
-    dispatch(modalOpenCreator({ modalKey: ModalKeysEnum.CREATE_CUSTOM_TYPE }));
   const openScreenshotPreviewModal = () =>
     dispatch(modalOpenCreator({ modalKey: ModalKeysEnum.SCREENSHOT_PREVIEW }));
   const openDeleteSliceModal = () =>
@@ -104,71 +101,6 @@ const useSliceMachineActions = () => {
     dispatch(hasSeenTutorialsToolTipCreator());
   const setSeenChangesToolTip = () => dispatch(hasSeenChangesToolTipCreator());
 
-  // Custom types module
-  const createCustomType = (
-    id: string,
-    label: string,
-    repeatable: boolean,
-    format: CustomTypeFormat,
-  ) =>
-    dispatch(
-      createCustomTypeCreator.request({ id, label, repeatable, format }),
-    );
-
-  /**
-   * Success actions = sync store state from external actions. If its name
-   * contains "Creator", it means it is still used in a saga and that `.request`
-   * and `.failure` need to be preserved
-   */
-  const saveCustomTypeSuccess = (customType: CustomType) =>
-    dispatch(
-      saveCustomTypeCreator.success({
-        customType: CustomTypes.toSM(customType),
-      }),
-    );
-
-  const deleteCustomTypeSuccess = (id: string) =>
-    dispatch(
-      deleteCustomTypeCreator.success({
-        customTypeId: id,
-      }),
-    );
-
-  const renameAvailableCustomTypeSuccess = (customType: CustomType) =>
-    dispatch(
-      renameAvailableCustomType({
-        renamedCustomType: CustomTypes.toSM(customType),
-      }),
-    );
-
-  /** End of sucess actions */
-
-  // Slice module
-  const saveSliceSuccess = (component: ComponentUI) => {
-    dispatch(
-      updateSliceCreator.success({
-        component,
-      }),
-    );
-  };
-
-  const saveSliceCustomScreenshotSuccess = (
-    variationId: string,
-    screenshot: ScreenshotUI,
-    component: ComponentUI,
-  ) => {
-    dispatch(
-      generateSliceCustomScreenshotCreator.success({
-        variationId,
-        screenshot,
-        component,
-      }),
-    );
-  };
-
-  const createSliceSuccess = (libraries: readonly LibraryUI[]) =>
-    dispatch(createSlice({ libraries }));
-
   const renameSlice = (
     libName: string,
     sliceId: string,
@@ -191,8 +123,6 @@ const useSliceMachineActions = () => {
       }),
     );
 
-  const pushChangesSuccess = () => dispatch(changesPushSuccessCreator());
-
   // Toaster store
   const openToaster = (
     content: string | React.ReactNode,
@@ -221,6 +151,71 @@ const useSliceMachineActions = () => {
     dispatch(getChangelogCreator.request());
   };
 
+  /**
+   * Success actions = sync store state from external actions. If its name
+   * contains "Creator", it means it is still used in a saga and that `.request`
+   * and `.failure` need to be preserved
+   */
+
+  /**
+   * Custom Type module
+   */
+  const createCustomTypeSuccess = (newCustomType: CustomType) =>
+    dispatch(
+      customTypeCreateSuccess({
+        newCustomType: CustomTypes.toSM(newCustomType),
+      }),
+    );
+  const saveCustomTypeSuccess = (customType: CustomType) =>
+    dispatch(
+      customTypeSaveSuccess({
+        newCustomType: CustomTypes.toSM(customType),
+      }),
+    );
+  const deleteCustomTypeSuccess = (id: string) =>
+    dispatch(
+      customTypeDeleteSuccess({
+        customTypeId: id,
+      }),
+    );
+  const renameCustomTypeSuccess = (customType: CustomType) =>
+    dispatch(
+      customTypeRenameSuccess({
+        renamedCustomType: CustomTypes.toSM(customType),
+      }),
+    );
+
+  /**
+   * Slice module
+   */
+  const saveSliceSuccess = (component: ComponentUI) => {
+    dispatch(
+      updateSliceCreator.success({
+        component,
+      }),
+    );
+  };
+  const saveSliceCustomScreenshotSuccess = (
+    variationId: string,
+    screenshot: ScreenshotUI,
+    component: ComponentUI,
+  ) => {
+    dispatch(
+      generateSliceCustomScreenshotCreator.success({
+        variationId,
+        screenshot,
+        component,
+      }),
+    );
+  };
+  const createSliceSuccess = (libraries: readonly LibraryUI[]) =>
+    dispatch(createSlice({ libraries }));
+
+  /**
+   * Changes module
+   */
+  const pushChangesSuccess = () => dispatch(changesPushSuccess());
+
   return {
     checkSimulatorSetup,
     connectToSimulatorFailure,
@@ -233,9 +228,8 @@ const useSliceMachineActions = () => {
     stopLoadingLogin,
     stopLoadingReview,
     startLoadingReview,
-    createCustomType,
     deleteCustomTypeSuccess,
-    renameAvailableCustomTypeSuccess,
+    renameCustomTypeSuccess,
     saveCustomTypeSuccess,
     saveSliceSuccess,
     saveSliceCustomScreenshotSuccess,
@@ -248,7 +242,6 @@ const useSliceMachineActions = () => {
     setSeenTutorialsToolTip,
     setSeenSimulatorToolTip,
     setSeenChangesToolTip,
-    openCreateCustomTypeModal,
     openScreenshotPreviewModal,
     openDeleteSliceModal,
     openSimulatorSetupModal,
@@ -258,6 +251,7 @@ const useSliceMachineActions = () => {
     saveSliceMock,
     getChangelog,
     pushChangesSuccess,
+    createCustomTypeSuccess,
   };
 };
 

package/src/modules/userContext/index.ts

@@ -53,7 +53,7 @@ export const hasSeenChangesToolTipCreator = createAction(
   "USER_CONTEXT/VIEW_CHANGES_TOOL_TIP",
 )();
 
-export const changesPushSuccessCreator = createAction(
+export const changesPushSuccess = createAction(
   "USER_CONTEXT/CHANGES_PUSH_SUCCESS",
 )();
 
@@ -65,7 +65,7 @@ type userContextActions = ActionType<
   | typeof hasSeenSimulatorToolTipCreator
   | typeof hasSeenChangesToolTipCreator
   | typeof refreshStateCreator
-  | typeof changesPushSuccessCreator
+  | typeof changesPushSuccess
 >;
 
 // Selectors
@@ -140,7 +140,7 @@ export const userContextReducer: Reducer<
         authStatus: getAuthStatus(action.payload.clientError),
       };
     }
-    case getType(changesPushSuccessCreator): {
+    case getType(changesPushSuccess): {
       return {
         ...state,
         lastSyncChange: Date.now(),

package/src/redux/saga.ts

@@ -1,7 +1,6 @@
 import { fork } from "redux-saga/effects";
 
 import { watchSimulatorSagas } from "@src/modules/simulator";
-import { watchAvailableCustomTypesSagas } from "@src/modules/availableCustomTypes";
 import { watchSliceSagas } from "@src/modules/slices";
 import { watchToasterSagas } from "@src/modules/toaster";
 import { watchChangelogSagas } from "@src/modules/environment";
@@ -9,7 +8,6 @@ import { watchChangelogSagas } from "@src/modules/environment";
 // Single entry point to start all Sagas at once
 export default function* rootSaga() {
   yield fork(watchSimulatorSagas);
-  yield fork(watchAvailableCustomTypesSagas);
   yield fork(watchSliceSagas);
   yield fork(watchToasterSagas);
   yield fork(watchChangelogSagas);

package/test/src/modules/availableCustomTypes/index.test.ts

@@ -1,22 +1,12 @@
 import { describe, expect, it } from "vitest";
-import {
-  createCustomTypeSaga,
-  createCustomTypeCreator,
-  availableCustomTypesReducer,
-  deleteCustomTypeCreator,
-} from "@src/modules/availableCustomTypes";
-import { testSaga } from "redux-saga-test-plan";
+
+import { availableCustomTypesReducer } from "@src/modules/availableCustomTypes";
 import { AvailableCustomTypesStoreType } from "@src/modules/availableCustomTypes/types";
 import { refreshStateCreator } from "@src/modules/environment";
+import { CustomTypeSM } from "@lib/models/common/CustomType";
+import { deleteSliceCreator } from "@src/modules/slices";
 
 import { dummyServerState } from "../__fixtures__/serverState";
-import { updateCustomType } from "@src/apiClient";
-import { createCustomType } from "@src/features/customTypes/customTypesTable/createCustomType";
-import { push } from "connected-next-router";
-import { modalCloseCreator } from "@src/modules/modal";
-import { openToasterCreator, ToasterType } from "@src/modules/toaster";
-import { CustomTypeSM, CustomTypes } from "@lib/models/common/CustomType";
-import { deleteSliceCreator } from "@src/modules/slices";
 
 const dummyCustomTypesState: AvailableCustomTypesStoreType = {};
 
@@ -57,70 +47,6 @@ describe("[Available Custom types module]", () => {
         },
       });
     });
-    it("should update the custom types state given CUSTOM_TYPES/CREATE.SUCCESS action", () => {
-      const createdCustomType: CustomTypeSM = {
-        id: "id",
-        label: "lama",
-        repeatable: false,
-        status: true,
-        format: "custom",
-        tabs: [
-          {
-            key: "Main",
-            value: [],
-          },
-        ],
-      };
-
-      const action = createCustomTypeCreator.success({
-        newCustomType: createdCustomType,
-      });
-
-      expect(
-        availableCustomTypesReducer(dummyCustomTypesState, action),
-      ).toEqual({
-        ...dummyCustomTypesState,
-        [createdCustomType.id]: {
-          local: createdCustomType,
-        },
-      });
-    });
-
-    it("should update the custom types state given CUSTOM_TYPES/DELETE.SUCCESS action", () => {
-      const customTypeIdToDelete = "id";
-      const mockCustomTypeToDelete: CustomTypeSM = {
-        id: "id",
-        label: "lama",
-        repeatable: false,
-        status: true,
-        format: "custom",
-        tabs: [
-          {
-            key: "Main",
-            value: [],
-          },
-        ],
-      };
-
-      const originalState = { ...dummyCustomTypesState };
-
-      originalState[customTypeIdToDelete] = {
-        local: mockCustomTypeToDelete,
-      };
-      mockCustomTypeToDelete.id = "another_ct";
-      originalState["another_ct"] = { local: mockCustomTypeToDelete };
-
-      const action = deleteCustomTypeCreator.success({
-        customTypeId: customTypeIdToDelete,
-      });
-
-      const result = availableCustomTypesReducer(originalState, action);
-
-      const expectState = { ...originalState };
-      delete expectState[customTypeIdToDelete];
-
-      expect(result).toEqual(expectState);
-    });
 
     it("should update the custom types state given SLICES/DELETE.SUCCESS action", () => {
       const sliceToDeleteId = "slice_id";
@@ -209,82 +135,4 @@ describe("[Available Custom types module]", () => {
       });
     });
   });
-
-  describe("[createCustomTypeSaga]", () => {
-    it("should call the api and dispatch the good actions on success", () => {
-      const actionPayload = {
-        format: "custom" as const, // CustomTypeFormat,
-        id: "id",
-        label: "label",
-        repeatable: true,
-      };
-      const customTypeCreated = CustomTypes.toSM(
-        createCustomType(
-          actionPayload.id,
-          actionPayload.label,
-          actionPayload.repeatable,
-          actionPayload.format,
-        ),
-      );
-      const saga = testSaga(
-        createCustomTypeSaga,
-        createCustomTypeCreator.request(actionPayload),
-      );
-
-      saga.next().call(updateCustomType, CustomTypes.fromSM(customTypeCreated));
-      saga
-        .next()
-        .put(
-          createCustomTypeCreator.success({ newCustomType: customTypeCreated }),
-        );
-      saga.next().put(modalCloseCreator());
-      saga.next().put(
-        push({
-          pathname: "/custom-types/id",
-          query: undefined,
-        }),
-      );
-      saga
-        .next()
-        .inspect(
-          (action: {
-            payload: { action: { type: string; payload: { type: string } } };
-          }) => {
-            expect(action.payload.action.type).toBe("TOASTER/OPEN");
-            expect(action.payload.action.payload.type).toBe(
-              ToasterType.SUCCESS,
-            );
-          },
-        );
-      saga.next().isDone();
-    });
-
-    it("should call the api and dispatch the good actions on failure", () => {
-      const actionPayload = {
-        id: "id",
-        label: "label",
-        repeatable: true,
-        format: "custom" as const,
-      };
-      const customTypeCreated = createCustomType(
-        actionPayload.id,
-        actionPayload.label,
-        actionPayload.repeatable,
-        actionPayload.format,
-      );
-      const saga = testSaga(
-        createCustomTypeSaga,
-        createCustomTypeCreator.request(actionPayload),
-      );
-
-      saga.next().call(updateCustomType, customTypeCreated);
-      saga.throw(new Error()).put(
-        openToasterCreator({
-          content: "Internal Error: Custom type not saved",
-          type: ToasterType.ERROR,
-        }),
-      );
-      saga.next().isDone();
-    });
-  });
 });