@overmap-ai/core 1.0.65-bulk-form-submit.0 → 1.0.65-current-user-cleaup.0

package/dist/overmap-core.umd.cjs

@@ -645,7 +645,7 @@ var __publicField = (obj, key, value) => {
   const fullAssetMarkerSize = 45;
   const DEFAULT_ISSUE_STATUS = IssueStatus.BACKLOG;
   const DEFAULT_ISSUE_PRIORITY = IssuePriority.MEDIUM;
-  const OUTBOX_RETRY_DELAY = 5e3;
+  const OUTBOX_RETRY_DELAY = 6e4;
   const EMPTY_ARRAY = Object.freeze([]);
   let debug = false;
   const REACT_APP_DEBUG_MEMOIZATION = {}.REACT_APP_DEBUG_MEMOIZATION || "";
@@ -1621,12 +1621,7 @@ var __publicField = (obj, key, value) => {
   })(LicenseStatus || {});
   const initialState$p = {
     users: {},
-    currentUser: {
-      id: 0,
-      username: "",
-      email: "",
-      profile: { file: null, file_sha1: null, favourite_project_ids: [], tour_step: -1 }
-    }
+    currentUser: null
   };
   const userSlice = toolkit.createSlice({
     name: "users",
@@ -1649,6 +1644,8 @@ var __publicField = (obj, key, value) => {
         state.currentUser = action.payload;
       },
       setProfilePicture: (state, action) => {
+        if (!state.currentUser)
+          return;
         state.currentUser.profile.file = action.payload.file ?? null;
         state.currentUser.profile.file_sha1 = action.payload.file_sha1 ?? null;
         const currentUser = state.users[state.currentUser.id];
@@ -1658,32 +1655,12 @@ var __publicField = (obj, key, value) => {
         currentUser.profile.file = action.payload.file ?? null;
         currentUser.profile.file_sha1 = action.payload.file_sha1 ?? null;
       },
-      addFavouriteProjectId: (state, action) => {
-        state.currentUser.profile.favourite_project_ids.push(action.payload);
-      },
-      removeFavouriteProjectId: (state, action) => {
-        state.currentUser.profile.favourite_project_ids = state.currentUser.profile.favourite_project_ids.filter(
-          (id) => id !== action.payload
-        );
-      },
-      setTourStep: (state, action) => {
-        state.currentUser.profile.tour_step = action.payload;
-      },
       removeUser: (state, action) => {
         delete state.users[action.payload];
       }
     }
   });
-  const {
-    setCurrentUser,
-    setProfilePicture,
-    setUsers,
-    addUsers,
-    addFavouriteProjectId,
-    removeFavouriteProjectId,
-    setTourStep,
-    removeUser
-  } = userSlice.actions;
+  const { setCurrentUser, setProfilePicture, setUsers, addUsers, removeUser } = userSlice.actions;
   const userReducer = userSlice.reducer;
   const selectCurrentUser = (state) => state.userReducer.currentUser;
   const selectUsersMapping = (state) => state.userReducer.users;
@@ -1704,7 +1681,6 @@ var __publicField = (obj, key, value) => {
       return fallbackToEmptyArray(users);
     })
   );
-  const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
   const organizationAccessAdapter = createModelAdapter(
     (organizationAccess) => organizationAccess.offline_id
   );
@@ -1730,7 +1706,7 @@ var __publicField = (obj, key, value) => {
     [selectCurrentUser, selectOrganizationAccesses],
     (currentUser, organizationAccesses) => {
       const activeOrganizationAccess = Object.values(organizationAccesses).find(
-        (organizationAccess) => organizationAccess.user === currentUser.id
+        (organizationAccess) => organizationAccess.user === (currentUser == null ? void 0 : currentUser.id)
       );
       return activeOrganizationAccess ?? null;
     }
@@ -1920,9 +1896,9 @@ var __publicField = (obj, key, value) => {
     [selectCurrentUser, selectProjectUsersAsMapping, selectProjectAccessUserMapping],
     (currentUser, userMapping, projectAccessMapping) => {
       return Object.values(userMapping).sort((userA, userB) => {
-        if (userA.id === currentUser.id) {
+        if (userA.id === (currentUser == null ? void 0 : currentUser.id)) {
           return -1;
-        } else if (userB.id === currentUser.id) {
+        } else if (userB.id === (currentUser == null ? void 0 : currentUser.id)) {
           return 1;
         }
         const projectAccessesA = projectAccessMapping[userA.id];
@@ -1999,9 +1975,9 @@ var __publicField = (obj, key, value) => {
     [selectCurrentUser, selectOrganizationUsersAsMapping, selectOrganizationAccessUserMapping],
     (currentUser, userMapping, organizationAccessMapping) => {
       return Object.values(userMapping).sort((userA, userB) => {
-        if (userA.id === currentUser.id) {
+        if (userA.id === (currentUser == null ? void 0 : currentUser.id)) {
           return -1;
-        } else if (userB.id === currentUser.id) {
+        } else if (userB.id === (currentUser == null ? void 0 : currentUser.id)) {
           return 1;
         }
         const organizationAccessesA = organizationAccessMapping[userA.id];
@@ -6211,22 +6187,50 @@ var __publicField = (obj, key, value) => {
       }
     }
     async refreshStore(projectId) {
-      const submissions = await this.enqueueRequest({
-        description: "Fetch form submissions",
+      const formSubmissions = {};
+      const modelSubmissions = await this.enqueueRequest({
+        description: "Fetch model submissions",
         method: HttpMethod.GET,
-        url: `/forms/in-project/${projectId}/submissions/`,
+        url: `/forms/in-project/${projectId}/submissions/model/latest/`,
         blockers: [],
         blocks: []
       });
-      this.dispatch(initializeFormSubmissions(submissions));
-      const attachments = await this.enqueueRequest({
-        description: "Fetch form attachments",
+      for (const modelSubmission of modelSubmissions) {
+        formSubmissions[modelSubmission.offline_id] = modelSubmission;
+      }
+      const standaloneSubmissions = await this.enqueueRequest({
+        description: "Fetch standalone submissions",
         method: HttpMethod.GET,
-        url: `/forms/in-project/${projectId}/attachments/`,
+        url: `/forms/in-project/${projectId}/submissions/standalone/`,
         blockers: [],
         blocks: []
       });
-      this.dispatch(initializeFormSubmissionAttachments(attachments));
+      for (const standaloneSubmission of standaloneSubmissions) {
+        formSubmissions[standaloneSubmission.offline_id] = standaloneSubmission;
+      }
+      this.dispatch(initializeFormSubmissions(Object.values(formSubmissions)));
+      const attachments = {};
+      const modelAttachments = await this.enqueueRequest({
+        description: "Fetch model submission attachments",
+        method: HttpMethod.GET,
+        url: `/forms/in-project/${projectId}/attachments/model/latest/`,
+        blockers: [],
+        blocks: []
+      });
+      for (const modelAttachment of modelAttachments) {
+        attachments[modelAttachment.offline_id] = modelAttachment;
+      }
+      const standaloneAttachments = await this.enqueueRequest({
+        description: "Fetch standalone submission attachments",
+        method: HttpMethod.GET,
+        url: `/forms/in-project/${projectId}/attachments/standalone/`,
+        blockers: [],
+        blocks: []
+      });
+      for (const standaloneAttachent of standaloneAttachments) {
+        attachments[standaloneAttachent.offline_id] = standaloneAttachent;
+      }
+      this.dispatch(initializeFormSubmissionAttachments(Object.values(attachments)));
     }
   }
   class WorkspaceService extends BaseApiService {
@@ -7593,7 +7597,6 @@ var __publicField = (obj, key, value) => {
   exports2.addDocumentAttachments = addDocumentAttachments;
   exports2.addDocuments = addDocuments;
   exports2.addEmailDomain = addEmailDomain;
-  exports2.addFavouriteProjectId = addFavouriteProjectId;
   exports2.addForm = addForm;
   exports2.addFormRevision = addFormRevision;
   exports2.addFormRevisionAttachment = addFormRevisionAttachment;
@@ -7823,7 +7826,6 @@ var __publicField = (obj, key, value) => {
   exports2.rehydratedReducer = rehydratedReducer;
   exports2.rehydratedSlice = rehydratedSlice;
   exports2.removeDocuments = removeDocuments;
-  exports2.removeFavouriteProjectId = removeFavouriteProjectId;
   exports2.removeIssueType = removeIssueType;
   exports2.removeProjectFile = removeProjectFile;
   exports2.removeProjectFilesOfProject = removeProjectFilesOfProject;
@@ -7902,7 +7904,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectEmailDomains = selectEmailDomains;
   exports2.selectEmailDomainsAsMapping = selectEmailDomainsAsMapping;
   exports2.selectEmailDomainsOfOrganization = selectEmailDomainsOfOrganization;
-  exports2.selectFavouriteProjects = selectFavouriteProjects;
   exports2.selectFilteredForms = selectFilteredForms;
   exports2.selectFormById = selectFormById;
   exports2.selectFormMapping = selectFormMapping;
@@ -8059,7 +8060,6 @@ var __publicField = (obj, key, value) => {
   exports2.setStageCompletions = setStageCompletions;
   exports2.setTeam = setTeam;
   exports2.setTokens = setTokens;
-  exports2.setTourStep = setTourStep;
   exports2.setUploadUrl = setUploadUrl;
   exports2.setUsers = setUsers;
   exports2.setWorkspaces = setWorkspaces;