@@ -20,20 +20,22 @@ import APEntityIdsService, {
2020import APAdminPortalApiProductsDisplayService , { TAPAdminPortalApiProductDisplay } from "../../displayServices/APAdminPortalApiProductsDisplayService" ;
2121import { E_CALL_STATE_ACTIONS } from "./ManageApiProductsCommon" ;
2222import APApiSpecsDisplayService , { TAPApiSpecDisplay } from "../../../displayServices/APApiSpecsDisplayService" ;
23- import { TAPManagedAssetBusinessGroupInfo , TAPManagedAssetLifecycleInfo } from "../../../displayServices/APManagedAssetDisplayService" ;
23+ import { TAPManagedAssetBusinessGroupInfo , TAPManagedAssetPublishDestinationInfo } from "../../../displayServices/APManagedAssetDisplayService" ;
2424import { APDisplayApAttributeDisplayList } from "../../../components/APDisplay/APDisplayApAttributeDisplayList" ;
2525import { APDisplayApControlledChannelParameters } from "../../../components/APDisplay/APDisplayApControlledChannelParameters" ;
2626import { Config } from "../../../Config" ;
2727import { APDisplayApisDetails } from "../../../components/APDisplay/APDisplayApisDetails" ;
2828import { Globals } from "../../../utils/Globals" ;
2929import APVersioningDisplayService from "../../../displayServices/APVersioningDisplayService" ;
3030import APMetaInfoDisplayService from "../../../displayServices/APMetaInfoDisplayService" ;
31- import { APIProductAccessLevel } from "@solace-iot-team/apim-connector-openapi-browser" ;
31+ import { APIProductAccessLevel , MetaEntityReference } from "@solace-iot-team/apim-connector-openapi-browser" ;
3232import { TAPAttributeDisplayList } from "../../../displayServices/APAttributesDisplayService/APAttributesDisplayService" ;
3333import { APDisplayBusinessGroupInfo } from "../../../components/APDisplay/APDisplayBusinessGroupInfo" ;
34+ import { IAPLifecycleStageInfo } from "../../../displayServices/APLifecycleStageInfoDisplayService" ;
3435
3536import '../../../components/APComponents.css' ;
3637import "./ManageApiProducts.css" ;
38+ import { OrganizationContext } from "../../../components/APContextProviders/APOrganizationContextProvider" ;
3739
3840export enum E_DISPLAY_ADMIN_PORTAL_API_PRODUCT_SCOPE {
3941 REVIEW_AND_CREATE = "REVIEW_AND_CREATE" ,
@@ -61,20 +63,24 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
6163 const [ showApiSpecRefreshCounter , setShowApiSpecRefreshCounter ] = React . useState < number > ( 0 ) ;
6264 const [ tabActiveIndex , setTabActiveIndex ] = React . useState ( 0 ) ;
6365 // version
64- const [ selectedVersion , setSelectedVersion ] = React . useState < string > ( ) ;
66+ const [ selectedRevision , setSelectedRevision ] = React . useState < string > ( ) ;
67+
68+ const [ organizationContext ] = React . useContext ( OrganizationContext ) ;
69+ const IsSingleApiSelection : boolean = organizationContext . apMaxNumApis_Per_ApiProduct === 1 ;
70+ const ApiTabHeader : string = IsSingleApiSelection ? "API" : "API(s)" ;
6571
6672 // * Api Calls *
67- const apiGetManagedObject = async ( version : string ) : Promise < TApiCallState > => {
73+ const apiGetManagedObject = async ( revision : string ) : Promise < TApiCallState > => {
6874 const funcName = 'apiGetManagedObject' ;
6975 const logName = `${ ComponentName } ${ funcName } ;
70- let callState : TApiCallState = ApiCallState . getInitialCallState ( E_CALL_STATE_ACTIONS . API_GET_API_PRODUCT , `retrieve details for api product: ${ props . apAdminPortalApiProductDisplay . apEntityId . displayName } version : ${ version } ) ;
76+ let callState : TApiCallState = ApiCallState . getInitialCallState ( E_CALL_STATE_ACTIONS . API_GET_API_PRODUCT , `retrieve details for api product: ${ props . apAdminPortalApiProductDisplay . apEntityId . displayName } revision : ${ revision } ) ;
7177 try {
7278 const object : TAPAdminPortalApiProductDisplay = await APAdminPortalApiProductsDisplayService . apiGet_AdminPortalApApiProductDisplay ( {
7379 organizationId : props . organizationId ,
7480 apiProductId : props . apAdminPortalApiProductDisplay . apEntityId . id ,
7581 default_ownerId : props . apAdminPortalApiProductDisplay . apOwnerInfo . id ,
7682 fetch_revision_list : true ,
77- revision : version ,
83+ revision : revision ,
7884 } ) ;
7985 setManagedObject ( object ) ;
8086 } catch ( e ) {
@@ -122,9 +128,9 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
122128 setManagedObject ( props . apAdminPortalApiProductDisplay ) ;
123129 }
124130
125- const doFetchVersion = async ( version : string ) => {
131+ const doFetchRevision = async ( revision : string ) => {
126132 props . onLoadingChange ( true ) ;
127- await apiGetManagedObject ( version ) ;
133+ await apiGetManagedObject ( revision ) ;
128134 props . onLoadingChange ( false ) ;
129135 }
130136
@@ -136,14 +142,14 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
136142
137143 React . useEffect ( ( ) => {
138144 if ( managedObject === undefined ) return ;
139- setSelectedVersion ( managedObject . apVersionInfo . apCurrentVersion ) ;
145+ setSelectedRevision ( managedObject . apVersionInfo . apCurrentVersion ) ;
140146 } , [ managedObject ] ) ; /* eslint-disable-line react-hooks/exhaustive-deps */
141147
142148 React . useEffect ( ( ) => {
143- if ( selectedVersion === undefined ) return ;
149+ if ( selectedRevision === undefined ) return ;
144150 if ( managedObject === undefined ) return ;
145- if ( selectedVersion !== managedObject . apVersionInfo . apCurrentVersion ) doFetchVersion ( selectedVersion ) ;
146- } , [ selectedVersion ] ) ; /* eslint-disable-line react-hooks/exhaustive-deps */
151+ if ( selectedRevision !== managedObject . apVersionInfo . apCurrentVersion ) doFetchRevision ( selectedRevision ) ;
152+ } , [ selectedRevision ] ) ; /* eslint-disable-line react-hooks/exhaustive-deps */
147153
148154 React . useEffect ( ( ) => {
149155 if ( apiCallStatus !== null ) {
@@ -255,46 +261,46 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
255261 return ( < > </ > ) ;
256262 }
257263
258- const renderVersionSelect = ( ) : JSX . Element => {
259- const funcName = 'renderVersionSelect ' ;
264+ const renderRevisionSelect = ( ) : JSX . Element => {
265+ const funcName = 'renderRevisionSelect ' ;
260266 const logName = `${ ComponentName } ${ funcName } ;
261267 if ( managedObject === undefined ) throw new Error ( `${ logName } ) ;
262268 if ( managedObject . apVersionInfo . apVersionList === undefined ) throw new Error ( `${ logName } ) ;
263269
264- const onVersionSelect = ( e : DropdownChangeParams ) => {
265- setSelectedVersion ( e . value ) ;
270+ const onRevisionSelect = ( e : DropdownChangeParams ) => {
271+ setSelectedRevision ( e . value ) ;
266272 }
267273
268274 return (
269275 < Dropdown
270- value = { selectedVersion }
276+ value = { selectedRevision }
271277 options = { APVersioningDisplayService . get_Sorted_ApVersionList ( managedObject . apVersionInfo . apVersionList ) }
272- onChange = { onVersionSelect }
278+ onChange = { onRevisionSelect }
273279 />
274280 ) ;
275281 }
276282
277- const renderVersion = ( mo : TManagedObject ) : JSX . Element => {
278- const funcName = 'renderVersion ' ;
283+ const renderRevision = ( mo : TManagedObject ) : JSX . Element => {
284+ const funcName = 'renderRevision ' ;
279285 const logName = `${ ComponentName } ${ funcName } ;
280286 switch ( props . scope ) {
281287 case E_DISPLAY_ADMIN_PORTAL_API_PRODUCT_SCOPE . VIEW_EXISTING :
282288 return (
283- < div > < b > Version : </ b > { renderVersionSelect ( ) } </ div >
289+ < div > < b > Revision : </ b > { renderRevisionSelect ( ) } </ div >
284290 ) ;
285291 case E_DISPLAY_ADMIN_PORTAL_API_PRODUCT_SCOPE . REVIEW_AND_CREATE :
286292 return (
287- < div > < b > New Version : { mo . apVersionInfo . apCurrentVersion } </ b > </ div >
293+ < div > < b > New Revision : { mo . apVersionInfo . apCurrentVersion } </ b > </ div >
288294 ) ;
289295 default :
290296 Globals . assertNever ( logName , props . scope ) ;
291297 }
292298 return ( < > </ > ) ;
293299 }
294300
295- const renderState = ( apManagedAssetLifecycleInfo : TAPManagedAssetLifecycleInfo ) : JSX . Element => {
301+ const renderState = ( apLifecycleStageInfo : IAPLifecycleStageInfo ) : JSX . Element => {
296302 return (
297- < span > < b > State: </ b > { apManagedAssetLifecycleInfo . apLifecycleState } </ span >
303+ < span > < b > State: </ b > { apLifecycleStageInfo . stage } </ span >
298304 ) ;
299305 }
300306
@@ -304,6 +310,16 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
304310 ) ;
305311 }
306312
313+ const renderPublishDestinationInfo = ( apPublishDestinationInfo : TAPManagedAssetPublishDestinationInfo ) : JSX . Element => {
314+ const renderValue = ( apExternalSystemEntityIdList : TAPEntityIdList ) : string => {
315+ if ( apExternalSystemEntityIdList . length === 0 ) return 'Not Published.' ;
316+ return APEntityIdsService . create_SortedDisplayNameList ( apExternalSystemEntityIdList ) . join ( ', ' ) ;
317+ }
318+ return (
319+ < span > < b > Publish Destination(s): </ b > { renderValue ( apPublishDestinationInfo . apExternalSystemEntityIdList ) } </ span >
320+ ) ;
321+ }
322+
307323 const renderHeader = ( mo : TManagedObject ) : JSX . Element => {
308324 return (
309325 < div className = "p-col-12" >
@@ -312,15 +328,16 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
312328
313329 < div > { renderBusinessGroupInfo ( mo . apBusinessGroupInfo ) } </ div >
314330 < div > { renderOwner ( mo . apOwnerInfo ) } </ div >
315- < div > { renderState ( mo . apLifecycleInfo ) } </ div >
331+ < div > { renderState ( mo . apLifecycleStageInfo ) } </ div >
316332 < div > { renderAccessLevel ( mo . apAccessLevel ) } </ div >
333+ < div > { renderPublishDestinationInfo ( mo . apPublishDestinationInfo ) } </ div >
317334
318335 { /* DEBUG */ }
319336 { /* <div><b>DEVEL: Current Version</b>: {mo.apVersionInfo.apCurrentVersion}, Last Version: {mo.apVersionInfo.apLastVersion}</div> */ }
320337
321338 </ div >
322339 < div className = "api-product-view-detail-right" >
323- < div > { renderVersion ( mo ) } </ div >
340+ < div > { renderRevision ( mo ) } </ div >
324341 </ div >
325342 </ div >
326343 </ div >
@@ -329,12 +346,19 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
329346
330347 const renderMeta = ( mo : TManagedObject ) : JSX . Element => {
331348 if ( props . scope === E_DISPLAY_ADMIN_PORTAL_API_PRODUCT_SCOPE . REVIEW_AND_CREATE ) return ( < > </ > ) ;
349+ const renderDerivedFrom = ( derivedFrom ?: MetaEntityReference ) : JSX . Element => {
350+ if ( derivedFrom === undefined ) return ( < > </ > ) ;
351+ const _name : string | undefined = derivedFrom . displayName !== undefined ? derivedFrom . displayName : derivedFrom . name ;
352+ return ( < div > Cloned from: { `${ _name } ${ derivedFrom . revision } } </ div > ) ;
353+ }
332354 return (
333355 < React . Fragment >
334356 < div > Created by: { mo . apMetaInfo . apCreatedBy } </ div >
335357 < div > Created on: { APMetaInfoDisplayService . create_Timestamp_DisplayString ( mo . apMetaInfo . apCreatedOn ) } </ div >
336358 < div > Last Modified by: { mo . apMetaInfo . apLastModifiedBy } </ div >
337- < div > Last Modifined on: { APMetaInfoDisplayService . create_Timestamp_DisplayString ( mo . apMetaInfo . apLastModifiedOn ) } </ div >
359+ < div > Last Modified on: { APMetaInfoDisplayService . create_Timestamp_DisplayString ( mo . apMetaInfo . apLastModifiedOn ) } </ div >
360+ { renderDerivedFrom ( mo . apMetaInfo . apDerivedFrom ) }
361+ { /* <div>Clones: TODO: list of id/displaynames? - needs another API call</div> */ }
338362 </ React . Fragment >
339363 ) ;
340364 }
@@ -395,7 +419,7 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
395419 </ div >
396420 </ React . Fragment >
397421 </ TabPanel >
398- < TabPanel header = 'APIs' >
422+ < TabPanel header = { ApiTabHeader } >
399423 < React . Fragment >
400424 < div >
401425 { renderShowApiButtons ( ) }
@@ -481,7 +505,7 @@ export const DisplayAdminPortalApiProduct: React.FC<IDisplayAdminPortalApiProduc
481505 { /* <div>DEBUG: selectedVersion = '{selectedVersion}'</div>
482506 <div>DEBUG: managedObject.apVersionInfo={JSON.stringify(managedObject?.apVersionInfo)}</div> */ }
483507
484- { managedObject && selectedVersion !== undefined && renderManagedObject ( ) }
508+ { managedObject && selectedRevision !== undefined && renderManagedObject ( ) }
485509
486510 </ div >
487511 </ React . Fragment >
0 commit comments