@overmap-ai/core 1.0.71-mapbox.4 → 1.0.71-mapbox.5

package/dist/overmap-core.umd.cjs

@@ -1740,39 +1740,26 @@ var __publicField = (obj, key, value) => {
   const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
   const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
   const outboxReducer = outboxSlice.reducer;
-  const initialState$j = {
-    projectFiles: {},
+  const projectFileModelAdapter = createModelAdapter((projectFile) => projectFile.offline_id);
+  const initialState$j = projectFileModelAdapter.getInitialState({
     activeProjectFileId: null,
     isImportingProjectFile: false
-  };
+  });
   const projectFileSlice = toolkit.createSlice({
     name: "projectFiles",
     initialState: initialState$j,
     extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
     reducers: {
-      addOrReplaceProjectFiles: (state, action) => {
-        for (let fileObj of action.payload) {
-          let file = fileObj.file;
-          if (file.includes("+")) {
-            console.warn("Attempting to apply fix for image URL with '+' character:", file);
-            const parts = file.split("/");
-            if (parts.length < 2) {
-              throw new Error("Invalid URL: " + file);
-            }
-            const lastPart = encodeURIComponent(parts[parts.length - 1]);
-            file = parts.slice(0, -1).join("/") + "/" + lastPart;
-            console.warn("Fixed URL:", file);
-            fileObj = { ...fileObj, file };
-          }
-          state.projectFiles[fileObj.offline_id] = fileObj;
-        }
-      },
-      addOrReplaceProjectFile: (state, action) => {
-        if (!action.payload.project) {
-          throw new Error("ProjectFile has no project. A project must be set before storing.");
-        }
-        state.projectFiles[action.payload.offline_id] = action.payload;
-      },
+      initializeProjectFiles: projectFileModelAdapter.initialize,
+      setProjectFile: projectFileModelAdapter.setOne,
+      setProjectFiles: projectFileModelAdapter.setMany,
+      addProjectFile: projectFileModelAdapter.addOne,
+      addProjectFiles: projectFileModelAdapter.addMany,
+      updateProjectFile: projectFileModelAdapter.updateOne,
+      updateProjectFiles: projectFileModelAdapter.updateMany,
+      deleteProjectFile: projectFileModelAdapter.deleteOne,
+      deleteProjectFiles: projectFileModelAdapter.deleteMany,
+      // TODO: move following to /web
       setIsImportingProjectFile: (state, action) => {
         state.isImportingProjectFile = action.payload;
       },
@@ -1781,50 +1768,46 @@ var __publicField = (obj, key, value) => {
         if (!activeProjectFileId) {
           throw new Error("Tried to save bounds for active project file, but no active project file was set.");
         }
-        if (!state.projectFiles[activeProjectFileId]) {
+        if (!state.instances[activeProjectFileId]) {
           throw new Error(
             `Tried to save bounds for active project file, but project file with ID ${activeProjectFileId} 
 					doesn't exist.`
           );
         }
-        state.projectFiles[activeProjectFileId].bounds = action.payload;
+        state.instances[activeProjectFileId].bounds = action.payload;
       },
-      // TODO: Move to MapContext. Should not be persisted.
       setActiveProjectFileId: (state, action) => {
         state.activeProjectFileId = action.payload;
       },
-      removeProjectFile: (state, action) => {
-        delete state.projectFiles[action.payload];
-      },
-      removeProjectFilesOfProject: (state, action) => {
-        const filesToDelete = Object.values(state.projectFiles).filter((file) => file.project === action.payload);
-        for (const file of filesToDelete) {
-          delete state.projectFiles[file.offline_id];
-        }
-      },
       resetProjectFileObjectUrls: (state, ..._args) => {
-        for (const key in state.projectFiles) {
-          delete state.projectFiles[key].objectURL;
+        for (const key in state.instances) {
+          delete state.instances[key].objectURL;
         }
       }
     }
   });
   const {
-    addOrReplaceProjectFiles,
-    addOrReplaceProjectFile,
+    initializeProjectFiles,
+    setProjectFile,
+    setProjectFiles,
+    addProjectFile,
+    addProjectFiles,
+    updateProjectFile,
+    updateProjectFiles,
+    deleteProjectFile,
+    deleteProjectFiles,
+    // TODO: move following to /web
     setIsImportingProjectFile,
     setActiveProjectFileId,
     saveActiveProjectFileBounds,
-    removeProjectFile,
-    removeProjectFilesOfProject,
     resetProjectFileObjectUrls
   } = projectFileSlice.actions;
-  const selectProjectFileMapping = (state) => state.projectFileReducer.projectFiles;
+  const selectProjectFileMapping = (state) => state.projectFileReducer.instances;
   const selectProjectFiles = toolkit.createSelector([selectProjectFileMapping], (mapping) => {
     return fallbackToEmptyArray(Object.values(mapping).sort((a, b) => a.z_index - b.z_index));
   });
   const selectProjectFileById = (id) => (state) => {
-    return state.projectFileReducer.projectFiles[id];
+    return state.projectFileReducer.instances[id];
   };
   const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
   const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
@@ -5003,7 +4986,7 @@ var __publicField = (obj, key, value) => {
         blocks: [file.offline_id]
       });
       void promise.then((result) => {
-        this.dispatch(addOrReplaceProjectFile(result));
+        this.dispatch(updateProjectFile(result));
       });
       return promise;
     }
@@ -5015,7 +4998,7 @@ var __publicField = (obj, key, value) => {
       if (!activeProjectFileId) {
         throw new Error("No active project file");
       }
-      const activeProjectFile = state.projectFileReducer.projectFiles[activeProjectFileId];
+      const activeProjectFile = state.projectFileReducer.instances[activeProjectFileId];
       if (!activeProjectFile) {
         throw new Error("No active project file");
       }
@@ -5054,7 +5037,7 @@ var __publicField = (obj, key, value) => {
         return this.enqueueRequest(requestDetails2);
       });
       void promise.then((result) => {
-        this.dispatch(addOrReplaceProjectFile(result));
+        this.dispatch(updateProjectFile(result));
       });
       this.dispatch(saveActiveProjectFileBounds);
       this.dispatch(setActiveProjectFileId(null));
@@ -5062,7 +5045,7 @@ var __publicField = (obj, key, value) => {
       return [activeProjectFile, promise];
     }
     delete(projectFileId) {
-      this.dispatch(removeProjectFile(projectFileId));
+      this.dispatch(deleteProjectFile(projectFileId));
       return this.enqueueRequest({
         method: HttpMethod.DELETE,
         url: `/projects/files/${projectFileId}`,
@@ -5078,8 +5061,7 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      this.dispatch(addOrReplaceProjectFiles([]));
-      this.dispatch(addOrReplaceProjectFiles(result));
+      this.dispatch(initializeProjectFiles(result));
     }
   }
   class ProjectAttachmentService extends BaseAttachmentService {
@@ -5157,7 +5139,7 @@ var __publicField = (obj, key, value) => {
         throw new Error("Expected project to exist");
       }
       const filesToDelete = selectProjectFiles(state).filter((file) => file.project === projectId);
-      this.dispatch(removeProjectFilesOfProject(project.id));
+      this.dispatch(deleteProjectFiles(filesToDelete.map(({ offline_id }) => offline_id)));
       const attachmentsOfProject = selectAttachmentsOfProject(project.id)(state);
       this.dispatch(deleteProjectAttachments(attachmentsOfProject.map(({ offline_id }) => offline_id)));
       const projectAccesses = selectProjectAccesses(state);
@@ -5180,7 +5162,7 @@ var __publicField = (obj, key, value) => {
       } catch (e) {
         this.dispatch(setProjects(Object.values(projects)));
         this.dispatch(initializeProjectAccesses(Object.values(projectAccesses)));
-        this.dispatch(addOrReplaceProjectFiles(filesToDelete));
+        this.dispatch(addProjectFiles(filesToDelete));
         this.dispatch(setProjectAttachments(attachmentsOfProject));
         this.dispatch({ type: "rehydrated/setRehydrated", payload: true });
         if (license) {
@@ -7299,10 +7281,10 @@ var __publicField = (obj, key, value) => {
   exports2.addIssueUpdates = addIssueUpdates;
   exports2.addIssues = addIssues;
   exports2.addLicenses = addLicenses;
-  exports2.addOrReplaceProjectFile = addOrReplaceProjectFile;
-  exports2.addOrReplaceProjectFiles = addOrReplaceProjectFiles;
   exports2.addProjectAttachment = addProjectAttachment;
   exports2.addProjectAttachments = addProjectAttachments;
+  exports2.addProjectFile = addProjectFile;
+  exports2.addProjectFiles = addProjectFiles;
   exports2.addTeam = addTeam;
   exports2.addUsers = addUsers;
   exports2.addWorkspace = addWorkspace;
@@ -7376,6 +7358,8 @@ var __publicField = (obj, key, value) => {
   exports2.deleteProjectAccesses = deleteProjectAccesses;
   exports2.deleteProjectAttachment = deleteProjectAttachment;
   exports2.deleteProjectAttachments = deleteProjectAttachments;
+  exports2.deleteProjectFile = deleteProjectFile;
+  exports2.deleteProjectFiles = deleteProjectFiles;
   exports2.deleteTeam = deleteTeam;
   exports2.deleteWorkspace = deleteWorkspace;
   exports2.dequeue = dequeue;
@@ -7443,6 +7427,7 @@ var __publicField = (obj, key, value) => {
   exports2.initializeOrganizationAccesses = initializeOrganizationAccesses;
   exports2.initializeProjectAccesses = initializeProjectAccesses;
   exports2.initializeProjectAttachments = initializeProjectAttachments;
+  exports2.initializeProjectFiles = initializeProjectFiles;
   exports2.initializeTeams = initializeTeams;
   exports2.initializeWorkspaces = initializeWorkspaces;
   exports2.isToday = isToday;
@@ -7491,8 +7476,6 @@ var __publicField = (obj, key, value) => {
   exports2.rehydratedSlice = rehydratedSlice;
   exports2.removeDocuments = removeDocuments;
   exports2.removeIssueType = removeIssueType;
-  exports2.removeProjectFile = removeProjectFile;
-  exports2.removeProjectFilesOfProject = removeProjectFilesOfProject;
   exports2.removeUser = removeUser;
   exports2.resetProjectFileObjectUrls = resetProjectFileObjectUrls;
   exports2.resetStore = resetStore;
@@ -7712,6 +7695,8 @@ var __publicField = (obj, key, value) => {
   exports2.setProfilePicture = setProfilePicture;
   exports2.setProjectAttachment = setProjectAttachment;
   exports2.setProjectAttachments = setProjectAttachments;
+  exports2.setProjectFile = setProjectFile;
+  exports2.setProjectFiles = setProjectFiles;
   exports2.setProjects = setProjects;
   exports2.setRehydrated = setRehydrated;
   exports2.setTeam = setTeam;
@@ -7766,6 +7751,8 @@ var __publicField = (obj, key, value) => {
   exports2.updateProjectAccess = updateProjectAccess;
   exports2.updateProjectAttachment = updateProjectAttachment;
   exports2.updateProjectAttachments = updateProjectAttachments;
+  exports2.updateProjectFile = updateProjectFile;
+  exports2.updateProjectFiles = updateProjectFiles;
   exports2.updateTeam = updateTeam;
   exports2.updateWorkspace = updateWorkspace;
   exports2.userReducer = userReducer;