chore: Migrate Tenant to Organization

app/client/src/ce/AppRouter.tsx

@@ -52,7 +52,7 @@ import SignupSuccess from "pages/setup/SignupSuccess";
 import type { ERROR_CODES } from "ee/constants/ApiConstants";
 import TemplatesListLoader from "pages/Templates/loader";
 import { getCurrentUser as getCurrentUserSelector } from "selectors/usersSelectors";
-import { getTenantPermissions } from "ee/selectors/tenantSelectors";
+import { getOrganizationPermissions } from "ee/selectors/organizationSelectors";
 import useBrandingTheme from "utils/hooks/useBrandingTheme";
 import RouteChangeListener from "RouteChangeListener";
 import { initCurrentPage } from "../actions/initActions";
@@ -71,7 +71,7 @@ export const loadingIndicator = <PageLoadingBar />;
 
 export function Routes() {
   const user = useSelector(getCurrentUserSelector);
-  const tenantPermissions = useSelector(getTenantPermissions);
+  const organizationPermissions = useSelector(getOrganizationPermissions);
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
 
   useFeatureFlagOverride();
@@ -102,7 +102,7 @@ export function Routes() {
             : getAdminSettingsPath(
                 isFeatureEnabled,
                 user?.isSuperUser || false,
-                tenantPermissions,
+                organizationPermissions,
               )
         }
       />
@@ -161,7 +161,7 @@ export default function AppRouter() {
 
   const isLoading = isConsolidatedPageLoading;
 
-  // hide the top loader once the tenant is loaded
+  // hide the top loader once the organization is loaded
   useEffect(() => {
     if (!isLoading) {
       const loader = document.getElementById("loader") as HTMLDivElement;

app/client/src/ce/actions/organizationActions.ts

@@ -0,0 +1,21 @@
+import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
+import type { UpdateOrganizationConfigRequest } from "ee/api/OrganizationApi";
+import type { ApiResponse } from "api/ApiResponses";
+
+export const getCurrentOrganization = (
+  isBackgroundRequest = true,
+  organizationConfig?: ApiResponse,
+) => ({
+  type: ReduxActionTypes.FETCH_CURRENT_ORGANIZATION_CONFIG,
+  payload: {
+    isBackgroundRequest,
+    organizationConfig,
+  },
+});
+
+export const updateOrganizationConfig = (
+  payload: UpdateOrganizationConfigRequest,
+) => ({
+  type: ReduxActionTypes.UPDATE_ORGANIZATION_CONFIG,
+  payload,
+});

app/client/src/ce/api/OrganizationApi.ts

@@ -0,0 +1,46 @@
+import type { AxiosPromise, AxiosRequestConfig } from "axios";
+
+import Api from "api/Api";
+import type { ApiResponse } from "api/ApiResponses";
+
+export type FetchCurrentOrganizationConfigResponse = ApiResponse<{
+  userPermissions: string[];
+  organizationConfiguration: Record<string, string>;
+  new: boolean;
+}>;
+
+export type UpdateOrganizationConfigResponse = ApiResponse<{
+  organizationConfiguration: Record<string, string>;
+}>;
+
+export interface UpdateOrganizationConfigRequest {
+  organizationConfiguration: Record<string, string>;
+  needsRefresh?: boolean;
+  isOnlyOrganizationSettings?: boolean;
+  apiConfig?: AxiosRequestConfig;
+}
+
+export class OrganizationApi extends Api {
+  static tenantsUrl = "v1/tenants";
+
+  static async fetchCurrentOrganizationConfig(): Promise<
+    AxiosPromise<FetchCurrentOrganizationConfigResponse>
+  > {
+    return Api.get(`${OrganizationApi.tenantsUrl}/current`);
+  }
+
+  static async updateOrganizationConfig(
+    request: UpdateOrganizationConfigRequest,
+  ): Promise<AxiosPromise<UpdateOrganizationConfigResponse>> {
+    return Api.put(
+      `${OrganizationApi.tenantsUrl}`,
+      request.organizationConfiguration,
+      null,
+      {
+        ...(request.apiConfig || {}),
+      },
+    );
+  }
+}
+
+export default OrganizationApi;

app/client/src/ce/constants/ReduxActionConstants.tsx

@@ -1193,19 +1193,21 @@ const AppSettingsActionTypes = {
     "UPDATE_APP_SETTINGS_PANE_SELECTED_TAB",
 };
 
-const TenantActionTypes = {
-  FETCH_CURRENT_TENANT_CONFIG: "FETCH_CURRENT_TENANT_CONFIG",
-  FETCH_CURRENT_TENANT_CONFIG_SUCCESS: "FETCH_CURRENT_TENANT_CONFIG_SUCCESS",
-  UPDATE_TENANT_CONFIG: "UPDATE_TENANT_CONFIG",
-  UPDATE_TENANT_CONFIG_SUCCESS: "UPDATE_TENANT_CONFIG_SUCCESS",
+const OrganizationActionTypes = {
+  FETCH_CURRENT_ORGANIZATION_CONFIG: "FETCH_CURRENT_ORGANIZATION_CONFIG",
+  FETCH_CURRENT_ORGANIZATION_CONFIG_SUCCESS:
+    "FETCH_CURRENT_ORGANIZATION_CONFIG_SUCCESS",
+  UPDATE_ORGANIZATION_CONFIG: "UPDATE_ORGANIZATION_CONFIG",
+  UPDATE_ORGANIZATION_CONFIG_SUCCESS: "UPDATE_ORGANIZATION_CONFIG_SUCCESS",
   FETCH_PRODUCT_ALERT_INIT: "FETCH_PRODUCT_ALERT_INIT",
   FETCH_PRODUCT_ALERT_SUCCESS: "FETCH_PRODUCT_ALERT_SUCCESS",
   UPDATE_PRODUCT_ALERT_CONFIG: "UPDATE_PRODUCT_ALERT_CONFIG",
 };
 
-const TenantActionErrorTypes = {
-  FETCH_CURRENT_TENANT_CONFIG_ERROR: "FETCH_CURRENT_TENANT_CONFIG_ERROR",
-  UPDATE_TENANT_CONFIG_ERROR: "UPDATE_TENANT_CONFIG_ERROR",
+const OrganizationActionErrorTypes = {
+  FETCH_CURRENT_ORGANIZATION_CONFIG_ERROR:
+    "FETCH_CURRENT_ORGANIZATION_CONFIG_ERROR",
+  UPDATE_ORGANIZATION_CONFIG_ERROR: "UPDATE_ORGANIZATION_CONFIG_ERROR",
   FETCH_PRODUCT_ALERT_FAILED: "FETCH_PRODUCT_ALERT_FAILED",
 };
 
@@ -1286,7 +1288,7 @@ export const ReduxActionTypes = {
   ...SnippingModeActionTypes,
   ...TableWidgetActionsTypes,
   ...TemplateActionsTypes,
-  ...TenantActionTypes,
+  ...OrganizationActionTypes,
   ...ThemeActionTypes,
   ...UserAuthActionTypes,
   ...UserProfileActionTypes,
@@ -1316,7 +1318,7 @@ export const ReduxActionErrorTypes = {
   ...PlatformActionErrorTypes,
   ...PluginActionErrorTypes,
   ...TemplateActionErrorTypes,
-  ...TenantActionErrorTypes,
+  ...OrganizationActionErrorTypes,
   ...UserAuthActionErrorTypes,
   ...UserProfileActionErrorTypes,
   ...WidgetCanvasActionErrorTypes,
@@ -1332,7 +1334,7 @@ export const toastMessageErrorTypes = {
   ...GitActionErrorTypes,
   ...ImportExportActionErrorTypes,
   ...PlatformActionErrorTypes,
-  ...TenantActionErrorTypes,
+  ...OrganizationActionErrorTypes,
   ...UserAuthActionErrorTypes,
   ...UserProfileActionErrorTypes,
   ...WorkspaceActionErrorTypes,

app/client/src/ce/constants/tenantConstants.ts → app/client/src/ce/constants/organizationConstants.ts

@@ -1,4 +1,4 @@
-export const tenantConfigConnection: string[] = [
+export const organizationConfigConnection: string[] = [
   "instanceName",
   "googleMapsKey",
   "emailVerificationEnabled",

app/client/src/ce/pages/AdminSettings/config/authentication.tsx

@@ -22,7 +22,7 @@ import { useSelector } from "react-redux";
 import {
   getThirdPartyAuths,
   getIsFormLoginEnabled,
-} from "ee/selectors/tenantSelectors";
+} from "ee/selectors/organizationSelectors";
 import {
   FORM_LOGIN_DESC,
   GITHUB_AUTH_DESC,

app/client/src/ce/pages/AdminSettings/config/general.tsx

@@ -110,7 +110,7 @@ export const APPSMITH_IS_ATOMIC_PUSH_ALLOWED: Setting = {
   category: SettingCategories.GENERAL,
   controlType: SettingTypes.CHECKBOX,
   label: "Allow atomic pushes",
-  text: "Git operations on this tenant should attempt to perform pushes atomically",
+  text: "Git operations on this organization should attempt to perform pushes atomically",
 };
 
 export const APPSMITH_ALLOWED_FRAME_ANCESTORS_SETTING: Setting = {

app/client/src/ce/pages/Applications/CreateNewAppsOption.test.tsx

@@ -15,8 +15,8 @@ jest.mock("selectors/gitModSelectors", () => ({
 
 const defaultStoreState = {
   ...unitTestBaseMockStore,
-  tenant: {
-    tenantConfiguration: {},
+  organization: {
+    organizationConfiguration: {},
   },
   entities: {
     ...unitTestBaseMockStore.entities,

app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx

@@ -27,7 +27,7 @@ import { fetchMockDatasources } from "actions/datasourceActions";
 import DatasourceForm from "pages/Editor/SaaSEditor/DatasourceForm";
 import type { Datasource } from "entities/Datasource";
 import { fetchingEnvironmentConfigs } from "ee/actions/environmentAction";
-import { shouldShowLicenseBanner } from "ee/selectors/tenantSelectors";
+import { shouldShowLicenseBanner } from "ee/selectors/organizationSelectors";
 import { isAirgapped } from "ee/utils/airgapHelpers";
 
 const SectionWrapper = styled.div<{ isBannerVisible: boolean }>`

app/client/src/ce/pages/Applications/index.tsx

@@ -97,9 +97,9 @@ import {
   getIsFetchingApplications,
 } from "ee/selectors/selectedWorkspaceSelectors";
 import {
-  getTenantPermissions,
+  getOrganizationPermissions,
   shouldShowLicenseBanner,
-} from "ee/selectors/tenantSelectors";
+} from "ee/selectors/organizationSelectors";
 import { getWorkflowsList } from "ee/selectors/workflowSelectors";
 import {
   getFetchedWorkspaces,
@@ -301,12 +301,12 @@ export function LeftPaneSection(props: {
 }) {
   const dispatch = useDispatch();
   const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
-  const tenantPermissions = useSelector(getTenantPermissions);
+  const organizationPermissions = useSelector(getOrganizationPermissions);
   const fetchedWorkspaces = useSelector(getFetchedWorkspaces);
 
   const canCreateWorkspace = getHasCreateWorkspacePermission(
     isFeatureEnabled,
-    tenantPermissions,
+    organizationPermissions,
   );
 
   const createNewWorkspace = async () => {

app/client/src/ce/reducers/index.tsx

@@ -54,8 +54,8 @@ import SettingsReducer from "ee/reducers/settingsReducer";
 import type { TriggerValuesEvaluationState } from "reducers/evaluationReducers/triggerReducer";
 import type { CanvasWidgetStructure } from "WidgetProvider/constants";
 import type { AppSettingsPaneReduxState } from "reducers/uiReducers/appSettingsPaneReducer";
-import type { TenantReduxState } from "ee/reducers/tenantReducer";
-import tenantReducer from "ee/reducers/tenantReducer";
+import type { OrganizationReduxState } from "ee/reducers/organizationReducer";
+import organizationReducer from "ee/reducers/organizationReducer";
 import type { FocusHistoryState } from "reducers/uiReducers/focusHistoryReducer";
 import type { EditorContextState } from "ee/reducers/uiReducers/editorContextReducer";
 import type { LibraryState } from "reducers/uiReducers/libraryReducer";
@@ -87,7 +87,7 @@ export const reducerObject = {
   evaluations: evaluationsReducer,
   form: formReducer,
   settings: SettingsReducer,
-  tenant: tenantReducer,
+  organization: organizationReducer,
   linting: lintErrorReducer,
   git: gitReducer,
 };
@@ -180,7 +180,7 @@ export interface AppState {
   settings: SettingsReduxState;
   // TODO: Fix this the next time the file is edited
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  tenant: TenantReduxState<any>;
+  organization: OrganizationReduxState<any>;
   git: {
     global: GitGlobalReduxState;
     artifacts: GitArtifactRootReduxState;