@overmap-ai/core 1.0.31-org-switcher-and-bug-fixes.0 → 1.0.31

package/dist/overmap-core.umd.cjs

@@ -2354,7 +2354,8 @@ var __publicField = (obj, key, value) => {
   const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
   const userReducer = userSlice.reducer;
   const initialState$a = {
-    organizationAccesses: {}
+    organizationAccesses: {},
+    activeOrganizationAccessId: null
   };
   const organizationAccessSlice = toolkit.createSlice({
     name: "organizationAccess",
@@ -2390,28 +2391,31 @@ var __publicField = (obj, key, value) => {
             `Tried to remove organization access with ID that doesn't exist: ${action.payload.offline_id}`
           );
         }
+      },
+      setActiveOrganizationAccessId: (state, action) => {
+        state.activeOrganizationAccessId = action.payload;
       }
     }
   });
-  const { setOrganizationAccesses, updateOrganizationAccess, removeOrganizationAccess } = organizationAccessSlice.actions;
+  const {
+    setOrganizationAccesses,
+    updateOrganizationAccess,
+    removeOrganizationAccess,
+    setActiveOrganizationAccessId
+  } = organizationAccessSlice.actions;
   const selectOrganizationAccesses = (state) => {
     return state.organizationAccessReducer.organizationAccesses;
   };
   const selectOrganizationAccess = (organizationAccessId) => (state) => {
     return state.organizationAccessReducer.organizationAccesses[organizationAccessId];
   };
-  const selectActiveOrganizationAccess = toolkit.createSelector(
-    [selectCurrentUser, selectOrganizationAccesses],
-    (currentUser, organizationAccesses) => {
-      const activeOrganizationAccess = Object.values(organizationAccesses).find(
-        (organizationAccess) => organizationAccess.user === currentUser.id
-      );
-      if (!activeOrganizationAccess) {
-        return null;
-      }
-      return activeOrganizationAccess;
+  const selectActiveOrganizationAccess = (state) => {
+    const activeOrganizationAccessId = state.organizationAccessReducer.activeOrganizationAccessId;
+    if (!activeOrganizationAccessId) {
+      return null;
     }
-  );
+    return state.organizationAccessReducer.organizationAccesses[activeOrganizationAccessId] ?? null;
+  };
   const selectOrganizationAccessForUser = (user) => (state) => {
     return Object.values(state.organizationAccessReducer.organizationAccesses).find(
       (organizationAccess) => organizationAccess.user === user.id
@@ -2460,11 +2464,6 @@ var __publicField = (obj, key, value) => {
   const selectOrganizations = (state) => {
     return Object.values(state.organizationReducer.organizations);
   };
-  const selectOrganizationsWithAccess = (state) => {
-    return Object.values(state.organizationReducer.organizations).filter(
-      (organization) => organization.has_access
-    );
-  };
   const selectActiveOrganization = (state) => {
     const id = selectActiveOrganizationId(state);
     if (!id) {
@@ -2686,6 +2685,13 @@ var __publicField = (obj, key, value) => {
       deleteProject: (state, action) => {
         delete state.projects[action.payload.id];
         state.recentProjectIds = state.recentProjectIds.filter((id) => id !== action.payload.id);
+      },
+      acceptProjectInvite: (state, action) => {
+        if (action.payload in state.projects) {
+          state.projects[action.payload].invited = false;
+        } else {
+          throw new Error("Accept project invite: user is not in this project");
+        }
       }
     }
   });
@@ -2695,7 +2701,8 @@ var __publicField = (obj, key, value) => {
     updateOrCreateProjects: addOrReplaceProjects,
     setActiveProjectId,
     setCreateProjectType,
-    deleteProject
+    deleteProject,
+    acceptProjectInvite
   } = projectSlice.actions;
   const selectProjects = (state) => state.projectReducer.projects;
   const selectActiveProjectId = (state) => state.projectReducer.activeProjectId;
@@ -2709,21 +2716,6 @@ var __publicField = (obj, key, value) => {
   const selectRecentProjects = (state) => {
     return state.projectReducer.recentProjectIds;
   };
-  const selectSortedProjects = toolkit.createSelector(
-    [selectActiveProject, selectProjects],
-    (activeProject, projects) => {
-      return Object.values(projects).sort((projectA, projectB) => {
-        if (activeProject) {
-          if (activeProject.id === projectA.id) {
-            return -1;
-          } else if (activeProject.id === projectB.id) {
-            return 1;
-          }
-        }
-        return projectA.name.toLowerCase().localeCompare(projectB.name.toLowerCase(), void 0, { numeric: true });
-      });
-    }
-  );
   const selectCreateProjectType = (state) => state.projectReducer.createProjectType;
   const projectReducer = projectSlice.reducer;
   const selectProjectUsersIds = toolkit.createSelector(
@@ -2734,6 +2726,10 @@ var __publicField = (obj, key, value) => {
     [selectProjectUsersIds, selectUsersAsMapping],
     (projectUserIds, users) => projectUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
   );
+  const selectProjectsWithAccess = toolkit.createSelector(
+    [selectProjects],
+    (projects) => Object.values(projects).filter((project) => !project.invited)
+  );
   const selectSortedProjectUsers = toolkit.createSelector(
     [selectCurrentUser, selectProjectUsersAsMapping, selectProjectAccessUserMapping],
     (currentUser, userMapping, projectAccessMapping) => {
@@ -4061,6 +4057,7 @@ var __publicField = (obj, key, value) => {
       store.dispatch(setLoggedIn(false));
       store.dispatch(clearTokens());
       store.dispatch(setActiveProjectId(null));
+      store.dispatch(setActiveOrganizationAccessId(null));
       store.dispatch(setActiveWorkspaceId(null));
       store.dispatch({ type: constants.RESET_STATE });
       store.dispatch({ type: resetStore });
@@ -4867,14 +4864,16 @@ var __publicField = (obj, key, value) => {
     //  Don't accept updateStore in ComponentService.list. Just return the offline objects and promise. Here, if
     //  overwrite, use setComponents. Otherwise, use bulkAddComponents.
     async _processInitialData(data, overwrite) {
-      var _a2, _b;
+      var _a2, _b, _c;
       const workspaces = {};
       const projects = [];
       const categories = [];
       const projectsData = data.projects;
       const { store } = this.client;
-      const oldProjectId = store.getState().projectReducer.activeProjectId;
-      let currentProjectId = oldProjectId ?? ((_a2 = projectsData[0]) == null ? void 0 : _a2.id);
+      const oldProjectId = (_a2 = projectsData.find(
+        (projectData) => projectData.id === store.getState().projectReducer.activeProjectId && !projectData.invited
+      )) == null ? void 0 : _a2.id;
+      let currentProjectId = oldProjectId ?? ((_b = projectsData.find((projectData) => !projectData.invited)) == null ? void 0 : _b.id);
       store.dispatch(setActiveProjectId(currentProjectId ?? null));
       let isProjectIdValid = false;
       for (const projectData of projectsData) {
@@ -4883,9 +4882,10 @@ var __publicField = (obj, key, value) => {
           name: projectData.name,
           owner_organization: projectData.organization_owner,
           owner_user: projectData.user_owner,
-          bounds: projectData.bounds
+          bounds: projectData.bounds,
+          invited: projectData.invited || false
         });
-        if (currentProjectId === projectData.id) {
+        if (currentProjectId === projectData.id && !projectData.invited) {
           isProjectIdValid = true;
           for (const workspaceData of projectData.workspaces) {
             const workspace = { ...workspaceData, project: projectData.id };
@@ -4900,41 +4900,43 @@ var __publicField = (obj, key, value) => {
         }
       }
       store.dispatch(setCurrentUser(data.user));
-      store.dispatch(addUsers(data.project_owners));
       const organizationsData = data.organizations;
       store.dispatch(setOrganizations(organizationsData));
-      const activeOrganizationId = store.getState().organizationReducer.activeOrganizationId;
-      const firstOrg = organizationsData.find((organization) => organization.has_access);
+      const validProjects = projects.filter((project) => !project.invited);
+      const firstOrg = organizationsData[0];
       const currProjObj = projects.find((project) => project.id === currentProjectId);
       const isOrgProject = !!(currProjObj == null ? void 0 : currProjObj.owner_organization);
-      const userIsInProjectOrg = isOrgProject && organizationsData.some(
-        (organization) => organization.has_access && organization.id === currProjObj.owner_organization
-      );
+      const userIsInProjectOrg = isOrgProject && organizationsData.some((organization) => organization.id === currProjObj.owner_organization);
       let currentOrgId = null;
-      if (activeOrganizationId) {
-        currentOrgId = activeOrganizationId;
-      } else if (userIsInProjectOrg) {
+      if (userIsInProjectOrg) {
         currentOrgId = currProjObj.owner_organization;
       } else if (firstOrg) {
         currentOrgId = firstOrg.id;
       }
       if (currentOrgId) {
-        await this.client.organizations.fetchInitialOrganizationData(currentOrgId, false);
+        store.dispatch(setActiveOrganizationId(currentOrgId));
+        const orgUsersResultPromise = this.fetchOrganizationUsers(currentOrgId);
+        const organizationAccessRefreshPromise = this.client.organizationAccess.refreshStore();
+        const orgUsersResult = await orgUsersResultPromise;
+        await organizationAccessRefreshPromise;
+        store.dispatch(addUsers(orgUsersResult));
       }
       if (!isProjectIdValid) {
-        if (projects.length !== 0) {
-          currentProjectId = projects[0].id;
+        if (validProjects.length !== 0) {
+          currentProjectId = validProjects[0].id;
           store.dispatch(setActiveProjectId(currentProjectId));
-          const projectData = projectsData[0];
-          for (const workspaceData of projectData.workspaces) {
-            const workspace = { ...workspaceData, project: projectData.id };
-            if (workspace.categories) {
-              for (const category of workspace.categories) {
-                categories.push(category);
+          const projectData = projectsData.find((projectData2) => projectData2.id === currentProjectId);
+          if (projectData) {
+            for (const workspaceData of projectData.workspaces) {
+              const workspace = { ...workspaceData, project: projectData.id };
+              if (workspace.categories) {
+                for (const category of workspace.categories) {
+                  categories.push(category);
+                }
               }
+              delete workspace.categories;
+              workspaces[workspace.offline_id] = workspace;
             }
-            delete workspace.categories;
-            workspaces[workspace.offline_id] = workspace;
           }
         } else {
           currentProjectId = null;
@@ -4951,7 +4953,7 @@ var __publicField = (obj, key, value) => {
       let currentWorkspaceId;
       const oldWorkspaceId = this.client.store.getState().workspaceReducer.activeWorkspaceId;
       if (overwrite || !oldWorkspaceId) {
-        currentWorkspaceId = (_b = Object.values(workspaces).at(0)) == null ? void 0 : _b.offline_id;
+        currentWorkspaceId = (_c = Object.values(workspaces).at(0)) == null ? void 0 : _c.offline_id;
       } else {
         currentWorkspaceId = oldWorkspaceId;
       }
@@ -4972,6 +4974,7 @@ var __publicField = (obj, key, value) => {
         void this.client.userForms.refreshStore().then(() => {
           void this.client.userFormSubmissions.refreshStore().then();
         });
+        void this.client.emailDomains.refreshStore().then();
       }
       if (currentProjectId) {
         const [_offlineAttachments, promise] = this.client.attachments.fetchAll(currentProjectId);
@@ -5261,6 +5264,17 @@ var __publicField = (obj, key, value) => {
         blocks: []
       });
     }
+    async acceptInvite(projectId) {
+      return this.enqueueRequest({
+        description: "Accept project invite",
+        method: HttpMethod.PATCH,
+        url: `/projects/${projectId}/accept-invite/`,
+        blockers: [projectId.toString()],
+        blocks: [projectId.toString()]
+      }).then(() => {
+        this.client.store.dispatch(acceptProjectInvite(projectId));
+      });
+    }
   }
   class UserFormService extends BaseApiService {
     add(state, initialRevision, url, ownerUser, ownerOrganization) {
@@ -5672,8 +5686,16 @@ var __publicField = (obj, key, value) => {
         blockers: [],
         blocks: []
       });
+      const currentUser = state.userReducer.currentUser;
       const organizationAccesses = result;
+      const activeOrganizationAccess = organizationAccesses.find(
+        (organizationAccess) => organizationAccess.user === currentUser.id
+      );
+      if (!activeOrganizationAccess) {
+        throw new Error("Current user does not have an organization access instance");
+      }
       store.dispatch(setOrganizationAccesses(organizationAccesses));
+      store.dispatch(setActiveOrganizationAccessId(activeOrganizationAccess.offline_id));
     }
   }
   const cachedRequestPromises = {};
@@ -5941,37 +5963,6 @@ var __publicField = (obj, key, value) => {
     }
   }
   class OrganizationService extends BaseApiService {
-    async fetchInitialOrganizationData(organization_id, showLoading) {
-      if (showLoading) {
-        this.client.store.dispatch(setIsFetchingInitialData(true));
-      }
-      return this.enqueueRequest({
-        description: "Get initial organization data",
-        method: HttpMethod.GET,
-        url: `/organizations/${organization_id}/initial-data/`,
-        payload: {},
-        isAuthNeeded: true,
-        blockers: [],
-        blocks: []
-      }).then((result) => {
-        this._processInitialOrganizationData(result, showLoading);
-        return result;
-      });
-    }
-    _processInitialOrganizationData(data, showLoading) {
-      const { store } = this.client;
-      const activeOrganization = data.organization;
-      const organizationAccesses = data.organization_accesses;
-      const email_domains = data.email_domains;
-      const users = data.users;
-      store.dispatch(addUsers(users));
-      store.dispatch(setActiveOrganizationId(activeOrganization.id));
-      store.dispatch(setOrganizationAccesses(organizationAccesses));
-      store.dispatch(setEmailDomains(email_domains));
-      if (showLoading) {
-        store.dispatch(setIsFetchingInitialData(false));
-      }
-    }
     async create(name) {
       const result = await this.enqueueRequest({
         description: "Create organization",
@@ -10745,6 +10736,7 @@ var __publicField = (obj, key, value) => {
   exports2.WorkspaceService = WorkspaceService;
   exports2.YELLOW = YELLOW;
   exports2._setLatestRetryTime = _setLatestRetryTime;
+  exports2.acceptProjectInvite = acceptProjectInvite;
   exports2.addAttachment = addAttachment;
   exports2.addAttachments = addAttachments;
   exports2.addCategory = addCategory;
@@ -10982,7 +10974,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectOrganizationUsersAsMapping = selectOrganizationUsersAsMapping;
   exports2.selectOrganizationUsersIds = selectOrganizationUsersIds;
   exports2.selectOrganizations = selectOrganizations;
-  exports2.selectOrganizationsWithAccess = selectOrganizationsWithAccess;
   exports2.selectPermittedWorkspaceIds = selectPermittedWorkspaceIds;
   exports2.selectPhotoAttachmentsOfIssue = selectPhotoAttachmentsOfIssue;
   exports2.selectProjectAccess = selectProjectAccess;
@@ -10994,6 +10985,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectProjectUsersAsMapping = selectProjectUsersAsMapping;
   exports2.selectProjectUsersIds = selectProjectUsersIds;
   exports2.selectProjects = selectProjects;
+  exports2.selectProjectsWithAccess = selectProjectsWithAccess;
   exports2.selectRecentIssueIds = selectRecentIssueIds;
   exports2.selectRecentIssuesAsSearchResults = selectRecentIssuesAsSearchResults;
   exports2.selectRecentProjects = selectRecentProjects;
@@ -11003,7 +10995,6 @@ var __publicField = (obj, key, value) => {
   exports2.selectSortedEmailDomains = selectSortedEmailDomains;
   exports2.selectSortedOrganizationUsers = selectSortedOrganizationUsers;
   exports2.selectSortedProjectUsers = selectSortedProjectUsers;
-  exports2.selectSortedProjects = selectSortedProjects;
   exports2.selectStageMapping = selectStageMapping;
   exports2.selectStages = selectStages;
   exports2.selectStagesFromComponentType = selectStagesFromComponentType;
@@ -11025,6 +11016,7 @@ var __publicField = (obj, key, value) => {
   exports2.selectWorkspaceMapping = selectWorkspaceMapping;
   exports2.selectWorkspaces = selectWorkspaces;
   exports2.setActiveIssueId = setActiveIssueId;
+  exports2.setActiveOrganizationAccessId = setActiveOrganizationAccessId;
   exports2.setActiveOrganizationId = setActiveOrganizationId;
   exports2.setActiveProjectFileId = setActiveProjectFileId;
   exports2.setActiveProjectId = setActiveProjectId;