Merge branch 'pe/conversation-starters' of https://github.com/continuedev/continue into pe/conversation-starters

Author: sestinj

gui/src/context/Auth.tsx

@@ -45,9 +45,9 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
   );
 
   // Orgs
-  const orgs = useAppSelector((store) => store.profiles.organizations);
+  const orgs = useAppSelector((store) => store.organizations.organizations);
   const selectedOrgId = useAppSelector(
-    (store) => store.profiles.selectedOrganizationId,
+    (store) => store.organizations.selectedOrganizationId,
   );
   const selectedOrganization = useMemo(() => {
     if (!selectedOrgId) {

gui/src/pages/config/ScopeSelect.tsx

@@ -12,7 +12,7 @@ import { useAppDispatch, useAppSelector } from "../../redux/hooks";
 export function ScopeSelect() {
   const { organizations, selectedOrganization } = useAuth();
   const selectedOrgId = useAppSelector(
-    (state) => state.profiles.selectedOrganizationId,
+    (state) => state.organizations.selectedOrganizationId,
   );
   const dispatch = useAppDispatch();
 

gui/src/redux/slices/index.ts

@@ -1 +1,2 @@
+export * from "./organizations";
 export * from "./profiles";

gui/src/redux/slices/organizations/index.ts

@@ -0,0 +1,2 @@
+export * from "./slice";
+export * from "./thunks";

gui/src/redux/slices/organizations/slice.ts

@@ -0,0 +1,50 @@
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { OrganizationDescription } from "core/config/ProfileLifecycleManager";
+
+export interface OrganizationsState {
+  organizations: OrganizationDescription[];
+  selectedOrganizationId: string | null;
+}
+
+const initialState: OrganizationsState = {
+  organizations: [],
+  selectedOrganizationId: null,
+};
+
+export const organizationsSlice = createSlice({
+  name: "organizations",
+  initialState,
+  reducers: {
+    setOrganizations: (
+      state,
+      { payload }: PayloadAction<OrganizationDescription[]>,
+    ) => {
+      state.organizations = payload;
+    },
+    setSelectedOrganizationId: (
+      state,
+      { payload }: PayloadAction<string | null>,
+    ) => {
+      state.selectedOrganizationId = payload;
+    },
+  },
+  selectors: {
+    selectOrganizations: (state) => state.organizations,
+    selectSelectedOrganizationId: (state) => state.selectedOrganizationId,
+    selectSelectedOrganization: (state) =>
+      state.organizations.find(
+        (org) => org.id === state.selectedOrganizationId,
+      ) ?? null,
+  },
+});
+
+export const { setOrganizations, setSelectedOrganizationId } =
+  organizationsSlice.actions;
+
+export const {
+  selectOrganizations,
+  selectSelectedOrganizationId,
+  selectSelectedOrganization,
+} = organizationsSlice.selectors;
+
+export const { reducer: organizationsReducer } = organizationsSlice;

gui/src/redux/slices/organizations/thunks.ts

@@ -0,0 +1,47 @@
+import { createAsyncThunk } from "@reduxjs/toolkit";
+import { OrganizationDescription } from "core/config/ProfileLifecycleManager";
+import { ThunkApiType } from "../../store";
+import { setAvailableProfiles } from "../profiles/slice";
+import { setOrganizations, setSelectedOrganizationId } from "./slice";
+
+export const selectOrgThunk = createAsyncThunk<
+  void,
+  string | null,
+  ThunkApiType
+>("organizations/select", async (id, { dispatch, extra, getState }) => {
+  const state = getState();
+  const initialId = state.organizations.selectedOrganizationId;
+  let newId = id;
+
+  // If no orgs, force clear
+  if (state.organizations.organizations.length === 0) {
+    newId = null;
+  } else if (newId) {
+    // If new id doesn't match an existing org, clear it
+    if (!state.organizations.organizations.find((o) => o.id === newId)) {
+      newId = null;
+    }
+  }
+  // Unlike profiles, don't fallback to the first org,
+  // Fallback to Personal (org = null)
+
+  if (initialId !== newId) {
+    dispatch(setAvailableProfiles(null));
+    dispatch(setSelectedOrganizationId(newId));
+    extra.ideMessenger.post("didChangeSelectedOrg", {
+      id: newId,
+    });
+  }
+});
+
+export const updateOrgsThunk = createAsyncThunk<
+  void,
+  OrganizationDescription[],
+  ThunkApiType
+>("organizations/update", async (orgs, { dispatch, getState }) => {
+  const state = getState();
+  dispatch(setOrganizations(orgs));
+
+  // This will trigger reselection if needed
+  dispatch(selectOrgThunk(state.organizations.selectedOrganizationId));
+});

gui/src/redux/slices/profiles/slice.ts

@@ -1,6 +1,5 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { ProfileDescription } from "core/config/ConfigHandler";
-import { OrganizationDescription } from "core/config/ProfileLifecycleManager";
 import { ensureProfilePreferences } from "./utils";
 
 export interface PreferencesState {
@@ -10,16 +9,12 @@ export interface PreferencesState {
 export interface ProfilesState {
   availableProfiles: ProfileDescription[] | null;
   selectedProfileId: string | null;
-  organizations: OrganizationDescription[];
-  selectedOrganizationId: string | null;
   preferencesByProfileId: Record<string, PreferencesState>;
 }
 
 const initialState: ProfilesState = {
   availableProfiles: null,
   selectedProfileId: null,
-  organizations: [],
-  selectedOrganizationId: null,
   preferencesByProfileId: {},
 };
 
@@ -46,18 +41,6 @@ export const profilesSlice = createSlice({
         }
       }
     },
-    setOrganizations: (
-      state,
-      { payload }: PayloadAction<OrganizationDescription[]>,
-    ) => {
-      state.organizations = payload;
-    },
-    setSelectedOrganizationId: (
-      state,
-      { payload }: PayloadAction<string | null>,
-    ) => {
-      state.selectedOrganizationId = payload;
-    },
     bookmarkSlashCommand: (
       state,
       action: PayloadAction<{ commandName: string }>,
@@ -112,8 +95,6 @@ export const profilesSlice = createSlice({
 export const {
   setAvailableProfiles,
   setSelectedProfile,
-  setOrganizations,
-  setSelectedOrganizationId,
   bookmarkSlashCommand,
   unbookmarkSlashCommand,
 } = profilesSlice.actions;

gui/src/redux/slices/profiles/thunks.ts

@@ -1,13 +1,7 @@
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { ProfileDescription } from "core/config/ConfigHandler";
-import { OrganizationDescription } from "core/config/ProfileLifecycleManager";
 import { ThunkApiType } from "../../store";
-import {
-  setAvailableProfiles,
-  setOrganizations,
-  setSelectedOrganizationId,
-  setSelectedProfile,
-} from "./slice";
+import { setAvailableProfiles, setSelectedProfile } from "./slice";
 
 export const selectProfileThunk = createAsyncThunk<
   void,
@@ -89,45 +83,3 @@ export const updateProfilesThunk = createAsyncThunk<
   // This will trigger reselection if needed
   dispatch(selectProfileThunk(selectedProfileId));
 });
-
-export const selectOrgThunk = createAsyncThunk<
-  void,
-  string | null,
-  ThunkApiType
->("session/selectOrg", async (id, { dispatch, extra, getState }) => {
-  const state = getState();
-  const initialId = state.profiles.selectedOrganizationId;
-  let newId = id;
-
-  // If no orgs, force clear
-  if (state.profiles.organizations.length === 0) {
-    newId = null;
-  } else if (newId) {
-    // If new id doesn't match an existing org, clear it
-    if (!state.profiles.organizations.find((o) => o.id === newId)) {
-      newId = null;
-    }
-  }
-  // Unlike profiles, don't fallback to the first org,
-  // Fallback to Personal (org = null)
-
-  if (initialId !== newId) {
-    dispatch(setAvailableProfiles(null));
-    dispatch(setSelectedOrganizationId(newId));
-    extra.ideMessenger.post("didChangeSelectedOrg", {
-      id: newId,
-    });
-  }
-});
-
-export const updateOrgsThunk = createAsyncThunk<
-  void,
-  OrganizationDescription[],
-  ThunkApiType
->("session/updateOrgs", async (orgs, { dispatch, getState }) => {
-  const state = getState();
-  dispatch(setOrganizations(orgs));
-
-  // This will trigger reselection if needed
-  dispatch(selectOrgThunk(state.profiles.selectedOrganizationId));
-});

gui/src/redux/store.ts

@@ -10,7 +10,7 @@ import { createFilter } from "redux-persist-transform-filter";
 import autoMergeLevel2 from "redux-persist/lib/stateReconciler/autoMergeLevel2";
 import storage from "redux-persist/lib/storage";
 import { IdeMessenger, IIdeMessenger } from "../context/IdeMessenger";
-import { profilesReducer } from "./slices";
+import { organizationsReducer, profilesReducer } from "./slices";
 import configReducer from "./slices/configSlice";
 import editModeStateReducer from "./slices/editModeState";
 import indexingReducer from "./slices/indexingSlice";
@@ -33,6 +33,7 @@ const rootReducer = combineReducers({
   indexing: indexingReducer,
   tabs: tabsReducer,
   profiles: profilesReducer,
+  organizations: organizationsReducer,
 });
 
 const saveSubsetFilters = [