@overmap-ai/core 1.0.30 → 1.0.31-display-invited-projects.1

package/dist/overmap-core.js

@@ -2688,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");
+      }
     }
   }
 });
@@ -2697,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;
@@ -2721,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) => {
@@ -4855,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) {
@@ -4871,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 };
@@ -4890,6 +4905,7 @@ class MainService extends BaseApiService {
     store.dispatch(setCurrentUser(data.user));
     const organizationsData = data.organizations;
     store.dispatch(setOrganizations(organizationsData));
+    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);
@@ -4909,19 +4925,21 @@ class MainService extends BaseApiService {
       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;
@@ -4938,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;
     }
@@ -5249,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) {
@@ -10711,6 +10740,7 @@ export {
   WorkspaceService,
   YELLOW,
   _setLatestRetryTime,
+  acceptProjectInvite,
   addAttachment,
   addAttachments,
   addCategory,
@@ -10959,6 +10989,7 @@ export {
   selectProjectUsersAsMapping,
   selectProjectUsersIds,
   selectProjects,
+  selectProjectsWithAccess,
   selectRecentIssueIds,
   selectRecentIssuesAsSearchResults,
   selectRecentProjects,