Merge pull request #24 from solace-iot-team/feature-apps

Feature apps

Author: ricardojosegomezulmke

ReleaseNotes.md

@@ -2,6 +2,18 @@
 
 Solace Async API Management.
 
+## Version 0.1.4
+  * [API-M Admin & Developer Portal](https://github.com/solace-iot-team/async-apim/tree/main/apim-portal): 0.1.4
+  * [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.7.6
+
+#### API-M Admin & Developer Portal
+**New Features:**
+* **Recover API Products**
+  - added `recover api products` module to `Manage API Products`.
+    - allows users with `organization admin` role to list, edit, delete API Products not containing the business group information
+
 ## Version 0.1.3
   * [API-M Admin & Developer Portal](https://github.com/solace-iot-team/async-apim/tree/main/apim-portal): 0.1.3
   * [API-M Server OpenAPI](https://github.com/solace-iot-team/async-apim/blob/main/apim-server/server/common/api.yml): 0.1.0

apim-portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "async-apim-portal",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Solace Async API Management Portal",
   "repository": {
     "type": "git",

apim-portal/src/admin-portal/components/ManageApiProducts/EditNewApiProduct/EditNewAccessAndStateForm.tsx

@@ -24,6 +24,7 @@ import { AuthHelper } from "../../../../auth/AuthHelper";
 import { EUIAdminPortalResourcePaths } from "../../../../utils/Globals";
 import { EditNewBusinessGroupSharingListForm } from "./EditNewBusinessGroupSharingListForm";
 import { TAPManagedAssetDisplay_BusinessGroupSharingList } from "../../../../displayServices/APManagedAssetDisplayService";
+import APBusinessGroupsDisplayService from "../../../../displayServices/APBusinessGroupsDisplayService";
 
 import '../../../../components/APComponents.css';
 import "../ManageApiProducts.css";
@@ -44,7 +45,7 @@ export const EditNewAccessAndStateForm: React.FC<IEditNewAccessAndStateFormProps
   type TManagedObjectFormData = {
     accessLevel: APIProductAccessLevel;
     lifecycleState: EAPLifecycleState;
-    owningBusinessGroupId: string;
+    owningBusinessGroupId?: string;
   };
   type TManagedObjectFormDataEnvelope = {
     businessGroupSharingList: TAPManagedAssetDisplay_BusinessGroupSharingList; /** not managed by form */
@@ -55,7 +56,7 @@ export const EditNewAccessAndStateForm: React.FC<IEditNewAccessAndStateFormProps
     const fd: TManagedObjectFormData = {
       accessLevel: mo.apAccessLevel,
       lifecycleState: mo.apLifecycleInfo.apLifecycleState,
-      owningBusinessGroupId: mo.apBusinessGroupInfo.apOwningBusinessGroupEntityId.id,
+      owningBusinessGroupId: (mo.apBusinessGroupInfo.apOwningBusinessGroupEntityId.id === APBusinessGroupsDisplayService.get_recovered_BusinessGroupId() ? undefined : mo.apBusinessGroupInfo.apOwningBusinessGroupEntityId.id),
     };
     return {
       businessGroupSharingList: mo.apBusinessGroupInfo.apBusinessGroupSharingList,
@@ -73,6 +74,7 @@ export const EditNewAccessAndStateForm: React.FC<IEditNewAccessAndStateFormProps
     const mo: TManagedObject = props.apApiProductDisplay_AccessAndState;
     const fd: TManagedObjectFormData = formDataEnvelope.formData;
 
+    if(fd.owningBusinessGroupId === undefined) throw new Error(`${logName}: fd.owningBusinessGroupId === undefined`);
     const apOwningMemberOfBusinessGroupDisplay: TAPMemberOfBusinessGroupDisplay | undefined = APMemberOfService.find_ApMemberOfBusinessGroupDisplay_From_ApMemberOfBusinessGroupDisplayTreeNodeList({
       apMemberOfBusinessGroupDisplayTreeNodeList: apMemberOfBusinessGroupDisplayTreeNodeList,
       businessGroupId: fd.owningBusinessGroupId
@@ -174,7 +176,7 @@ export const EditNewAccessAndStateForm: React.FC<IEditNewAccessAndStateFormProps
                   {...field}
                   options={apMemberOfBusinessGroupTreeTableNodeList}
                   onChange={(e) => { field.onChange(e.value); }} 
-                  placeholder="Select Business Group"
+                  // placeholder="Select Business Group"
                   filter={true}
                   selectionMode="single"
                   className={classNames({ 'p-invalid': fieldState.invalid })}                       
@@ -209,9 +211,9 @@ export const EditNewAccessAndStateForm: React.FC<IEditNewAccessAndStateFormProps
     if(apMemberOfBusinessGroupDisplayTreeNodeList === undefined) throw new Error(`${logName}: apMemberOfBusinessGroupDisplayTreeNodeList === undefined`);
     const uniqueKey_EditNewBusinessGroupSharingListForm = ComponentName+'_EditNewBusinessGroupSharingListForm';
 
-    const _owningBusinessGroupId: string = managedObjectUseForm.watch('formData.owningBusinessGroupId');
+    const _owningBusinessGroupId: string | undefined = managedObjectUseForm.watch('formData.owningBusinessGroupId');
     // catch the first render
-    const owningBusinessGroupId: string = _owningBusinessGroupId === undefined ? managedObjectFormDataEnvelope.formData.owningBusinessGroupId : _owningBusinessGroupId;
+    const owningBusinessGroupId: string | undefined = _owningBusinessGroupId === undefined ? managedObjectFormDataEnvelope.formData.owningBusinessGroupId : _owningBusinessGroupId;
 
     return (
       <div className="card p-mt-4">
@@ -281,7 +283,7 @@ export const EditNewAccessAndStateForm: React.FC<IEditNewAccessAndStateFormProps
                 uniqueKeyPrefix={uniqueKey_EditNewBusinessGroupSharingListForm}
                 apManagedAssetDisplay_BusinessGroupSharingList={managedObjectFormDataEnvelope.businessGroupSharingList}
                 apMemberOfBusinessGroupDisplayTreeNodeList={apMemberOfBusinessGroupDisplayTreeNodeList}
-                apExcludeBusinessGroupIdList={[owningBusinessGroupId]}
+                apExcludeBusinessGroupIdList={owningBusinessGroupId === undefined ? [] : [owningBusinessGroupId]}
                 onChange={onChange_EditNewBusinessGroupSharingList}
               />
             </div>

apim-portal/src/admin-portal/components/ManageApiProducts/EditNewApiProduct/EditNewGeneralForm.tsx

@@ -142,7 +142,7 @@ export const EditNewGeneralForm: React.FC<IEditNewGeneralFormProps> = (props: IE
   }
 
   const validate_Id = async(id: string): Promise<string | boolean> => {
-    if(props.action === EAction.EDIT) return true;
+    if(props.action !== EAction.NEW) return true;
     // check if id exists
     const checkResult: boolean | undefined = await apiCheck_ApiProductIdExists(id);
     if(checkResult === undefined) return false;

apim-portal/src/admin-portal/components/ManageApiProducts/EditNewApiProduct/ManageEditNewApiProduct.tsx

@@ -8,7 +8,7 @@ import { APComponentHeader } from "../../../../components/APComponentHeader/APCo
 import { ApiCallState, TApiCallState } from "../../../../utils/ApiCallState";
 import { ApiCallStatusError } from "../../../../components/ApiCallStatusError/ApiCallStatusError";
 import { TAPEntityId } from "../../../../utils/APEntityIdsService";
-import { EAction, E_CALL_STATE_ACTIONS, E_COMPONENT_STATE, E_COMPONENT_STATE_EDIT_NEW } from "../ManageApiProductsCommon";
+import { EAction, E_CALL_STATE_ACTIONS, E_COMPONENT_STATE_EDIT_NEW } from "../ManageApiProductsCommon";
 import APAdminPortalApiProductsDisplayService, { 
   TAPAdminPortalApiProductDisplay 
 } from "../../../displayServices/APAdminPortalApiProductsDisplayService";
@@ -48,7 +48,7 @@ export interface IManageEditNewApiProductProps {
   onEditNewSuccess: (apiCallState: TApiCallState, apiProductEntityId: TAPEntityId) => void;
   /** edit: required */
   apiProductEntityId?: TAPEntityId;
-  onNavigateToCommand?: (componentState: E_COMPONENT_STATE, apiProductEntityId: TAPEntityId) => void;
+  onNavigateToCommand?: (apiProductEntityId: TAPEntityId) => void;
 }
 
 export const ManageEditNewApiProduct: React.FC<IManageEditNewApiProductProps> = (props: IManageEditNewApiProductProps) => {
@@ -234,7 +234,7 @@ export const ManageEditNewApiProduct: React.FC<IManageEditNewApiProductProps> =
     const logName = `${ComponentName}.${funcName}()`;
     if(props.onNavigateToCommand === undefined) throw new Error(`${logName}: props.onNavigateToCommand === undefined`);
     if(props.apiProductEntityId === undefined) throw new Error(`${logName}: props.apiProductEntityId === undefined`);
-    props.onNavigateToCommand(E_COMPONENT_STATE.MANAGED_OBJECT_VIEW, props.apiProductEntityId);
+    props.onNavigateToCommand(props.apiProductEntityId);
   }
 
   const setBreadCrumbItemList = () => {

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

@@ -5,6 +5,7 @@ import { DataTable } from 'primereact/datatable';
 import { Column } from "primereact/column";
 import { InputText } from 'primereact/inputtext';
 import { MenuItem } from "primereact/api";
+import { Divider } from "primereact/divider";
 
 import { ApiCallState, TApiCallState } from "../../../utils/ApiCallState";
 import { APComponentHeader } from "../../../components/APComponentHeader/APComponentHeader";
@@ -27,16 +28,14 @@ export interface IListApiProductsProps {
   onError: (apiCallState: TApiCallState) => void;
   onSuccess: (apiCallState: TApiCallState) => void;
   onLoadingChange: (isLoading: boolean) => void;
-  onManagedObjectEdit: (managedObjectEntityId: TAPEntityId) => void;
-  onManagedObjectDelete: (managedObjectEntityId: TAPEntityId) => void;
   onManagedObjectView: (apAdminPortalApiProductDisplay: TAPAdminPortalApiProductDisplay) => void;
   setBreadCrumbItemList: (itemList: Array<MenuItem>) => void;
 }
 
 export const ListApiProducts: React.FC<IListApiProductsProps> = (props: IListApiProductsProps) => {
   const ComponentName = 'ListApiProducts';
 
-  const MessageNoManagedObjectsFoundCreateNew = 'No API Products found - create a new API Product.';
+  const MessageNoManagedObjectsFound = 'No API Products defined.';
   // const GlobalSearchPlaceholder = 'Enter search word list separated by <space> ...';
   const GlobalSearchPlaceholder = 'search...';
 
@@ -87,7 +86,8 @@ export const ListApiProducts: React.FC<IListApiProductsProps> = (props: IListApi
   }, []); /* eslint-disable-line react-hooks/exhaustive-deps */
 
   React.useEffect(() => {
-    if(managedObjectList !== undefined) setIsInitialized(true);
+    if(managedObjectList === undefined) return;
+    setIsInitialized(true);
   }, [managedObjectList]); /* eslint-disable-line react-hooks/exhaustive-deps */
 
   React.useEffect(() => {
@@ -256,7 +256,13 @@ export const ListApiProducts: React.FC<IListApiProductsProps> = (props: IListApi
     if(managedObjectList === undefined) throw new Error(`${logName}: managedObjectList === undefined`);
 
     if(managedObjectList.length === 0) {
-      return (<h3>{MessageNoManagedObjectsFoundCreateNew}</h3>);
+      return (
+        <React.Fragment>
+          <Divider />
+          {MessageNoManagedObjectsFound}
+          <Divider />
+        </React.Fragment>
+      );
     }
     if(managedObjectList.length > 0) {
       return renderManagedObjectDataTable();