@overmap-ai/core 1.0.29-org-switcher-and-bug-fixes.6 → 1.0.29

package/dist/overmap-core.umd.cjs

@@ -2336,7 +2336,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",
@@ -2372,28 +2373,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
@@ -2442,11 +2446,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) {
@@ -4018,6 +4017,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 });
@@ -4860,26 +4860,25 @@ 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 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) {
@@ -4932,6 +4931,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);
@@ -5632,8 +5632,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 = {};
@@ -5901,37 +5909,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",
@@ -6298,7 +6275,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;
@@ -6340,6 +6316,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;