X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/60e8ad5f90108900b4c189f88fbe483e7010432e..dc95b803fa84b3c9ef7c11a4f81dd0d86077d779:/src/store/advanced-tab/advanced-tab.ts diff --git a/src/store/advanced-tab/advanced-tab.ts b/src/store/advanced-tab/advanced-tab.ts index fd68eb4b..92d14d7b 100644 --- a/src/store/advanced-tab/advanced-tab.ts +++ b/src/store/advanced-tab/advanced-tab.ts @@ -20,6 +20,7 @@ import { VirtualMachinesResource } from '~/models/virtual-machines'; import { UserResource } from '~/models/user'; import { ListResults } from '~/services/common-service/common-resource-service'; import { LinkResource } from '~/models/link'; +import { KeepServiceResource } from '~/models/keep-services'; export const ADVANCED_TAB_DIALOG = 'advancedTabDialog'; @@ -70,11 +71,18 @@ enum VirtualMachineData { enum ResourcePrefix { REPOSITORIES = 'repositories', AUTORIZED_KEYS = 'authorized_keys', - VIRTUAL_MACHINES = 'virtual_machines' + VIRTUAL_MACHINES = 'virtual_machines', + KEEP_SERVICES = 'keep_services' } -type AdvanceResourceKind = CollectionData | ProcessData | ProjectData | RepositoryData | SshKeyData | VirtualMachineData; +enum KeepServiceData { + KEEP_SERVICE = 'keep_services', + CREATED_AT = 'created_at' +} + +type AdvanceResourceKind = CollectionData | ProcessData | ProjectData | RepositoryData | SshKeyData | VirtualMachineData | KeepServiceData; type AdvanceResourcePrefix = GroupContentsResourcePrefix | ResourcePrefix; +type AdvanceResponseData = ContainerRequestResource | ProjectResource | CollectionResource | RepositoryResource | SshKeyResource | VirtualMachinesResource | KeepServiceResource | undefined; export const openAdvancedTabDialog = (uuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { @@ -82,7 +90,7 @@ export const openAdvancedTabDialog = (uuid: string) => switch (kind) { case ResourceKind.COLLECTION: const { data: dataCollection, metadata: metaCollection, user: userCollection } = await dispatch(getDataForAdvancedTab(uuid)); - const advanceDataCollection: AdvancedTabDialogData = advancedTabData({ + const advanceDataCollection = advancedTabData({ uuid, metadata: metaCollection, user: userCollection, @@ -97,7 +105,7 @@ export const openAdvancedTabDialog = (uuid: string) => break; case ResourceKind.PROCESS: const { data: dataProcess, metadata: metaProcess, user: userProcess } = await dispatch(getDataForAdvancedTab(uuid)); - const advancedDataProcess: AdvancedTabDialogData = advancedTabData({ + const advancedDataProcess = advancedTabData({ uuid, metadata: metaProcess, user: userProcess, @@ -112,7 +120,7 @@ export const openAdvancedTabDialog = (uuid: string) => break; case ResourceKind.PROJECT: const { data: dataProject, metadata: metaProject, user: userProject } = await dispatch(getDataForAdvancedTab(uuid)); - const advanceDataProject: AdvancedTabDialogData = advancedTabData({ + const advanceDataProject = advancedTabData({ uuid, metadata: metaProject, user: userProject, @@ -127,7 +135,7 @@ export const openAdvancedTabDialog = (uuid: string) => break; case ResourceKind.REPOSITORY: const dataRepository = getState().repositories.items.find(it => it.uuid === uuid); - const advanceDataRepository: AdvancedTabDialogData = advancedTabData({ + const advanceDataRepository = advancedTabData({ uuid, metadata: '', user: '', @@ -142,7 +150,7 @@ export const openAdvancedTabDialog = (uuid: string) => break; case ResourceKind.SSH_KEY: const dataSshKey = getState().auth.sshKeys.find(it => it.uuid === uuid); - const advanceDataSshKey: AdvancedTabDialogData = advancedTabData({ + const advanceDataSshKey = advancedTabData({ uuid, metadata: '', user: '', @@ -157,7 +165,7 @@ export const openAdvancedTabDialog = (uuid: string) => break; case ResourceKind.VIRTUAL_MACHINE: const dataVirtualMachine = getState().virtualMachines.virtualMachines.items.find(it => it.uuid === uuid); - const advanceDataVirtualMachine: AdvancedTabDialogData = advancedTabData({ + const advanceDataVirtualMachine = advancedTabData({ uuid, metadata: '', user: '', @@ -170,6 +178,21 @@ export const openAdvancedTabDialog = (uuid: string) => }); dispatch(initAdvancedTabDialog(advanceDataVirtualMachine)); break; + case ResourceKind.KEEP_SERVICE: + const dataKeepService = getState().keepServices.find(it => it.uuid === uuid); + const advanceDataKeepService = advancedTabData({ + uuid, + metadata: '', + user: '', + apiResponseKind: keepServiceApiResponse, + data: dataKeepService, + resourceKind: KeepServiceData.KEEP_SERVICE, + resourcePrefix: ResourcePrefix.KEEP_SERVICES, + resourceKindProperty: KeepServiceData.CREATED_AT, + property: dataKeepService!.createdAt + }); + dispatch(initAdvancedTabDialog(advanceDataKeepService)); + break; default: dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Could not open advanced tab for this resource.", hideDuration: 2000, kind: SnackbarKind.ERROR })); } @@ -190,23 +213,32 @@ const getDataForAdvancedTab = (uuid: string) => const initAdvancedTabDialog = (data: AdvancedTabDialogData) => dialogActions.OPEN_DIALOG({ id: ADVANCED_TAB_DIALOG, data }); -const advancedTabData = (args: { - uuid: string, metadata: ListResults | string, user: UserResource | string, apiResponseKind: any, data: any, resourceKind: AdvanceResourceKind, - resourcePrefix: AdvanceResourcePrefix, resourceKindProperty: AdvanceResourceKind, property: any -}) => { +interface AdvancedTabData { + uuid: string; + metadata: ListResults | string; + user: UserResource | string; + apiResponseKind: (apiResponse: AdvanceResponseData) => string; + data: AdvanceResponseData; + resourceKind: AdvanceResourceKind; + resourcePrefix: AdvanceResourcePrefix; + resourceKindProperty: AdvanceResourceKind; + property: any; +} + +const advancedTabData = ({ uuid, user, metadata, apiResponseKind, data, resourceKind, resourcePrefix, resourceKindProperty, property }: AdvancedTabData) => { return { - uuid: args.uuid, - user: args.user, - metadata: args.metadata, - apiResponse: args.apiResponseKind(args.data), - pythonHeader: pythonHeader(args.resourceKind), - pythonExample: pythonExample(args.uuid, args.resourcePrefix), - cliGetHeader: cliGetHeader(args.resourceKind), - cliGetExample: cliGetExample(args.uuid, args.resourceKind), - cliUpdateHeader: cliUpdateHeader(args.resourceKind, args.resourceKindProperty), - cliUpdateExample: cliUpdateExample(args.uuid, args.resourceKind, args.property, args.resourceKindProperty), - curlHeader: curlHeader(args.resourceKind, args.resourceKindProperty), - curlExample: curlExample(args.uuid, args.resourcePrefix, args.property, args.resourceKind, args.resourceKindProperty), + uuid, + user, + metadata, + apiResponse: apiResponseKind(data), + pythonHeader: pythonHeader(resourceKind), + pythonExample: pythonExample(uuid, resourcePrefix), + cliGetHeader: cliGetHeader(resourceKind), + cliGetExample: cliGetExample(uuid, resourceKind), + cliUpdateHeader: cliUpdateHeader(resourceKind, resourceKindProperty), + cliUpdateExample: cliUpdateExample(uuid, resourceKind, property, resourceKindProperty), + curlHeader: curlHeader(resourceKind, resourceKindProperty), + curlExample: curlExample(uuid, resourcePrefix, property, resourceKind, resourceKindProperty), }; }; @@ -379,12 +411,34 @@ const sshKeyApiResponse = (apiResponse: SshKeyResource) => { const virtualMachineApiResponse = (apiResponse: VirtualMachinesResource) => { const { uuid, ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid, hostname } = apiResponse; - const response = `"uuid": "${uuid}", + const response = `"hostname": ${stringify(hostname)}, +"uuid": "${uuid}", "owner_uuid": "${ownerUuid}", "modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, "modified_by_user_uuid": ${stringify(modifiedByUserUuid)}, "modified_at": ${stringify(modifiedAt)}, -"hostname": ${stringify(hostname)}, +"modified_at": ${stringify(modifiedAt)}, "created_at": "${createdAt}"`; + + return response; +}; + +const keepServiceApiResponse = (apiResponse: KeepServiceResource) => { + const { + uuid, readOnly, serviceHost, servicePort, serviceSslFlag, serviceType, + ownerUuid, createdAt, modifiedAt, modifiedByClientUuid, modifiedByUserUuid + } = apiResponse; + const response = `"uuid": "${uuid}", +"owner_uuid": "${ownerUuid}", +"modified_by_client_uuid": ${stringify(modifiedByClientUuid)}, +"modified_by_user_uuid": ${stringify(modifiedByUserUuid)}, +"modified_at": ${stringify(modifiedAt)}, +"service_host": "${serviceHost}", +"service_port": "${servicePort}", +"service_ssl_flag": "${stringify(serviceSslFlag)}", +"service_type": "${serviceType}", +"created_at": "${createdAt}", +"read_only": "${stringify(readOnly)}"`; + return response; }; \ No newline at end of file