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

package/dist/constants/offline.d.ts

@@ -1 +1 @@
-export declare const OUTBOX_RETRY_DELAY = 5000;
+export declare const OUTBOX_RETRY_DELAY = 60000;

package/dist/overmap-core.js

@@ -657,7 +657,7 @@ const emailRegex = /^.+@.+\..+$/;
 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 || "";
@@ -1633,12 +1633,7 @@ var LicenseStatus = /* @__PURE__ */ ((LicenseStatus2) => {
 })(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 = createSlice({
   name: "users",
@@ -1661,6 +1656,8 @@ const userSlice = createSlice({
       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];
@@ -1670,32 +1667,12 @@ const userSlice = createSlice({
       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;
@@ -1716,7 +1693,6 @@ const selectUsersByIds = restructureCreateSelectorWithArgs(
     return fallbackToEmptyArray(users);
   })
 );
-const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const organizationAccessAdapter = createModelAdapter(
   (organizationAccess) => organizationAccess.offline_id
 );
@@ -1742,7 +1718,7 @@ const selectActiveOrganizationAccess = createSelector(
   [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;
   }
@@ -1932,9 +1908,9 @@ const selectSortedProjectUsers = createSelector(
   [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];
@@ -2011,9 +1987,9 @@ const selectSortedOrganizationUsers = createSelector(
   [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];
@@ -6223,22 +6199,50 @@ class FormSubmissionService extends BaseUploadService {
     }
   }
   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 {
@@ -7606,7 +7610,6 @@ export {
   addDocumentAttachments,
   addDocuments,
   addEmailDomain,
-  addFavouriteProjectId,
   addForm,
   addFormRevision,
   addFormRevisionAttachment,
@@ -7836,7 +7839,6 @@ export {
   rehydratedReducer,
   rehydratedSlice,
   removeDocuments,
-  removeFavouriteProjectId,
   removeIssueType,
   removeProjectFile,
   removeProjectFilesOfProject,
@@ -7915,7 +7917,6 @@ export {
   selectEmailDomains,
   selectEmailDomainsAsMapping,
   selectEmailDomainsOfOrganization,
-  selectFavouriteProjects,
   selectFilteredForms,
   selectFormById,
   selectFormMapping,
@@ -8072,7 +8073,6 @@ export {
   setStageCompletions,
   setTeam,
   setTokens,
-  setTourStep,
   setUploadUrl,
   setUsers,
   setWorkspaces,