pages_core 3.15.2 → 3.15.3

data/app/javascript/components/Attachments/useAttachments.ts

@@ -6,10 +6,17 @@ export default function useAttachments(
   records: Attachments.Record[]
 ): Attachments.State {
   const [deleted, setDeleted] = useState<Attachments.Record[]>([]);
+  const collection = useDragCollection(records);
+
+  const update = (records: Attachments.Record[]) => {
+    collection.dispatch({ type: "reinitialize", payload: records });
+    setDeleted([]);
+  };
 
   return {
-    collection: useDragCollection(records),
+    collection: collection,
     deleted: deleted,
-    setDeleted: setDeleted
+    setDeleted: setDeleted,
+    update: update
   };
 }

data/app/javascript/components/ImageGrid/useImageGrid.ts

@@ -4,23 +4,39 @@ import * as Images from "../../types/Images";
 
 import { useDragCollection } from "../drag";
 
-export default function useImageGrid(
-  records: Images.Record[],
-  enablePrimary = false
-): Images.GridState {
+function filterRecords(records: Images.Record[], enablePrimary = false) {
   const primaryRecords = enablePrimary
     ? records.filter((r) => r.primary).slice(0, 1)
     : [];
   const imageRecords = records.filter((r) => primaryRecords.indexOf(r) === -1);
+  return [primaryRecords, imageRecords];
+}
+
+export default function useImageGrid(
+  records: Images.Record[],
+  enablePrimary = false
+): Images.GridState {
+  const [primaryRecords, imageRecords] = filterRecords(records, enablePrimary);
 
   const primary = useDragCollection(primaryRecords);
   const images = useDragCollection(imageRecords);
   const [deleted, setDeleted] = useState<Images.Record[]>([]);
 
+  const update = (records: Images.Record[]) => {
+    const [primaryRecords, imageRecords] = filterRecords(
+      records,
+      enablePrimary
+    );
+    primary.dispatch({ type: "reinitialize", payload: primaryRecords });
+    images.dispatch({ type: "reinitialize", payload: imageRecords });
+    setDeleted([]);
+  };
+
   return {
     primary: primary,
     images: images,
     deleted: deleted,
-    setDeleted: setDeleted
+    setDeleted: setDeleted,
+    update: update
   };
 }

data/app/javascript/components/PageForm.tsx

@@ -82,11 +82,6 @@ export default function PageForm(props: Props) {
     });
   };
 
-  const clearDeletedObjects = () => {
-    filesState.setDeleted([]);
-    imagesState.setDeleted([]);
-  };
-
   const handleSubmit = (evt: React.MouseEvent) => {
     evt.preventDefault();
     let method = postJson;
@@ -110,7 +105,8 @@ export default function PageForm(props: Props) {
         if (response.errors && response.errors.length > 0) {
           errorToast("A validation error prevented the page from being saved.");
         } else {
-          clearDeletedObjects();
+          filesState.update(response.page_files);
+          imagesState.update(response.page_images);
           noticeToast("Your changes were saved");
         }
       })

data/app/javascript/components/drag/useDragCollection.ts

@@ -66,6 +66,8 @@ function dragCollectionReducer<T = Drag.DraggableRecord>(
           return { ...d, rect: getPosition(d) };
         });
       });
+    case "reinitialize":
+      return action.payload.map((r) => createDraggable(r));
     case "remove":
       return state.filter(
         (d: Drag.Draggable<T>) => d.handle !== action.payload.handle

data/app/javascript/types/Attachments.ts

@@ -26,4 +26,5 @@ export interface State {
   collection: Drag.Collection<Record>;
   deleted: Record[];
   setDeleted: (records: Record[]) => void;
+  update: (records: Record[]) => void;
 }

data/app/javascript/types/Drag.ts

@@ -15,6 +15,7 @@ export type CollectionAction<T = DraggableRecord> =
       payload: Item<T>[];
     }
   | { type: "update"; payload: Item<T> }
+  | { type: "reinitialize"; payload: Array<T> }
   | { type: "remove"; payload: Draggable<T> }
   | { type: "updatePositions"; payload?: Draggable<T> };
 

data/app/javascript/types/Images.ts

@@ -44,4 +44,5 @@ export interface GridState {
   images: Drag.Collection<Record>;
   deleted: Record[];
   setDeleted: (records: Record[]) => void;
+  update: (records: Record[]) => void;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.15.2
+  version: 3.15.3
 platform: ruby
 authors:
 - Inge Jørgensen