Enable API Resources UI in sub organization from View only capability

wso2 · Dec 19, 2024 · 8b48582 · 8b48582
1 parent 994ba7d
commit 8b48582
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 45 deletions.
diff --git a/apps/console/src/extensions/i18n/models/extensions.ts b/apps/console/src/extensions/i18n/models/extensions.ts
@@ -327,6 +327,7 @@ export interface Extensions {
         apiResource: {
             pageHeader: {
                 description: string;
+                subOrgDescription: string;
                 title: string;
             };
             empty: string;

diff --git a/apps/console/src/extensions/i18n/resources/en-US/extensions.ts b/apps/console/src/extensions/i18n/resources/en-US/extensions.ts
@@ -473,6 +473,7 @@ export const extensions: Extensions = {
         apiResource: {
             pageHeader: {
                 description: "Create and manage the APIs used to define the API scopes/permissions that can be consumed by your applications.",
+                subOrgDescription: "View the APIs used to define the API scopes/permissions that can be consumed by your applications.",
                 title: "API Resources"
             },
             empty: "There are no API resources available at the moment.",

diff --git a/features/admin.api-resources.v2/package.json b/features/admin.api-resources.v2/package.json
@@ -22,6 +22,7 @@
         "@wso2is/forms": "^2.3.5",
         "@wso2is/react-components": "^2.8.10",
         "@wso2is/admin.core.v1": "^2.34.59",
+        "@wso2is/admin.organizations.v1": "^2.26.59",
         "axios": "^0.19.2",
         "i18next": "^21.9.1",
         "node-forge": "^0.10.0",

diff --git a/features/admin.api-resources.v2/pages/api-resources.tsx b/features/admin.api-resources.v2/pages/api-resources.tsx
@@ -25,6 +25,8 @@ import {
     getEmptyPlaceholderIllustrations,
     history
 } from "@wso2is/admin.core.v1";
+import { OrganizationType } from "@wso2is/admin.organizations.v1/constants";
+import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
 import { IdentityAppsApiException } from "@wso2is/core/exceptions";
 import { AlertInterface, AlertLevels, IdentifiableComponentInterface, LinkInterface } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
@@ -88,6 +90,7 @@ const APIResourcesPage: FunctionComponent<APIResourcesPageInterface> = (
 
     const featureConfig: FeatureConfigInterface = useSelector((state: AppState) => state.config.ui.features);
     const allowedScopes: string = useSelector((state: AppState) => state?.auth?.allowedScopes);
+    const { organizationType } = useGetCurrentOrganizationType();
 
     const {
         data: apiResourcesListData,
@@ -252,7 +255,7 @@ const APIResourcesPage: FunctionComponent<APIResourcesPageInterface> = (
             }
             pageTitle={ t("extensions:develop.apiResource.pageHeader.title") }
             title={ t("extensions:develop.apiResource.pageHeader.title") }
-            description={ (
+            description={ organizationType !== OrganizationType.SUBORGANIZATION ? (
                 <>
                     { t("extensions:develop.apiResource.pageHeader.description") }
                     <DocumentationLink
@@ -261,54 +264,68 @@ const APIResourcesPage: FunctionComponent<APIResourcesPageInterface> = (
                         { t("extensions:common.learnMore") }
                     </DocumentationLink>
                 </>
-            ) }
+            ) : (
+                <>
+                    { t("extensions:develop.apiResource.pageHeader.subOrgDescription") }
+                    <DocumentationLink
+                        link={ getLink("develop.apiResources.learnMore") }
+                    >
+                        { t("extensions:common.learnMore") }
+                    </DocumentationLink>
+                </>
+            )}
             data-componentid={ `${ componentId }-page-layout` }
             data-testid={ `${ componentId }-page-layout` }
             headingColumnWidth="11"
             actionColumnWidth="5"
         >
-            <EmphasizedSegment
-                onClick={ () => {
-                    history.push(APIResourcesConstants.getPaths().get("API_RESOURCES_CATEGORY")
-                        .replace(":categoryId", APIResourceType.MANAGEMENT));
-                } }
-                className="clickable"
-                data-componentid={ `${ componentId }-management-api-container` }
-            >
-                <List>
-                    <List.Item>
-                        <Grid container direction="row" xs={ 12 } alignItems="center">
-                            <Grid xs={ 10 } alignContent="center">
-                                <GenericIcon
-                                    verticalAlign="middle"
-                                    fill="primary"
-                                    transparent
-                                    icon={ <BuildingGearIcon size="medium" /> }
-                                    spaced="right"
-                                    floated="left"
-                                    className="mt-1"
-                                />
-                                <List.Header>
-                                    { t("extensions:develop.apiResource.managementAPI.header") }
-                                </List.Header>
-                                <List.Description>
-                                    { t("extensions:develop.apiResource.managementAPI.description") }
-                                </List.Description>
-                            </Grid>
-                            <Grid xs={ 2 }>
-                                <GenericIcon
-                                    verticalAlign="middle"
-                                    fill="primary"
-                                    transparent
-                                    icon={ <ChevronRightIcon /> }
-                                    spaced="right"
-                                    floated="right"
-                                />
-                            </Grid>
-                        </Grid>
-                    </List.Item>
-                </List>
-            </EmphasizedSegment>
+            {
+                organizationType !== OrganizationType.SUBORGANIZATION &&
+                (
+                    <EmphasizedSegment
+                        onClick={ () => {
+                            history.push(APIResourcesConstants.getPaths().get("API_RESOURCES_CATEGORY")
+                                .replace(":categoryId", APIResourceType.MANAGEMENT));
+                        } }
+                        className="clickable"
+                        data-componentid={ `${ componentId }-management-api-container` }
+                    >
+                        <List>
+                            <List.Item>
+                                <Grid container direction="row" xs={ 12 } alignItems="center">
+                                    <Grid xs={ 10 } alignContent="center">
+                                        <GenericIcon
+                                            verticalAlign="middle"
+                                            fill="primary"
+                                            transparent
+                                            icon={ <BuildingGearIcon size="medium" /> }
+                                            spaced="right"
+                                            floated="left"
+                                            className="mt-1"
+                                        />
+                                        <List.Header>
+                                            { t("extensions:develop.apiResource.managementAPI.header") }
+                                        </List.Header>
+                                        <List.Description>
+                                            { t("extensions:develop.apiResource.managementAPI.description") }
+                                        </List.Description>
+                                    </Grid>
+                                    <Grid xs={ 2 }>
+                                        <GenericIcon
+                                            verticalAlign="middle"
+                                            fill="primary"
+                                            transparent
+                                            icon={ <ChevronRightIcon /> }
+                                            spaced="right"
+                                            floated="right"
+                                        />
+                                    </Grid>
+                                </Grid>
+                            </List.Item>
+                        </List>
+                    </EmphasizedSegment>
+                )
+            }
             <EmphasizedSegment
                 onClick={ () => {
                     history.push(APIResourcesConstants.getPaths().get("API_RESOURCES_CATEGORY")

diff --git a/features/admin.core.v1/constants/app-constants.ts b/features/admin.core.v1/constants/app-constants.ts
@@ -483,7 +483,8 @@ export class AppConstants {
         "smsTemplates",
         "governanceConnectors",
         "branding",
-        "consoleSettings"
+        "consoleSettings",
+        "apiResources"
     ];
 
     /**

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml