slice-machine-ui 1.23.2-alpha.bmo-add-github-settings-page.5 → 1.23.2-alpha.bmo-add-github-settings-page.7

package/src/modules/availableCustomTypes/index.ts

@@ -1,28 +1,15 @@
 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,
   normalizeFrontendCustomTypes,
 } from "@lib/models/common/normalizers/customType";
 import { omit } from "lodash";
-import { deleteSliceCreator } from "../slices";
+import { sliceDeleteSuccess } from "../slices";
 import { filterSliceFromCustomType } from "@lib/utils/shared/customTypes";
 import {
   LocalOrRemoteCustomType,
@@ -30,63 +17,37 @@ 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 deleteSliceCreator.success>;
+  | ActionType<typeof customTypeCreateSuccess>
+  | ActionType<typeof customTypeRenameSuccess>
+  | ActionType<typeof customTypeSaveSuccess>
+  | ActionType<typeof customTypeDeleteSuccess>
+  | ActionType<typeof sliceDeleteSuccess>;
 
 // Selectors
 export const selectAllCustomTypes = (
@@ -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)) {
@@ -191,7 +152,7 @@ export const availableCustomTypesReducer: Reducer<
       return state;
     }
 
-    case getType(deleteSliceCreator.success): {
+    case getType(sliceDeleteSuccess): {
       const sliceId = action.payload.sliceId;
 
       const customTypesUpdated: AvailableCustomTypesStoreType = Object.entries(
@@ -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,12 +5,7 @@ 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,10 +1,7 @@
 export enum ModalKeysEnum {
   LOGIN = "LOGIN",
-  CREATE_CUSTOM_TYPE = "CREATE_CUSTOM_TYPE",
-  RENAME_SLICE = "RENAME_SLICE",
   SCREENSHOT_PREVIEW = "SCREENSHOT_PREVIEW",
   SCREENSHOTS = "SCREENSHOTS",
-  DELETE_SLICE = "DELETE_SLICE",
   SIMULATOR_SETUP = "SIMULATOR_SETUP",
 }
 

package/src/modules/slices/index.ts

@@ -1,111 +1,49 @@
-import {
-  ActionType,
-  createAction,
-  createAsyncAction,
-  getType,
-} from "typesafe-actions";
-import {
-  call,
-  fork,
-  put,
-  SagaReturnType,
-  select,
-  takeLatest,
-} from "redux-saga/effects";
+import { ActionType, createAction, getType } from "typesafe-actions";
 import { Reducer } from "redux";
 
 import { LocalOrRemoteSlice } from "@lib/models/common/ModelData";
 import { normalizeFrontendSlices } from "@lib/models/common/normalizers/slices";
 import { SliceSM } from "@lib/models/common/Slice";
 import { LibraryUI } from "@models/common/LibraryUI";
-import { withLoader } from "@src/modules/loading";
-import { LoadingKeysEnum } from "@src/modules/loading/types";
-import { deleteSlice, renameSlice, SaveSliceMockRequest } from "@src/apiClient";
-import { modalCloseCreator } from "@src/modules/modal";
+import { SaveSliceMockRequest } from "@src/apiClient";
 import { refreshStateCreator } from "@src/modules/environment";
 import { SliceMachineStoreType } from "@src/redux/type";
-import { openToasterCreator, ToasterType } from "@src/modules/toaster";
 import { SlicesStoreType } from "./types";
 import { ComponentUI, ScreenshotUI } from "@lib/models/common/ComponentUI";
-import { selectSliceById } from "./selector";
-import { ScreenshotGenerationMethod } from "@lib/models/common/Screenshots";
 
 // Action Creators
-export const createSlice = createAction("SLICES/CREATE_SLICE")<{
+export const sliceCreateSuccess = createAction("SLICES/CREATE_SUCCESS")<{
   libraries: Readonly<LibraryUI[]>;
 }>();
 
-export const renameSliceCreator = createAsyncAction(
-  "SLICES/RENAME.REQUEST",
-  "SLICES/RENAME.RESPONSE",
-  "SLICES/RENAME.FAILURE",
-)<
-  {
-    libName: string;
-    sliceId: string;
-    newSliceName: string;
-  },
-  {
-    libName: string;
-    renamedSlice: SliceSM;
-  }
->();
+export const sliceRenameSuccess = createAction("SLICES/RENAME_SUCCESS")<{
+  libName: string;
+  renamedSlice: SliceSM;
+}>();
 
-export const deleteSliceCreator = createAsyncAction(
-  "SLICES/DELETE.REQUEST",
-  "SLICES/DELETE.RESPONSE",
-  "SLICES/DELETE.FAILURE",
-)<
-  {
-    sliceId: string;
-    sliceName: string;
-    libName: string;
-  },
-  {
-    sliceId: string;
-    sliceName: string;
-    libName: string;
-  }
->();
+export const sliceDeleteSuccess = createAction("SLICES/DELETE_SUCCESS")<{
+  sliceId: string;
+  libName: string;
+}>();
 
-export const updateSliceCreator = createAsyncAction(
-  "SLICE/UPDATE.REQUEST",
-  "SLICE/UPDATE.RESPONSE",
-  "SLICE/UPDATE.FAILURE",
-)<
-  {
-    component: ComponentUI;
-    setSliceBuilderState: () => void;
-  },
-  {
-    component: ComponentUI;
-  }
->();
+export const sliceUpdateSuccess = createAction("SLICE/UPDATE_SUCCESS")<{
+  component: ComponentUI;
+}>();
 
-export const generateSliceCustomScreenshotCreator = createAsyncAction(
-  "SLICE/GENERATE_CUSTOM_SCREENSHOT.REQUEST",
-  "SLICE/GENERATE_CUSTOM_SCREENSHOT.RESPONSE",
-  "SLICE/GENERATE_CUSTOM_SCREENSHOT.FAILURE",
-)<
-  {
-    variationId: string;
-    component: ComponentUI;
-    file: Blob;
-    method: ScreenshotGenerationMethod;
-  },
-  { variationId: string; screenshot: ScreenshotUI; component: ComponentUI }
->();
+export const sliceGenerateCustomScreenshotSuccess = createAction(
+  "SLICE/GENERATE_CUSTOM_SCREENSHOT_SUCCESS",
+)<{ variationId: string; screenshot: ScreenshotUI; component: ComponentUI }>();
 
 export const updateSliceMock =
   createAction("SLICE/UPDATE_MOCK")<SaveSliceMockRequest>();
 
 type SlicesActions =
   | ActionType<typeof refreshStateCreator>
-  | ActionType<typeof createSlice>
-  | ActionType<typeof renameSliceCreator>
-  | ActionType<typeof deleteSliceCreator>
-  | ActionType<typeof updateSliceCreator>
-  | ActionType<typeof generateSliceCustomScreenshotCreator>
+  | ActionType<typeof sliceCreateSuccess>
+  | ActionType<typeof sliceRenameSuccess>
+  | ActionType<typeof sliceDeleteSuccess>
+  | ActionType<typeof sliceUpdateSuccess>
+  | ActionType<typeof sliceGenerateCustomScreenshotSuccess>
   | ActionType<typeof updateSliceMock>;
 
 // Selectors
@@ -143,12 +81,12 @@ export const slicesReducer: Reducer<SlicesStoreType | null, SlicesActions> = (
         libraries: action.payload.libraries,
         remoteSlices: action.payload.remoteSlices,
       };
-    case getType(createSlice):
+    case getType(sliceCreateSuccess):
       return {
         ...state,
         libraries: action.payload.libraries,
       };
-    case getType(renameSliceCreator.success): {
+    case getType(sliceRenameSuccess): {
       const { libName, renamedSlice } = action.payload;
       const newLibs = state.libraries.map((library) => {
         if (library.name !== libName) return library;
@@ -169,7 +107,7 @@ export const slicesReducer: Reducer<SlicesStoreType | null, SlicesActions> = (
         libraries: newLibs,
       };
     }
-    case getType(updateSliceCreator.success): {
+    case getType(sliceUpdateSuccess): {
       const newComponentUI = action.payload.component;
 
       const newLibraries = state.libraries.map((library) => {
@@ -186,7 +124,7 @@ export const slicesReducer: Reducer<SlicesStoreType | null, SlicesActions> = (
 
       return { ...state, libraries: newLibraries };
     }
-    case getType(generateSliceCustomScreenshotCreator.success): {
+    case getType(sliceGenerateCustomScreenshotSuccess): {
       const { component, screenshot, variationId } = action.payload;
 
       const newLibraries = state.libraries.map((library) => {
@@ -209,7 +147,7 @@ export const slicesReducer: Reducer<SlicesStoreType | null, SlicesActions> = (
 
       return { ...state, libraries: newLibraries };
     }
-    case getType(deleteSliceCreator.success): {
+    case getType(sliceDeleteSuccess): {
       const { libName, sliceId } = action.payload;
       const newLibs = state.libraries.map((library) => {
         if (library.name !== libName) return library;
@@ -254,107 +192,3 @@ export const slicesReducer: Reducer<SlicesStoreType | null, SlicesActions> = (
       return state;
   }
 };
-
-// Sagas
-
-export function* renameSliceSaga({
-  payload,
-}: ReturnType<typeof renameSliceCreator.request>) {
-  const { libName, sliceId, newSliceName } = payload;
-  try {
-    const slice = (yield select((store: SliceMachineStoreType) =>
-      selectSliceById(store, libName, sliceId),
-    )) as ReturnType<typeof selectSliceById>;
-    if (!slice) {
-      throw new Error(
-        `Slice "${payload.sliceId} in the "${payload.libName}" library not found.`,
-      );
-    }
-
-    const renamedSlice = renameSliceModel({
-      slice: slice.model,
-      newName: newSliceName,
-    });
-
-    yield call(renameSlice, renamedSlice, libName);
-    yield put(renameSliceCreator.success({ libName, renamedSlice }));
-
-    yield put(modalCloseCreator());
-    yield put(
-      openToasterCreator({
-        content: "Slice name updated",
-        type: ToasterType.SUCCESS,
-      }),
-    );
-  } catch (e) {
-    yield put(
-      openToasterCreator({
-        content: "Internal Error: Slice name not saved",
-        type: ToasterType.ERROR,
-      }),
-    );
-  }
-}
-
-function* watchRenameSlice() {
-  yield takeLatest(
-    getType(renameSliceCreator.request),
-    withLoader(renameSliceSaga, LoadingKeysEnum.RENAME_SLICE),
-  );
-}
-
-export function* deleteSliceSaga({
-  payload,
-}: ReturnType<typeof deleteSliceCreator.request>) {
-  const { libName, sliceId, sliceName } = payload;
-  try {
-    const result = (yield call(
-      deleteSlice,
-      sliceId,
-      libName,
-    )) as SagaReturnType<typeof deleteSlice>;
-    if (result.errors.length > 0) {
-      throw result.errors;
-    }
-    yield put(deleteSliceCreator.success(payload));
-    yield put(
-      openToasterCreator({
-        content: `Successfully deleted Slice “${sliceName}”`,
-        type: ToasterType.SUCCESS,
-      }),
-    );
-  } catch (e) {
-    yield put(
-      openToasterCreator({
-        content: "An unexpected error happened while deleting your slice.",
-        type: ToasterType.ERROR,
-      }),
-    );
-  }
-  yield put(modalCloseCreator());
-}
-
-function* watchDeleteSlice() {
-  yield takeLatest(
-    getType(deleteSliceCreator.request),
-    withLoader(deleteSliceSaga, LoadingKeysEnum.DELETE_SLICE),
-  );
-}
-
-// Saga Exports
-export function* watchSliceSagas() {
-  yield fork(watchRenameSlice);
-  yield fork(watchDeleteSlice);
-}
-
-type RenameSliceModelArgs = {
-  slice: SliceSM;
-  newName: string;
-};
-
-export function renameSliceModel(args: RenameSliceModelArgs): SliceSM {
-  return {
-    ...args.slice,
-    name: args.newName,
-  };
-}

package/src/modules/slices/selector.ts

@@ -2,20 +2,6 @@ import { SliceMachineStoreType } from "@src/redux/type";
 
 import { getLibraries } from "./index";
 
-export const selectSliceById = (
-  store: SliceMachineStoreType,
-  libraryName: string,
-  sliceId: string,
-) => {
-  // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-  const libraries = getLibraries(store) || [];
-
-  const library = libraries.find((library) => library.name === libraryName);
-  const slice = library?.components.find((c) => c.model.id === sliceId);
-
-  return slice;
-};
-
 export const selectCurrentSlice = (
   store: SliceMachineStoreType,
   lib: string,