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

package/dist/overmap-core.js

@@ -2357,7 +2357,8 @@ const selectUsersAsMapping = (state) => state.userReducer.users;
 const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
 const userReducer = userSlice.reducer;
 const initialState$a = {
-  organizationAccesses: {}
+  organizationAccesses: {},
+  activeOrganizationAccessId: null
 };
 const organizationAccessSlice = createSlice({
   name: "organizationAccess",
@@ -2393,28 +2394,31 @@ const organizationAccessSlice = createSlice({
           `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 = 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
@@ -2463,11 +2467,6 @@ const selectActiveOrganizationId = (state) => {
 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) {
@@ -2689,6 +2688,13 @@ const projectSlice = createSlice({
     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");
+      }
     }
   }
 });
@@ -2698,7 +2704,8 @@ const {
   updateOrCreateProjects: addOrReplaceProjects,
   setActiveProjectId,
   setCreateProjectType,
-  deleteProject
+  deleteProject,
+  acceptProjectInvite
 } = projectSlice.actions;
 const selectProjects = (state) => state.projectReducer.projects;
 const selectActiveProjectId = (state) => state.projectReducer.activeProjectId;
@@ -2712,21 +2719,6 @@ const selectActiveProject = (state) => {
 const selectRecentProjects = (state) => {
   return state.projectReducer.recentProjectIds;
 };
-const selectSortedProjects = 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 = createSelector(
@@ -2737,6 +2729,10 @@ const selectProjectUsersAsMapping = createSelector(
   [selectProjectUsersIds, selectUsersAsMapping],
   (projectUserIds, users) => projectUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
 );
+const selectProjectsWithAccess = createSelector(
+  [selectProjects],
+  (projects) => Object.values(projects).filter((project) => !project.invited)
+);
 const selectSortedProjectUsers = createSelector(
   [selectCurrentUser, selectProjectUsersAsMapping, selectProjectAccessUserMapping],
   (currentUser, userMapping, projectAccessMapping) => {
@@ -4064,6 +4060,7 @@ class AuthService extends BaseApiService {
     store.dispatch(setLoggedIn(false));
     store.dispatch(clearTokens());
     store.dispatch(setActiveProjectId(null));
+    store.dispatch(setActiveOrganizationAccessId(null));
     store.dispatch(setActiveWorkspaceId(null));
     store.dispatch({ type: RESET_STATE });
     store.dispatch({ type: resetStore });
@@ -4870,14 +4867,16 @@ class MainService extends BaseApiService {
   //  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) {
@@ -4886,9 +4885,10 @@ class MainService extends BaseApiService {
         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 };
@@ -4903,41 +4903,43 @@ class MainService extends BaseApiService {
       }
     }
     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;
@@ -4954,7 +4956,7 @@ class MainService extends BaseApiService {
     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;
     }
@@ -4975,6 +4977,7 @@ class MainService extends BaseApiService {
       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);
@@ -5264,6 +5267,17 @@ class ProjectService extends BaseApiService {
       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) {
@@ -5675,8 +5689,16 @@ class OrganizationAccessService extends BaseApiService {
       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 = {};
@@ -5944,37 +5966,6 @@ class EmailDomainsService extends BaseApiService {
   }
 }
 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",
@@ -10749,6 +10740,7 @@ export {
   WorkspaceService,
   YELLOW,
   _setLatestRetryTime,
+  acceptProjectInvite,
   addAttachment,
   addAttachments,
   addCategory,
@@ -10986,7 +10978,6 @@ export {
   selectOrganizationUsersAsMapping,
   selectOrganizationUsersIds,
   selectOrganizations,
-  selectOrganizationsWithAccess,
   selectPermittedWorkspaceIds,
   selectPhotoAttachmentsOfIssue,
   selectProjectAccess,
@@ -10998,6 +10989,7 @@ export {
   selectProjectUsersAsMapping,
   selectProjectUsersIds,
   selectProjects,
+  selectProjectsWithAccess,
   selectRecentIssueIds,
   selectRecentIssuesAsSearchResults,
   selectRecentProjects,
@@ -11007,7 +10999,6 @@ export {
   selectSortedEmailDomains,
   selectSortedOrganizationUsers,
   selectSortedProjectUsers,
-  selectSortedProjects,
   selectStageMapping,
   selectStages,
   selectStagesFromComponentType,
@@ -11029,6 +11020,7 @@ export {
   selectWorkspaceMapping,
   selectWorkspaces,
   setActiveIssueId,
+  setActiveOrganizationAccessId,
   setActiveOrganizationId,
   setActiveProjectFileId,
   setActiveProjectId,