wip

Author: brunozoric

packages/api-headless-cms-workflows/src/utils/state.ts

@@ -1,11 +1,8 @@
 import type { IEntryState } from "@webiny/api-headless-cms/types/index.js";
 import type { IWorkflowStateModel } from "@webiny/api-workflows/context/abstractions/WorkflowState.js";
 
-export const getStateValues = (state: IWorkflowStateModel): IEntryState | undefined => {
-    const activeStep = state.getActiveStep();
-    if (!activeStep) {
-        return undefined;
-    }
+export const getStateValues = (state: IWorkflowStateModel): IEntryState => {
+    const activeStep = state.currentStep;
 
     return {
         workflowId: state.workflowId,

packages/api-website-builder-workflows/src/utils/state.ts

@@ -1,12 +1,8 @@
 import type { IWorkflowStateModel } from "@webiny/api-workflows";
 import type { IWbPageState } from "~/types.js";
 
-export const getStateValues = (state: IWorkflowStateModel): IWbPageState | undefined => {
-    const activeStep = state.getActiveStep();
-    if (!activeStep) {
-        return undefined;
-    }
-
+export const getStateValues = (state: IWorkflowStateModel): IWbPageState => {
+    const activeStep = state.currentStep;
     return {
         workflowId: state.workflowId,
         stepId: activeStep.id,

packages/api-website-builder-workflows/src/websiteBuilder/updatePage.ts

@@ -11,6 +11,7 @@ export const attachUpdatePageLifecycleEvents = (params: IParams) => {
     const { context } = params;
     context.websiteBuilder.pages.onPageBeforeUpdate.subscribe(async ({ original }) => {
         let state: IWorkflowState;
+
         try {
             state = await context.workflowState.getTargetState(WB_PAGE_APP, original.id);
         } catch {

packages/app-aco/src/components/Table/createTableData.ts

@@ -4,6 +4,9 @@ import type { FolderTableRow, RecordTableRow } from "~/table.types.js";
 export const createRecordsData = <T extends { id: string; $selectable?: boolean }>(
     items: T[]
 ): RecordTableRow<T>[] => {
+    console.log({
+        items
+    });
     return items.map(item => ({
         id: item.id,
         $type: "RECORD",

packages/app-aco/src/features/folders/createFolder/CreateFolder.test.ts

@@ -25,7 +25,7 @@ describe("CreateFolder", () => {
     const gateway = new CreateFolderMockGateway();
 
     let container: Container;
-    const foldersCache = new ListCache<Folder>()
+    const foldersCache = new ListCache<Folder>();
 
     beforeEach(() => {
         container = new Container();

packages/app-aco/src/features/folders/loadFolderHierarchy/LoadFolderHierarchy.test.ts

@@ -175,9 +175,7 @@ describe("GetFolderHierarchy", () => {
 
         expect(foldersCache.hasItems()).toBe(false);
 
-        await expect(useCase.execute("folder-0")).rejects.toThrow(
-            "Gateway error"
-        );
+        await expect(useCase.execute("folder-0")).rejects.toThrow("Gateway error");
 
         expect(spy).toHaveBeenCalledTimes(1);
         expect(foldersCache.hasItems()).toBe(false);

packages/app-aco/src/features/folders/loadFolderHierarchy/abstractions.ts

@@ -40,5 +40,5 @@ export const LoadFolderHierarchyGateway = createAbstraction<ILoadFolderHierarchy
 
 export namespace LoadFolderHierarchyGateway {
     export type Interface = ILoadFolderHierarchyGateway;
-    export type Return = Promise<LoadFolderHierarchyGatewayResponse>
+    export type Return = Promise<LoadFolderHierarchyGatewayResponse>;
 }

packages/app-website-builder-workflows/package.json

@@ -20,6 +20,7 @@
     "@webiny/feature": "0.0.0",
     "@webiny/icons": "0.0.0",
     "mobx": "^6.15.0",
+    "mobx-react-lite": "^3.4.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-helmet": "^6.1.0"

packages/app-website-builder-workflows/src/Components/PageEditor/PageEditorAutoSave.tsx

@@ -1,13 +1,14 @@
 import React from "react";
 import { PageEditorConfig } from "@webiny/app-website-builder";
 import { useWorkflowState } from "@webiny/app-workflows";
+import { observer } from "mobx-react-lite";
 
 const { Ui } = PageEditorConfig;
 
 interface IWrappedAutoSave {
     element?: React.ReactElement | null;
 }
-const WrappedAutoSave = (props: IWrappedAutoSave) => {
+const WrappedAutoSave = observer((props: IWrappedAutoSave) => {
     const { presenter } = useWorkflowState();
     /**
      * Autosave should work only when the page does not have a workflow state assigned.
@@ -17,9 +18,9 @@ const WrappedAutoSave = (props: IWrappedAutoSave) => {
     }
 
     return null;
-};
+});
 
-export const PageEditorAutoSave = Ui.TopBar.Action.createDecorator(Original => {
+export const PageEditorAutoSave = Ui.TopBar.Element.createDecorator(Original => {
     return function PageEditorAutoSaveDecorated(props) {
         if (props.name === "autoSave") {
             return <Original {...props} element={<WrappedAutoSave element={props.element} />} />;

packages/app-website-builder-workflows/src/Components/PageEditor/PageEditorConfig.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { PageEditorConfig as BaseConfig } from "@webiny/app-website-builder";
 import { PageEditorAutoSave } from "./PageEditorAutoSave.js";
+import { PageEditorSettings } from "./PageEditorSettings.js";
 import { PageFormWorkflowStateTooltip } from "./PageFormWorkflowStateTooltip.js";
 import { PageFormWorkflowStatePublishButton } from "./PageFormWorkflowStatePublishButton.js";
 import { PageEditorLayout } from "./PageEditorLayout.js";
@@ -12,6 +13,8 @@ export const PageEditorConfig = () => {
             <BaseConfig>
                 {/* Should remove autosave feature */}
                 <PageEditorAutoSave />
+                {/* Should remove settings button */}
+                <PageEditorSettings />
                 {/* Should add a button with list of steps and their states + comment button in each row */}
                 <PageFormWorkflowStateTooltip />
                 {/* should remove publish button from the form */}