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

package/dist/overmap-core.js

@@ -617,15 +617,15 @@ const wrapMigration = (migrator) => (state) => {
 };
 const migrations = [initialVersioning, signOut, signOut, createOutboxState];
 const manifest = Object.fromEntries(migrations.map((migration2, i) => [i, wrapMigration(migration2)]));
-const initialState$k = {
+const initialState$l = {
   accessToken: "",
   refreshToken: "",
   isLoggedIn: false
 };
 const authSlice = createSlice({
   name: "auth",
-  initialState: initialState$k,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
+  initialState: initialState$l,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$l)),
   reducers: {
     setTokens: (state, action) => {
       state.accessToken = action.payload.accessToken;
@@ -1328,7 +1328,7 @@ const getLocalRelativeDateString = memoize((date, min, max) => {
     return getLocalDateString(date);
   return relative.format(days, "days");
 });
-const initialState$j = {
+const initialState$k = {
   categories: {},
   usedCategoryColors: [],
   categoryVisibility: {
@@ -1338,8 +1338,8 @@ const initialState$j = {
 };
 const categorySlice = createSlice({
   name: "categories",
-  initialState: initialState$j,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
+  initialState: initialState$k,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$k)),
   reducers: {
     setCategories: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -1472,13 +1472,13 @@ const selectHiddenCategoryCount = (state) => {
   return hiddenCategoryCount;
 };
 const categoryReducer = categorySlice.reducer;
-const initialState$i = {
+const initialState$j = {
   components: {}
 };
 const componentSlice = createSlice({
   name: "components",
-  initialState: initialState$i,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
+  initialState: initialState$j,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$j)),
   reducers: {
     addComponent: (state, action) => {
       state.components[action.payload.offline_id] = action.payload;
@@ -1590,13 +1590,13 @@ const {
   removeAllComponentsOfType
 } = componentSlice.actions;
 const componentReducer = componentSlice.reducer;
-const initialState$h = {
+const initialState$i = {
   completionsByComponentId: {}
 };
 const componentStageCompletionSlice = createSlice({
   name: "componentStageCompletions",
-  initialState: initialState$h,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
+  initialState: initialState$i,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$i)),
   reducers: {
     addStageCompletion: (state, action) => {
       let stageToCompletionDateMapping = state.completionsByComponentId[action.payload.component];
@@ -1647,13 +1647,13 @@ const selectCompletedStageIdsForComponent = (component) => (state) => {
   return Object.keys(state.componentStageCompletionReducer.completionsByComponentId[component.offline_id] ?? {});
 };
 const componentStageCompletionReducer = componentStageCompletionSlice.reducer;
-const initialState$g = {
+const initialState$h = {
   stages: {}
 };
 const componentStageSlice = createSlice({
   name: "componentStages",
-  initialState: initialState$g,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
+  initialState: initialState$h,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$h)),
   reducers: {
     addStages: (state, action) => {
       Object.assign(state.stages, toOfflineIdRecord(action.payload));
@@ -1713,14 +1713,14 @@ const selectStagesFromStageIds = restructureCreateSelectorWithArgs(
 );
 const { addStages, updateStages, removeStages } = componentStageSlice.actions;
 const componentStageReducer = componentStageSlice.reducer;
-const initialState$f = {
+const initialState$g = {
   componentTypes: {},
   hiddenComponentTypeIds: {}
 };
 const componentTypeSlice = createSlice({
   name: "componentTypes",
-  initialState: initialState$f,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$f)),
+  initialState: initialState$g,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$g)),
   reducers: {
     addComponentType: (state, action) => {
       state.componentTypes[action.payload.offline_id] = action.payload;
@@ -1779,13 +1779,13 @@ const selectComponentTypesByName = restructureCreateSelectorWithArgs(
 const selectHiddenComponentTypeIds = (state) => state.componentTypeReducer.hiddenComponentTypeIds;
 const { addComponentType, setComponentTypes, toggleComponentTypeVisibility, deleteComponentType } = componentTypeSlice.actions;
 const componentTypeReducer = componentTypeSlice.reducer;
-const initialState$e = {
+const initialState$f = {
   workspaces: {},
   activeWorkspaceId: null
 };
 const workspaceSlice = createSlice({
   name: "workspace",
-  initialState: initialState$e,
+  initialState: initialState$f,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setWorkspaces: (state, action) => {
@@ -1842,7 +1842,7 @@ const selectPermittedWorkspaceIds = createSelector(
 );
 const workspaceReducer = workspaceSlice.reducer;
 const maxRecentIssues = 10;
-const initialState$d = {
+const initialState$e = {
   issues: {},
   attachments: {},
   comments: {},
@@ -1854,9 +1854,9 @@ const initialState$d = {
 };
 const issueSlice = createSlice({
   name: "issues",
-  initialState: initialState$d,
+  initialState: initialState$e,
   extraReducers: (builder) => builder.addCase("RESET", (state) => {
-    Object.assign(state, initialState$d);
+    Object.assign(state, initialState$e);
   }),
   reducers: {
     setIssues: (state, action) => {
@@ -2187,15 +2187,15 @@ const selectRecentIssuesAsSearchResults = createSelector(
   }
 );
 const issueReducer = issueSlice.reducer;
-const initialState$c = {
+const initialState$d = {
   s3Urls: {}
 };
 const msPerHour = 1e3 * 60 * 60;
 const msPerWeek = msPerHour * 24 * 7;
 const fileSlice = createSlice({
   name: "file",
-  initialState: initialState$c,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
+  initialState: initialState$d,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$d)),
   reducers: {
     setUploadUrl: (state, action) => {
       const { url, fields, sha1 } = action.payload;
@@ -2222,7 +2222,7 @@ const selectUploadUrl = (sha1) => (state) => {
   return url;
 };
 const fileReducer = fileSlice.reducer;
-const initialState$b = {
+const initialState$c = {
   // TODO: Change first MapStyle.SATELLITE to MaptStyle.None when project creation map is fixed
   mapStyle: MapStyle.SATELLITE,
   showTooltips: false,
@@ -2230,8 +2230,8 @@ const initialState$b = {
 };
 const mapSlice = createSlice({
   name: "map",
-  initialState: initialState$b,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+  initialState: initialState$c,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$c)),
   reducers: {
     setMapStyle: (state, action) => {
       state.mapStyle = action.payload;
@@ -2249,26 +2249,209 @@ const selectMapStyle = (state) => state.mapReducer.mapStyle;
 const selectShowTooltips = (state) => state.mapReducer.showTooltips;
 const selectCenterMapToProject = (state) => state.mapReducer.centerMapToProject;
 const mapReducer = mapSlice.reducer;
+var ProjectAccessLevel = /* @__PURE__ */ ((ProjectAccessLevel2) => {
+  ProjectAccessLevel2[ProjectAccessLevel2["BASIC"] = 0] = "BASIC";
+  ProjectAccessLevel2[ProjectAccessLevel2["ADMIN"] = 2] = "ADMIN";
+  return ProjectAccessLevel2;
+})(ProjectAccessLevel || {});
+var OrganizationAccessLevel = /* @__PURE__ */ ((OrganizationAccessLevel2) => {
+  OrganizationAccessLevel2[OrganizationAccessLevel2["BASIC"] = 0] = "BASIC";
+  OrganizationAccessLevel2[OrganizationAccessLevel2["ADMIN"] = 2] = "ADMIN";
+  return OrganizationAccessLevel2;
+})(OrganizationAccessLevel || {});
+var ProjectType = /* @__PURE__ */ ((ProjectType2) => {
+  ProjectType2[ProjectType2["PERSONAL"] = 0] = "PERSONAL";
+  ProjectType2[ProjectType2["ORGANIZATION"] = 2] = "ORGANIZATION";
+  return ProjectType2;
+})(ProjectType || {});
+var VerificationCodeType = /* @__PURE__ */ ((VerificationCodeType2) => {
+  VerificationCodeType2[VerificationCodeType2["USER_REGISTRATION"] = 0] = "USER_REGISTRATION";
+  VerificationCodeType2[VerificationCodeType2["APPLICATION_INVITE"] = 2] = "APPLICATION_INVITE";
+  VerificationCodeType2[VerificationCodeType2["PROJECT_INVITE"] = 4] = "PROJECT_INVITE";
+  VerificationCodeType2[VerificationCodeType2["ORGANIZATION_INVITE"] = 6] = "ORGANIZATION_INVITE";
+  VerificationCodeType2[VerificationCodeType2["ADD_EMAIL_DOMAIN"] = 8] = "ADD_EMAIL_DOMAIN";
+  VerificationCodeType2[VerificationCodeType2["RESET_PASSWORD"] = 10] = "RESET_PASSWORD";
+  return VerificationCodeType2;
+})(VerificationCodeType || {});
+const initialState$b = {
+  users: {},
+  currentUser: {
+    id: 0,
+    username: "",
+    email: "",
+    profile: { file: null, file_sha1: null, favourite_project_ids: [], tour_step: -1 }
+  }
+};
+const userSlice = createSlice({
+  name: "users",
+  initialState: initialState$b,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$b)),
+  reducers: {
+    setUsers: (state, action) => {
+      const usersMapping = {};
+      action.payload.forEach((user) => {
+        usersMapping[user.id] = user;
+      });
+      state.users = usersMapping;
+    },
+    addUsers: (state, action) => {
+      for (const user of action.payload) {
+        state.users[user.id] = user;
+      }
+    },
+    setCurrentUser: (state, action) => {
+      state.currentUser = action.payload;
+    },
+    setProfilePicture: (state, action) => {
+      state.currentUser.profile.file = action.payload.file ?? null;
+      state.currentUser.profile.file_sha1 = action.payload.file_sha1 ?? null;
+      const currentUser = state.users[state.currentUser.id];
+      if (!currentUser) {
+        throw new Error("Unable to find current user in users slice");
+      }
+      currentUser.profile.file = action.payload.file ?? null;
+      currentUser.profile.file_sha1 = action.payload.file_sha1 ?? null;
+    },
+    addFavouriteProjectId: (state, action) => {
+      state.currentUser.profile.favourite_project_ids.push(action.payload);
+    },
+    removeFavouriteProjectId: (state, action) => {
+      state.currentUser.profile.favourite_project_ids = state.currentUser.profile.favourite_project_ids.filter(
+        (id) => id !== action.payload
+      );
+    },
+    setTourStep: (state, action) => {
+      state.currentUser.profile.tour_step = action.payload;
+    },
+    removeUser: (state, action) => {
+      delete state.users[action.payload];
+    }
+  }
+});
+const {
+  setCurrentUser,
+  setProfilePicture,
+  setUsers,
+  addUsers,
+  addFavouriteProjectId,
+  removeFavouriteProjectId,
+  setTourStep,
+  removeUser
+} = userSlice.actions;
+const selectCurrentUser = (state) => state.userReducer.currentUser;
+const selectUser = (userId) => (state) => {
+  if (userId === null)
+    return void 0;
+  return state.userReducer.users[userId];
+};
+const selectUsersAsMapping = (state) => state.userReducer.users;
+const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
+const userReducer = userSlice.reducer;
 const initialState$a = {
+  organizationAccesses: {},
+  activeOrganizationAccessId: null
+};
+const organizationAccessSlice = createSlice({
+  name: "organizationAccess",
+  initialState: initialState$a,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+  reducers: {
+    setOrganizationAccesses: (state, action) => {
+      if (!Array.isArray(action.payload))
+        throw new Error("Expected an array of OrganizationAccess");
+      if (action.payload.filter(onlyUniqueOfflineIds).length !== action.payload.length) {
+        throw new Error("Tried to use setOrganizationAccesses reducer with duplicate ID's");
+      }
+      const organizationAccesses = {};
+      for (const organizationAccess of action.payload) {
+        organizationAccesses[organizationAccess.offline_id] = organizationAccess;
+      }
+      state.organizationAccesses = organizationAccesses;
+    },
+    updateOrganizationAccess: (state, action) => {
+      if (action.payload.offline_id in state.organizationAccesses) {
+        state.organizationAccesses[action.payload.offline_id] = action.payload;
+      } else {
+        throw new Error(
+          `Tried to update organization access with ID that doesn't exist: ${action.payload.offline_id}`
+        );
+      }
+    },
+    removeOrganizationAccess: (state, action) => {
+      if (action.payload.offline_id in state.organizationAccesses) {
+        delete state.organizationAccesses[action.payload.offline_id];
+      } else {
+        throw new Error(
+          `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,
+  setActiveOrganizationAccessId
+} = organizationAccessSlice.actions;
+const selectOrganizationAccesses = (state) => {
+  return state.organizationAccessReducer.organizationAccesses;
+};
+const selectOrganizationAccess = (organizationAccessId) => (state) => {
+  return state.organizationAccessReducer.organizationAccesses[organizationAccessId];
+};
+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
+  );
+};
+const selectOrganizationAccessUserMapping = (state) => {
+  const organizationAccesses = {};
+  for (const organizationAccess of Object.values(state.organizationAccessReducer.organizationAccesses)) {
+    organizationAccesses[organizationAccess.user] = organizationAccess;
+  }
+  return organizationAccesses;
+};
+const organizationAccessReducer = organizationAccessSlice.reducer;
+const initialState$9 = {
   organizations: {},
   activeOrganizationId: null
 };
 const organizationSlice = createSlice({
   name: "organizations",
-  initialState: initialState$a,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$a)),
+  initialState: initialState$9,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
   reducers: {
     setOrganizations: (state, action) => {
       for (const org of action.payload) {
         state.organizations[org.id] = org;
       }
     },
+    updateActiveOrganization: (state, action) => {
+      if (!state.activeOrganizationId) {
+        throw new Error("Cannot update name of active organization. Active organization ID does not exist");
+      }
+      if (state.activeOrganizationId !== action.payload.id) {
+        throw new Error("Tried updating active organization with different organization");
+      }
+      state.organizations[state.activeOrganizationId] = action.payload;
+    },
     setActiveOrganizationId: (state, action) => {
       state.activeOrganizationId = action.payload;
     }
   }
 });
-const { setOrganizations, setActiveOrganizationId } = organizationSlice.actions;
+const { setOrganizations, setActiveOrganizationId, updateActiveOrganization } = organizationSlice.actions;
 const selectActiveOrganizationId = (state) => {
   return state.organizationReducer.activeOrganizationId;
 };
@@ -2286,6 +2469,35 @@ const selectActiveOrganization = (state) => {
   }
   return organization;
 };
+const selectOrganizationUsersIds = createSelector(
+  [selectOrganizationAccesses],
+  (organizationAccesses) => Object.values(organizationAccesses).map((organizationAccess) => organizationAccess.user)
+);
+const selectOrganizationUsersAsMapping = createSelector(
+  [selectOrganizationUsersIds, selectUsersAsMapping],
+  (organizationUserIds, users) => organizationUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
+);
+const selectSortedOrganizationUsers = createSelector(
+  [selectCurrentUser, selectOrganizationUsersAsMapping, selectOrganizationAccessUserMapping],
+  (currentUser, userMapping, organizationAccessMapping) => {
+    return Object.values(userMapping).sort((userA, userB) => {
+      if (userA.id === currentUser.id) {
+        return -1;
+      } else if (userB.id === currentUser.id) {
+        return 1;
+      }
+      const organizationAccessesA = organizationAccessMapping[userA.id];
+      const organizationAccessesB = organizationAccessMapping[userB.id];
+      if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === (organizationAccessesB == null ? void 0 : organizationAccessesB.access_level)) {
+        return userA.username.localeCompare(userB.username);
+      }
+      if ((organizationAccessesA == null ? void 0 : organizationAccessesA.access_level) === OrganizationAccessLevel.ADMIN) {
+        return -1;
+      }
+      return 1;
+    });
+  }
+);
 const selectOrganization = (id) => (state) => {
   return state.organizationReducer.organizations[id];
 };
@@ -2306,14 +2518,14 @@ const createOfflineAction = (request2, baseUrl) => {
     }
   };
 };
-const initialState$9 = {
+const initialState$8 = {
   deletedRequests: [],
   latestRetryTime: 0
 };
 const outboxSlice = createSlice({
   name: "outbox",
-  initialState: initialState$9,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$9)),
+  initialState: initialState$8,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
   reducers: {
     // enqueueActions is a reducer that does nothing but enqueue API request to the Redux Offline outbox
     // Whenever an issue is being created, a reducer addIssue() is responsible for adding it to the offline store
@@ -2345,13 +2557,13 @@ const selectDeletedRequests = (state) => state.outboxReducer.deletedRequests;
 const selectLatestRetryTime = (state) => state.outboxReducer.latestRetryTime;
 const { enqueueRequest, markForDeletion, markAsDeleted, _setLatestRetryTime } = outboxSlice.actions;
 const outboxReducer = outboxSlice.reducer;
-const initialState$8 = {
+const initialState$7 = {
   projectAccesses: {}
 };
 const projectAccessSlice = createSlice({
   name: "projectAccess",
-  initialState: initialState$8,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$8)),
+  initialState: initialState$7,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$7)),
   reducers: {
     setProjectAccesses: (state, action) => {
       if (!Array.isArray(action.payload))
@@ -2419,31 +2631,7 @@ const selectProjectAccessUserMapping = (state) => {
   return projectAccesses;
 };
 const projectAccessReducer = projectAccessSlice.reducer;
-var ProjectAccessLevel = /* @__PURE__ */ ((ProjectAccessLevel2) => {
-  ProjectAccessLevel2[ProjectAccessLevel2["BASIC"] = 0] = "BASIC";
-  ProjectAccessLevel2[ProjectAccessLevel2["ADMIN"] = 2] = "ADMIN";
-  return ProjectAccessLevel2;
-})(ProjectAccessLevel || {});
-var OrganizationAccessLevel = /* @__PURE__ */ ((OrganizationAccessLevel2) => {
-  OrganizationAccessLevel2[OrganizationAccessLevel2["BASIC"] = 0] = "BASIC";
-  OrganizationAccessLevel2[OrganizationAccessLevel2["ADMIN"] = 2] = "ADMIN";
-  return OrganizationAccessLevel2;
-})(OrganizationAccessLevel || {});
-var ProjectType = /* @__PURE__ */ ((ProjectType2) => {
-  ProjectType2[ProjectType2["PERSONAL"] = 0] = "PERSONAL";
-  ProjectType2[ProjectType2["ORGANIZATION"] = 2] = "ORGANIZATION";
-  return ProjectType2;
-})(ProjectType || {});
-var VerificationCodeType = /* @__PURE__ */ ((VerificationCodeType2) => {
-  VerificationCodeType2[VerificationCodeType2["USER_REGISTRATION"] = 0] = "USER_REGISTRATION";
-  VerificationCodeType2[VerificationCodeType2["APPLICATION_INVITE"] = 2] = "APPLICATION_INVITE";
-  VerificationCodeType2[VerificationCodeType2["PROJECT_INVITE"] = 4] = "PROJECT_INVITE";
-  VerificationCodeType2[VerificationCodeType2["ORGANIZATION_INVITE"] = 6] = "ORGANIZATION_INVITE";
-  VerificationCodeType2[VerificationCodeType2["ADD_EMAIL_DOMAIN"] = 8] = "ADD_EMAIL_DOMAIN";
-  VerificationCodeType2[VerificationCodeType2["RESET_PASSWORD"] = 10] = "RESET_PASSWORD";
-  return VerificationCodeType2;
-})(VerificationCodeType || {});
-const initialState$7 = {
+const initialState$6 = {
   projects: {},
   activeProjectId: null,
   recentProjectIds: [],
@@ -2452,7 +2640,7 @@ const initialState$7 = {
 };
 const projectSlice = createSlice({
   name: "projects",
-  initialState: initialState$7,
+  initialState: initialState$6,
   reducers: {
     setProjects: (state, action) => {
       const projectsMap = {};
@@ -2509,14 +2697,43 @@ const selectActiveProject = (state) => {
   if (!activeProjectId) {
     return null;
   }
-  return state.projectReducer.projects[activeProjectId] ?? null;
-};
-const selectRecentProjects = (state) => {
-  return state.projectReducer.recentProjectIds;
-};
-const selectCreateProjectType = (state) => state.projectReducer.createProjectType;
-const projectReducer = projectSlice.reducer;
-const initialState$6 = {
+  return state.projectReducer.projects[activeProjectId] ?? null;
+};
+const selectRecentProjects = (state) => {
+  return state.projectReducer.recentProjectIds;
+};
+const selectCreateProjectType = (state) => state.projectReducer.createProjectType;
+const projectReducer = projectSlice.reducer;
+const selectProjectUsersIds = createSelector(
+  [selectProjectAccesses],
+  (projectAccesses) => Object.values(projectAccesses).map((projectAccess) => projectAccess.user)
+);
+const selectProjectUsersAsMapping = createSelector(
+  [selectProjectUsersIds, selectUsersAsMapping],
+  (projectUserIds, users) => projectUserIds.reduce((accum, userId) => ({ ...accum, [userId]: users[userId] }), {})
+);
+const selectSortedProjectUsers = createSelector(
+  [selectCurrentUser, selectProjectUsersAsMapping, selectProjectAccessUserMapping],
+  (currentUser, userMapping, projectAccessMapping) => {
+    return Object.values(userMapping).sort((userA, userB) => {
+      if (userA.id === currentUser.id) {
+        return -1;
+      } else if (userB.id === currentUser.id) {
+        return 1;
+      }
+      const projectAccessesA = projectAccessMapping[userA.id];
+      const projectAccessesB = projectAccessMapping[userB.id];
+      if ((projectAccessesA == null ? void 0 : projectAccessesA.access_level) === (projectAccessesB == null ? void 0 : projectAccessesB.access_level)) {
+        return userA.username.localeCompare(userB.username);
+      }
+      if ((projectAccessesA == null ? void 0 : projectAccessesA.access_level) === ProjectAccessLevel.ADMIN) {
+        return -1;
+      }
+      return 1;
+    });
+  }
+);
+const initialState$5 = {
   projectFiles: {},
   activeProjectFileId: null,
   isImportingProjectFile: false,
@@ -2524,8 +2741,8 @@ const initialState$6 = {
 };
 const projectFileSlice = createSlice({
   name: "projectFiles",
-  initialState: initialState$6,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$6)),
+  initialState: initialState$5,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$5)),
   reducers: {
     addOrReplaceProjectFiles: (state, action) => {
       for (let fileObj of action.payload) {
@@ -2626,12 +2843,12 @@ const selectProjectFiles = createSelector(
 const selectActiveProjectFileId = (state) => state.projectFileReducer.activeProjectFileId;
 const selectIsImportingProjectFile = (state) => state.projectFileReducer.isImportingProjectFile;
 const projectFileReducer = projectFileSlice.reducer;
-const initialState$5 = {
+const initialState$4 = {
   isRehydrated: false
 };
 const rehydratedSlice = createSlice({
   name: "rehydrated",
-  initialState: initialState$5,
+  initialState: initialState$4,
   // The `reducers` field lets us define reducers and generate associated actions
   reducers: {
     setRehydrated: (state, action) => {
@@ -2641,7 +2858,7 @@ const rehydratedSlice = createSlice({
 });
 const selectRehydrated = (state) => state.rehydratedReducer.isRehydrated;
 const rehydratedReducer = rehydratedSlice.reducer;
-const initialState$4 = {
+const initialState$3 = {
   useIssueTemplate: false,
   placementMode: false,
   enableClustering: true,
@@ -2656,8 +2873,8 @@ const initialState$4 = {
 };
 const settingSlice = createSlice({
   name: "settings",
-  initialState: initialState$4,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$4)),
+  initialState: initialState$3,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
   reducers: {
     setEnableDuplicateIssues: (state, action) => {
       state.useIssueTemplate = action.payload;
@@ -2720,7 +2937,7 @@ function considerCachingRevision(revision, formId, preferPending = false) {
 function getLatestRevisionFromCache(formId) {
   return LATEST_REVISION_CACHE[formId];
 }
-const initialState$3 = {
+const initialState$2 = {
   userForms: {},
   revisions: {},
   submissions: {},
@@ -2728,8 +2945,8 @@ const initialState$3 = {
 };
 const userFormSlice = createSlice({
   name: "userForms",
-  initialState: initialState$3,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$3)),
+  initialState: initialState$2,
+  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$2)),
   reducers: {
     setUserForms: (state, action) => {
       state.userForms = {};
@@ -2977,171 +3194,38 @@ const selectNumberOfUserForms = createSelector([selectUserFormMapping], (userFor
   return Object.keys(userForms).length;
 });
 const userFormReducer = userFormSlice.reducer;
-const initialState$2 = {
-  users: {},
-  currentUser: {
-    id: 0,
-    username: "",
-    email: "",
-    profile: { file: null, file_sha1: null, favourite_project_ids: [], tour_step: -1 }
-  }
-};
-const userSlice = createSlice({
-  name: "users",
-  initialState: initialState$2,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$2)),
-  reducers: {
-    setUsers: (state, action) => {
-      const usersMapping = {};
-      action.payload.forEach((user) => {
-        usersMapping[user.id] = user;
-      });
-      state.users = usersMapping;
-    },
-    setCurrentUser: (state, action) => {
-      state.currentUser = action.payload;
-    },
-    setProfilePicture: (state, action) => {
-      state.currentUser.profile.file = action.payload.file ?? null;
-      state.currentUser.profile.file_sha1 = action.payload.file_sha1 ?? null;
-      const currentUser = state.users[state.currentUser.id];
-      if (!currentUser) {
-        throw new Error("Unable to find current user in users slice");
-      }
-      currentUser.profile.file = action.payload.file ?? null;
-      currentUser.profile.file_sha1 = action.payload.file_sha1 ?? null;
-    },
-    addFavouriteProjectId: (state, action) => {
-      state.currentUser.profile.favourite_project_ids.push(action.payload);
-    },
-    removeFavouriteProjectId: (state, action) => {
-      state.currentUser.profile.favourite_project_ids = state.currentUser.profile.favourite_project_ids.filter(
-        (id) => id !== action.payload
-      );
-    },
-    setTourStep: (state, action) => {
-      state.currentUser.profile.tour_step = action.payload;
-    },
-    removeUser: (state, action) => {
-      delete state.users[action.payload];
-    }
-  }
-});
-const {
-  setCurrentUser,
-  setProfilePicture,
-  setUsers,
-  addFavouriteProjectId,
-  removeFavouriteProjectId,
-  setTourStep,
-  removeUser
-} = userSlice.actions;
-const selectCurrentUser = (state) => state.userReducer.currentUser;
-const selectUser = (userId) => (state) => {
-  if (userId === null)
-    return void 0;
-  return state.userReducer.users[userId];
-};
-const selectUsersAsMapping = (state) => state.userReducer.users;
-const selectFavouriteProjects = (state) => state.userReducer.currentUser.profile.favourite_project_ids;
-const selectSortedUsers = createSelector(
-  [selectCurrentUser, selectUsersAsMapping, selectProjectAccessUserMapping],
-  (currentUser, userMapping, projectAccessMapping) => {
-    return Object.values(userMapping).sort((userA, userB) => {
-      if (userA.id === currentUser.id) {
-        return -1;
-      } else if (userB.id === currentUser.id) {
-        return 1;
-      }
-      const projectAccessesA = projectAccessMapping[userA.id];
-      const projectAccessesB = projectAccessMapping[userB.id];
-      if ((projectAccessesA == null ? void 0 : projectAccessesA.access_level) === (projectAccessesB == null ? void 0 : projectAccessesB.access_level)) {
-        return userA.username.localeCompare(userB.username);
-      }
-      if ((projectAccessesA == null ? void 0 : projectAccessesA.access_level) === ProjectAccessLevel.ADMIN) {
-        return -1;
-      }
-      return 1;
-    });
-  }
-);
-const userReducer = userSlice.reducer;
 const initialState$1 = {
-  organizationAccesses: {},
-  activeOrganizationAccessId: null
+  emailDomains: {}
 };
-const organizationAccessSlice = createSlice({
-  name: "organizationAccess",
+const emailDomainsSlice = createSlice({
+  name: "emailDomains",
   initialState: initialState$1,
-  extraReducers: (builder) => builder.addCase("RESET", (state) => Object.assign(state, initialState$1)),
   reducers: {
-    setOrganizationAccesses: (state, action) => {
-      if (!Array.isArray(action.payload))
-        throw new Error("Expected an array of OrganizationAccess");
-      if (action.payload.filter(onlyUniqueOfflineIds).length !== action.payload.length) {
-        throw new Error("Tried to use setOrganizationAccesses reducer with duplicate ID's");
-      }
-      const organizationAccesses = {};
-      for (const organizationAccess of action.payload) {
-        organizationAccesses[organizationAccess.offline_id] = organizationAccess;
-      }
-      state.organizationAccesses = organizationAccesses;
+    setEmailDomains: (state, action) => {
+      const emailDomains = {};
+      action.payload.forEach((emailDomain) => {
+        emailDomains[emailDomain.offline_id] = emailDomain;
+      });
+      state.emailDomains = emailDomains;
     },
-    updateOrganizationAccess: (state, action) => {
-      if (action.payload.offline_id in state.organizationAccesses) {
-        state.organizationAccesses[action.payload.offline_id] = action.payload;
-      } else {
-        throw new Error(
-          `Tried to update organization access with ID that doesn't exist: ${action.payload.offline_id}`
-        );
-      }
+    addEmailDomain: (state, action) => {
+      state.emailDomains[action.payload.offline_id] = action.payload;
     },
-    removeOrganizationAccess: (state, action) => {
-      if (action.payload.offline_id in state.organizationAccesses) {
-        delete state.organizationAccesses[action.payload.offline_id];
+    removeEmailDomain: (state, action) => {
+      if (action.payload.offline_id in state.emailDomains) {
+        delete state.emailDomains[action.payload.offline_id];
       } else {
-        throw new Error(
-          `Tried to remove organization access with ID that doesn't exist: ${action.payload.offline_id}`
-        );
+        throw new Error(`Tried to remove email domain with ID that doesn't exist: ${action.payload.offline_id}`);
       }
-    },
-    setActiveOrganizationAccessId: (state, action) => {
-      state.activeOrganizationAccessId = action.payload;
     }
   }
 });
-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 = (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
-  );
-};
-const selectOrganizationAccessUserMapping = (state) => {
-  const organizationAccesses = {};
-  Object.values(state.organizationAccessReducer.organizationAccesses).forEach((organizationAccess) => {
-    organizationAccesses[organizationAccess.user] = organizationAccess;
-  });
-  return organizationAccesses;
-};
-const organizationAccessReducer = organizationAccessSlice.reducer;
+const { setEmailDomains, addEmailDomain, removeEmailDomain } = emailDomainsSlice.actions;
+const selectEmailDomainsAsMapping = (state) => state.emailDomainsReducer.emailDomains;
+const selectSortedEmailDomains = (state) => Object.values(state.emailDomainsReducer.emailDomains).sort(
+  (ed1, ed2) => ed1.domain.localeCompare(ed2.domain)
+);
+const emailDomainsReducer = emailDomainsSlice.reducer;
 const initialState = {
   version: 0
 };
@@ -3178,7 +3262,8 @@ const overmapReducers = {
   settingReducer,
   userFormReducer,
   userReducer,
-  workspaceReducer
+  workspaceReducer,
+  emailDomainsReducer
 };
 const overmapReducer = combineReducers(overmapReducers);
 const resetStore = "RESET";
@@ -4732,7 +4817,7 @@ class MainService extends BaseApiService {
       return result;
     });
   }
-  async fetchUsers(projectId) {
+  async fetchProjectUsers(projectId) {
     return this.enqueueRequest({
       description: "Fetch users",
       method: HttpMethod.GET,
@@ -4741,6 +4826,15 @@ class MainService extends BaseApiService {
       blocks: []
     });
   }
+  async fetchOrganizationUsers(orgId) {
+    return this.enqueueRequest({
+      description: "Fetch organization users",
+      method: HttpMethod.GET,
+      url: `/organizations/${orgId}/users/`,
+      blockers: [],
+      blocks: []
+    });
+  }
   // TODO:
   //  Don't accept updateStore in ComponentService.list. Just return the offline objects and promise. Here, if
   //  overwrite, use setComponents. Otherwise, use bulkAddComponents.
@@ -4759,8 +4853,8 @@ class MainService extends BaseApiService {
       projects.push({
         id: projectData.id,
         name: projectData.name,
-        owner_organization: projectData.owner_organization,
-        owner_user: projectData.owner_user,
+        owner_organization: projectData.organization_owner,
+        owner_user: projectData.user_owner,
         bounds: projectData.bounds
       });
       if (currentProjectId === projectData.id) {
@@ -4783,13 +4877,20 @@ class MainService extends BaseApiService {
     const firstOrg = organizationsData[0];
     const currProjObj = projects.find((project) => project.id === currentProjectId);
     const isOrgProject = !!(currProjObj == null ? void 0 : currProjObj.owner_organization);
-    if (isOrgProject && currProjObj.owner_organization) {
-      store.dispatch(setActiveOrganizationId(currProjObj.owner_organization));
+    const userIsInProjectOrg = isOrgProject && currProjObj.owner_organization && organizationsData.find((organization) => organization.id === currProjObj.owner_organization);
+    let currentOrgId = null;
+    if (userIsInProjectOrg) {
+      currentOrgId = currProjObj.owner_organization;
     } else if (firstOrg) {
-      console.warn(
-        "No active organization; using the first available one. TODO: No active organization in personal projects."
-      );
-      store.dispatch(setActiveOrganizationId(firstOrg.id));
+      currentOrgId = firstOrg.id;
+    }
+    if (currentOrgId) {
+      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) {
@@ -4812,13 +4913,11 @@ class MainService extends BaseApiService {
       }
     }
     if (currentProjectId) {
-      const usersResultPromise = this.fetchUsers(currentProjectId);
+      const usersResultPromise = this.fetchProjectUsers(currentProjectId);
       const projectAccessRefreshPromise = this.client.projectAccesses.refreshStore();
-      const organizationAccessRefreshPromise = this.client.organizationAccess.refreshStore();
       const usersResult = await usersResultPromise;
       await projectAccessRefreshPromise;
-      await organizationAccessRefreshPromise;
-      store.dispatch(setUsers(usersResult));
+      store.dispatch(addUsers(usersResult));
     }
     let currentWorkspaceId;
     const oldWorkspaceId = this.client.store.getState().workspaceReducer.activeWorkspaceId;
@@ -4844,6 +4943,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);
@@ -4867,21 +4967,18 @@ class MainService extends BaseApiService {
   }
 }
 class ProjectAccessService extends BaseApiService {
-  fetchAll(projectId) {
-    const { store } = this.client;
-    const promise = this.enqueueRequest({
+  async fetchAll(projectId) {
+    return this.enqueueRequest({
       description: "Get project accesses",
       method: HttpMethod.GET,
       url: `/projects/${projectId}/access/`,
       blockers: [],
       blocks: []
     });
-    const offlineProjectAccesses = Object.values(store.getState().projectAccessReducer.projectAccesses);
-    return [offlineProjectAccesses, promise];
   }
-  update(projectAccess) {
+  async update(projectAccess) {
     this.client.store.dispatch(updateProjectAccess(projectAccess));
-    const promise = this.enqueueRequest({
+    return this.enqueueRequest({
       description: "Edit project access",
       method: HttpMethod.PATCH,
       url: `/access/${projectAccess.offline_id}/`,
@@ -4889,10 +4986,9 @@ class ProjectAccessService extends BaseApiService {
       blockers: [projectAccess.offline_id],
       blocks: [projectAccess.offline_id]
     });
-    return [projectAccess, promise];
   }
   // TODO: Re-add user to project if removal fails
-  remove(projectAccess) {
+  async remove(projectAccess) {
     const { store } = this.client;
     store.dispatch(removeProjectAccess(projectAccess));
     store.dispatch(removeUser(projectAccess.user));
@@ -4912,7 +5008,7 @@ class ProjectAccessService extends BaseApiService {
     if (!projectId) {
       throw new Error("No active project");
     }
-    const [_offlineProjectAccesses, promise] = this.fetchAll(projectId);
+    const promise = this.fetchAll(projectId);
     const result = await promise;
     const activeProjectAccess = result.find((projectAccess) => projectAccess.user === currentUser.id);
     if (!activeProjectAccess) {
@@ -5509,6 +5605,31 @@ class WorkspaceService extends BaseApiService {
   }
 }
 class OrganizationAccessService extends BaseApiService {
+  async update(organizationAccess) {
+    const promise = this.enqueueRequest({
+      description: "Edit organization access",
+      method: HttpMethod.PATCH,
+      url: `/organizations/${organizationAccess.organization}/access/${organizationAccess.offline_id}/`,
+      payload: organizationAccess,
+      blockers: [organizationAccess.offline_id],
+      blocks: [organizationAccess.offline_id]
+    });
+    void promise.then(() => {
+      this.client.store.dispatch(updateOrganizationAccess(organizationAccess));
+    });
+    return promise;
+  }
+  async remove(organizationAccess) {
+    this.client.store.dispatch(removeOrganizationAccess(organizationAccess));
+    this.client.store.dispatch(removeUser(organizationAccess.user));
+    return this.enqueueRequest({
+      description: "Remove organization access",
+      method: HttpMethod.DELETE,
+      url: `/organizations/${organizationAccess.organization}/access/${organizationAccess.offline_id}/`,
+      blockers: [organizationAccess.offline_id],
+      blocks: []
+    });
+  }
   async refreshStore() {
     const { store } = this.client;
     const state = store.getState();
@@ -5756,6 +5877,86 @@ class EmailVerificationService extends BaseApiService {
     return this.enqueueRequest(requestDetails);
   }
 }
+class EmailDomainsService extends BaseApiService {
+  async fetchAll(orgId) {
+    return this.enqueueRequest({
+      description: "Fetch email domains for organization",
+      method: HttpMethod.GET,
+      url: `/organizations/${orgId}/email-domains/`,
+      blockers: [orgId.toString()],
+      blocks: []
+    });
+  }
+  async add(orgId, email) {
+    return this.enqueueRequest({
+      description: "Add email domain to organization",
+      method: HttpMethod.POST,
+      url: `/organizations/${orgId}/email-domains/`,
+      payload: { email },
+      blockers: [orgId.toString(), "create-org"],
+      blocks: []
+    });
+  }
+  async remove(emailDomain) {
+    this.client.store.dispatch(removeEmailDomain(emailDomain));
+    return this.enqueueRequest({
+      description: "Remove email domain from organization",
+      method: HttpMethod.DELETE,
+      url: `/organizations/${emailDomain.organization}/email-domains/${emailDomain.offline_id}/`,
+      blockers: [emailDomain.domain],
+      blocks: []
+    }).catch((e) => {
+      this.client.store.dispatch(addEmailDomain(emailDomain));
+      throw e;
+    });
+  }
+  async refreshStore() {
+    const organizationId = this.client.store.getState().organizationReducer.activeOrganizationId;
+    if (!organizationId) {
+      throw new Error("No active organization");
+    }
+    const promise = this.fetchAll(organizationId);
+    const result = await promise;
+    this.client.store.dispatch(setEmailDomains(result));
+  }
+}
+class OrganizationService extends BaseApiService {
+  async create(name) {
+    const result = await this.enqueueRequest({
+      description: "Create organization",
+      method: HttpMethod.POST,
+      url: "/organizations/",
+      payload: { name },
+      blockers: [],
+      blocks: [`add-org-${name}`, "create-org"]
+    });
+    await this.client.main.fetchInitialData(true);
+    return result;
+  }
+  async update(organization) {
+    const promise = this.enqueueRequest({
+      description: "Edit organization",
+      method: HttpMethod.PATCH,
+      url: `/organizations/${organization.id}/`,
+      payload: organization,
+      blockers: [`add-org-${organization.name}`, organization.id.toString()],
+      blocks: [organization.id.toString()]
+    });
+    return promise.then((result) => {
+      this.client.store.dispatch(updateActiveOrganization(organization));
+      return result;
+    });
+  }
+  async invite(organizationId, email) {
+    return this.enqueueRequest({
+      description: "Invite user to organization",
+      method: HttpMethod.POST,
+      url: `/organizations/${organizationId}/invite/${email}/`,
+      blockers: [],
+      blocks: []
+    });
+  }
+}
 class OvermapSDK {
   constructor(apiUrl, store) {
     __publicField(this, "API_URL");
@@ -5765,6 +5966,7 @@ class OvermapSDK {
     __publicField(this, "auth", new AuthService(this));
     __publicField(this, "categories", new CategoryService(this));
     __publicField(this, "projectAccesses", new ProjectAccessService(this));
+    __publicField(this, "organizations", new OrganizationService(this));
     __publicField(this, "organizationAccess", new OrganizationAccessService(this));
     __publicField(this, "issues", new IssueService(this));
     __publicField(this, "issueComments", new IssueCommentService(this));
@@ -5779,6 +5981,7 @@ class OvermapSDK {
     __publicField(this, "projects", new ProjectService(this));
     __publicField(this, "projectFiles", new ProjectFileService(this));
     __publicField(this, "emailVerification", new EmailVerificationService(this));
+    __publicField(this, "emailDomains", new EmailDomainsService(this));
     this.API_URL = apiUrl;
     this.store = store;
   }
@@ -5821,6 +6024,7 @@ export {
   ComponentTypeService,
   DEFAULT_ISSUE_PRIORITY,
   DEFAULT_ISSUE_STATUS,
+  EmailDomainsService,
   EmailVerificationService,
   FileService,
   GREEN,
@@ -5834,6 +6038,7 @@ export {
   OUTBOX_RETRY_DELAY,
   OrganizationAccessLevel,
   OrganizationAccessService,
+  OrganizationService,
   OutboxCoordinator,
   OvermapContext,
   OvermapProvider,
@@ -5857,6 +6062,7 @@ export {
   addComponent,
   addComponentType,
   addComponentsInBatches,
+  addEmailDomain,
   addFavouriteProjectId,
   addIssue,
   addOrReplaceCategories,
@@ -5876,6 +6082,7 @@ export {
   addUserFormSubmissionAttachment,
   addUserFormSubmissions,
   addUserForms,
+  addUsers,
   addWorkspace,
   areArraysEqual,
   authReducer,
@@ -5915,6 +6122,8 @@ export {
   dequeue,
   discard,
   downloadInMemoryFile,
+  emailDomainsReducer,
+  emailDomainsSlice,
   emailRegex,
   enqueue,
   enqueueRequest,
@@ -5983,6 +6192,7 @@ export {
   removeCategory,
   removeColor,
   removeComponent,
+  removeEmailDomain,
   removeFavouriteProjectId,
   removeIssue,
   removeIssueComment,
@@ -6041,6 +6251,7 @@ export {
   selectCreateProjectType,
   selectCurrentUser,
   selectDeletedRequests,
+  selectEmailDomainsAsMapping,
   selectEnableClustering,
   selectEnableDuplicateIssues,
   selectEnablePlacementMode,
@@ -6075,6 +6286,8 @@ export {
   selectOrganizationAccessForUser,
   selectOrganizationAccessUserMapping,
   selectOrganizationAccesses,
+  selectOrganizationUsersAsMapping,
+  selectOrganizationUsersIds,
   selectOrganizations,
   selectPermittedWorkspaceIds,
   selectPhotoAttachmentsOfIssue,
@@ -6084,6 +6297,8 @@ export {
   selectProjectAccesses,
   selectProjectFileVisibility,
   selectProjectFiles,
+  selectProjectUsersAsMapping,
+  selectProjectUsersIds,
   selectProjects,
   selectRecentIssueIds,
   selectRecentIssuesAsSearchResults,
@@ -6091,7 +6306,9 @@ export {
   selectRehydrated,
   selectRevisionsForForm,
   selectShowTooltips,
-  selectSortedUsers,
+  selectSortedEmailDomains,
+  selectSortedOrganizationUsers,
+  selectSortedProjectUsers,
   selectStageMapping,
   selectStages,
   selectStagesFromComponentType,
@@ -6126,6 +6343,7 @@ export {
   setComponents,
   setCreateProjectType,
   setCurrentUser,
+  setEmailDomains,
   setEnableClustering,
   setEnableDuplicateIssues,
   setEnablePlacementMode,
@@ -6166,6 +6384,7 @@ export {
   unfavoriteForm,
   unhideAllCategories,
   unhideCategory,
+  updateActiveOrganization,
   updateAttachment,
   updateComponent,
   updateIssue,