@overmap-ai/core 1.0.17 → 1.0.18-fix-misc-issues.0

package/dist/overmap-core.umd.cjs

@@ -2327,8 +2327,7 @@ var __publicField = (obj, key, value) => {
   const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
   const outboxReducer = outboxSlice.reducer;
   const initialState$8 = {
-    projectAccesses: {},
-    activeProjectAccessId: null
+    projectAccesses: {}
   };
   const projectAccessSlice = toolkit.createSlice({
     name: "projectAccess",
@@ -2371,19 +2370,10 @@ var __publicField = (obj, key, value) => {
             delete state.projectAccesses[projectAccess.offline_id];
           }
         }
-      },
-      setActiveProjectAccessId: (state, action) => {
-        state.activeProjectAccessId = action.payload;
       }
     }
   });
-  const {
-    setProjectAccesses,
-    updateProjectAccess,
-    removeProjectAccess,
-    removeProjectAccessesOfProject,
-    setActiveProjectAccessId
-  } = projectAccessSlice.actions;
+  const { setProjectAccesses, updateProjectAccess, removeProjectAccess, removeProjectAccessesOfProject } = projectAccessSlice.actions;
   const selectProjectAccesses = (state) => {
     return state.projectAccessReducer.projectAccesses;
   };
@@ -2391,11 +2381,11 @@ var __publicField = (obj, key, value) => {
     return state.projectAccessReducer.projectAccesses[projectAccessId];
   };
   const selectActiveProjectAccess = (state) => {
-    const activeProjectAccessId = state.projectAccessReducer.activeProjectAccessId;
-    if (!activeProjectAccessId) {
-      return null;
-    }
-    return state.projectAccessReducer.projectAccesses[activeProjectAccessId] ?? null;
+    const currentUser = state.userReducer.currentUser;
+    const activeProjectId = state.projectReducer.activeProjectId;
+    return Object.values(state.projectAccessReducer.projectAccesses).find((projectAccess) => {
+      return projectAccess.user === currentUser.id && projectAccess.project === activeProjectId;
+    }) ?? null;
   };
   const selectProjectAccessForUser = (user) => (state) => {
     return Object.values(state.projectAccessReducer.projectAccesses).find(
@@ -3816,7 +3806,7 @@ var __publicField = (obj, key, value) => {
           return [responsePromise.then(parseTokens), uuid$1];
         } catch (e) {
           if (logoutOnFailure) {
-            this.logout();
+            void this.logout().then();
           }
           throw e;
         }
@@ -3891,16 +3881,16 @@ var __publicField = (obj, key, value) => {
     /**
      * Logs the user out
      */
-    logout() {
+    async logout() {
       const { store } = this.client;
       store.dispatch(setLoggedIn(false));
       store.dispatch(clearTokens());
       store.dispatch(setActiveProjectId(null));
-      store.dispatch(setActiveProjectAccessId(null));
       store.dispatch(setActiveOrganizationAccessId(null));
       store.dispatch(setActiveWorkspaceId(null));
       store.dispatch({ type: constants.RESET_STATE });
       store.dispatch({ type: resetStore });
+      await localforage.clear();
       window.location.reload();
     }
     /**
@@ -3918,7 +3908,7 @@ var __publicField = (obj, key, value) => {
         store.dispatch(setTokens({ accessToken, refreshToken }));
       } catch (e) {
         console.error("Could not renew tokens; logging out.");
-        this.logout();
+        await this.logout();
         throw e;
       }
     }
@@ -4858,7 +4848,6 @@ var __publicField = (obj, key, value) => {
         throw new Error("Current user does not have a project access instance");
       }
       store.dispatch(setProjectAccesses(result));
-      store.dispatch(setActiveProjectAccessId(activeProjectAccess.offline_id));
     }
   }
   class ProjectFileService extends BaseApiService {
@@ -6049,7 +6038,6 @@ var __publicField = (obj, key, value) => {
   exports2.setActiveIssueId = setActiveIssueId;
   exports2.setActiveOrganizationAccessId = setActiveOrganizationAccessId;
   exports2.setActiveOrganizationId = setActiveOrganizationId;
-  exports2.setActiveProjectAccessId = setActiveProjectAccessId;
   exports2.setActiveProjectFileId = setActiveProjectFileId;
   exports2.setActiveProjectId = setActiveProjectId;
   exports2.setActiveWorkspaceId = setActiveWorkspaceId;