fix(app-record-locking): ensure savedOn is updated on ACO cache updates

packages/api-headless-cms/tsconfig.build.json

@@ -6,7 +6,6 @@
     { "path": "../api-i18n/tsconfig.build.json" },
     { "path": "../api-security/tsconfig.build.json" },
     { "path": "../api-tenancy/tsconfig.build.json" },
-    { "path": "../aws-sdk/tsconfig.build.json" },
     { "path": "../error/tsconfig.build.json" },
     { "path": "../handler/tsconfig.build.json" },
     { "path": "../handler-aws/tsconfig.build.json" },
@@ -17,7 +16,8 @@
     { "path": "../pubsub/tsconfig.build.json" },
     { "path": "../utils/tsconfig.build.json" },
     { "path": "../validation/tsconfig.build.json" },
-    { "path": "../api-wcp/tsconfig.build.json" }
+    { "path": "../api-wcp/tsconfig.build.json" },
+    { "path": "../aws-sdk/tsconfig.build.json" }
   ],
   "compilerOptions": {
     "rootDir": "./src",

packages/api-headless-cms/tsconfig.json

@@ -6,7 +6,6 @@
     { "path": "../api-i18n" },
     { "path": "../api-security" },
     { "path": "../api-tenancy" },
-    { "path": "../aws-sdk" },
     { "path": "../error" },
     { "path": "../handler" },
     { "path": "../handler-aws" },
@@ -17,7 +16,8 @@
     { "path": "../pubsub" },
     { "path": "../utils" },
     { "path": "../validation" },
-    { "path": "../api-wcp" }
+    { "path": "../api-wcp" },
+    { "path": "../aws-sdk" }
   ],
   "compilerOptions": {
     "rootDirs": ["./src", "./__tests__"],
@@ -34,8 +34,6 @@
       "@webiny/api-security": ["../api-security/src"],
       "@webiny/api-tenancy/*": ["../api-tenancy/src/*"],
       "@webiny/api-tenancy": ["../api-tenancy/src"],
-      "@webiny/aws-sdk/*": ["../aws-sdk/src/*"],
-      "@webiny/aws-sdk": ["../aws-sdk/src"],
       "@webiny/error/*": ["../error/src/*"],
       "@webiny/error": ["../error/src"],
       "@webiny/handler/*": ["../handler/src/*"],
@@ -57,7 +55,9 @@
       "@webiny/validation/*": ["../validation/src/*"],
       "@webiny/validation": ["../validation/src"],
       "@webiny/api-wcp/*": ["../api-wcp/src/*"],
-      "@webiny/api-wcp": ["../api-wcp/src"]
+      "@webiny/api-wcp": ["../api-wcp/src"],
+      "@webiny/aws-sdk/*": ["../aws-sdk/src/*"],
+      "@webiny/aws-sdk": ["../aws-sdk/src"]
     },
     "baseUrl": "."
   }

packages/app-record-locking/package.json

@@ -17,6 +17,7 @@
     "@emotion/styled": "^11.10.6",
     "@material-design-icons/svg": "^0.14.3",
     "@webiny/app": "0.0.0",
+    "@webiny/app-aco": "0.0.0",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-headless-cms": "0.0.0",
     "@webiny/app-security": "0.0.0",

packages/app-record-locking/src/components/HeadlessCmsActionsAcoCell.tsx

@@ -6,6 +6,7 @@ import { useRecordLocking } from "~/hooks";
 import { UseContentEntriesListHookDecorator } from "./decorators/UseContentEntriesListHookDecorator";
 import styled from "@emotion/styled";
 import { UseSaveEntryDecorator } from "~/components/decorators/UseSaveEntryDecorator";
+import { UseRecordsDecorator } from "./decorators/UseRecordsDecorator";
 
 const CenterAlignment = styled.div`
     display: block;
@@ -66,6 +67,7 @@ export const HeadlessCmsActionsAcoCell = () => {
             <UseContentEntriesListHookDecorator />
             <UseSaveEntryDecorator />
             <RecordLockingCellActions />
+            <UseRecordsDecorator />
         </>
     );
 };

packages/app-record-locking/src/components/decorators/UseRecordsDecorator.tsx

@@ -0,0 +1,24 @@
+import { useRecords } from "@webiny/app-aco";
+
+/**
+ * When record locking mechanism is checking for records equality, it compares record `id` and `savedOn`.
+ * When you're updating ACO cache, you're just passing the new content entry value(s), and sometimes you might
+ * be doing it without the `savedOn`, and that causes record locking to keep its old state.
+ *
+ * This decorator ensures that calls to `updateRecordInCache` always include a `savedOn` timestamp.
+ */
+export const UseRecordsDecorator = useRecords.createDecorator(baseHook => {
+    return (folderId?: string) => {
+        const hook = baseHook(folderId);
+
+        return {
+            ...hook,
+            updateRecordInCache(record: any) {
+                hook.updateRecordInCache({
+                    ...record,
+                    savedOn: new Date().toISOString()
+                });
+            }
+        };
+    };
+});

packages/app-record-locking/tsconfig.build.json

@@ -4,6 +4,7 @@
   "references": [
     { "path": "../app/tsconfig.build.json" },
     { "path": "../app-admin/tsconfig.build.json" },
+    { "path": "../app-aco/tsconfig.build.json" },
     { "path": "../app-headless-cms/tsconfig.build.json" },
     { "path": "../app-security/tsconfig.build.json" },
     { "path": "../app-wcp/tsconfig.build.json" },

packages/app-record-locking/tsconfig.json

@@ -4,6 +4,7 @@
   "references": [
     { "path": "../app" },
     { "path": "../app-admin" },
+    { "path": "../app-aco" },
     { "path": "../app-headless-cms" },
     { "path": "../app-security" },
     { "path": "../app-wcp" },
@@ -24,6 +25,8 @@
       "@webiny/app": ["../app/src"],
       "@webiny/app-admin/*": ["../app-admin/src/*"],
       "@webiny/app-admin": ["../app-admin/src"],
+      "@webiny/app-aco/*": ["../app-aco/src/*"],
+      "@webiny/app-aco": ["../app-aco/src"],
       "@webiny/app-headless-cms/*": ["../app-headless-cms/src/*"],
       "@webiny/app-headless-cms": ["../app-headless-cms/src"],
       "@webiny/app-security/*": ["../app-security/src/*"],

yarn.lock

@@ -17112,6 +17112,7 @@ __metadata:
     "@emotion/styled": ^11.10.6
     "@material-design-icons/svg": ^0.14.3
     "@webiny/app": 0.0.0
+    "@webiny/app-aco": 0.0.0
     "@webiny/app-admin": 0.0.0
     "@webiny/app-headless-cms": 0.0.0
     "@webiny/app-security": 0.0.0