Merge pull request #20 from solace-iot-team/feature-asset-tags

Feature asset tags

Author: ricardojosegomezulmke

ReleaseNotes.md

@@ -2,11 +2,26 @@
 
 Solace Async API Management.
 
+## Version 0.1.1
+  * [API-M Admin & Developer Portal](https://github.com/solace-iot-team/async-apim/tree/main/apim-portal): 0.1.1
+  * [API-M Server OpenAPI](https://github.com/solace-iot-team/async-apim/blob/main/apim-server/server/common/api.yml): 0.1.0
+  * [API-M Server](https://github.com/solace-iot-team/async-apim/tree/main/apim-server): 0.1.0
+  * [API-M Connector OpenAPI](https://github.com/solace-iot-team/platform-api): 0.6.5
+
+#### API-M Admin & Developer Portal
+
+**New Features:**
+- **API Products**
+  - added owning Business Group attribute management
+  - refactored edit/new UI components
+  - list only shows API Products owned by the currently selected business group
+  - **_Note:_** Existing API Products not tagged with the correct attribute settings will not be displayed
+
 ## Version 0.1.0
   * [API-M Admin & Developer Portal](https://github.com/solace-iot-team/async-apim/tree/main/apim-portal): 0.1.0
   * [API-M Server OpenAPI](https://github.com/solace-iot-team/async-apim/blob/main/apim-server/server/common/api.yml): 0.1.0
   * [API-M Server](https://github.com/solace-iot-team/async-apim/tree/main/apim-server): 0.1.0
-  * [API-M Connector OpenAPI](https://github.com/solace-iot-team/platform-api): 0.6.5
+  * [API-M Connector OpenAPI](https://github.com/solace-iot-team/platform-api): 0.7.6
 
 #### API-M Admin & Developer Portal
 

apim-portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "async-apim-portal",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Solace Async API Management Portal",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@asyncapi/react-component": "1.0.0-next.33",
-    "@solace-iot-team/apim-connector-openapi-browser": "^0.6.5",
+    "@solace-iot-team/apim-connector-openapi-browser": "^0.7.6",
     "async-mutex": "^0.3.2",
     "base-64": "^1.0.0",
     "js-yaml": "^4.1.0",

apim-portal/src/admin-portal/AdminPortalAppRoutes.tsx

@@ -10,7 +10,6 @@ import { ManageSystemSettingsPage } from "./pages/ManageSystemSettingsPage";
 import { MonitorSystemHealthPage } from "./pages/MonitorSystemHealthPage";
 import { ManageOrgEnvironmentsPage } from "./pages/ManageOrgEnvironmentsPage";
 import { ManageApisPage } from "./pages/ManageApisPage";
-import { ManageApiProductsPage } from "./pages/ManageApiProductsPage";
 import { ManageAppsPage } from './pages/ManageAppsPage';
 import { AdminPortalHealthCheckViewPage } from "./pages/AdminPortalHealthCheckViewPage";
 import { ManageOrgUsersPage } from "./pages/ManageOrgUsersPage";
@@ -20,6 +19,11 @@ import { ManageSystemUsersPage } from "./pages/ManageSystemUsersPage";
 import { ManageOrganizationSettingsPage } from "./pages/ManageOrganizationSettingsPage";
 import { ManageSystemOrganizationsPage } from "./pages/ManageSystemOrganizationsPage";
 import { MonitorOrganizationStatusPage } from "./pages/MonitorOrganizationStatusPage";
+import { ManageApiProductsPage } from "./pages/ManageApiProductsPage";
+
+import { ManageApiProductsPage as deleteme_ManageApiProductsPage} from "./pages/deleteme.ManageApiProductsPage";
+
+
 
 export const AdminPortalAppRoutes = (): Array<JSX.Element> => {
   // const componentName = 'AdminPortalAppRoutes';
@@ -44,6 +48,10 @@ export const AdminPortalAppRoutes = (): Array<JSX.Element> => {
         /* API Team*/
         <ProtectedRouteWithRbacAndOrgAccess path={EUIAdminPortalResourcePaths.ManageOrganizationApis} component={ManageApisPage} exact key={EUIAdminPortalResourcePaths.ManageOrganizationApis} />,
         <ProtectedRouteWithRbacAndOrgAccess path={EUIAdminPortalResourcePaths.ManageOrganizationApiProducts} component={ManageApiProductsPage} exact key={EUIAdminPortalResourcePaths.ManageOrganizationApiProducts} />,
+
+        <ProtectedRouteWithRbacAndOrgAccess path={EUIAdminPortalResourcePaths.deleteme_ManageOrganizationApiProducts} component={deleteme_ManageApiProductsPage} exact key={EUIAdminPortalResourcePaths.deleteme_ManageOrganizationApiProducts} />,
+
+
         <ProtectedRouteWithRbacAndOrgAccess path={EUIAdminPortalResourcePaths.ManageOrganizationApps} component={ManageAppsPage} exact key={EUIAdminPortalResourcePaths.ManageOrganizationApps} />,
     ]
   );

apim-portal/src/admin-portal/components/AdminPortalSideBar/AdminPortalSideBar.tsx

@@ -47,7 +47,7 @@ export const AdminPortalSideBar: React.FC<IAdminPortalSideBarProps> = (props: IA
   const getApimMenuItems = (): Array<MenuItem> => {
     if(
       isDisabled(EUIAdminPortalResourcePaths.ManageOrganizationApps) && 
-      isDisabled(EUIAdminPortalResourcePaths.ManageOrganizationApiProducts) &&
+      isDisabled(EUIAdminPortalResourcePaths.deleteme_ManageOrganizationApiProducts) &&
       isDisabled(EUIAdminPortalResourcePaths.ManageOrganizationApis)
       ) return [];
 
@@ -62,6 +62,11 @@ export const AdminPortalSideBar: React.FC<IAdminPortalSideBarProps> = (props: IA
         disabled: isDisabledWithConnectorUnavailable(isDisabledWithoutOrg, EUIAdminPortalResourcePaths.ManageOrganizationApiProducts),
         command: () => { navigateTo(EUIAdminPortalResourcePaths.ManageOrganizationApiProducts); }
       },
+      // {
+      //   label: 'OLD API Products',
+      //   disabled: isDisabledWithConnectorUnavailable(isDisabledWithoutOrg, EUIAdminPortalResourcePaths.deleteme_ManageOrganizationApiProducts),
+      //   command: () => { navigateTo(EUIAdminPortalResourcePaths.deleteme_ManageOrganizationApiProducts); }
+      // },
       {
         label: 'APIs',
         disabled: isDisabledWithConnectorUnavailable(isDisabledWithoutOrg, EUIAdminPortalResourcePaths.ManageOrganizationApis),

apim-portal/src/admin-portal/components/ManageApiProducts/DeleteApiProduct.tsx

@@ -7,18 +7,18 @@ import { Dialog } from 'primereact/dialog';
 import { APClientConnectorOpenApi } from "../../../utils/APClientConnectorOpenApi";
 import { ApiCallState, TApiCallState } from "../../../utils/ApiCallState";
 import { ApiCallStatusError } from "../../../components/ApiCallStatusError/ApiCallStatusError";
-import { E_CALL_STATE_ACTIONS } from "./ManageApiProductsCommon";
-import APAdminPortalApiProductsService from "../../utils/APAdminPortalApiProductsService";
 
 import '../../../components/APComponents.css';
 import "./ManageApiProducts.css";
+import { TAPEntityId } from "../../../utils/APEntityIdsService";
+import { E_CALL_STATE_ACTIONS } from "./ManageApiProductsCommon";
+import APAdminPortalApiProductsDisplayService from "../../displayServices/APAdminPortalApiProductsDisplayService";
 
 export interface IDeleteApiProductProps {
-  organizationId: string,
-  apiProductId: string;
-  apiProductDisplayName: string;
+  organizationId: string;
+  apiProductEntityId: TAPEntityId;
   onError: (apiCallState: TApiCallState) => void;
-  onSuccess: (apiCallState: TApiCallState) => void;
+  onDeleteSuccess: (apiCallState: TApiCallState) => void;
   onCancel: () => void;
   onLoadingChange: (isLoading: boolean) => void;
 }
@@ -35,11 +35,11 @@ export const DeleteApiProduct: React.FC<IDeleteApiProductProps> = (props: IDelet
   const apiDeleteManagedObject = async(): Promise<TApiCallState> => {
     const funcName = 'apiDeleteManagedObject';
     const logName = `${componentName}.${funcName}()`;
-    let callState: TApiCallState = ApiCallState.getInitialCallState(E_CALL_STATE_ACTIONS.API_DELETE_API_PRODUCT, `delete api product: ${props.apiProductDisplayName}`);
+    let callState: TApiCallState = ApiCallState.getInitialCallState(E_CALL_STATE_ACTIONS.API_DELETE_API_PRODUCT, `delete api product: ${props.apiProductEntityId.displayName}`);
     try { 
-      await APAdminPortalApiProductsService.deleteApApiProductDisplay({
+      await APAdminPortalApiProductsDisplayService.apiDelete_ApApiProductDisplay({
         organizationId: props.organizationId,
-        apiProductId: props.apiProductId
+        apiProductId: props.apiProductEntityId.id
       });
     } catch(e) {
       APClientConnectorOpenApi.logError(logName, e);
@@ -53,7 +53,7 @@ export const DeleteApiProduct: React.FC<IDeleteApiProductProps> = (props: IDelet
   React.useEffect(() => {
     if (apiCallStatus !== null) {
       if(!apiCallStatus.success) props.onError(apiCallStatus);
-      else props.onSuccess(apiCallStatus);
+      else props.onDeleteSuccess(apiCallStatus);
     }
   }, [apiCallStatus]); /* eslint-disable-line react-hooks/exhaustive-deps */
 
@@ -76,7 +76,7 @@ export const DeleteApiProduct: React.FC<IDeleteApiProductProps> = (props: IDelet
   const renderDeleteManagedObjectDialogContent = (): JSX.Element => {
     return (
       <React.Fragment>
-        <p>Deleting API Product: <b>{props.apiProductDisplayName}</b>.</p>
+        <p>Deleting API Product: <b>{props.apiProductEntityId.displayName}</b>.</p>
         <p>Are you sure you want to delete it?</p>
       </React.Fragment>  
     );