Fix e2e tests (#938)

* fix tests

* eslint

Author: t-aleksander

web/src/pages/auth/AuthPage.tsx

@@ -48,7 +48,7 @@ export const AuthPage = () => {
 
   const setAppStore = useAppStore((state) => state.setState);
 
-  const enterpriseEnabled = useAppStore((state) => state.enterprise_status?.enabled);
+  const enterpriseEnabled = useAppStore((s) => s.appInfo?.license_info.enterprise);
 
   const [params] = useSearchParams();
   const redirectUrl = params.get('r');

web/src/pages/auth/Login/Login.tsx

@@ -40,7 +40,7 @@ export const Login = () => {
   } = useApi();
   const toaster = useToaster();
 
-  const enterpriseEnabled = useAppStore((state) => state.enterprise_status?.enabled);
+  const enterpriseEnabled = useAppStore((s) => s.appInfo?.license_info.enterprise);
   const { data: openIdInfo, isLoading: openIdLoading } = useQuery({
     enabled: enterpriseEnabled,
     queryKey: [QueryKeys.FETCH_OPENID_INFO],
@@ -145,7 +145,7 @@ export const Login = () => {
               text={LL.form.login()}
               data-testid="login-form-submit"
             />
-            {enterpriseEnabled && openIdInfo && (
+            {openIdInfo && (
               <OpenIdLoginButton
                 url={openIdInfo.url}
                 display_name={openIdInfo?.button_display_name}

web/src/pages/settings/components/OpenIdSettings/components/DirectorySyncSettings.tsx

@@ -31,7 +31,7 @@ export const DirsyncSettings = ({
 }) => {
   const { LL } = useI18nContext();
   const localLL = LL.settingsPage.openIdSettings;
-  const enterpriseEnabled = useAppStore((state) => state.enterprise_status?.enabled);
+  const enterpriseEnabled = useAppStore((s) => s.appInfo?.license_info.enterprise);
   const [googleServiceAccountFileName, setGoogleServiceAccountFileName] = useState<
     string | null
   >(null);

web/src/pages/settings/components/OpenIdSettings/components/OpenIdGeneralSettings.tsx

@@ -23,7 +23,7 @@ export const OpenIdGeneralSettings = () => {
   } = useApi();
 
   const settings = useSettingsPage((state) => state.settings);
-  const enterpriseEnabled = useAppStore((state) => state.enterprise_status?.enabled);
+  const enterpriseEnabled = useAppStore((s) => s.appInfo?.license_info.enterprise);
 
   const queryClient = useQueryClient();
 

web/src/pages/settings/components/OpenIdSettings/components/OpenIdProviderSettings.tsx

@@ -27,7 +27,7 @@ export const OpenIdSettingsForm = ({
 }) => {
   const { LL } = useI18nContext();
   const localLL = LL.settingsPage.openIdSettings;
-  const enterpriseEnabled = useAppStore((state) => state.enterprise_status?.enabled);
+  const enterpriseEnabled = useAppStore((s) => s.appInfo?.license_info.enterprise);
   const { control } = formControl;
 
   const options: SelectOption<string>[] = useMemo(

web/src/pages/settings/components/OpenIdSettings/components/OpenIdSettingsRootForm.tsx

@@ -30,7 +30,7 @@ export const OpenIdSettingsRootForm = () => {
   const localLL = LL.settingsPage.openIdSettings;
   const [currentProvider, setCurrentProvider] = useState<OpenIdProvider | null>(null);
   const queryClient = useQueryClient();
-  const enterpriseEnabled = useAppStore((state) => state.enterprise_status?.enabled);
+  const enterpriseEnabled = useAppStore((s) => s.appInfo?.license_info.enterprise);
 
   const {
     settings: { fetchOpenIdProviders, addOpenIdProvider, deleteOpenIdProvider },

web/src/shared/hooks/store/useAppStore.ts

@@ -3,18 +3,12 @@ import { createJSONStorage, persist } from 'zustand/middleware';
 import { createWithEqualityFn } from 'zustand/traditional';
 
 import { Locales } from '../../../i18n/i18n-types';
-import {
-  AppInfo,
-  EnterpriseStatus,
-  SettingsEnterprise,
-  SettingsEssentials,
-} from '../../types';
+import { AppInfo, SettingsEnterprise, SettingsEssentials } from '../../types';
 
 const defaultValues: StoreValues = {
   settings: undefined,
   language: undefined,
   appInfo: undefined,
-  enterprise_status: undefined,
   enterprise_settings: undefined,
 };
 
@@ -42,7 +36,6 @@ type StoreValues = {
   settings?: SettingsEssentials;
   language?: Locales;
   appInfo?: AppInfo;
-  enterprise_status?: EnterpriseStatus;
   enterprise_settings?: SettingsEnterprise;
 };