Merge pull request #6114 from DonOmalVindula/ai-features-hotfix-conso…

…le-2.15.9 [Hotfix][console] Disable AI features in sub-organizations
wso2 · Apr 30, 2024 · f30bb7c · f30bb7c
2 parents f66775e + 6397a51
commit f30bb7c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/...pplications.v1/components/settings/sign-on-methods/components/sign-on-methods-wrapper.tsx b/...pplications.v1/components/settings/sign-on-methods/components/sign-on-methods-wrapper.tsx
@@ -23,6 +23,7 @@ import { useSelector } from "react-redux";
 import { SignOnMethodsCore } from "./sign-on-methods-core";
 import { AppState, FeatureConfigInterface } from "../../../../../admin.core.v1";
 import useAILoginFlow from "../../../../../admin.login-flow.ai.v1/hooks/use-ai-login-flow";
+import { useGetCurrentOrganizationType } from "../../../../../admin.organizations.v1/hooks/use-get-organization-type";
 import {
     ApplicationInterface,
     AuthenticationSequenceInterface
@@ -96,12 +97,14 @@ export const SignOnMethodsWrapper: FunctionComponent<SignOnMethodsWrapperPropsIn
 
     const { aiGeneratedLoginFlow } = useAILoginFlow();
 
+    const { isSubOrganization } = useGetCurrentOrganizationType();
+
     const applicationDisabledFeatures: string[] = useSelector((state: AppState) =>
         state.config.ui.features?.applications?.disabledFeatures);
 
     let processedAuthenticationSequence: AuthenticationSequenceInterface = authenticationSequence;
 
-    if (!applicationDisabledFeatures?.includes(LOGIN_FLOW_AI_FEATURE_TAG)) {
+    if (!applicationDisabledFeatures?.includes(LOGIN_FLOW_AI_FEATURE_TAG) && !isSubOrganization()) {
         processedAuthenticationSequence = aiGeneratedLoginFlow ?? authenticationSequence;
     }
 

diff --git a/...uthentication-flow-builder.v1/components/script-editor-panel/script-based-flow-switch.tsx b/...uthentication-flow-builder.v1/components/script-editor-panel/script-based-flow-switch.tsx
@@ -38,6 +38,7 @@ import { AdaptiveScriptUtils } from "../../../admin.applications.v1/utils/adapti
 import { AppState } from "../../../admin.core.v1/store";
 import { LOGIN_FLOW_AI_FEATURE_TAG } from "../../../admin.login-flow.ai.v1/constants/login-flow-ai-constants";
 import useAILoginFlow from "../../../admin.login-flow.ai.v1/hooks/use-ai-login-flow";
+import { useGetCurrentOrganizationType } from "../../../admin.organizations.v1/hooks/use-get-organization-type";
 import useAuthenticationFlow from "../../hooks/use-authentication-flow";
 import "./script-based-flow-switch.scss";
 
@@ -72,6 +73,8 @@ const ScriptBasedFlowSwitch = (props: PropsWithChildren<ScriptBasedFlowSwitchPro
 
     const { aiGeneratedLoginFlow } = useAILoginFlow();
 
+    const { isSubOrganization } = useGetCurrentOrganizationType();
+
     const [ showScriptResetWarning, setShowScriptResetWarning ] = useState<boolean>(false);
 
     const applicationDisabledFeatures: string[] = useSelector((state: AppState) =>
@@ -84,6 +87,7 @@ const ScriptBasedFlowSwitch = (props: PropsWithChildren<ScriptBasedFlowSwitchPro
     useEffect(() => {
         // Enable conditional authentication script for AI generated authentication sequence.
         if (!applicationDisabledFeatures?.includes(LOGIN_FLOW_AI_FEATURE_TAG)
+            && !isSubOrganization()
             && aiGeneratedLoginFlow?.script
             && !AdaptiveScriptUtils.isDefaultScript(
                 aiGeneratedLoginFlow.script,

diff --git a/features/admin.branding.v1/components/branding-page-layout.tsx b/features/admin.branding.v1/components/branding-page-layout.tsx
@@ -27,6 +27,7 @@ import { LoadingScreen } from "../../admin.ai.v1/components/branding-ai-loading-
 import useAIBrandingPreference from "../../admin.ai.v1/hooks/use-ai-branding-preference";
 import { AppState } from "../../admin.core.v1/store";
 import { ExtendedFeatureConfigInterface } from "../../admin.extensions.v1/configs/models";
+import { useGetCurrentOrganizationType } from "../../admin.organizations.v1/hooks/use-get-organization-type";
 import { AI_BRANDING_FEATURE_ID } from "../constants/ai-branding-constants";
 
 type BrandingPageLayoutInterface = IdentifiableComponentInterface;
@@ -49,6 +50,8 @@ const BrandingPageLayout: FunctionComponent<BrandingPageLayoutInterface> = (
         mergedBrandingPreference
     } = useAIBrandingPreference();
 
+    const { isSubOrganization } = useGetCurrentOrganizationType();
+
     return (
         <PageLayout
             pageTitle={ t("extensions:develop.branding.pageHeader.title") }
@@ -74,7 +77,7 @@ const BrandingPageLayout: FunctionComponent<BrandingPageLayoutInterface> = (
             className="branding-page"
         >
             {
-                !disabledFeatures.includes(AI_BRANDING_FEATURE_ID) && (
+                !disabledFeatures.includes(AI_BRANDING_FEATURE_ID) && !isSubOrganization() && (
                     <BrandingAIBanner/>
                 )
             }

diff --git a/features/admin.login-flow.ai.v1/providers/ai-login-flow-provider.tsx b/features/admin.login-flow.ai.v1/providers/ai-login-flow-provider.tsx
@@ -24,6 +24,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { Dispatch } from "redux";
 import { AuthenticationSequenceInterface } from "../../admin.applications.v1/models/application";
 import { AppState } from "../../admin.core.v1";
+import { useGetCurrentOrganizationType } from "../../admin.organizations.v1/hooks/use-get-organization-type";
 import { useAILoginFlowGenerationResult } from "../api/use-ai-login-flow-generation-result";
 import LoginFlowAIBanner from "../components/login-flow-ai-banner";
 import LoginFlowAILoadingScreen from "../components/login-flow-ai-loading-screen";
@@ -47,6 +48,8 @@ const AILoginFlowProvider = (props: PropsWithChildren<AILoginFlowProviderProps>)
 
     const dispatch: Dispatch = useDispatch();
 
+    const { isSubOrganization } = useGetCurrentOrganizationType();
+
     const applicationDisabledFeatures: string[] = useSelector((state: AppState) =>
         state.config.ui.features?.applications?.disabledFeatures);
 
@@ -131,7 +134,8 @@ const AILoginFlowProvider = (props: PropsWithChildren<AILoginFlowProviderProps>)
                 ) : (
                     <>
                         {
-                            !applicationDisabledFeatures?.includes(LOGIN_FLOW_AI_FEATURE_TAG) && (
+                            !applicationDisabledFeatures?.includes(LOGIN_FLOW_AI_FEATURE_TAG) &&
+                            !isSubOrganization() && (
                                 <LoginFlowAIBanner/>
                             )
                         }