@overmap-ai/core 1.0.71-project-file-improvements.4 → 1.0.71-workspace-settings.1

package/dist/overmap-core.umd.cjs

@@ -1127,9 +1127,9 @@ var __publicField = (obj, key, value) => {
   );
   const selectStagesOfAssetType = restructureCreateSelectorWithArgs(
     toolkit.createSelector([selectAssetStages, (_state, assetTypeId) => assetTypeId], (stages, assetTypeId) => {
-      return fallbackToEmptyArray(
-        stages.filter((stage) => stage.asset_type === assetTypeId).sort((a, b) => a.priority - b.priority)
-      );
+      const stagesOfAssetType = stages.filter((stage) => stage.asset_type === assetTypeId);
+      const sortedStages = stagesOfAssetType.sort((a, b) => a.priority - b.priority);
+      return fallbackToEmptyArray(sortedStages);
     })
   );
   const selectAssetStagesByIds = restructureCreateSelectorWithArgs(
@@ -1846,36 +1846,86 @@ var __publicField = (obj, key, value) => {
   const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
   const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
   const outboxReducer = outboxSlice.reducer;
-  const projectFileAdapter = createModelAdapter((file) => file.offline_id);
-  const initialState$j = projectFileAdapter.getInitialState({});
+  const initialState$j = {
+    projectFiles: {},
+    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: {
-      initializeProjectFiles: projectFileAdapter.initialize,
-      addProjectFile: projectFileAdapter.addOne,
-      addProjectFiles: projectFileAdapter.addMany,
-      setProjectFile: projectFileAdapter.setOne,
-      setProjectFiles: projectFileAdapter.setMany,
-      updateProjectFile: projectFileAdapter.updateOne,
-      updateProjectFiles: projectFileAdapter.updateMany,
-      deleteProjectFile: projectFileAdapter.deleteOne,
-      deleteProjectFiles: projectFileAdapter.deleteMany
+      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;
+      },
+      setIsImportingProjectFile: (state, action) => {
+        state.isImportingProjectFile = action.payload;
+      },
+      saveActiveProjectFileBounds: (state, action) => {
+        const activeProjectFileId = state.activeProjectFileId;
+        if (!activeProjectFileId) {
+          throw new Error("Tried to save bounds for active project file, but no active project file was set.");
+        }
+        if (!state.projectFiles[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;
+      },
+      // 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;
+        }
+      }
     }
   });
   const {
-    initializeProjectFiles,
-    addProjectFile,
-    addProjectFiles,
-    setProjectFile,
-    setProjectFiles,
-    updateProjectFile,
-    updateProjectFiles,
-    deleteProjectFile,
-    deleteProjectFiles
+    addOrReplaceProjectFiles,
+    addOrReplaceProjectFile,
+    setIsImportingProjectFile,
+    setActiveProjectFileId,
+    saveActiveProjectFileBounds,
+    removeProjectFile,
+    removeProjectFilesOfProject,
+    resetProjectFileObjectUrls
   } = projectFileSlice.actions;
-  const selectProjectFileMapping = (state) => state.projectFileReducer.instances;
+  const selectProjectFileMapping = (state) => state.projectFileReducer.projectFiles;
   const selectProjectFiles = toolkit.createSelector(
     [selectProjectFileMapping, selectActiveProjectId],
     (mapping, activeProjectId) => {
@@ -1884,8 +1934,10 @@ var __publicField = (obj, key, value) => {
       );
     }
   );
+  const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
+  const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
   const selectProjectFileById = (id) => (state) => {
-    return state.projectFileReducer.instances[id];
+    return state.projectFileReducer.projectFiles[id];
   };
   const projectFileReducer = projectFileSlice.reducer;
   const projectAttachmentAdapter = createModelAdapter((attachment) => attachment.offline_id);
@@ -5047,98 +5099,93 @@ var __publicField = (obj, key, value) => {
       this.dispatch(initializeProjectAccesses(result));
     }
   }
-  class ProjectFileService extends BaseUploadService {
-    async add(payload) {
-      var _a2;
-      const { store } = this.client;
-      const createdBy = (_a2 = store.getState().userReducer.currentUser) == null ? void 0 : _a2.id;
-      const { file, ...payloadWithoutFile } = payload;
-      const sha1 = await hashFile(file);
-      const filePayload = {
-        sha1,
-        file_type: file.type,
-        extension: file.name.split(".").pop(),
-        size: file.size
-      };
-      const offlineProjectFile = offline({
-        ...payloadWithoutFile,
-        submitted_at: (/* @__PURE__ */ new Date()).toISOString(),
-        created_by: createdBy,
-        file_name: file.name,
-        file_sha1: sha1,
-        file: URL.createObjectURL(file)
-      });
-      this.dispatch(addProjectFile(offlineProjectFile));
+  class ProjectFileService extends BaseApiService {
+    async saveExisting(file) {
+      if (!file.offline_id) {
+        throw new Error(
+          "You can only use this method to save existing project files. The one provided has no offline_id."
+        );
+      }
+      const editableData = { ...file };
+      delete editableData.file;
       const promise = this.enqueueRequest({
-        description: "Add project file",
-        method: HttpMethod.POST,
-        url: `/projects/${payload.project}/files/`,
-        payload: {
-          offline_id: offlineProjectFile.offline_id,
-          submitted_at: offlineProjectFile.submitted_at,
-          z_index: offlineProjectFile.z_index,
-          canvas_bounds: offlineProjectFile.canvas_bounds,
-          bounds: offlineProjectFile.bounds,
-          file_name: offlineProjectFile.file_name,
-          file_sha1: offlineProjectFile.file_sha1,
-          file: offlineProjectFile.file,
-          file_payload: filePayload
-        },
-        blockers: [],
-        blocks: [offlineProjectFile.offline_id]
+        method: HttpMethod.PATCH,
+        url: `/projects/files/${file.offline_id}/`,
+        payload: editableData,
+        blockers: [file.offline_id],
+        blocks: [file.offline_id]
       });
-      promise.then((result) => {
-        this.processPresignedUrls(result.presigned_urls);
-        this.dispatch(updateProjectFile(result.project_file));
-      }).catch(() => {
-        this.dispatch(deleteProjectFile(offlineProjectFile.offline_id));
+      void promise.then((result) => {
+        this.dispatch(addOrReplaceProjectFile(result));
       });
-      return [offlineProjectFile, promise.then((result) => result.project_file)];
+      return promise;
     }
-    update(payload) {
+    // TODO: This needs to be seperated into a update and create method
+    saveActive() {
       const { store } = this.client;
-      const projectFile = selectProjectFileById(payload.offline_id)(store.getState());
-      if (!projectFile) {
-        throw new Error(`Project file with id ${payload.offline_id} not found`);
+      const state = store.getState();
+      const activeProjectFileId = state.projectFileReducer.activeProjectFileId;
+      const activeProjectId = state.projectReducer.activeProjectId;
+      if (!activeProjectFileId) {
+        throw new Error("No active project file");
+      }
+      if (!activeProjectId) {
+        throw new Error("No active project");
+      }
+      const activeProjectFile = state.projectFileReducer.projectFiles[activeProjectFileId];
+      if (!activeProjectFile) {
+        throw new Error("No active project file");
+      }
+      if (!activeProjectFile.bounds && !activeProjectFile.canvas_bounds) {
+        throw new Error("Project file must either have bounds or canvas_bounds set");
+      }
+      let requestDetails;
+      const existing = typeof activeProjectFile.file === "string" && !activeProjectFile.file.startsWith("blob:");
+      if (existing) {
+        const editableData = { ...activeProjectFile };
+        delete editableData.file;
+        requestDetails = {
+          method: HttpMethod.PATCH,
+          url: `/projects/files/${activeProjectFileId}/`,
+          payload: editableData,
+          blockers: [activeProjectFileId],
+          blocks: [activeProjectFileId]
+        };
+      } else {
+        requestDetails = new Promise((resolve, reject) => {
+          this.client.files.uploadFileToS3(activeProjectFile.file_sha1).then(([fileProps]) => {
+            resolve({
+              method: HttpMethod.POST,
+              url: `/projects/${activeProjectId}/files/`,
+              payload: {
+                ...activeProjectFile,
+                ...fileProps
+              },
+              blockers: [activeProjectFileId],
+              blocks: [activeProjectFileId]
+            });
+          }).catch(reject);
+        });
       }
-      const updatedProjectFile = {
-        ...projectFile,
-        ...payload
-      };
-      this.dispatch(updateProjectFile(updatedProjectFile));
-      const promise = this.enqueueRequest({
-        description: "Update project file",
-        method: HttpMethod.PATCH,
-        url: `/projects/files/${payload.offline_id}/`,
-        payload,
-        blockers: [payload.offline_id],
-        blocks: [payload.offline_id]
+      const promise = Promise.resolve(requestDetails).then((requestDetails2) => {
+        return this.enqueueRequest(requestDetails2);
       });
-      promise.then((result) => {
-        this.dispatch(updateProjectFile(result));
-      }).catch(() => {
-        this.dispatch(updateProjectFile(projectFile));
+      void promise.then((result) => {
+        this.dispatch(addOrReplaceProjectFile(result));
       });
-      return [updatedProjectFile, promise];
+      this.dispatch(saveActiveProjectFileBounds);
+      this.dispatch(setActiveProjectFileId(null));
+      this.dispatch(setIsImportingProjectFile(false));
+      return [activeProjectFile, promise];
     }
-    delete(id) {
-      const { store } = this.client;
-      const projectFileToDelete = selectProjectFileById(id)(store.getState());
-      if (!projectFileToDelete) {
-        throw new Error(`Project file with id ${id} not found`);
-      }
-      this.dispatch(deleteProjectFile(id));
-      const promise = this.enqueueRequest({
-        description: "Delete project file",
+    delete(projectFileId) {
+      this.dispatch(removeProjectFile(projectFileId));
+      return this.enqueueRequest({
         method: HttpMethod.DELETE,
-        url: `/projects/files/${id}/`,
-        blockers: [id],
+        url: `/projects/files/${projectFileId}`,
+        blockers: [projectFileId],
         blocks: []
       });
-      promise.catch(() => {
-        this.dispatch(updateProjectFile(projectFileToDelete));
-      });
-      return promise;
     }
     async refreshStore(projectId) {
       const result = await this.enqueueRequest({
@@ -5148,7 +5195,8 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
-      this.dispatch(initializeProjectFiles(result));
+      this.dispatch(addOrReplaceProjectFiles([]));
+      this.dispatch(addOrReplaceProjectFiles(result));
     }
   }
   class ProjectAttachmentService extends BaseAttachmentService {
@@ -5225,8 +5273,8 @@ var __publicField = (obj, key, value) => {
       if (!project) {
         throw new Error("Expected project to exist");
       }
-      const projectFiles = selectProjectFiles(state).filter((file) => file.project === projectId);
-      this.dispatch(deleteProjectFiles(projectFiles.map(({ offline_id }) => offline_id)));
+      const filesToDelete = selectProjectFiles(state).filter((file) => file.project === projectId);
+      this.dispatch(removeProjectFilesOfProject(project.id));
       const attachmentsOfProject = selectAttachmentsOfProject(project.id)(state);
       this.dispatch(deleteProjectAttachments(attachmentsOfProject.map(({ offline_id }) => offline_id)));
       const projectAccesses = selectProjectAccesses(state);
@@ -5249,7 +5297,7 @@ var __publicField = (obj, key, value) => {
       } catch (e) {
         this.dispatch(setProjects(Object.values(projects)));
         this.dispatch(initializeProjectAccesses(Object.values(projectAccesses)));
-        this.dispatch(initializeProjectFiles(projectFiles));
+        this.dispatch(addOrReplaceProjectFiles(filesToDelete));
         this.dispatch(setProjectAttachments(attachmentsOfProject));
         this.dispatch({ type: "rehydrated/setRehydrated", payload: true });
         if (license) {
@@ -7381,11 +7429,11 @@ var __publicField = (obj, key, value) => {
   exports2.addIssueUpdates = addIssueUpdates;
   exports2.addIssues = addIssues;
   exports2.addLicenses = addLicenses;
+  exports2.addOrReplaceProjectFile = addOrReplaceProjectFile;
+  exports2.addOrReplaceProjectFiles = addOrReplaceProjectFiles;
   exports2.addOrReplaceProjects = addOrReplaceProjects;
   exports2.addProjectAttachment = addProjectAttachment;
   exports2.addProjectAttachments = addProjectAttachments;
-  exports2.addProjectFile = addProjectFile;
-  exports2.addProjectFiles = addProjectFiles;
   exports2.addTeam = addTeam;
   exports2.addUsers = addUsers;
   exports2.addWorkspace = addWorkspace;
@@ -7463,8 +7511,6 @@ 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;
@@ -7533,7 +7579,6 @@ 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;
@@ -7586,13 +7631,18 @@ 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;
   exports2.restructureCreateSelectorWithArgs = restructureCreateSelectorWithArgs;
+  exports2.saveActiveProjectFileBounds = saveActiveProjectFileBounds;
   exports2.selectAccessToken = selectAccessToken;
   exports2.selectActiveOrganizationAccess = selectActiveOrganizationAccess;
   exports2.selectActiveProject = selectActiveProject;
   exports2.selectActiveProjectAccess = selectActiveProjectAccess;
+  exports2.selectActiveProjectFileId = selectActiveProjectFileId;
   exports2.selectActiveProjectId = selectActiveProjectId;
   exports2.selectActiveStatusLicenses = selectActiveStatusLicenses;
   exports2.selectAllDocumentAttachments = selectAllDocumentAttachments;
@@ -7684,6 +7734,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectGeoImageMapping = selectGeoImageMapping;
   exports2.selectGeoImages = selectGeoImages;
   exports2.selectGeoImagesOfProject = selectGeoImagesOfProject;
+  exports2.selectIsImportingProjectFile = selectIsImportingProjectFile;
   exports2.selectIsLoggedIn = selectIsLoggedIn;
   exports2.selectIssueAssociationById = selectIssueAssociationById;
   exports2.selectIssueAssociationMapping = selectIssueAssociationMapping;
@@ -7766,6 +7817,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectWorkspaceById = selectWorkspaceById;
   exports2.selectWorkspaceMapping = selectWorkspaceMapping;
   exports2.selectWorkspaces = selectWorkspaces;
+  exports2.setActiveProjectFileId = setActiveProjectFileId;
   exports2.setActiveProjectId = setActiveProjectId;
   exports2.setAsset = setAsset;
   exports2.setAssetAttachment = setAssetAttachment;
@@ -7792,6 +7844,7 @@ var __publicField = (obj, key, value) => {
   exports2.setFormSubmissions = setFormSubmissions;
   exports2.setGeoImage = setGeoImage;
   exports2.setGeoImages = setGeoImages;
+  exports2.setIsImportingProjectFile = setIsImportingProjectFile;
   exports2.setIssueAssociation = setIssueAssociation;
   exports2.setIssueAssociations = setIssueAssociations;
   exports2.setIssueAttachment = setIssueAttachment;
@@ -7805,8 +7858,6 @@ 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;
@@ -7861,8 +7912,6 @@ 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;