pages_core 3.15.1 → 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

@@ -12,10 +12,15 @@ function getPosition<T>(draggable: Drag.Draggable<T>) {
 }
 
 function hideDraggable<T>(
-  draggable: Drag.Draggable<T> | null,
-  callback: () => Drag.Draggable<T>[]
+  draggable: Drag.Item<T> | null,
+  callback: () => Drag.Item<T>[]
 ) {
-  if (draggable && "ref" in draggable && draggable.ref.current) {
+  if (
+    draggable &&
+    draggable !== "Files" &&
+    "ref" in draggable &&
+    draggable.ref.current
+  ) {
     const prevDisplay = draggable.ref.current.style.display;
     draggable.ref.current.style.display = "none";
     const result = callback();
@@ -61,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/components/drag/useDragUploader.ts

@@ -42,7 +42,7 @@ function mousePosition(evt: AnyTouchEvent): Drag.Position {
   if ("touches" in evt && evt.type == "touchmove") {
     x = evt.touches[0].clientX;
     y = evt.touches[0].clientY;
-  } else if (evt instanceof MouseEvent) {
+  } else if ("clientX" in evt && "clientY" in evt) {
     x = evt.clientX;
     y = evt.clientY;
   }

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;
 }

data/app/models/concerns/pages_core/page_model/attachments.rb

@@ -33,6 +33,11 @@ module PagesCore
         super.in_locale(locale)
       end
 
+      def page_files_attributes=(attrs)
+        ids = page_files.map(&:id)
+        super(attrs.reject { |a| a["_destroy"] && ids.exclude?(a["id"]) })
+      end
+
       def files
         page_files
       end

data/app/models/concerns/pages_core/page_model/images.rb

@@ -19,11 +19,11 @@ module PagesCore
 
         after_save :update_primary_image
 
-        accepts_nested_attributes_for :page_images,
-                                      reject_if: proc { |a|
-                                                   a["image_id"].blank?
-                                                 },
-                                      allow_destroy: true
+        accepts_nested_attributes_for(
+          :page_images,
+          reject_if: proc { |a| a["image_id"].blank? },
+          allow_destroy: true
+        )
       end
 
       def image?
@@ -42,6 +42,11 @@ module PagesCore
         super.in_locale(locale)
       end
 
+      def page_images_attributes=(attrs)
+        ids = page_images.map(&:id)
+        super(attrs.reject { |a| a["_destroy"] && ids.exclude?(a["id"]) })
+      end
+
       private
 
       def update_primary_image

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.15.1
+  version: 3.15.3
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails