From 2da7588cfb51016b85d84a139af5cf8a7824e59d Mon Sep 17 00:00:00 2001 From: Ezhilarasi Date: Thu, 29 Aug 2019 14:58:21 +0530 Subject: [PATCH] Utility for Zip file extraction Change-Id: Id30facf5b79dddfcaf97e8b0c13c0c8a8d937e3b Issue-ID: CCSDK-1275 Signed-off-by: Ezhilarasi --- .../utility}/zipfile-extraction.component.ts | 4 +- .../feature-modules/blueprint/blueprint.module.ts | 4 +- .../zipfile-extraction.component.html | 20 ---------- .../zipfile-extraction.component.scss | 20 ---------- .../zipfile-extraction.component.spec.ts | 46 ---------------------- 5 files changed, 3 insertions(+), 91 deletions(-) rename cds-ui/client/src/app/{feature-modules/blueprint/common-module/zipfile-extraction => common/utility}/zipfile-extraction.component.ts (96%) delete mode 100644 cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.html delete mode 100644 cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.scss delete mode 100644 cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.spec.ts diff --git a/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.ts b/cds-ui/client/src/app/common/utility/zipfile-extraction.component.ts similarity index 96% rename from cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.ts rename to cds-ui/client/src/app/common/utility/zipfile-extraction.component.ts index 2683ff5f4..fcadee816 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.ts +++ b/cds-ui/client/src/app/common/utility/zipfile-extraction.component.ts @@ -20,8 +20,8 @@ limitations under the License. */ import { Component, OnInit } from '@angular/core'; import * as JSZip from 'jszip'; -import { SortPipe } from '../../../../common/shared/pipes/sort.pipe'; -import { LoaderService } from '../../../../common/core/services/loader.service'; +import { SortPipe } from '../shared/pipes/sort.pipe'; +import { LoaderService } from '../core/services/loader.service'; @Component({ selector: 'app-zipfile-extraction', diff --git a/cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts index edbaca67f..8f70d2e71 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/blueprint.module.ts @@ -32,13 +32,11 @@ import { DeployTemplateModule } from './deploy-template/deploy-template.module'; import { TestTemplateModule } from './test-template/test-template.module'; import { AppMaterialModule } from '../../../app/common/modules/app-material.module'; import { ReactiveFormsModule } from '@angular/forms'; -import { ZipfileExtractionComponent } from './common-module/zipfile-extraction/zipfile-extraction.component'; @NgModule({ declarations: [ BlueprintComponent, - ZipfileExtractionComponent - ], + ], imports: [ CommonModule, BlueprintRoutingModule, diff --git a/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.html b/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.html deleted file mode 100644 index 9b7f44b1c..000000000 --- a/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.html +++ /dev/null @@ -1,20 +0,0 @@ - \ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.scss b/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.scss deleted file mode 100644 index 93f5c9dea..000000000 --- a/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.scss +++ /dev/null @@ -1,20 +0,0 @@ -/* -============LICENSE_START========================================== -=================================================================== -Copyright (C) 2019 IBM Intellectual Property. All rights reserved. -=================================================================== - -Unless otherwise specified, all software contained herein is licensed -under the Apache License, Version 2.0 (the License); -you may not use this software 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. -============LICENSE_END============================================ -*/ \ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.spec.ts b/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.spec.ts deleted file mode 100644 index a6674caae..000000000 --- a/cds-ui/client/src/app/feature-modules/blueprint/common-module/zipfile-extraction/zipfile-extraction.component.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -/* -============LICENSE_START========================================== -=================================================================== -Copyright (C) 2019 IBM Intellectual Property. All rights reserved. -=================================================================== - -Unless otherwise specified, all software contained herein is licensed -under the Apache License, Version 2.0 (the License); -you may not use this software 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. -============LICENSE_END============================================ -*/ - -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ZipfileExtractionComponent } from './zipfile-extraction.component'; - -describe('ZipfileExtractionComponent', () => { - let component: ZipfileExtractionComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ZipfileExtractionComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ZipfileExtractionComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); -- 2.16.6