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

package/dist/overmap-core.js

@@ -1138,9 +1138,9 @@ const selectAssetTypeStagesMapping = restructureCreateSelectorWithArgs(
 );
 const selectStagesOfAssetType = restructureCreateSelectorWithArgs(
   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(
@@ -1857,36 +1857,86 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 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 = 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 = createSelector(
   [selectProjectFileMapping, selectActiveProjectId],
   (mapping, activeProjectId) => {
@@ -1895,8 +1945,10 @@ const selectProjectFiles = createSelector(
     );
   }
 );
+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);
@@ -5058,98 +5110,93 @@ class ProjectAccessService extends BaseApiService {
     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({
@@ -5159,7 +5206,8 @@ class ProjectFileService extends BaseUploadService {
       blockers: [],
       blocks: []
     });
-    this.dispatch(initializeProjectFiles(result));
+    this.dispatch(addOrReplaceProjectFiles([]));
+    this.dispatch(addOrReplaceProjectFiles(result));
   }
 }
 class ProjectAttachmentService extends BaseAttachmentService {
@@ -5236,8 +5284,8 @@ class ProjectService extends BaseApiService {
     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);
@@ -5260,7 +5308,7 @@ class ProjectService extends BaseApiService {
     } 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) {
@@ -7393,11 +7441,11 @@ export {
   addIssueUpdates,
   addIssues,
   addLicenses,
+  addOrReplaceProjectFile,
+  addOrReplaceProjectFiles,
   addOrReplaceProjects,
   addProjectAttachment,
   addProjectAttachments,
-  addProjectFile,
-  addProjectFiles,
   addTeam,
   addUsers,
   addWorkspace,
@@ -7475,8 +7523,6 @@ export {
   deleteProjectAccesses,
   deleteProjectAttachment,
   deleteProjectAttachments,
-  deleteProjectFile,
-  deleteProjectFiles,
   deleteTeam,
   deleteWorkspace,
   dequeue,
@@ -7545,7 +7591,6 @@ export {
   initializeOrganizationAccesses,
   initializeProjectAccesses,
   initializeProjectAttachments,
-  initializeProjectFiles,
   initializeTeams,
   initializeWorkspaces,
   isToday,
@@ -7598,13 +7643,18 @@ export {
   rehydratedSlice,
   removeDocuments,
   removeIssueType,
+  removeProjectFile,
+  removeProjectFilesOfProject,
   removeUser,
+  resetProjectFileObjectUrls,
   resetStore,
   restructureCreateSelectorWithArgs,
+  saveActiveProjectFileBounds,
   selectAccessToken,
   selectActiveOrganizationAccess,
   selectActiveProject,
   selectActiveProjectAccess,
+  selectActiveProjectFileId,
   selectActiveProjectId,
   selectActiveStatusLicenses,
   selectAllDocumentAttachments,
@@ -7696,6 +7746,7 @@ export {
   selectGeoImageMapping,
   selectGeoImages,
   selectGeoImagesOfProject,
+  selectIsImportingProjectFile,
   selectIsLoggedIn,
   selectIssueAssociationById,
   selectIssueAssociationMapping,
@@ -7778,6 +7829,7 @@ export {
   selectWorkspaceById,
   selectWorkspaceMapping,
   selectWorkspaces,
+  setActiveProjectFileId,
   setActiveProjectId,
   setAsset,
   setAssetAttachment,
@@ -7804,6 +7856,7 @@ export {
   setFormSubmissions,
   setGeoImage,
   setGeoImages,
+  setIsImportingProjectFile,
   setIssueAssociation,
   setIssueAssociations,
   setIssueAttachment,
@@ -7817,8 +7870,6 @@ export {
   setProfilePicture,
   setProjectAttachment,
   setProjectAttachments,
-  setProjectFile,
-  setProjectFiles,
   setProjects,
   setRehydrated,
   setTeam,
@@ -7873,8 +7924,6 @@ export {
   updateProjectAccess,
   updateProjectAttachment,
   updateProjectAttachments,
-  updateProjectFile,
-  updateProjectFiles,
   updateTeam,
   updateWorkspace,
   userReducer,