From: JvD_Ericsson Date: Fri, 25 Aug 2023 12:46:04 +0000 (+0100) Subject: UI support for service update via tosca template import X-Git-Tag: 1.13.4~18 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdc.git;a=commitdiff_plain;h=243e567a44b042d9792f3436dedff9eeda8f720f UI support for service update via tosca template import Issue-ID: SDC-4604 Signed-off-by: JvD_Ericsson Change-Id: I68f7640a254d0636cb967c15d51522b8c8a7abfc --- diff --git a/catalog-ui/src/app/ng2/components/ui/ui-elements.module.ts b/catalog-ui/src/app/ng2/components/ui/ui-elements.module.ts index 8e0a66c8f5..3209b0fdb9 100644 --- a/catalog-ui/src/app/ng2/components/ui/ui-elements.module.ts +++ b/catalog-ui/src/app/ng2/components/ui/ui-elements.module.ts @@ -42,6 +42,7 @@ import {SdcTileModule} from "./tile/sdc-tile.module"; import {PerfectScrollbarDirective} from "./perfect-scroll-bar/perfect-scrollbar.directive"; import {FileOpenerComponent} from "./file-opener/file-opener.component"; import {DownloadArtifactComponent} from "app/ng2/components/ui/download-artifact/download-artifact.component"; +import {UploadArtifactComponent} from "app/ng2/components/ui/upload-artifact/upload-artifact.component"; import {SdcElementIconComponent} from "./sdc-element-icon/sdc-element-icon.component"; import {PanelWrapperComponent} from "./panel-wrapper/panel-wrapper.component"; import { ModalImportTypeComponent } from './modal-import-type/modal-import-type.component'; @@ -57,6 +58,7 @@ import { ModalImportTypeComponent } from './modal-import-type/modal-import-type. FileOpenerComponent, SdcElementIconComponent, DownloadArtifactComponent, + UploadArtifactComponent, PanelWrapperComponent, ModalImportTypeComponent ], @@ -99,6 +101,7 @@ import { ModalImportTypeComponent } from './modal-import-type/modal-import-type. SdcElementIconComponent, FileOpenerComponent, DownloadArtifactComponent, + UploadArtifactComponent, PanelWrapperComponent, ModalImportTypeComponent ], diff --git a/catalog-ui/src/app/ng2/components/ui/upload-artifact/upload-artifact.component.ts b/catalog-ui/src/app/ng2/components/ui/upload-artifact/upload-artifact.component.ts new file mode 100644 index 0000000000..ece47e71df --- /dev/null +++ b/catalog-ui/src/app/ng2/components/ui/upload-artifact/upload-artifact.component.ts @@ -0,0 +1,92 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2023 Nordix Foundation + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +import { Component, EventEmitter, Input, Output } from "@angular/core"; +import { ArtifactModel } from "app/models"; +import { TranslateService } from '../../../shared/translator/translate.service'; +import { SdcUiServices } from 'onap-ui-angular'; + +@Component({ + selector: 'upload-artifact', + template: ` + + +` +}) +export class UploadArtifactComponent { + + @Input() extensions: string; + @Input() artifact: ArtifactModel; + @Input() isInstance: boolean; + @Input() uploadIconClass: string; + @Input() componentType: string; + @Input() componentId: string; + @Input() testId: string; + @Input() disabled: boolean; + @Output("onFileUpload") onFileUpload: EventEmitter = new EventEmitter(); + + public extensionsWithDot: string; + public iconType:string = "upload-o"; + + constructor( + private modalService: SdcUiServices.ModalService, + private translateService: TranslateService) { + + } + + ngOnInit () { + this.extensionsWithDot = this.getExtensionsWithDot(this.extensions); + } + + public getExtensionsWithDot(extensions:string):string { + extensions = extensions || ''; + return extensions.split(',') + .map(ext => '.' + ext.toString()) + .join(','); + } + + public onFileSelect(event) { + const file = event.target.files[0]; + if (file && file.name) { + const fileExtension: string = file.name.split('.').pop(); + if (this.extensionsWithDot.includes(fileExtension.toLowerCase())) { + this.onFileUpload.emit(file); + } else { + const title: string = this.translateService.translate('NEW_SERVICE_RESOURCE_ERROR_VALID_TOSCA_EXTENSIONS_TITLE'); + const message: string = this.translateService.translate('NEW_SERVICE_RESOURCE_ERROR_VALID_TOSCA_EXTENSIONS', {extensions: this.extensionsWithDot}); + this.modalService.openWarningModal(title, message, 'error-invalid-tosca-ext'); + } + } + } +} diff --git a/catalog-ui/src/app/ng2/pages/workspace/tosca-artifacts/__snapshots__/tosca-artifact-page.spec.ts.snap b/catalog-ui/src/app/ng2/pages/workspace/tosca-artifacts/__snapshots__/tosca-artifact-page.spec.ts.snap index 14146d51d2..695e16d553 100644 --- a/catalog-ui/src/app/ng2/pages/workspace/tosca-artifacts/__snapshots__/tosca-artifact-page.spec.ts.snap +++ b/catalog-ui/src/app/ng2/pages/workspace/tosca-artifacts/__snapshots__/tosca-artifact-page.spec.ts.snap @@ -2,7 +2,9 @@ exports[`tosca artifacts page should match current snapshot of tosca artifact pages component 1`] = ` + + - + {{row.artifactType}} @@ -37,7 +38,22 @@ {{ row.artifactVersion }} - + + +
+ +
+ + +
; public componentId: string; public componentType:string; + public isLoading: boolean = false; - constructor(private serviceLoader: SdcUiServices.LoaderService, private workspaceService: WorkspaceService, private store: Store) { + constructor( + private workspaceService: WorkspaceService, + private store: Store, + @Inject("Notification") private Notification: any, + private componentService: TopologyTemplateService) { } @@ -41,4 +47,47 @@ export class ToscaArtifactPageComponent implements OnInit { this.table.rowDetail.toggleExpandRow(event.row); } } + + getExtension(artifactType: string) { + switch (artifactType) { + case (ArtifactType.TOSCA.TOSCA_CSAR): + return "csar"; + case (ArtifactType.TOSCA.TOSCA_TEMPLATE): + return "yaml,yml"; + } + } + + isService() { + return ComponentType.SERVICE === this.componentType; + } + + isCheckedOut() { + return this.workspaceService.metadata.lifecycleState === ComponentState.NOT_CERTIFIED_CHECKOUT; + } + + onFileUpload(file, artifactType) { + if (file && file.name) { + this.isLoading = true; + switch (artifactType) { + case (ArtifactType.TOSCA.TOSCA_CSAR): + this.Notification.error({ + message: "Feature not implemented yet", + title: "Error" + }); + this.isLoading = false; + break; + case (ArtifactType.TOSCA.TOSCA_TEMPLATE): + this.componentService.putServiceToscaTemplate(this.componentId, this.componentType, file).subscribe((response)=> { + this.Notification.success({ + message: "Service " + response.name + " has been updated", + title: "Success" + }); + this.isLoading = false; + }, () => { + this.isLoading = false; + }); + break; + } + } + } } \ No newline at end of file diff --git a/catalog-ui/src/app/ng2/pages/workspace/tosca-artifacts/tosca-artifact-page.spec.ts b/catalog-ui/src/app/ng2/pages/workspace/tosca-artifacts/tosca-artifact-page.spec.ts index af3558e15b..6b59f97954 100644 --- a/catalog-ui/src/app/ng2/pages/workspace/tosca-artifacts/tosca-artifact-page.spec.ts +++ b/catalog-ui/src/app/ng2/pages/workspace/tosca-artifacts/tosca-artifact-page.spec.ts @@ -12,14 +12,15 @@ import 'rxjs/add/observable/of'; import {NgxsModule, Store} from "@ngxs/store"; import {ArtifactsState} from "../../../store/states/artifacts.state"; import {toscaArtifactMock} from "../../../../../jest/mocks/artifacts-mock"; +import { ComponentServiceNg2 } from "app/ng2/services/component-services/component.service"; describe('tosca artifacts page', () => { let fixture: ComponentFixture; let topologyTemplateServiceMock: Partial; let workspaceServiceMock: Partial; - let loaderServiceMock: Partial; let store: Store; + let notificationMock: Partial; beforeEach( @@ -30,10 +31,6 @@ describe('tosca artifacts page', () => { }; workspaceServiceMock = {metadata: {uniqueId: 'service_unique_id', componentType: 'SERVICE'}} - loaderServiceMock = { - activate : jest.fn(), - deactivate: jest.fn() - } const configure: ConfigureFn = testBed => { testBed.configureTestingModule({ declarations: [ToscaArtifactPageComponent], @@ -42,7 +39,8 @@ describe('tosca artifacts page', () => { providers: [ {provide: WorkspaceService, useValue: workspaceServiceMock}, {provide: TopologyTemplateService, useValue: topologyTemplateServiceMock}, - {provide: SdcUiServices.LoaderService, useValue: loaderServiceMock } + {provide: ComponentServiceNg2, useValue: {}}, + {provide: "Notification", useValue: notificationMock } ], }); }; diff --git a/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts b/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts index 812f157c1b..0386a1577a 100644 --- a/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts +++ b/catalog-ui/src/app/ng2/services/component-services/topology-template.service.ts @@ -76,6 +76,10 @@ export class TopologyTemplateService { this.baseUrl = sdcConfig.api.root + sdcConfig.api.component_api_root; } + putServiceToscaTemplate(componentId: string, componentType: string, file) { + return this.http.put(this.baseUrl + this.getServerTypeUrl(componentType) + componentId + '/toscaTemplate', file) + } + getFullComponent(componentType: string, uniqueId: string): Observable { return this.http.get(this.baseUrl + this.getServerTypeUrl(componentType) + uniqueId); }