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

package/dist/overmap-core.js

@@ -1751,39 +1751,26 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 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 = 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;
     },
@@ -1792,50 +1779,46 @@ const projectFileSlice = createSlice({
       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 = 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;
@@ -5014,7 +4997,7 @@ class ProjectFileService extends BaseApiService {
       blocks: [file.offline_id]
     });
     void promise.then((result) => {
-      this.dispatch(addOrReplaceProjectFile(result));
+      this.dispatch(updateProjectFile(result));
     });
     return promise;
   }
@@ -5026,7 +5009,7 @@ class ProjectFileService extends BaseApiService {
     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");
     }
@@ -5065,7 +5048,7 @@ class ProjectFileService extends BaseApiService {
       return this.enqueueRequest(requestDetails2);
     });
     void promise.then((result) => {
-      this.dispatch(addOrReplaceProjectFile(result));
+      this.dispatch(updateProjectFile(result));
     });
     this.dispatch(saveActiveProjectFileBounds);
     this.dispatch(setActiveProjectFileId(null));
@@ -5073,7 +5056,7 @@ class ProjectFileService extends BaseApiService {
     return [activeProjectFile, promise];
   }
   delete(projectFileId) {
-    this.dispatch(removeProjectFile(projectFileId));
+    this.dispatch(deleteProjectFile(projectFileId));
     return this.enqueueRequest({
       method: HttpMethod.DELETE,
       url: `/projects/files/${projectFileId}`,
@@ -5089,8 +5072,7 @@ class ProjectFileService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    this.dispatch(addOrReplaceProjectFiles([]));
-    this.dispatch(addOrReplaceProjectFiles(result));
+    this.dispatch(initializeProjectFiles(result));
   }
 }
 class ProjectAttachmentService extends BaseAttachmentService {
@@ -5168,7 +5150,7 @@ class ProjectService extends BaseApiService {
       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);
@@ -5191,7 +5173,7 @@ class ProjectService extends BaseApiService {
     } 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) {
@@ -7311,10 +7293,10 @@ export {
   addIssueUpdates,
   addIssues,
   addLicenses,
-  addOrReplaceProjectFile,
-  addOrReplaceProjectFiles,
   addProjectAttachment,
   addProjectAttachments,
+  addProjectFile,
+  addProjectFiles,
   addTeam,
   addUsers,
   addWorkspace,
@@ -7388,6 +7370,8 @@ export {
   deleteProjectAccesses,
   deleteProjectAttachment,
   deleteProjectAttachments,
+  deleteProjectFile,
+  deleteProjectFiles,
   deleteTeam,
   deleteWorkspace,
   dequeue,
@@ -7455,6 +7439,7 @@ export {
   initializeOrganizationAccesses,
   initializeProjectAccesses,
   initializeProjectAttachments,
+  initializeProjectFiles,
   initializeTeams,
   initializeWorkspaces,
   isToday,
@@ -7503,8 +7488,6 @@ export {
   rehydratedSlice,
   removeDocuments,
   removeIssueType,
-  removeProjectFile,
-  removeProjectFilesOfProject,
   removeUser,
   resetProjectFileObjectUrls,
   resetStore,
@@ -7724,6 +7707,8 @@ export {
   setProfilePicture,
   setProjectAttachment,
   setProjectAttachments,
+  setProjectFile,
+  setProjectFiles,
   setProjects,
   setRehydrated,
   setTeam,
@@ -7778,6 +7763,8 @@ export {
   updateProjectAccess,
   updateProjectAttachment,
   updateProjectAttachments,
+  updateProjectFile,
+  updateProjectFiles,
   updateTeam,
   updateWorkspace,
   userReducer,