diff --git a/src/portal/.browserslistrc b/src/portal/.browserslistrc new file mode 100644 index 0000000000..427441dc93 --- /dev/null +++ b/src/portal/.browserslistrc @@ -0,0 +1,17 @@ +# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries + +# For the full list of supported browsers by the Angular framework, please see: +# https://angular.io/guide/browser-support + +# You can see what browsers were selected by your queries by running: +# npx browserslist + +last 1 Chrome version +last 1 Firefox version +last 2 Edge major versions +last 2 Safari major versions +last 2 iOS major versions +Firefox ESR +not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line. diff --git a/src/portal/README.md b/src/portal/README.md index ceec0b813a..1ee23b69c6 100644 --- a/src/portal/README.md +++ b/src/portal/README.md @@ -2,4 +2,100 @@ Harbor UI ============ -This is the project based on Clarity and Angular to build Harbor UI. \ No newline at end of file +This is the project based on Clarity and Angular to build Harbor UI. + + + +Start +============ +1. npm install (should trigger 'npm postinstall') +2. npm run postinstall (if not triggered, manually run this step) +3. create "proxy.config.json" file with below content under "portal" directory, and replace "hostname" with an available Harbor hostname +4. npm run start +5. open your browser on https://localhost:4200 +```json +{ + "/api/*": { + "target": "https://hostname", + "secure": false, + "changeOrigin": true, + "logLevel": "debug" + }, + "/service/*": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/c/login": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/c/oidc/login": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/sign_in": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/c/log_out": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/sendEmail": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/language": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/reset": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/c/userExists": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/reset_password": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/i18n/lang/*.json": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug", + "pathRewrite": { "^/src$": "" } + }, + "/swagger.json": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/swagger2.json": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/chartrepo/*": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + }, + "/LICENSE": { + "target": "https://hostname", + "secure": false, + "logLevel": "debug" + } +} +``` diff --git a/src/portal/angular.json b/src/portal/angular.json index 9e6cff76a5..3c99cbd693 100644 --- a/src/portal/angular.json +++ b/src/portal/angular.json @@ -11,10 +11,15 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { + "allowedCommonJsDependencies": [ + "swagger-ui", + "js-yaml" + ], "outputPath": "dist", "index": "src/index.html", "main": "src/main.ts", - "tsConfig": "src/tsconfig.app.json", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.app.json", "extractCss": true, "assets": [ "src/images", @@ -31,12 +36,12 @@ { "input": "src/css/dark-theme.scss", "bundleName": "dark-theme", - "lazy": true + "inject": false }, { "input": "src/css/light-theme.scss", "bundleName": "light-theme", - "lazy": true + "inject": false } ], "scripts": [ @@ -92,9 +97,10 @@ "test": { "builder": "@angular-devkit/build-angular:karma", "options": { - "tsConfig": "src/tsconfig.spec.json", + "tsConfig": "tsconfig.spec.json", "main": "src/test.ts", - "karmaConfig": "./karma.conf.js", + "polyfills": "src/polyfills.ts", + "karmaConfig": "karma.conf.js", "scripts": [ "node_modules/core-js/client/shim.min.js", "node_modules/mutationobserver-shim/dist/mutationobserver.min.js", diff --git a/src/portal/browserslist b/src/portal/browserslist deleted file mode 100644 index 37371cb04b..0000000000 --- a/src/portal/browserslist +++ /dev/null @@ -1,11 +0,0 @@ -# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers -# For additional information regarding the format and rule options, please see: -# https://github.com/browserslist/browserslist#queries -# -# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed - -> 0.5% -last 2 versions -Firefox ESR -not dead -not IE 9-11 \ No newline at end of file diff --git a/src/portal/favicon.ico b/src/portal/favicon.ico deleted file mode 100644 index 8b3d012439..0000000000 Binary files a/src/portal/favicon.ico and /dev/null differ diff --git a/src/portal/package-lock.json b/src/portal/package-lock.json index 4a1fd517c1..79870cfeaf 100644 --- a/src/portal/package-lock.json +++ b/src/portal/package-lock.json @@ -2448,33 +2448,19 @@ } }, "@ngx-translate/core": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-10.0.2.tgz", - "integrity": "sha512-7nM3DrJaqKswwtJlbu2kuKNl+hE8Isr18sKsKvGGpSxQk+G0gO0reDlx2PhUNus7TJTkA1C59vU/JoN8hIvZ4g==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz", + "integrity": "sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==", "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } + "tslib": "^2.0.0" } }, "@ngx-translate/http-loader": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-3.0.1.tgz", - "integrity": "sha1-ILD5i8bCUyESnT4zAqs8xInApCo=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-6.0.0.tgz", + "integrity": "sha512-LCekn6qCbeXWlhESCxU1rAbZz33WzDG0lI7Ig0pYC1o5YxJWrkU9y3Y4tNi+jakQ7R6YhTR2D3ox6APxDtA0wA==", "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } + "tslib": "^2.0.0" } }, "@nodelib/fs.scandir": { diff --git a/src/portal/package.json b/src/portal/package.json index 42b7a16f53..3c0c9a3103 100644 --- a/src/portal/package.json +++ b/src/portal/package.json @@ -1,6 +1,6 @@ { "name": "harbor", - "version": "2.2.0", + "version": "2.3.0", "description": "Harbor UI with Clarity", "angular-cli": {}, "scripts": { @@ -39,8 +39,8 @@ "@clr/ui": "^4.0.2", "@fortawesome/fontawesome-free": "^5.1.0-4", "@ng-bootstrap/ng-bootstrap": "^7.0.0", - "@ngx-translate/core": "^10.0.2", - "@ngx-translate/http-loader": "^3.0.1", + "@ngx-translate/core": "^13.0.0", + "@ngx-translate/http-loader": "^6.0.0", "@types/jquery": "^2.0.41", "@webcomponents/custom-elements": "^1.0.0", "@webcomponents/webcomponentsjs": "^2.0.0", diff --git a/src/portal/scripts/generate-build-timestamp.js b/src/portal/scripts/generate-build-timestamp.js index a3fcbf035f..db83541a2d 100644 --- a/src/portal/scripts/generate-build-timestamp.js +++ b/src/portal/scripts/generate-build-timestamp.js @@ -3,6 +3,7 @@ */ const fs = require('fs'); const data = fs.readFileSync('src/environments/environment.prod.ts', 'utf8').split('\n'); +const timestamp = new Date().getTime(); let buildTimestampIndex = 0; data.forEach((item,index) => { @@ -10,10 +11,29 @@ data.forEach((item,index) => { buildTimestampIndex = index; } }); +// modify buildTimestamp value in src/environments/environment.prod.ts file if (buildTimestampIndex > 0) { - const timestamp = new Date().getTime(); data[buildTimestampIndex] = ` buildTimestamp: ${timestamp},`; fs.writeFileSync('src/environments/environment.prod.ts', data.join('\n'), 'utf8'); } +// modify below lines in src/index.html to add buildTimestamp query string, in case of css cache in different builds +// +// +const indexHtmlData = fs.readFileSync('src/index.html', 'utf8').split('\n'); +let lightIndex = 0; +let darkIndex =0; +indexHtmlData.forEach((item,index) => { + if(item.indexOf('light-theme.css') !== -1) { + lightIndex = index; + } + if(item.indexOf('dark-theme.css') !== -1) { + darkIndex = index; + } +}); +if (lightIndex > 0 && darkIndex > 0) { + indexHtmlData[lightIndex] = ` `; + indexHtmlData[darkIndex] = ` `; + fs.writeFileSync('src/index.html', indexHtmlData.join('\n'), 'utf8'); +} \ No newline at end of file diff --git a/src/portal/server/controllers/scanners.ts b/src/portal/server/controllers/scanners.ts index 694ed1c17e..80c68e3e1c 100644 --- a/src/portal/server/controllers/scanners.ts +++ b/src/portal/server/controllers/scanners.ts @@ -1,4 +1,4 @@ -import { Scanner } from '../../src/app/config/scanner/scanner'; +import { Scanner } from '../../src/app/base/left-side-nav/interrogation-services/scanner/scanner'; import { Request, Response } from "express"; diff --git a/src/portal/server/src/mock-api.ts b/src/portal/server/src/mock-api.ts index ef39f56556..dabd140413 100644 --- a/src/portal/server/src/mock-api.ts +++ b/src/portal/server/src/mock-api.ts @@ -1,7 +1,7 @@ import express from "express"; import { Express } from 'express'; import * as Controllers from '../controllers'; -import { CURRENT_BASE_HREF } from "../../src/lib/utils/utils"; +import { CURRENT_BASE_HREF } from "../../src/app/shared/units/utils"; const mockApi: Express = express(); diff --git a/src/portal/src/app/account/account.module.ts b/src/portal/src/app/account/account.module.ts index 630226b5b6..f641fdf804 100644 --- a/src/portal/src/app/account/account.module.ts +++ b/src/portal/src/app/account/account.module.ts @@ -12,40 +12,35 @@ // See the License for the specific language governing permissions and // limitations under the License. import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { CoreModule } from '../core/core.module'; +import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '../shared/shared.module'; -import { PasswordSettingComponent } from './password-setting/password-setting.component'; -import { AccountSettingsModalComponent } from './account-settings/account-settings-modal.component'; import { SignUpComponent } from './sign-up/sign-up.component'; -import { ForgotPasswordComponent } from './password-setting/forgot-password/forgot-password.component'; -import { ResetPasswordComponent } from './password-setting/reset-password/reset-password.component'; import { SignUpPageComponent } from './sign-up/sign-up-page.component'; -import { PasswordSettingService } from './password-setting/password-setting.service'; -import { AccountSettingsModalService } from './account-settings/account-settings-modal-service.service'; - +import { SignInComponent } from "./sign-in/sign-in.component"; +import { SignInGuard } from "../shared/router-guard/sign-in-guard-activate.service"; +import { TopRepoService } from "./sign-in/top-repo/top-repository.service"; +import { TopRepoComponent } from "./sign-in/top-repo/top-repo.component"; +const routes: Routes = [ + { + path: 'sign-in', + canActivate: [SignInGuard], + component: SignInComponent + } +]; @NgModule({ imports: [ - CoreModule, - RouterModule, + RouterModule.forChild(routes), SharedModule, ], declarations: [ - PasswordSettingComponent, - AccountSettingsModalComponent, SignUpComponent, - ForgotPasswordComponent, - ResetPasswordComponent, - SignUpPageComponent], - exports: [ - PasswordSettingComponent, - AccountSettingsModalComponent, - ForgotPasswordComponent, - ResetPasswordComponent, - SignUpComponent, - SignUpPageComponent], - - providers: [PasswordSettingService, AccountSettingsModalService] + SignUpPageComponent, + SignInComponent, + TopRepoComponent, + ], + providers: [ + TopRepoService + ] }) export class AccountModule { } diff --git a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.html b/src/portal/src/app/account/password-setting/reset-password/reset-password.component.html deleted file mode 100644 index 5ad506b803..0000000000 --- a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.html +++ /dev/null @@ -1,40 +0,0 @@ - -

{{'RESET_PWD.TITLE' | translate}}

- - -
-
-
-
- - -
-
- - -
-
-
-
-
- - - -
- diff --git a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.scss b/src/portal/src/app/account/password-setting/reset-password/reset-password.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.spec.ts b/src/portal/src/app/account/password-setting/reset-password/reset-password.component.spec.ts deleted file mode 100644 index 48a2efba1d..0000000000 --- a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.spec.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { ResetPasswordComponent } from './reset-password.component'; -import { FormsModule } from '@angular/forms'; -import { PasswordSettingService } from '../password-setting.service'; -import { RouterTestingModule } from '@angular/router/testing'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; -import { ErrorHandler } from '../../../../lib/utils/error-handler'; - -describe('ResetPasswordComponent', () => { - let component: ResetPasswordComponent; - let fixture: ComponentFixture; - let fakePasswordSettingService = null; - let fakeMessageHandlerService = null; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - BrowserAnimationsModule, - ClarityModule - ], - declarations: [ResetPasswordComponent, InlineAlertComponent], - providers: [ - TranslateService, - { provide: PasswordSettingService, useValue: fakePasswordSettingService }, - { provide: MessageHandlerService, useValue: fakeMessageHandlerService }, - ErrorHandler - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ResetPasswordComponent); - component = fixture.componentInstance; - component.inlineAlert = TestBed.createComponent(InlineAlertComponent).componentInstance; - component.open(); - fixture.autoDetectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.ts b/src/portal/src/app/account/password-setting/reset-password/reset-password.component.ts deleted file mode 100644 index b51e777308..0000000000 --- a/src/portal/src/app/account/password-setting/reset-password/reset-password.component.ts +++ /dev/null @@ -1,155 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { Component, ViewChild, OnInit } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; -import { NgForm } from '@angular/forms'; - -import { PasswordSettingService } from '../password-setting.service'; -import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { CommonRoutes } from "../../../../lib/entities/shared.const"; - -@Component({ - selector: 'reset-password', - templateUrl: "reset-password.component.html", - styleUrls: ['./reset-password.component.scss', '../password-setting.component.scss', '../../../common.scss'] -}) -export class ResetPasswordComponent implements OnInit { - opened: boolean = true; - onGoing: boolean = false; - password: string = ""; - private validationState: any = { - "newPassword": true, - "reNewPassword": true - }; - resetUuid: string = ""; - resetOk: boolean = false; - confirmPwd: string = ""; - - @ViewChild("resetPwdForm", {static: true}) resetPwdForm: NgForm; - @ViewChild(InlineAlertComponent) - inlineAlert: InlineAlertComponent; - - constructor( - private pwdService: PasswordSettingService, - private route: ActivatedRoute, - private msgHandler: MessageHandlerService, - private router: Router) { } - - ngOnInit(): void { - this.route.queryParams.subscribe(params => this.resetUuid = params["reset_uuid"] || ""); - } - - public get showProgress(): boolean { - return this.onGoing; - } - - public get isValid(): boolean { - return this.resetPwdForm && this.resetPwdForm.valid && this.samePassword(); - } - - public get btnCancelCaption(): string { - if (!this.resetOk) { - return 'BUTTON.CANCEL'; - } else { - return 'BUTTON.CLOSE'; - } - } - - public getValidationState(key: string): boolean { - return this.validationState && - this.validationState[key]; - } - - public open(): void { - this.resetOk = false; - this.onGoing = false; - this.validationState = { - "newPassword": true, - "reNewPassword": true - }; - this.resetPwdForm.resetForm(); - this.inlineAlert.close(); - - this.opened = true; - } - - public close(): void { - // If already reset password ok, navigator to sign-in - if (this.resetOk) { - this.router.navigateByUrl(CommonRoutes.EMBEDDED_SIGN_IN); - } - this.opened = false; - } - - public send(): void { - // Double confirm to avoid improper situations - if (!this.password) { - return; - } - - if (!this.isValid) { - return; - } - - this.onGoing = true; - this.pwdService.resetPassword(this.resetUuid, this.password) - .subscribe(() => { - this.onGoing = false; - this.resetOk = true; - this.inlineAlert.showInlineSuccess({ message: 'RESET_PWD.RESET_OK' }); - }, error => { - this.onGoing = false; - if (this.msgHandler.isAppLevel(error)) { - this.close(); - } else { - this.inlineAlert.showInlineError(error); - } - }); - } - - public handleValidation(key: string, flag: boolean): void { - if (!flag) { - this.validationState[key] = true; - } else { - this.validationState[key] = this.getControlValidationState(key); - if (this.validationState[key]) { - this.validationState["reNewPassword"] = this.samePassword(); - } - } - } - - getControlValidationState(key: string): boolean { - if (this.resetPwdForm) { - let control = this.resetPwdForm.controls[key]; - if (control) { - return control.valid; - } - } - - return false; - } - - samePassword(): boolean { - if (this.resetPwdForm) { - let control1 = this.resetPwdForm.controls["newPassword"]; - let control2 = this.resetPwdForm.controls["reNewPassword"]; - if (control1 && control2) { - return control1.value === control2.value; - } - } - - return false; - } -} diff --git a/src/portal/src/app/shared/sign-in-credential.ts b/src/portal/src/app/account/sign-in/sign-in-credential.ts similarity index 100% rename from src/portal/src/app/shared/sign-in-credential.ts rename to src/portal/src/app/account/sign-in/sign-in-credential.ts diff --git a/src/portal/src/app/sign-in/sign-in.component.html b/src/portal/src/app/account/sign-in/sign-in.component.html similarity index 100% rename from src/portal/src/app/sign-in/sign-in.component.html rename to src/portal/src/app/account/sign-in/sign-in.component.html diff --git a/src/portal/src/app/sign-in/sign-in.component.scss b/src/portal/src/app/account/sign-in/sign-in.component.scss similarity index 100% rename from src/portal/src/app/sign-in/sign-in.component.scss rename to src/portal/src/app/account/sign-in/sign-in.component.scss diff --git a/src/portal/src/app/sign-in/sign-in.component.spec.ts b/src/portal/src/app/account/sign-in/sign-in.component.spec.ts similarity index 93% rename from src/portal/src/app/sign-in/sign-in.component.spec.ts rename to src/portal/src/app/account/sign-in/sign-in.component.spec.ts index ee75f23af2..3336576830 100644 --- a/src/portal/src/app/sign-in/sign-in.component.spec.ts +++ b/src/portal/src/app/account/sign-in/sign-in.component.spec.ts @@ -1,11 +1,11 @@ -import { waitForAsync, ComponentFixture, getTestBed, inject, TestBed } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { SignInComponent } from './sign-in.component'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; -import { AppConfigService } from '../services/app-config.service'; -import { SessionService } from '../shared/session.service'; +import { AppConfigService } from '../../services/app-config.service'; +import { SessionService } from '../../shared/services/session.service'; import { CookieService } from 'ngx-cookie'; -import { SkinableConfig } from "../services/skinable-config.service"; +import { SkinableConfig } from "../../services/skinable-config.service"; import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core'; import { ClarityModule } from "@clr/angular"; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; diff --git a/src/portal/src/app/sign-in/sign-in.component.ts b/src/portal/src/app/account/sign-in/sign-in.component.ts similarity index 91% rename from src/portal/src/app/sign-in/sign-in.component.ts rename to src/portal/src/app/account/sign-in/sign-in.component.ts index facdd0536e..151eaabc0a 100644 --- a/src/portal/src/app/sign-in/sign-in.component.ts +++ b/src/portal/src/app/account/sign-in/sign-in.component.ts @@ -15,19 +15,19 @@ import { Component, OnInit } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; import { Input, ViewChild, AfterViewChecked } from '@angular/core'; import { NgForm } from '@angular/forms'; -import { SessionService } from '../shared/session.service'; -import { SignInCredential } from '../shared/sign-in-credential'; -import { SignUpComponent } from '../account/sign-up/sign-up.component'; -import { ForgotPasswordComponent } from '../account/password-setting/forgot-password/forgot-password.component'; -import { AppConfigService } from '../services/app-config.service'; -import { AppConfig } from '../services/app-config'; -import { User } from '../user/user'; +import { SessionService } from '../../shared/services/session.service'; +import { SignUpComponent } from '../sign-up/sign-up.component'; +import { ForgotPasswordComponent } from '../../base/password-setting/forgot-password/forgot-password.component'; +import { AppConfigService } from '../../services/app-config.service'; +import { AppConfig } from '../../services/app-config'; +import { User } from '../../base/left-side-nav/user/user'; import { CookieService, CookieOptions } from 'ngx-cookie'; -import { SkinableConfig } from "../services/skinable-config.service"; -import {ModalEvent} from "../base/modal-event"; -import {modalEvents} from "../base/modal-events.const"; -import {AboutDialogComponent} from "../shared/about-dialog/about-dialog.component"; -import { CommonRoutes, CONFIG_AUTH_MODE } from "../../lib/entities/shared.const"; +import { SkinableConfig } from "../../services/skinable-config.service"; +import {ModalEvent} from "../../base/modal-event"; +import {modalEvents} from "../../base/modal-events.const"; +import {AboutDialogComponent} from "../../shared/components/about-dialog/about-dialog.component"; +import { CommonRoutes, CONFIG_AUTH_MODE } from "../../shared/entities/shared.const"; +import { SignInCredential } from "./sign-in-credential"; // Define status flags for signing in states export const signInStatusNormal = 0; @@ -247,7 +247,7 @@ export class SignInComponent implements AfterViewChecked, OnInit { // Remeber me this.remeberMe(); - // Redirect to the right route + // Redirect to the right router-guard if (this.redirectUrl === "") { // Routing to the default location this.router.navigateByUrl(CommonRoutes.HARBOR_DEFAULT); diff --git a/src/portal/src/app/sign-in/sign-in.service.spec.ts b/src/portal/src/app/account/sign-in/sign-in.service.spec.ts similarity index 100% rename from src/portal/src/app/sign-in/sign-in.service.spec.ts rename to src/portal/src/app/account/sign-in/sign-in.service.spec.ts diff --git a/src/portal/src/app/sign-in/sign-in.service.ts b/src/portal/src/app/account/sign-in/sign-in.service.ts similarity index 93% rename from src/portal/src/app/sign-in/sign-in.service.ts rename to src/portal/src/app/account/sign-in/sign-in.service.ts index 7c805ef703..109c3248be 100644 --- a/src/portal/src/app/sign-in/sign-in.service.ts +++ b/src/portal/src/app/account/sign-in/sign-in.service.ts @@ -13,10 +13,10 @@ // limitations under the License. import { Injectable } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; -import { SignInCredential } from '../shared/sign-in-credential'; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; -import { HTTP_FORM_OPTIONS } from "../../lib/utils/utils"; +import { HTTP_FORM_OPTIONS } from "../../shared/units/utils"; +import { SignInCredential } from "./sign-in-credential"; const signInUrl = '/c/login'; /** * diff --git a/src/portal/src/app/sign-in/top-repo/top-repo.component.html b/src/portal/src/app/account/sign-in/top-repo/top-repo.component.html similarity index 100% rename from src/portal/src/app/sign-in/top-repo/top-repo.component.html rename to src/portal/src/app/account/sign-in/top-repo/top-repo.component.html diff --git a/src/portal/src/app/sign-in/top-repo/top-repo.component.scss b/src/portal/src/app/account/sign-in/top-repo/top-repo.component.scss similarity index 100% rename from src/portal/src/app/sign-in/top-repo/top-repo.component.scss rename to src/portal/src/app/account/sign-in/top-repo/top-repo.component.scss diff --git a/src/portal/src/app/sign-in/top-repo/top-repo.component.spec.ts b/src/portal/src/app/account/sign-in/top-repo/top-repo.component.spec.ts similarity index 95% rename from src/portal/src/app/sign-in/top-repo/top-repo.component.spec.ts rename to src/portal/src/app/account/sign-in/top-repo/top-repo.component.spec.ts index e2f44d7d89..286382d12b 100644 --- a/src/portal/src/app/sign-in/top-repo/top-repo.component.spec.ts +++ b/src/portal/src/app/account/sign-in/top-repo/top-repo.component.spec.ts @@ -8,7 +8,7 @@ import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; import { TopRepoService } from './top-repository.service'; describe('TopRepoComponent', () => { let component: TopRepoComponent; diff --git a/src/portal/src/app/sign-in/top-repo/top-repo.component.ts b/src/portal/src/app/account/sign-in/top-repo/top-repo.component.ts similarity index 86% rename from src/portal/src/app/sign-in/top-repo/top-repo.component.ts rename to src/portal/src/app/account/sign-in/top-repo/top-repo.component.ts index d3a3e598b9..12fa890987 100644 --- a/src/portal/src/app/sign-in/top-repo/top-repo.component.ts +++ b/src/portal/src/app/account/sign-in/top-repo/top-repo.component.ts @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Component, OnInit } from '@angular/core'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; import { TopRepoService } from './top-repository.service'; -import { Repository } from "../../../../ng-swagger-gen/models/repository"; -import { ListMode } from "../../../lib/entities/shared.const"; +import { Repository } from "../../../../../ng-swagger-gen/models/repository"; +import { ListMode } from "../../../shared/entities/shared.const"; @Component({ diff --git a/src/portal/src/app/sign-in/top-repo/top-repository.service.spec.ts b/src/portal/src/app/account/sign-in/top-repo/top-repository.service.spec.ts similarity index 100% rename from src/portal/src/app/sign-in/top-repo/top-repository.service.spec.ts rename to src/portal/src/app/account/sign-in/top-repo/top-repository.service.spec.ts diff --git a/src/portal/src/app/sign-in/top-repo/top-repository.service.ts b/src/portal/src/app/account/sign-in/top-repo/top-repository.service.ts similarity index 90% rename from src/portal/src/app/sign-in/top-repo/top-repository.service.ts rename to src/portal/src/app/account/sign-in/top-repo/top-repository.service.ts index a98da0d0d1..79e2fd3652 100644 --- a/src/portal/src/app/sign-in/top-repo/top-repository.service.ts +++ b/src/portal/src/app/account/sign-in/top-repo/top-repository.service.ts @@ -15,8 +15,8 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; -import { Repository } from "../../../../ng-swagger-gen/models/repository"; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS } from "../../../lib/utils/utils"; +import { Repository } from "../../../../../ng-swagger-gen/models/repository"; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS } from "../../../shared/units/utils"; export const topRepoEndpoint = CURRENT_BASE_HREF + "/repositories/top"; /** diff --git a/src/portal/src/app/sign-in/top-repo/top-repository.ts b/src/portal/src/app/account/sign-in/top-repo/top-repository.ts similarity index 100% rename from src/portal/src/app/sign-in/top-repo/top-repository.ts rename to src/portal/src/app/account/sign-in/top-repo/top-repository.ts diff --git a/src/portal/src/app/account/sign-up/sign-up-page.component.spec.ts b/src/portal/src/app/account/sign-up/sign-up-page.component.spec.ts index c03b3031e9..b0ba973980 100644 --- a/src/portal/src/app/account/sign-up/sign-up-page.component.spec.ts +++ b/src/portal/src/app/account/sign-up/sign-up-page.component.spec.ts @@ -1,13 +1,13 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { UserService } from '../../user/user.service'; +import { UserService } from '../../base/left-side-nav/user/user.service'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { MessageService } from '../../global-message/message.service'; +import { MessageService } from '../../shared/components/global-message/message.service'; import { RouterTestingModule } from '@angular/router/testing'; import { SignUpPageComponent } from './sign-up-page.component'; import { FormsModule } from '@angular/forms'; -import { NewUserFormComponent } from '../../shared/new-user-form/new-user-form.component'; -import { SessionService } from '../../shared/session.service'; +import { NewUserFormComponent } from '../../shared/components/new-user-form/new-user-form.component'; +import { SessionService } from '../../shared/services/session.service'; describe('SignUpPageComponent', () => { let component: SignUpPageComponent; diff --git a/src/portal/src/app/account/sign-up/sign-up-page.component.ts b/src/portal/src/app/account/sign-up/sign-up-page.component.ts index 2cd751a612..2c793e07a9 100644 --- a/src/portal/src/app/account/sign-up/sign-up-page.component.ts +++ b/src/portal/src/app/account/sign-up/sign-up-page.component.ts @@ -14,11 +14,11 @@ import { Component, ViewChild, OnInit } from '@angular/core'; import { Router } from '@angular/router'; -import { NewUserFormComponent } from '../../shared/new-user-form/new-user-form.component'; -import { User } from '../../user/user'; -import { UserService } from '../../user/user.service'; -import { AlertType } from '../../shared/shared.const'; -import { MessageService } from '../../global-message/message.service'; +import { NewUserFormComponent } from '../../shared/components/new-user-form/new-user-form.component'; +import { User } from '../../base/left-side-nav/user/user'; +import { UserService } from '../../base/left-side-nav/user/user.service'; +import { MessageService } from '../../shared/components/global-message/message.service'; +import { AlertType } from "../../shared/entities/shared.const"; @Component({ selector: 'sign-up-page', diff --git a/src/portal/src/app/account/sign-up/sign-up.component.spec.ts b/src/portal/src/app/account/sign-up/sign-up.component.spec.ts index a40fc9f4a4..91ba40bd5c 100644 --- a/src/portal/src/app/account/sign-up/sign-up.component.spec.ts +++ b/src/portal/src/app/account/sign-up/sign-up.component.spec.ts @@ -1,16 +1,16 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ClarityModule } from "@clr/angular"; import { SignUpComponent } from './sign-up.component'; -import { SessionService } from '../../shared/session.service'; -import { UserService } from '../../user/user.service'; +import { SessionService } from '../../shared/services/session.service'; +import { UserService } from '../../base/left-side-nav/user/user.service'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { NewUserFormComponent } from '../../shared/new-user-form/new-user-form.component'; +import { NewUserFormComponent } from '../../shared/components/new-user-form/new-user-form.component'; import { FormsModule } from '@angular/forms'; -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; -import { ErrorHandler } from '../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../shared/units/error-handler'; +import { InlineAlertComponent } from "../../shared/components/inline-alert/inline-alert.component"; describe('SignUpComponent', () => { let component: SignUpComponent; diff --git a/src/portal/src/app/account/sign-up/sign-up.component.ts b/src/portal/src/app/account/sign-up/sign-up.component.ts index d42a9b2837..92ab61efb9 100644 --- a/src/portal/src/app/account/sign-up/sign-up.component.ts +++ b/src/portal/src/app/account/sign-up/sign-up.component.ts @@ -12,14 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Component, Output, ViewChild, EventEmitter } from '@angular/core'; -import { Modal } from '../../../lib/services/interface'; - -import { NewUserFormComponent } from '../../shared/new-user-form/new-user-form.component'; -import { User } from '../../user/user'; -import { SessionService } from '../../shared/session.service'; -import { UserService } from '../../user/user.service'; -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; - +import { Modal } from '../../shared/services/interface'; +import { NewUserFormComponent } from '../../shared/components/new-user-form/new-user-form.component'; +import { User } from '../../base/left-side-nav/user/user'; +import { SessionService } from '../../shared/services/session.service'; +import { UserService } from '../../base/left-side-nav/user/user.service'; +import { InlineAlertComponent } from "../../shared/components/inline-alert/inline-alert.component"; @Component({ selector: 'sign-up', diff --git a/src/portal/src/app/all-pipes/all-pipes.module.ts b/src/portal/src/app/all-pipes/all-pipes.module.ts deleted file mode 100644 index 80f69f7dfc..0000000000 --- a/src/portal/src/app/all-pipes/all-pipes.module.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SelectArtifactIconPipe } from './select-artifact-icon/select-artifact-icon.pipe'; - - - -@NgModule({ - declarations: [SelectArtifactIconPipe], - imports: [ - CommonModule - ], - exports: [ - SelectArtifactIconPipe - ] -}) -export class AllPipesModule { } diff --git a/src/portal/src/app/all-pipes/select-artifact-icon/select-artifact-icon.pipe.spec.ts b/src/portal/src/app/all-pipes/select-artifact-icon/select-artifact-icon.pipe.spec.ts deleted file mode 100644 index 6928752ee5..0000000000 --- a/src/portal/src/app/all-pipes/select-artifact-icon/select-artifact-icon.pipe.spec.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { SelectArtifactIconPipe } from './select-artifact-icon.pipe'; - -describe('SelectArtifactIconPipe', () => { - let mockTypeImage = "IMAGE"; - let mockTypeChart = "CHART"; - let mockTypecnab = "CNAB"; - it('create an instance', () => { - const pipe = new SelectArtifactIconPipe(); - expect(pipe).toBeTruthy(); - }); - it('it should success get adress of icon', () => { - const pipe = new SelectArtifactIconPipe(); - expect(pipe.transform(mockTypeImage, '')).toBe('images/artifact-image.svg'); - expect(pipe.transform(mockTypeChart, '')).toBe('images/artifact-chart.svg'); - expect(pipe.transform(mockTypecnab, '')).toBe('images/artifact-cnab.svg'); - expect(pipe.transform("", '')).toBe('images/artifact-default.svg'); - - }); -}); diff --git a/src/portal/src/app/all-pipes/select-artifact-icon/select-artifact-icon.pipe.ts b/src/portal/src/app/all-pipes/select-artifact-icon/select-artifact-icon.pipe.ts deleted file mode 100644 index 876007cfa4..0000000000 --- a/src/portal/src/app/all-pipes/select-artifact-icon/select-artifact-icon.pipe.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { artifactImages, artifactDefault } from '../../project/repository/artifact/artifact'; - -@Pipe({ - name: 'selectArtifactIcon' -}) -export class SelectArtifactIconPipe implements PipeTransform { - - transform(value: string, ...args: any[]): any { - - if (artifactImages.some(image => image === value)) { - return 'images/artifact-' + value.toLowerCase() + '.svg'; - } else { - return artifactDefault; - } - } - -} diff --git a/src/portal/src/app/app.component.spec.ts b/src/portal/src/app/app.component.spec.ts index a79509a58e..37873fffe5 100644 --- a/src/portal/src/app/app.component.spec.ts +++ b/src/portal/src/app/app.component.spec.ts @@ -18,7 +18,7 @@ import { Title } from '@angular/platform-browser'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CookieService } from 'ngx-cookie'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { SessionService } from './shared/session.service'; +import { SessionService } from './shared/services/session.service'; import { AppConfigService } from './services/app-config.service'; import { AppComponent } from './app.component'; import { ClarityModule } from "@clr/angular"; diff --git a/src/portal/src/app/app.component.ts b/src/portal/src/app/app.component.ts index a8dba24ae9..5cd7507a42 100644 --- a/src/portal/src/app/app.component.ts +++ b/src/portal/src/app/app.component.ts @@ -13,15 +13,13 @@ // limitations under the License. import { Component } from '@angular/core'; import { Title } from '@angular/platform-browser'; - import { TranslateService } from '@ngx-translate/core'; -import { CookieService } from 'ngx-cookie'; - -import { SessionService } from './shared/session.service'; import { AppConfigService } from './services/app-config.service'; import { ThemeService } from './services/theme.service'; import { THEME_ARRAY, ThemeInterface } from './services/theme'; -import { clone } from '../lib/utils/utils'; +import { clone } from './shared/units/utils'; +import { DEFAULT_LANG_LOCALSTORAGE_KEY, DeFaultLang, supportedLangs } from "./shared/entities/shared.const"; +import { forkJoin, Observable } from "rxjs"; const HAS_STYLE_MODE: string = 'styleModeLocal'; @@ -31,17 +29,16 @@ const HAS_STYLE_MODE: string = 'styleModeLocal'; }) export class AppComponent { themeArray: ThemeInterface[] = clone(THEME_ARRAY); - styleMode: string = this.themeArray[0].showStyle; constructor( private translate: TranslateService, - private cookie: CookieService, - private session: SessionService, private appConfigService: AppConfigService, private titleService: Title, public theme: ThemeService ) { + // init language + this.initLanguage(); // Override page title let key: string = "APP_TITLE.HARBOR"; if (this.appConfigService.isIntegrationMode()) { @@ -67,4 +64,37 @@ export class AppComponent { } }); } + initLanguage() { + /** + * due to the bug(https://github.com/ngx-translate/core/issues/1258) of translate module + * we have to call use method for all supported languages + * use method will load related language json from backend server + */ + const usedLangs: Array> = []; + supportedLangs.forEach(lang => { + usedLangs.push(this.translate.use(lang)); + }); + forkJoin(usedLangs).subscribe(() => { // use target lang after all langs json loaded + this.translate.addLangs(supportedLangs); + this.translate.setDefaultLang(DeFaultLang); + let selectedLang: string = DeFaultLang; + if (localStorage && localStorage.getItem(DEFAULT_LANG_LOCALSTORAGE_KEY)) {// If user has selected lang, then directly use it + selectedLang = localStorage.getItem(DEFAULT_LANG_LOCALSTORAGE_KEY); + } else {// If user has not selected lang, then use browser language(if contained in supportedLangs) + const browserCultureLang: string = this.translate + .getBrowserCultureLang() + .toLowerCase(); + if (browserCultureLang && browserCultureLang.trim() !== "") { + if (supportedLangs && supportedLangs.length > 0) { + if (supportedLangs.find(lang => lang === browserCultureLang)) { + selectedLang = browserCultureLang; + } + } + } + } + localStorage.setItem(DEFAULT_LANG_LOCALSTORAGE_KEY, selectedLang); + this.translate.use(selectedLang); + } + ); + } } diff --git a/src/portal/src/app/app.module.ts b/src/portal/src/app/app.module.ts index ab9ae96411..3652f25fe1 100644 --- a/src/portal/src/app/app.module.ts +++ b/src/portal/src/app/app.module.ts @@ -12,86 +12,68 @@ // See the License for the specific language governing permissions and // limitations under the License. import { BrowserModule } from '@angular/platform-browser'; -import { NgModule, APP_INITIALIZER, LOCALE_ID, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { NgModule, APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { AppComponent } from './app.component'; import { InterceptHttpService } from './services/intercept-http.service'; - -import { BaseModule } from './base/base.module'; import { HarborRoutingModule } from './harbor-routing.module'; -import { SharedModule } from './shared/shared.module'; -import { AccountModule } from './account/account.module'; -import { SignInModule } from './sign-in/sign-in.module'; -import { ConfigurationModule } from './config/config.module'; -import { DeveloperCenterModule } from './dev-center/dev-center.module'; -import { registerLocaleData } from '@angular/common'; - -import { TranslateService } from "@ngx-translate/core"; import { AppConfigService } from './services/app-config.service'; import { SkinableConfig } from "./services/skinable-config.service"; -import { ProjectConfigComponent } from './project/project-config/project-config.component'; +import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; +import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; +import { CookieModule } from "ngx-cookie"; +import { + MissingTranslationHandler, + MissingTranslationHandlerParams, + TranslateLoader, + TranslateModule +} from "@ngx-translate/core"; +import { + ProjectDefaultService, + ProjectService, + UserPermissionDefaultService, + UserPermissionService +} from "./shared/services"; +import { ErrorHandler } from "./shared/units/error-handler"; +import { MessageHandlerService } from "./shared/services/message-handler.service"; +import { HarborTranslateLoaderService } from "./services/harbor-translate-loader.service"; -import zh from '@angular/common/locales/zh-Hans'; -import es from '@angular/common/locales/es'; -import localeFr from '@angular/common/locales/fr'; -import localePt from '@angular/common/locales/pt-PT'; -import localeTr from '@angular/common/locales/tr'; -import { DevCenterComponent } from './dev-center/dev-center.component'; -import { VulnerabilityPageComponent } from './vulnerability-page/vulnerability-page.component'; -import { GcPageComponent } from './gc-page/gc-page.component'; -import { OidcOnboardModule } from './oidc-onboard/oidc-onboard.module'; -import { LicenseModule } from './license/license.module'; -import { InterrogationServicesComponent } from "./interrogation-services/interrogation-services.component"; -import { LabelsComponent } from './labels/labels.component'; -import { ProjectQuotasComponent } from './project-quotas/project-quotas.component'; -import { HarborLibraryModule } from "../lib/harbor-library.module"; -import { HTTP_INTERCEPTORS } from '@angular/common/http'; -import { AllPipesModule } from './all-pipes/all-pipes.module'; -import { DistributionModule } from './distribution/distribution.module'; -import { SystemRobotAccountsModule } from './system-robot-accounts/system-robot-accounts.module'; -registerLocaleData(zh, 'zh-cn'); -registerLocaleData(es, 'es-es'); -registerLocaleData(localeFr, 'fr-fr'); -registerLocaleData(localePt, 'pt-br'); -registerLocaleData(localeTr, 'tr-tr'); - -export function initConfig(configService: AppConfigService, skinableService: SkinableConfig) { +function initConfig(configService: AppConfigService, skinableService: SkinableConfig) { return () => { skinableService.getCustomFile().subscribe(); configService.load().subscribe(); }; } -export function getCurrentLanguage(translateService: TranslateService) { - return translateService.currentLang; +class MyMissingTranslationHandler implements MissingTranslationHandler { + handle(params: MissingTranslationHandlerParams) { + const missingText: string = "{Harbor}"; + return params.key || missingText; + } } + + + @NgModule({ declarations: [ AppComponent, - ProjectConfigComponent, - VulnerabilityPageComponent, - GcPageComponent, - InterrogationServicesComponent, - LabelsComponent, - ProjectQuotasComponent ], imports: [ + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: HarborTranslateLoaderService + }, + missingTranslationHandler: { + provide: MissingTranslationHandler, + useClass: MyMissingTranslationHandler + } + }), BrowserModule, - SharedModule, - BaseModule, - AccountModule, - SignInModule, + BrowserAnimationsModule, + HttpClientModule, HarborRoutingModule, - ConfigurationModule, - DeveloperCenterModule, - OidcOnboardModule, - LicenseModule, - HarborLibraryModule, - AllPipesModule, - DistributionModule, - SystemRobotAccountsModule - ], - exports: [ + CookieModule.forRoot(), ], providers: [ AppConfigService, @@ -102,9 +84,10 @@ export function getCurrentLanguage(translateService: TranslateService) { deps: [AppConfigService, SkinableConfig], multi: true }, - { provide: LOCALE_ID, useValue: "en-US" }, - { provide: HTTP_INTERCEPTORS, useClass: InterceptHttpService, multi: true } - + { provide: HTTP_INTERCEPTORS, useClass: InterceptHttpService, multi: true }, + { provide: ProjectService, useClass: ProjectDefaultService }, + { provide: ErrorHandler, useClass: MessageHandlerService }, + { provide: UserPermissionService, useClass: UserPermissionDefaultService }, ], schemas: [ CUSTOM_ELEMENTS_SCHEMA diff --git a/src/portal/src/app/account/account-settings/account-settings-modal-service.service.spec.ts b/src/portal/src/app/base/account-settings/account-settings-modal-service.service.spec.ts similarity index 100% rename from src/portal/src/app/account/account-settings/account-settings-modal-service.service.spec.ts rename to src/portal/src/app/base/account-settings/account-settings-modal-service.service.spec.ts diff --git a/src/portal/src/app/account/account-settings/account-settings-modal-service.service.ts b/src/portal/src/app/base/account-settings/account-settings-modal-service.service.ts similarity index 84% rename from src/portal/src/app/account/account-settings/account-settings-modal-service.service.ts rename to src/portal/src/app/base/account-settings/account-settings-modal-service.service.ts index bf290ff6f3..3c8cf11bae 100644 --- a/src/portal/src/app/account/account-settings/account-settings-modal-service.service.ts +++ b/src/portal/src/app/base/account-settings/account-settings-modal-service.service.ts @@ -2,12 +2,14 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { catchError, map } from 'rxjs/operators'; import { throwError as observableThrowError, Observable } from 'rxjs'; -import { CURRENT_BASE_HREF } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF } from "../../shared/units/utils"; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class AccountSettingsModalService { constructor(private http: HttpClient) { } diff --git a/src/portal/src/app/account/account-settings/account-settings-modal.component.html b/src/portal/src/app/base/account-settings/account-settings-modal.component.html similarity index 100% rename from src/portal/src/app/account/account-settings/account-settings-modal.component.html rename to src/portal/src/app/base/account-settings/account-settings-modal.component.html diff --git a/src/portal/src/app/account/account-settings/account-settings-modal.component.scss b/src/portal/src/app/base/account-settings/account-settings-modal.component.scss similarity index 100% rename from src/portal/src/app/account/account-settings/account-settings-modal.component.scss rename to src/portal/src/app/base/account-settings/account-settings-modal.component.scss diff --git a/src/portal/src/app/account/account-settings/account-settings-modal.component.spec.ts b/src/portal/src/app/base/account-settings/account-settings-modal.component.spec.ts similarity index 93% rename from src/portal/src/app/account/account-settings/account-settings-modal.component.spec.ts rename to src/portal/src/app/base/account-settings/account-settings-modal.component.spec.ts index eebf34f4ec..b475a1c1ae 100644 --- a/src/portal/src/app/account/account-settings/account-settings-modal.component.spec.ts +++ b/src/portal/src/app/base/account-settings/account-settings-modal.component.spec.ts @@ -1,23 +1,23 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { AccountSettingsModalComponent } from './account-settings-modal.component'; -import { SessionService } from "../../shared/session.service"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { SearchTriggerService } from "../../base/global-search/search-trigger.service"; +import { SessionService } from "../../shared/services/session.service"; +import { MessageHandlerService } from "../../shared/services/message-handler.service"; +import { SearchTriggerService } from "../../shared/components/global-search/search-trigger.service"; import { AccountSettingsModalService } from './account-settings-modal-service.service'; import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef } from '@angular/core'; import { ClarityModule } from "@clr/angular"; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; import { Router } from '@angular/router'; -import { clone } from '../../../lib/utils/utils'; -import { ConfirmationDialogComponent } from '../../shared/confirmation-dialog/confirmation-dialog.component'; -import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; -import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; -import { ErrorHandler } from '../../../lib/utils/error-handler'; +import { clone } from '../../shared/units/utils'; +import { ErrorHandler } from '../../shared/units/error-handler'; +import { ConfirmationDialogComponent } from "../../shared/components/confirmation-dialog"; +import { InlineAlertComponent } from "../../shared/components/inline-alert/inline-alert.component"; +import { ConfirmationDialogService } from "../global-confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationMessage } from "../global-confirmation-dialog/confirmation-message"; describe('AccountSettingsModalComponent', () => { let component: AccountSettingsModalComponent; diff --git a/src/portal/src/app/account/account-settings/account-settings-modal.component.ts b/src/portal/src/app/base/account-settings/account-settings-modal.component.ts similarity index 92% rename from src/portal/src/app/account/account-settings/account-settings-modal.component.ts rename to src/portal/src/app/base/account-settings/account-settings-modal.component.ts index 433a4e3f32..bc59983e51 100644 --- a/src/portal/src/app/account/account-settings/account-settings-modal.component.ts +++ b/src/portal/src/app/base/account-settings/account-settings-modal.component.ts @@ -1,4 +1,3 @@ -import { ChangeDetectorRef } from '@angular/core'; // Copyright Project Harbor Authors // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,26 +11,24 @@ import { ChangeDetectorRef } from '@angular/core'; // 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. + +import { ChangeDetectorRef } from '@angular/core'; import { Component, OnInit, ViewChild, AfterViewChecked } from "@angular/core"; import { NgForm } from "@angular/forms"; import { Router, NavigationExtras } from "@angular/router"; -import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; - -import { SessionUser } from "../../shared/session-user"; -import { SessionService } from "../../shared/session.service"; -import { InlineAlertComponent } from "../../shared/inline-alert/inline-alert.component"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { SearchTriggerService } from "../../base/global-search/search-trigger.service"; +import { SessionUser } from "../../shared/entities/session-user"; +import { SessionService } from "../../shared/services/session.service"; +import { MessageHandlerService } from "../../shared/services/message-handler.service"; +import { SearchTriggerService } from "../../shared/components/global-search/search-trigger.service"; import { AccountSettingsModalService } from './account-settings-modal-service.service'; -import { ConfirmationDialogComponent } from "../../shared/confirmation-dialog/confirmation-dialog.component"; -import { - ConfirmationTargets, - ConfirmationButtons -} from "../../shared/shared.const"; -import { randomWord } from '../../shared/shared.utils'; +import { randomWord } from '../../shared/units/shared.utils'; import { ResetSecret } from './account'; -import { CopyInputComponent } from "../../../lib/components/push-image/copy-input.component"; -import { CommonRoutes } from "../../../lib/entities/shared.const"; +import { CopyInputComponent } from "../../shared/components/push-image/copy-input.component"; +import { CommonRoutes, ConfirmationButtons, ConfirmationTargets } from "../../shared/entities/shared.const"; +import { ConfirmationDialogComponent } from "../../shared/components/confirmation-dialog"; +import { InlineAlertComponent } from "../../shared/components/inline-alert/inline-alert.component"; +import { ConfirmationMessage } from "../global-confirmation-dialog/confirmation-message"; + @Component({ selector: "account-settings-modal", templateUrl: "account-settings-modal.component.html", @@ -224,7 +221,7 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked { // Log out system logOut(): void { - // Naviagte to the sign in route + // Naviagte to the sign in router-guard // Appending 'signout' means destroy session cache let navigatorExtra: NavigationExtras = { queryParams: { signout: true } diff --git a/src/portal/src/app/account/account-settings/account.ts b/src/portal/src/app/base/account-settings/account.ts similarity index 100% rename from src/portal/src/app/account/account-settings/account.ts rename to src/portal/src/app/base/account-settings/account.ts diff --git a/src/portal/src/app/base/base.module.ts b/src/portal/src/app/base/base.module.ts index 4f5ffd6be8..dfeeb6717a 100644 --- a/src/portal/src/app/base/base.module.ts +++ b/src/portal/src/app/base/base.module.ts @@ -13,37 +13,127 @@ // limitations under the License. import { NgModule } from '@angular/core'; import { SharedModule } from '../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { ProjectModule } from '../project/project.module'; -import { UserModule } from '../user/user.module'; -import { AccountModule } from '../account/account.module'; -import { GroupModule } from '../group/group.module'; -import { NavigatorComponent } from './navigator/navigator.component'; -import { GlobalSearchComponent } from './global-search/global-search.component'; -import { FooterComponent } from './footer/footer.component'; +import { RouterModule, Routes } from '@angular/router'; import { HarborShellComponent } from './harbor-shell/harbor-shell.component'; -import { SearchResultComponent } from './global-search/search-result.component'; - -import { SearchTriggerService } from './global-search/search-trigger.service'; +import { SystemAdminGuard } from "../shared/router-guard/system-admin-activate.service"; +import { MemberGuard } from "../shared/router-guard/member-guard-activate.service"; +import { ProjectRoutingResolver } from "../services/routing-resolvers/project-routing-resolver.service"; +import { PasswordSettingComponent } from "./password-setting/password-setting.component"; +import { AccountSettingsModalComponent } from "./account-settings/account-settings-modal.component"; +import { ForgotPasswordComponent } from "./password-setting/forgot-password/forgot-password.component"; +import { GlobalConfirmationDialogComponent } from "./global-confirmation-dialog/global-confirmation-dialog.component"; +const routes: Routes = [ + { + path: '', + component: HarborShellComponent, + children: [ + { path: '', redirectTo: 'projects', pathMatch: 'full' }, + { + path: 'projects', + loadChildren: () => import('./left-side-nav/projects/projects.module').then(m => m.ProjectsModule) + }, + { + path: 'logs', + loadChildren: () => import('./left-side-nav/log/log.module').then(m => m.LogModule) + }, + { + path: 'users', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/user/user.module').then(m => m.UserModule) + }, + { + path: 'robot-accounts', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/system-robot-accounts/system-robot-accounts.module') + .then(m => m.SystemRobotAccountsModule) + }, + { + path: 'groups', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/group/group.module').then(m => m.GroupModule) + }, + { + path: 'registries', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/registries/endpoint.module').then(m => m.EndpointModule) + }, + { + path: 'replications', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/replication/replication.module').then(m => m.ReplicationModule) + }, + { + path: 'distribution', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/distribution/distribution.module').then(m => m.DistributionModule) + }, + { + path: 'interrogation-services', + canActivate: [SystemAdminGuard], + loadChildren: () => + import('./left-side-nav/interrogation-services/interrogation-services.module') + .then(m => m.InterrogationServicesModule) + }, + { + path: 'labels', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/labels/labels.module').then(m => m.LabelsModule) + }, + { + path: 'project-quotas', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/project-quotas/project-quotas.module').then(m => m.ProjectQuotasModule) + }, + { + path: 'gc', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/gc-page/gc.module').then(m => m.GcModule) + }, + { + path: 'configs', + canActivate: [SystemAdminGuard], + loadChildren: () => import('./left-side-nav/config/config.module').then(m => m.ConfigurationModule) + }, + { + path: 'projects/:id', + loadChildren: () => import('./project/project.module').then(m => m.ProjectModule), + canActivate: [MemberGuard], + resolve: { + projectResolver: ProjectRoutingResolver + } + }, + { + path: 'projects/:id/repositories', + loadChildren: () => import('./project/repository/artifact/artifact.module').then(m => m.ArtifactModule), + canActivate: [MemberGuard], + resolve: { + projectResolver: ProjectRoutingResolver + } + }, + { + path: 'projects/:id/helm-charts', + canActivate: [MemberGuard], + resolve: { + projectResolver: ProjectRoutingResolver + }, + loadChildren: () => import('./project/helm-chart/helm-chart-detail/helm-chart-detail.module').then(m => m.HelmChartListModule), + }, + ] + } +]; @NgModule({ imports: [ SharedModule, - ProjectModule, - UserModule, - AccountModule, - RouterModule, - GroupModule + RouterModule.forChild(routes), ], declarations: [ - NavigatorComponent, - GlobalSearchComponent, - FooterComponent, HarborShellComponent, - SearchResultComponent, - ], - exports: [ HarborShellComponent, NavigatorComponent, SearchResultComponent ], - providers: [SearchTriggerService] + PasswordSettingComponent, + AccountSettingsModalComponent, + ForgotPasswordComponent, + GlobalConfirmationDialogComponent + ] }) export class BaseModule { diff --git a/src/portal/src/app/base/footer/footer.component.html b/src/portal/src/app/base/footer/footer.component.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/portal/src/app/base/footer/footer.component.spec.ts b/src/portal/src/app/base/footer/footer.component.spec.ts deleted file mode 100644 index 30acbc4f67..0000000000 --- a/src/portal/src/app/base/footer/footer.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { FooterComponent } from './footer.component'; - -describe('FooterComponent', () => { - let component: FooterComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [FooterComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FooterComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/lib/components/confirmation-dialog/confirmation-batch-message.ts b/src/portal/src/app/base/global-confirmation-dialog/confirmation-batch-message.ts similarity index 100% rename from src/portal/src/lib/components/confirmation-dialog/confirmation-batch-message.ts rename to src/portal/src/app/base/global-confirmation-dialog/confirmation-batch-message.ts diff --git a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.service.spec.ts b/src/portal/src/app/base/global-confirmation-dialog/confirmation-dialog.service.spec.ts similarity index 100% rename from src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.service.spec.ts rename to src/portal/src/app/base/global-confirmation-dialog/confirmation-dialog.service.spec.ts diff --git a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts b/src/portal/src/app/base/global-confirmation-dialog/confirmation-dialog.service.ts similarity index 97% rename from src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts rename to src/portal/src/app/base/global-confirmation-dialog/confirmation-dialog.service.ts index d1d5f6b855..187e0bc03a 100644 --- a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts +++ b/src/portal/src/app/base/global-confirmation-dialog/confirmation-dialog.service.ts @@ -17,7 +17,9 @@ import { Subject } from "rxjs"; import { ConfirmationMessage } from './confirmation-message'; import { ConfirmationAcknowledgement } from './confirmation-state-message'; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class ConfirmationDialogService { confirmationAnnoucedSource = new Subject(); confirmationConfirmSource = new Subject(); diff --git a/src/portal/src/lib/components/confirmation-dialog/confirmation-message.ts b/src/portal/src/app/base/global-confirmation-dialog/confirmation-message.ts similarity index 96% rename from src/portal/src/lib/components/confirmation-dialog/confirmation-message.ts rename to src/portal/src/app/base/global-confirmation-dialog/confirmation-message.ts index 501cc6ec55..bed0718efb 100644 --- a/src/portal/src/lib/components/confirmation-dialog/confirmation-message.ts +++ b/src/portal/src/app/base/global-confirmation-dialog/confirmation-message.ts @@ -14,7 +14,7 @@ import { ConfirmationTargets, ConfirmationButtons -} from "../../entities/shared.const"; +} from "../../shared/entities/shared.const"; export class ConfirmationMessage { public constructor( diff --git a/src/portal/src/app/shared/confirmation-dialog/confirmation-state-message.ts b/src/portal/src/app/base/global-confirmation-dialog/confirmation-state-message.ts similarity index 91% rename from src/portal/src/app/shared/confirmation-dialog/confirmation-state-message.ts rename to src/portal/src/app/base/global-confirmation-dialog/confirmation-state-message.ts index 275ce396ef..ac2767d625 100644 --- a/src/portal/src/app/shared/confirmation-dialog/confirmation-state-message.ts +++ b/src/portal/src/app/base/global-confirmation-dialog/confirmation-state-message.ts @@ -11,7 +11,7 @@ // 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. -import { ConfirmationState, ConfirmationTargets } from '../shared.const'; +import { ConfirmationState, ConfirmationTargets } from '../../shared/entities/shared.const'; export class ConfirmationAcknowledgement { constructor(state: ConfirmationState, data: any, source: ConfirmationTargets) { diff --git a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.html similarity index 100% rename from src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.html rename to src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.html diff --git a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss b/src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.scss similarity index 100% rename from src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.scss rename to src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.scss diff --git a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.spec.ts b/src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.spec.ts similarity index 80% rename from src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.spec.ts rename to src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.spec.ts index fa34f3f7d9..b42e5ea26d 100644 --- a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.spec.ts +++ b/src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.spec.ts @@ -1,6 +1,5 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { ConfirmationDialogComponent } from './confirmation-dialog.component'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ClarityModule } from '@clr/angular'; @@ -9,10 +8,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ConfirmationDialogService } from './confirmation-dialog.service'; +import { GlobalConfirmationDialogComponent } from "./global-confirmation-dialog.component"; describe('ConfirmationDialogComponent', () => { - let component: ConfirmationDialogComponent; - let fixture: ComponentFixture; + let component: GlobalConfirmationDialogComponent; + let fixture: ComponentFixture; const mockConfirmationDialogService = { confirmationAnnouced$: of({ title: "title", @@ -36,7 +36,7 @@ describe('ConfirmationDialogComponent', () => { NoopAnimationsModule, HttpClientTestingModule ], - declarations: [ConfirmationDialogComponent], + declarations: [GlobalConfirmationDialogComponent], providers: [ TranslateService, { provide: ConfirmationDialogService, useValue: mockConfirmationDialogService }, @@ -46,7 +46,7 @@ describe('ConfirmationDialogComponent', () => { })); beforeEach(() => { - fixture = TestBed.createComponent(ConfirmationDialogComponent); + fixture = TestBed.createComponent(GlobalConfirmationDialogComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.ts similarity index 87% rename from src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts rename to src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.ts index ecb1c75401..b8b43e1fd5 100644 --- a/src/portal/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/portal/src/app/base/global-confirmation-dialog/global-confirmation-dialog.component.ts @@ -14,19 +14,19 @@ import { Component, OnDestroy } from '@angular/core'; import { Subscription } from "rxjs"; import { TranslateService } from '@ngx-translate/core'; - -import { ConfirmationDialogService } from './confirmation-dialog.service'; import { ConfirmationMessage } from './confirmation-message'; -import { ConfirmationAcknowledgement } from './confirmation-state-message'; -import { ConfirmationState, ConfirmationTargets, ConfirmationButtons } from '../shared.const'; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../shared/entities/shared.const"; +import { ConfirmationDialogService } from "./confirmation-dialog.service"; +import { ConfirmationAcknowledgement } from "./confirmation-state-message"; + @Component({ - selector: 'confiramtion-dialog', - templateUrl: 'confirmation-dialog.component.html', - styleUrls: ['confirmation-dialog.component.scss'] + selector: 'global-confirmation-dialog', + templateUrl: 'global-confirmation-dialog.component.html', + styleUrls: ['global-confirmation-dialog.component.scss'] }) -export class ConfirmationDialogComponent implements OnDestroy { +export class GlobalConfirmationDialogComponent implements OnDestroy { opened: boolean = false; dialogTitle: string = ""; dialogContent: string = ""; diff --git a/src/portal/src/app/base/harbor-shell/harbor-shell.component.html b/src/portal/src/app/base/harbor-shell/harbor-shell.component.html index ab320db0d5..233d71c1f8 100644 --- a/src/portal/src/app/base/harbor-shell/harbor-shell.component.html +++ b/src/portal/src/app/base/harbor-shell/harbor-shell.component.html @@ -111,5 +111,5 @@ - + diff --git a/src/portal/src/app/base/harbor-shell/harbor-shell.component.spec.ts b/src/portal/src/app/base/harbor-shell/harbor-shell.component.spec.ts index f1d61f3afd..0ffc74411a 100644 --- a/src/portal/src/app/base/harbor-shell/harbor-shell.component.spec.ts +++ b/src/portal/src/app/base/harbor-shell/harbor-shell.component.spec.ts @@ -1,26 +1,26 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../../shared/services/session.service'; import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { SearchTriggerService } from '../global-search/search-trigger.service'; +import { SearchTriggerService } from '../../shared/components/global-search/search-trigger.service'; import { HarborShellComponent } from './harbor-shell.component'; import { ClarityModule } from "@clr/angular"; import { of } from 'rxjs'; -import { ConfigScannerService } from "../../config/scanner/config-scanner.service"; +import { ConfigScannerService } from "../left-side-nav/interrogation-services/scanner/config-scanner.service"; import { modalEvents } from '../modal-events.const'; -import { AccountSettingsModalComponent } from '../../account/account-settings/account-settings-modal.component'; -import { PasswordSettingComponent } from '../../account/password-setting/password-setting.component'; -import { AboutDialogComponent } from '../../shared/about-dialog/about-dialog.component'; +import { PasswordSettingComponent } from '../password-setting/password-setting.component'; +import { AboutDialogComponent } from '../../shared/components/about-dialog/about-dialog.component'; import { FormsModule } from '@angular/forms'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; -import { AccountSettingsModalService } from '../../account/account-settings/account-settings-modal-service.service'; -import { PasswordSettingService } from '../../account/password-setting/password-setting.service'; +import { MessageHandlerService } from '../../shared/services/message-handler.service'; +import { PasswordSettingService } from '../password-setting/password-setting.service'; import { SkinableConfig } from '../../services/skinable-config.service'; -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; import { AppConfigService } from "../../services/app-config.service"; -import { ErrorHandler } from '../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../shared/units/error-handler'; +import { AccountSettingsModalComponent } from "../account-settings/account-settings-modal.component"; +import { InlineAlertComponent } from "../../shared/components/inline-alert/inline-alert.component"; +import { AccountSettingsModalService } from "../account-settings/account-settings-modal-service.service"; describe('HarborShellComponent', () => { let component: HarborShellComponent; diff --git a/src/portal/src/app/base/harbor-shell/harbor-shell.component.ts b/src/portal/src/app/base/harbor-shell/harbor-shell.component.ts index 6a8ee6fe5d..0c135fa442 100644 --- a/src/portal/src/app/base/harbor-shell/harbor-shell.component.ts +++ b/src/portal/src/app/base/harbor-shell/harbor-shell.component.ts @@ -15,21 +15,19 @@ import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; import { Subscription } from "rxjs"; import { AppConfigService } from '../../services/app-config.service'; - import { ModalEvent } from '../modal-event'; import { modalEvents } from '../modal-events.const'; - -import { AccountSettingsModalComponent } from '../../account/account-settings/account-settings-modal.component'; -import { PasswordSettingComponent } from '../../account/password-setting/password-setting.component'; -import { NavigatorComponent } from '../navigator/navigator.component'; -import { SessionService } from '../../shared/session.service'; -import { AboutDialogComponent } from '../../shared/about-dialog/about-dialog.component'; -import { SearchTriggerService } from '../global-search/search-trigger.service'; -import { CommonRoutes } from "../../../lib/entities/shared.const"; -import { ConfigScannerService, SCANNERS_DOC } from "../../config/scanner/config-scanner.service"; +import { PasswordSettingComponent } from '../password-setting/password-setting.component'; +import { NavigatorComponent } from '../../shared/components/navigator/navigator.component'; +import { SessionService } from '../../shared/services/session.service'; +import { AboutDialogComponent } from '../../shared/components/about-dialog/about-dialog.component'; +import { SearchTriggerService } from '../../shared/components/global-search/search-trigger.service'; +import { CommonRoutes } from "../../shared/entities/shared.const"; +import { ConfigScannerService, SCANNERS_DOC } from "../left-side-nav/interrogation-services/scanner/config-scanner.service"; import { THEME_ARRAY, ThemeInterface } from "../../services/theme"; -import { clone } from "../../../lib/utils/utils"; +import { clone } from "../../shared/units/utils"; import { ThemeService } from "../../services/theme.service"; +import { AccountSettingsModalComponent } from "../account-settings/account-settings-modal.component"; const HAS_SHOWED_SCANNER_INFO: string = 'hasShowScannerInfo'; const YES: string = 'yes'; diff --git a/src/portal/src/app/config/auth/config-auth.component.html b/src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.html similarity index 100% rename from src/portal/src/app/config/auth/config-auth.component.html rename to src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.html diff --git a/src/portal/src/app/config/auth/config-auth.component.scss b/src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.scss similarity index 100% rename from src/portal/src/app/config/auth/config-auth.component.scss rename to src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.scss diff --git a/src/portal/src/app/config/auth/config-auth.component.spec.ts b/src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.spec.ts similarity index 87% rename from src/portal/src/app/config/auth/config-auth.component.spec.ts rename to src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.spec.ts index 8c993916c0..715979873f 100644 --- a/src/portal/src/app/config/auth/config-auth.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.spec.ts @@ -1,17 +1,17 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { ConfirmMessageHandler } from '../config.msg.utils'; -import { AppConfigService } from '../../services/app-config.service'; -import { ConfigurationService } from '../config.service'; +import { AppConfigService } from '../../../../services/app-config.service'; +import { ConfigurationService } from '../../../../services/config.service'; import { ConfigurationAuthComponent } from './config-auth.component'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { of } from 'rxjs'; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { SystemInfoService } from "../../../lib/services"; -import { clone } from '../../../lib/utils/utils'; -import { CONFIG_AUTH_MODE } from '../../../lib/entities/shared.const'; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { SystemInfoService } from "../../../../shared/services"; +import { clone } from '../../../../shared/units/utils'; +import { CONFIG_AUTH_MODE } from '../../../../shared/entities/shared.const'; describe('ConfigurationAuthComponent', () => { let component: ConfigurationAuthComponent; diff --git a/src/portal/src/app/config/auth/config-auth.component.ts b/src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.ts similarity index 92% rename from src/portal/src/app/config/auth/config-auth.component.ts rename to src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.ts index b28ae023bf..00d14e5d36 100644 --- a/src/portal/src/app/config/auth/config-auth.component.ts +++ b/src/portal/src/app/base/left-side-nav/config/auth/config-auth.component.ts @@ -14,17 +14,16 @@ import { Component, Input, ViewChild, SimpleChanges, OnChanges, OnInit, Output, EventEmitter } from '@angular/core'; import { NgForm } from '@angular/forms'; import { Subscription } from "rxjs"; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { ConfirmMessageHandler } from '../config.msg.utils'; -import { AppConfigService } from '../../services/app-config.service'; -import { ConfigurationService } from '../config.service'; -import { Configuration } from "../../../lib/components/config/config"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { errorHandler as errorHandlerFn } from "../../../lib/utils/shared/shared.utils"; - -import { SystemInfoService } from "../../../lib/services"; -import { clone, isEmpty, getChanges as getChangesFunc } from "../../../lib/utils/utils"; -import { CONFIG_AUTH_MODE } from "../../../lib/entities/shared.const"; +import { AppConfigService } from '../../../../services/app-config.service'; +import { ConfigurationService } from '../../../../services/config.service'; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { SystemInfoService } from "../../../../shared/services"; +import { clone, isEmpty, getChanges as getChangesFunc } from "../../../../shared/units/utils"; +import { CONFIG_AUTH_MODE } from "../../../../shared/entities/shared.const"; +import { errorHandler } from "../../../../shared/units/shared.utils"; +import { Configuration } from "../config"; const fakePass = 'aWpLOSYkIzJTTU4wMDkx'; @Component({ @@ -49,7 +48,7 @@ export class ConfigurationAuthComponent implements OnChanges, OnInit { private appConfigService: AppConfigService, private confirmMessageHandler: ConfirmMessageHandler, private systemInfo: SystemInfoService, - private errorHandler: ErrorHandler, + private errorHandlerEntity: ErrorHandler, ) { } ngOnInit() { @@ -58,7 +57,7 @@ export class ConfigurationAuthComponent implements OnChanges, OnInit { getSystemInfo(): void { this.systemInfo.getSystemInfo() .subscribe(systemInfo => (this.redirectUrl = systemInfo.external_url) - , error => this.errorHandler.error(error)); + , error => this.errorHandlerEntity.error(error)); } get checkable() { return this.currentConfig && @@ -144,7 +143,7 @@ export class ConfigurationAuthComponent implements OnChanges, OnInit { this.msgHandler.showSuccess('CONFIG.TEST_LDAP_SUCCESS'); }, error => { this.testingOnGoing = false; - let err = errorHandlerFn(error); + let err = errorHandler(error); if (!err || !err.trim()) { err = 'UNKNOWN'; } @@ -165,10 +164,9 @@ export class ConfigurationAuthComponent implements OnChanges, OnInit { this.msgHandler.showSuccess('CONFIG.TEST_OIDC_SUCCESS'); }, error => { this.testingOnGoing = false; - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } - } public get showTestingServerBtn(): boolean { diff --git a/src/portal/src/app/config/config.component.html b/src/portal/src/app/base/left-side-nav/config/config.component.html similarity index 100% rename from src/portal/src/app/config/config.component.html rename to src/portal/src/app/base/left-side-nav/config/config.component.html diff --git a/src/portal/src/app/config/config.component.scss b/src/portal/src/app/base/left-side-nav/config/config.component.scss similarity index 100% rename from src/portal/src/app/config/config.component.scss rename to src/portal/src/app/base/left-side-nav/config/config.component.scss diff --git a/src/portal/src/app/config/config.component.spec.ts b/src/portal/src/app/base/left-side-nav/config/config.component.spec.ts similarity index 84% rename from src/portal/src/app/config/config.component.spec.ts rename to src/portal/src/app/base/left-side-nav/config/config.component.spec.ts index e92e6606f5..4cdac61ae4 100644 --- a/src/portal/src/app/config/config.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/config/config.component.spec.ts @@ -1,17 +1,17 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SessionService } from '../shared/session.service'; -import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; +import { SessionService } from '../../../shared/services/session.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ClarityModule } from "@clr/angular"; -import { AppConfigService } from '../services/app-config.service'; -import { ConfigurationService } from './config.service'; +import { AppConfigService } from '../../../services/app-config.service'; +import { ConfigurationService } from '../../../services/config.service'; import { ConfigurationComponent } from './config.component'; import { of } from 'rxjs'; -import { ConfirmationAcknowledgement } from '../shared/confirmation-dialog/confirmation-state-message'; -import { ConfirmationState, ConfirmationTargets } from '../shared/shared.const'; -import { Configuration } from '../../lib/components/config/config'; +import { Configuration } from './config'; +import { ConfirmationState, ConfirmationTargets } from "../../../shared/entities/shared.const"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationAcknowledgement } from "../../global-confirmation-dialog/confirmation-state-message"; describe('ConfigurationComponent', () => { let component: ConfigurationComponent; diff --git a/src/portal/src/app/config/config.component.ts b/src/portal/src/app/base/left-side-nav/config/config.component.ts similarity index 88% rename from src/portal/src/app/config/config.component.ts rename to src/portal/src/app/base/left-side-nav/config/config.component.ts index 284d696e56..0e0e25322b 100644 --- a/src/portal/src/app/config/config.component.ts +++ b/src/portal/src/app/base/left-side-nav/config/config.component.ts @@ -13,17 +13,17 @@ // limitations under the License. import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { Subscription } from "rxjs"; -import { ConfirmationTargets, ConfirmationState } from '../shared/shared.const'; -import { SessionService } from '../shared/session.service'; -import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; -import { AppConfigService } from '../services/app-config.service'; +import { SessionService } from '../../../shared/services/session.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { AppConfigService } from '../../../services/app-config.service'; import { ConfigurationAuthComponent } from './auth/config-auth.component'; import { ConfigurationEmailComponent } from './email/config-email.component'; -import { ConfigurationService } from './config.service'; -import { Configuration, StringValueItem } from "../../lib/components/config/config"; -import { SystemSettingsComponent } from "../../lib/components/config/system/system-settings.component"; -import { clone, isEmpty } from "../../lib/utils/utils"; +import { ConfigurationService } from '../../../services/config.service'; +import { Configuration, StringValueItem } from "./config"; +import { SystemSettingsComponent } from "./system/system-settings.component"; +import { clone, isEmpty } from "../../../shared/units/utils"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationState, ConfirmationTargets } from "../../../shared/entities/shared.const"; const fakePass = 'aWpLOSYkIzJTTU4wMDkx'; const TabLinkContentMap = { diff --git a/src/portal/src/app/config/config.module.ts b/src/portal/src/app/base/left-side-nav/config/config.module.ts similarity index 56% rename from src/portal/src/app/config/config.module.ts rename to src/portal/src/app/base/left-side-nav/config/config.module.ts index 1934c4fd7e..d1f80dad2f 100644 --- a/src/portal/src/app/config/config.module.ts +++ b/src/portal/src/app/base/left-side-nav/config/config.module.ts @@ -13,37 +13,33 @@ // limitations under the License. import { NgModule } from "@angular/core"; -import { CoreModule } from "../core/core.module"; -import { SharedModule } from "../shared/shared.module"; - +import { SharedModule } from "../../../shared/shared.module"; import { ConfigurationComponent } from "./config.component"; -import { ConfigurationService } from "./config.service"; import { ConfirmMessageHandler } from "./config.msg.utils"; import { ConfigurationAuthComponent } from "./auth/config-auth.component"; import { ConfigurationEmailComponent } from "./email/config-email.component"; -import { ConfigurationScannerComponent } from "./scanner/config-scanner.component"; -import { NewScannerModalComponent } from "./scanner/new-scanner-modal/new-scanner-modal.component"; -import { NewScannerFormComponent } from "./scanner/new-scanner-form/new-scanner-form.component"; -import { ConfigScannerService } from "./scanner/config-scanner.service"; -import { ScannerMetadataComponent } from "./scanner/scanner-metadata/scanner-metadata.component"; - +import { SystemSettingsComponent } from "./system/system-settings.component"; +import { RouterModule, Routes } from "@angular/router"; +const routes: Routes = [ + { + path: '', + component: ConfigurationComponent + } +]; @NgModule({ - imports: [CoreModule, SharedModule], + imports: [ + SharedModule, + RouterModule.forChild(routes) + ], declarations: [ ConfigurationComponent, ConfigurationAuthComponent, ConfigurationEmailComponent, - ConfigurationScannerComponent, - NewScannerModalComponent, - NewScannerFormComponent, - ScannerMetadataComponent + SystemSettingsComponent ], - exports: [ConfigurationComponent], providers: [ - ConfigurationService, ConfirmMessageHandler, - ConfigScannerService, ] }) export class ConfigurationModule { diff --git a/src/portal/src/app/config/config.msg.utils.ts b/src/portal/src/app/base/left-side-nav/config/config.msg.utils.ts similarity index 63% rename from src/portal/src/app/config/config.msg.utils.ts rename to src/portal/src/app/base/left-side-nav/config/config.msg.utils.ts index 58e5553883..6a6a87240e 100644 --- a/src/portal/src/app/config/config.msg.utils.ts +++ b/src/portal/src/app/base/left-side-nav/config/config.msg.utils.ts @@ -1,7 +1,7 @@ -import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; -import { ConfirmationMessage } from '../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationTargets } from '../shared/shared.const'; import { Injectable } from '@angular/core'; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationTargets } from "../../../shared/entities/shared.const"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; @Injectable() export class ConfirmMessageHandler { diff --git a/src/portal/src/lib/components/config/config.ts b/src/portal/src/app/base/left-side-nav/config/config.ts similarity index 100% rename from src/portal/src/lib/components/config/config.ts rename to src/portal/src/app/base/left-side-nav/config/config.ts diff --git a/src/portal/src/app/config/email/config-email.component.html b/src/portal/src/app/base/left-side-nav/config/email/config-email.component.html similarity index 100% rename from src/portal/src/app/config/email/config-email.component.html rename to src/portal/src/app/base/left-side-nav/config/email/config-email.component.html diff --git a/src/portal/src/app/config/email/config-email.component.scss b/src/portal/src/app/base/left-side-nav/config/email/config-email.component.scss similarity index 100% rename from src/portal/src/app/config/email/config-email.component.scss rename to src/portal/src/app/base/left-side-nav/config/email/config-email.component.scss diff --git a/src/portal/src/app/config/email/config-email.component.spec.ts b/src/portal/src/app/base/left-side-nav/config/email/config-email.component.spec.ts similarity index 92% rename from src/portal/src/app/config/email/config-email.component.spec.ts rename to src/portal/src/app/base/left-side-nav/config/email/config-email.component.spec.ts index 66d8317738..e7da3538d0 100644 --- a/src/portal/src/app/config/email/config-email.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/config/email/config-email.component.spec.ts @@ -1,12 +1,12 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { ConfirmMessageHandler } from '../config.msg.utils'; -import { ConfigurationService } from '../config.service'; +import { ConfigurationService } from '../../../../services/config.service'; import { ConfigurationEmailComponent } from './config-email.component'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { clone } from '../../../lib/utils/utils'; +import { clone } from '../../../../shared/units/utils'; import { of } from 'rxjs'; describe('ConfigurationEmailComponent', () => { diff --git a/src/portal/src/app/config/email/config-email.component.ts b/src/portal/src/app/base/left-side-nav/config/email/config-email.component.ts similarity index 93% rename from src/portal/src/app/config/email/config-email.component.ts rename to src/portal/src/app/base/left-side-nav/config/email/config-email.component.ts index 170b8db3ad..c180cbfda5 100644 --- a/src/portal/src/app/config/email/config-email.component.ts +++ b/src/portal/src/app/base/left-side-nav/config/email/config-email.component.ts @@ -13,13 +13,13 @@ // limitations under the License. import { Component, Input, ViewChild, SimpleChanges, OnChanges, Output, EventEmitter } from '@angular/core'; import { NgForm } from '@angular/forms'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { ConfirmMessageHandler } from '../config.msg.utils'; -import { ConfigurationService } from '../config.service'; -import { Configuration } from "../../../lib/components/config/config"; -import { isEmpty, getChanges as getChangesFunc, clone } from "../../../lib/utils/utils"; -import { errorHandler } from "../../../lib/utils/shared/shared.utils"; -const fakePass = 'aWpLOSYkIzJTTU4wMDkx'; +import { ConfigurationService } from '../../../../services/config.service'; +import { Configuration } from "../config"; +import { isEmpty, getChanges as getChangesFunc, clone } from "../../../../shared/units/utils"; +import { errorHandler } from "../../../../shared/units/shared.utils"; + @Component({ selector: 'config-email', templateUrl: "config-email.component.html", diff --git a/src/portal/src/lib/components/config/system/system-settings.component.html b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html similarity index 100% rename from src/portal/src/lib/components/config/system/system-settings.component.html rename to src/portal/src/app/base/left-side-nav/config/system/system-settings.component.html diff --git a/src/portal/src/lib/components/config/system/system-settings.component.scss b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.scss similarity index 83% rename from src/portal/src/lib/components/config/system/system-settings.component.scss rename to src/portal/src/app/base/left-side-nav/config/system/system-settings.component.scss index d9bafdb5e0..7338f1c770 100644 --- a/src/portal/src/lib/components/config/system/system-settings.component.scss +++ b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.scss @@ -112,3 +112,27 @@ transform: translateY(-50%); } } +.info-tips-icon { + color: grey; +} + +.info-tips-icon:hover { + color: #007CBB; +} + +.replication-config { + margin-top: 0; + margin-bottom: 0; +} + +.replication-text { + font-size: 14px; + font-weight: 600; +} + +.replication-tooltip { + top: -8px; +} +.margin-top-3px { + margin-top: 3px; +} diff --git a/src/portal/src/lib/components/config/system/system-settings.component.spec.ts b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.spec.ts similarity index 81% rename from src/portal/src/lib/components/config/system/system-settings.component.spec.ts rename to src/portal/src/app/base/left-side-nav/config/system/system-settings.component.spec.ts index 2bfee9bc8c..2cd8931da8 100644 --- a/src/portal/src/lib/components/config/system/system-settings.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.spec.ts @@ -1,19 +1,14 @@ import { ComponentFixture, ComponentFixtureAutoDetect, TestBed } from '@angular/core/testing'; -import { HarborLibraryModule } from "../../../harbor-library.module"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../entities/service.config"; import { SystemSettingsComponent } from "./system-settings.component"; -import { ConfigurationService, SystemInfoService } from "../../../services"; -import { ErrorHandler } from "../../../utils/error-handler"; +import { SystemInfoService } from "../../../../shared/services"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; import { of } from "rxjs"; import { StringValueItem } from "../config"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { CURRENT_BASE_HREF } from "../../../utils/utils"; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('SystemSettingsComponent', () => { let component: SystemSettingsComponent; let fixture: ComponentFixture; - const config: IServiceConfig = { - baseEndpoint: CURRENT_BASE_HREF + "/testing" - }; const mockedAllowlist = { id: 1, project_id: 1, @@ -41,17 +36,18 @@ describe('SystemSettingsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - HarborLibraryModule, + SharedTestingModule, BrowserAnimationsModule ], providers: [ - ConfigurationService, { provide: ErrorHandler, useValue: fakedErrorHandler }, { provide: SystemInfoService, useValue: fakedSystemInfoService }, - { provide: SERVICE_CONFIG, useValue: config }, // open auto detect { provide: ComponentFixtureAutoDetect, useValue: true } - ] + ], + declarations: [ + SystemSettingsComponent + ] }); }); beforeEach(() => { diff --git a/src/portal/src/lib/components/config/system/system-settings.component.ts b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.ts similarity index 91% rename from src/portal/src/lib/components/config/system/system-settings.component.ts rename to src/portal/src/app/base/left-side-nav/config/system/system-settings.component.ts index 1b8163d303..f8ad46e5f0 100644 --- a/src/portal/src/lib/components/config/system/system-settings.component.ts +++ b/src/portal/src/app/base/left-side-nav/config/system/system-settings.component.ts @@ -5,24 +5,22 @@ import { Output, EventEmitter, ViewChild, - Inject, OnChanges, SimpleChanges, ElementRef } from '@angular/core'; import {NgForm} from '@angular/forms'; import {Configuration, StringValueItem} from '../config'; -import {SERVICE_CONFIG, IServiceConfig} from '../../../entities/service.config'; -import {clone, isEmpty, getChanges, compareValue} from '../../../utils/utils'; -import {ErrorHandler} from '../../../utils/error-handler'; -import {ConfirmationMessage} from '../../confirmation-dialog/confirmation-message'; -import {ConfirmationDialogComponent} from '../../confirmation-dialog/confirmation-dialog.component'; -import {ConfirmationState, ConfirmationTargets} from '../../../entities/shared.const'; -import {ConfirmationAcknowledgement} from '../../confirmation-dialog/confirmation-state-message'; -import { - ConfigurationService, SystemCVEAllowlist, SystemInfo, SystemInfoService, VulnerabilityItem -} from '../../../services'; +import { clone, isEmpty, getChanges, compareValue, CURRENT_BASE_HREF } from '../../../../shared/units/utils'; +import {ErrorHandler} from '../../../../shared/units/error-handler'; +import {ConfirmationMessage} from '../../../global-confirmation-dialog/confirmation-message'; +import {ConfirmationDialogComponent} from '../../../../shared/components/confirmation-dialog'; +import {ConfirmationState, ConfirmationTargets} from '../../../../shared/entities/shared.const'; +import {ConfirmationAcknowledgement} from '../../../global-confirmation-dialog/confirmation-state-message'; +import { SystemCVEAllowlist, SystemInfo, SystemInfoService, +} from '../../../../shared/services'; import {forkJoin} from "rxjs"; +import { ConfigurationService } from "../../../../services/config.service"; const fakePass = 'aWpLOSYkIzJTTU4wMDkx'; const ONE_THOUSAND: number = 1000; @@ -32,7 +30,7 @@ const TARGET_BLANK = "_blank"; @Component({ selector: 'system-settings', templateUrl: './system-settings.component.html', - styleUrls: ['./system-settings.component.scss', '../registry-config.component.scss'] + styleUrls: ['./system-settings.component.scss'] }) export class SystemSettingsComponent implements OnChanges, OnInit { config: Configuration = new Configuration(); @@ -161,7 +159,7 @@ export class SystemSettingsComponent implements OnChanges, OnInit { this.onGoing = true; let observables = []; if (!isEmpty(changes)) { - observables.push(this.configService.saveConfigurations(changes)); + observables.push(this.configService.saveConfiguration(changes)); } if (!compareValue(this.systemAllowlistOrigin, this.systemAllowlist)) { observables.push(this.systemInfoService.updateSystemAllowlist(this.systemAllowlist)); @@ -197,7 +195,7 @@ export class SystemSettingsComponent implements OnChanges, OnInit { retrieveConfig(): void { this.onGoing = true; - this.configService.getConfigurations() + this.configService.getConfiguration() .subscribe((configurations: Configuration) => { this.onGoing = false; // Add two password fields @@ -263,13 +261,11 @@ export class SystemSettingsComponent implements OnChanges, OnInit { } } - constructor(@Inject(SERVICE_CONFIG) private configInfo: IServiceConfig, + constructor( private configService: ConfigurationService, private errorHandler: ErrorHandler, private systemInfoService: SystemInfoService) { - if (this.configInfo && this.configInfo.systemInfoEndpoint) { - this.downloadLink = this.configInfo.systemInfoEndpoint + "/getcert"; - } + this.downloadLink = CURRENT_BASE_HREF + "/systeminfo/getcert"; } ngOnInit() { diff --git a/src/portal/src/app/distribution/base.scss b/src/portal/src/app/base/left-side-nav/distribution/base.scss similarity index 100% rename from src/portal/src/app/distribution/base.scss rename to src/portal/src/app/base/left-side-nav/distribution/base.scss diff --git a/src/portal/src/app/distribution/distribution-instances/distribution-instances.component.html b/src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.html similarity index 100% rename from src/portal/src/app/distribution/distribution-instances/distribution-instances.component.html rename to src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.html diff --git a/src/portal/src/app/distribution/distribution-instances/distribution-instances.component.scss b/src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.scss similarity index 95% rename from src/portal/src/app/distribution/distribution-instances/distribution-instances.component.scss rename to src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.scss index 63b7653489..11ceadcd95 100644 --- a/src/portal/src/app/distribution/distribution-instances/distribution-instances.component.scss +++ b/src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.scss @@ -1,4 +1,4 @@ -@import "../base.scss"; +@import "../base"; $refrsh-btn-color: #007CBB; .refresh-btn { @include refresh-button diff --git a/src/portal/src/app/distribution/distribution-instances/distribution-instances.component.spec.ts b/src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.spec.ts similarity index 92% rename from src/portal/src/app/distribution/distribution-instances/distribution-instances.component.spec.ts rename to src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.spec.ts index 16b3397e48..1a76f46a0c 100644 --- a/src/portal/src/app/distribution/distribution-instances/distribution-instances.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.spec.ts @@ -1,16 +1,16 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { ClarityModule } from '@clr/angular'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedTestingModule } from '../../../../shared/shared.module'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { DistributionInstancesComponent } from './distribution-instances.component'; -import { PreheatService } from "../../../../ng-swagger-gen/services/preheat.service"; -import { Instance } from '../../../../ng-swagger-gen/models/instance'; +import { PreheatService } from "../../../../../../ng-swagger-gen/services/preheat.service"; +import { Instance } from '../../../../../../ng-swagger-gen/models/instance'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; -import { Metadata } from '../../../../ng-swagger-gen/models/metadata'; +import { Metadata } from '../../../../../../ng-swagger-gen/models/metadata'; import { DistributionSetupModalComponent } from '../distribution-setup-modal/distribution-setup-modal.component'; describe('DistributionInstanceComponent', () => { @@ -101,7 +101,7 @@ describe('DistributionInstanceComponent', () => { imports: [ ClarityModule, TranslateModule, - SharedModule, + SharedTestingModule, HttpClientTestingModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA], diff --git a/src/portal/src/app/distribution/distribution-instances/distribution-instances.component.ts b/src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.ts similarity index 92% rename from src/portal/src/app/distribution/distribution-instances/distribution-instances.component.ts rename to src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.ts index 0c3e1c940d..60924e6b12 100644 --- a/src/portal/src/app/distribution/distribution-instances/distribution-instances.component.ts +++ b/src/portal/src/app/base/left-side-nav/distribution/distribution-instances/distribution-instances.component.ts @@ -1,4 +1,4 @@ -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; import { Subscription, @@ -7,28 +7,24 @@ import { throwError as observableThrowError } from 'rxjs'; import { DistributionSetupModalComponent } from '../distribution-setup-modal/distribution-setup-modal.component'; -import { OperationService } from '../../../lib/components/operation/operation.service'; -import { - ConfirmationState, - ConfirmationTargets, - ConfirmationButtons -} from '../../shared/shared.const'; -import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service'; -import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; +import { OperationService } from '../../../../shared/components/operation/operation.service'; import { operateChanges, OperateInfo, OperationState -} from '../../../lib/components/operation/operate'; +} from '../../../../shared/components/operation/operate'; import { TranslateService } from '@ngx-translate/core'; import { map, catchError, finalize } from 'rxjs/operators'; -import { errorHandler } from '../../../lib/utils/shared/shared.utils'; -import { clone, DEFAULT_PAGE_SIZE } from '../../../lib/utils/utils'; -import { Instance } from "../../../../ng-swagger-gen/models/instance"; -import { PreheatService } from "../../../../ng-swagger-gen/services/preheat.service"; -import { Metadata } from '../../../../ng-swagger-gen/models/metadata'; +import { clone, DEFAULT_PAGE_SIZE } from '../../../../shared/units/utils'; +import { Instance } from "../../../../../../ng-swagger-gen/models/instance"; +import { PreheatService } from "../../../../../../ng-swagger-gen/services/preheat.service"; +import { Metadata } from '../../../../../../ng-swagger-gen/models/metadata'; import { FrontInstance, HEALTHY, UNHEALTHY } from '../distribution-interface'; import { ClrDatagridStateInterface } from '@clr/angular'; +import { ConfirmationDialogService } from "../../../global-confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../../shared/entities/shared.const"; +import { errorHandler } from "../../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../../global-confirmation-dialog/confirmation-message"; interface MultiOperateData { operation: string; diff --git a/src/portal/src/app/distribution/distribution-interface.ts b/src/portal/src/app/base/left-side-nav/distribution/distribution-interface.ts similarity index 87% rename from src/portal/src/app/distribution/distribution-interface.ts rename to src/portal/src/app/base/left-side-nav/distribution/distribution-interface.ts index c555ceca42..6e6adcf172 100644 --- a/src/portal/src/app/distribution/distribution-interface.ts +++ b/src/portal/src/app/base/left-side-nav/distribution/distribution-interface.ts @@ -1,4 +1,4 @@ -import { Instance } from '../../../ng-swagger-gen/models/instance'; +import { Instance } from '../../../../../ng-swagger-gen/models/instance'; export class AuthMode { static NONE = 'NONE'; diff --git a/src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.html b/src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.html similarity index 100% rename from src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.html rename to src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.html diff --git a/src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.scss b/src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.scss similarity index 100% rename from src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.scss rename to src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.scss diff --git a/src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.spec.ts b/src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.spec.ts similarity index 92% rename from src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.spec.ts rename to src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.spec.ts index 9fa751520d..5161a4febf 100644 --- a/src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.spec.ts @@ -1,12 +1,12 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ClarityModule } from '@clr/angular'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedTestingModule } from '../../../../shared/shared.module'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { DistributionSetupModalComponent } from './distribution-setup-modal.component'; -import { PreheatService } from "../../../../ng-swagger-gen/services/preheat.service"; -import { Instance } from '../../../../ng-swagger-gen/models/instance'; +import { PreheatService } from "../../../../../../ng-swagger-gen/services/preheat.service"; +import { Instance } from '../../../../../../ng-swagger-gen/models/instance'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; @@ -37,7 +37,7 @@ describe('DistributionSetupModalComponent', () => { imports: [ ClarityModule, TranslateModule, - SharedModule, + SharedTestingModule, HttpClientTestingModule ], schemas: [CUSTOM_ELEMENTS_SCHEMA], diff --git a/src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.ts b/src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.ts similarity index 94% rename from src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.ts rename to src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.ts index 81004ccd04..18aa2c1862 100644 --- a/src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.ts +++ b/src/portal/src/app/base/left-side-nav/distribution/distribution-setup-modal/distribution-setup-modal.component.ts @@ -1,4 +1,4 @@ -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { Component, EventEmitter, @@ -10,18 +10,18 @@ import { } from '@angular/core'; import { NgForm } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; -import { errorHandler } from '../../../lib/utils/shared/shared.utils'; -import { PreheatService } from '../../../../ng-swagger-gen/services/preheat.service'; -import { Instance } from '../../../../ng-swagger-gen/models/instance'; +import { PreheatService } from '../../../../../../ng-swagger-gen/services/preheat.service'; +import { Instance } from '../../../../../../ng-swagger-gen/models/instance'; import { AuthMode, FrontInstance } from '../distribution-interface'; -import { clone } from '../../../lib/utils/utils'; -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; +import { clone } from '../../../../shared/units/utils'; import { ClrLoadingState } from '@clr/angular'; -import { Metadata } from '../../../../ng-swagger-gen/models/metadata'; -import { operateChanges, OperateInfo, OperationState } from '../../../lib/components/operation/operate'; -import { OperationService } from '../../../lib/components/operation/operation.service'; +import { Metadata } from '../../../../../../ng-swagger-gen/models/metadata'; +import { operateChanges, OperateInfo, OperationState } from '../../../../shared/components/operation/operate'; +import { OperationService } from '../../../../shared/components/operation/operation.service'; import { debounceTime, distinctUntilChanged, filter, finalize, switchMap } from 'rxjs/operators'; import { Subject, Subscription } from 'rxjs'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { errorHandler } from "../../../../shared/units/shared.utils"; const DEFAULT_PROVIDER: string = 'dragonfly'; diff --git a/src/portal/src/app/distribution/distribution.module.ts b/src/portal/src/app/base/left-side-nav/distribution/distribution.module.ts similarity index 53% rename from src/portal/src/app/distribution/distribution.module.ts rename to src/portal/src/app/base/left-side-nav/distribution/distribution.module.ts index 2a850b8d8c..fcd10fe0c6 100644 --- a/src/portal/src/app/distribution/distribution.module.ts +++ b/src/portal/src/app/base/left-side-nav/distribution/distribution.module.ts @@ -1,11 +1,21 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { DistributionInstancesComponent } from './distribution-instances/distribution-instances.component'; import { DistributionSetupModalComponent } from './distribution-setup-modal/distribution-setup-modal.component'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '../../../shared/shared.module'; +import { RouterModule, Routes } from "@angular/router"; +const routes: Routes = [ + { + path: 'instances', + component: DistributionInstancesComponent + }, + { path: '', redirectTo: 'instances', pathMatch: 'full' }, +]; @NgModule({ - imports: [CommonModule, SharedModule], + imports: [ + SharedModule, + RouterModule.forChild(routes) + ], declarations: [ DistributionSetupModalComponent, DistributionInstancesComponent diff --git a/src/portal/src/app/gc-page/gc-page.component.html b/src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.html similarity index 100% rename from src/portal/src/app/gc-page/gc-page.component.html rename to src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.html diff --git a/src/portal/src/app/gc-page/gc-page.component.scss b/src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.scss similarity index 100% rename from src/portal/src/app/gc-page/gc-page.component.scss rename to src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.scss diff --git a/src/portal/src/app/gc-page/gc-page.component.spec.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.spec.ts similarity index 94% rename from src/portal/src/app/gc-page/gc-page.component.spec.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.spec.ts index 41ef3be18b..01857ee1de 100644 --- a/src/portal/src/app/gc-page/gc-page.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.spec.ts @@ -2,7 +2,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ClarityModule } from '@clr/angular'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { SessionService } from "../shared/session.service"; +import { SessionService } from "../../../shared/services/session.service"; import { GcPageComponent } from './gc-page.component'; describe('GcPageComponent', () => { diff --git a/src/portal/src/app/gc-page/gc-page.component.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.ts similarity index 87% rename from src/portal/src/app/gc-page/gc-page.component.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.ts index 00bf2a3dcc..90cef9fb52 100644 --- a/src/portal/src/app/gc-page/gc-page.component.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc-page.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from "@angular/core"; -import { SessionService } from "../shared/session.service"; +import { SessionService } from "../../../shared/services/session.service"; @Component({ selector: "app-gc-page", diff --git a/src/portal/src/app/base/left-side-nav/gc-page/gc.module.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc.module.ts new file mode 100644 index 0000000000..447fbadf87 --- /dev/null +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc.module.ts @@ -0,0 +1,33 @@ +import { NgModule } from "@angular/core"; +import { RouterModule, Routes } from "@angular/router"; +import { GcPageComponent } from "./gc-page.component"; +import { GcComponent } from "./gc/gc.component"; +import { GcHistoryComponent } from "./gc/gc-history/gc-history.component"; +import { GcRepoService } from "./gc/gc.service"; +import { SharedModule } from "../../../shared/shared.module"; +import { GcApiDefaultRepository, GcApiRepository } from "./gc/gc.api.repository"; +import { GcViewModelFactory } from "./gc/gc.viewmodel.factory"; + +const routes: Routes = [ + { + path: '', + component: GcPageComponent + } +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes) + ], + declarations: [ + GcPageComponent, + GcComponent, + GcHistoryComponent + ], + providers: [ + GcRepoService, + {provide: GcApiRepository, useClass: GcApiDefaultRepository }, + GcViewModelFactory + ] +}) +export class GcModule {} diff --git a/src/portal/src/lib/components/config/gc/gc-history/gc-history.component.html b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.html similarity index 100% rename from src/portal/src/lib/components/config/gc/gc-history/gc-history.component.html rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.html diff --git a/src/portal/src/lib/components/config/gc/gc-history/gc-history.component.scss b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.scss similarity index 100% rename from src/portal/src/lib/components/config/gc/gc-history/gc-history.component.scss rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.scss diff --git a/src/portal/src/lib/components/config/gc/gc-history/gc-history.component.spec.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.spec.ts similarity index 93% rename from src/portal/src/lib/components/config/gc/gc-history/gc-history.component.spec.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.spec.ts index c3cd1d3afb..565a2c225a 100644 --- a/src/portal/src/lib/components/config/gc/gc-history/gc-history.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.spec.ts @@ -1,19 +1,17 @@ import { ComponentFixture, ComponentFixtureAutoDetect, - fakeAsync, TestBed, - tick, waitForAsync } from '@angular/core/testing'; -import { SharedModule } from '../../../../utils/shared/shared.module'; import { GcRepoService } from "../gc.service"; import { of } from 'rxjs'; import { GcViewModelFactory } from "../gc.viewmodel.factory"; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { ErrorHandler } from '../../../../utils/error-handler'; +import { ErrorHandler } from '../../../../../shared/units/error-handler'; import { GcHistoryComponent } from './gc-history.component'; import { GcJobData } from "../gcLog"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; describe('GcHistoryComponent', () => { let component: GcHistoryComponent; @@ -64,7 +62,7 @@ describe('GcHistoryComponent', () => { TestBed.configureTestingModule({ declarations: [GcHistoryComponent], imports: [ - SharedModule, + SharedTestingModule, TranslateModule.forRoot() ], providers: [ diff --git a/src/portal/src/lib/components/config/gc/gc-history/gc-history.component.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.ts similarity index 93% rename from src/portal/src/lib/components/config/gc/gc-history/gc-history.component.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.ts index 1ecb868cab..1bc51754f5 100644 --- a/src/portal/src/lib/components/config/gc/gc-history/gc-history.component.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc-history/gc-history.component.ts @@ -2,9 +2,9 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { GcRepoService } from "../gc.service"; import { GcJobViewModel } from "../gcLog"; import { GcViewModelFactory } from "../gc.viewmodel.factory"; -import { ErrorHandler } from "../../../../utils/error-handler"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; import { Subscription, timer } from "rxjs"; -import { REFRESH_TIME_DIFFERENCE } from '../../../../entities/shared.const'; +import { REFRESH_TIME_DIFFERENCE } from '../../../../../shared/entities/shared.const'; const JOB_STATUS = { PENDING: "pending", RUNNING: "running" diff --git a/src/portal/src/lib/components/config/gc/gc.api.repository.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.api.repository.ts similarity index 64% rename from src/portal/src/lib/components/config/gc/gc.api.repository.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc.api.repository.ts index 9c9f754de9..f5c8699dfc 100644 --- a/src/portal/src/lib/components/config/gc/gc.api.repository.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.api.repository.ts @@ -1,9 +1,8 @@ - -import { Injectable, Inject } from '@angular/core'; +import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { throwError as observableThrowError, Observable } from 'rxjs'; -import { catchError, map } from 'rxjs/operators'; -import { SERVICE_CONFIG, IServiceConfig } from "../../../entities/service.config"; +import { catchError } from 'rxjs/operators'; +import { CURRENT_BASE_HREF } from "../../../../shared/units/utils"; export abstract class GcApiRepository { abstract postSchedule(param): Observable; @@ -24,44 +23,43 @@ export abstract class GcApiRepository { @Injectable() export class GcApiDefaultRepository extends GcApiRepository { constructor( - private http: HttpClient, - @Inject(SERVICE_CONFIG) private config: IServiceConfig + private http: HttpClient ) { super(); } public postSchedule(param): Observable { - return this.http.post(`${this.config.gcEndpoint}/schedule`, param) + return this.http.post(`${CURRENT_BASE_HREF}/system/gc/schedule`, param) .pipe(catchError(error => observableThrowError(error))); } public putSchedule(param): Observable { - return this.http.put(`${this.config.gcEndpoint}/schedule`, param) + return this.http.put(`${CURRENT_BASE_HREF}/system/gc/schedule`, param) .pipe(catchError(error => observableThrowError(error))); } public getSchedule(): Observable { - return this.http.get(`${this.config.gcEndpoint}/schedule`) + return this.http.get(`${CURRENT_BASE_HREF}/system/gc/schedule`) .pipe(catchError(error => observableThrowError(error))); } public getLog(id): Observable { - return this.http.get(`${this.config.gcEndpoint}/${id}/log`) + return this.http.get(`${CURRENT_BASE_HREF}/system/gc/${id}/log`) .pipe(catchError(error => observableThrowError(error))); } public getStatus(id): Observable { - return this.http.get(`${this.config.gcEndpoint}/id`) + return this.http.get(`${CURRENT_BASE_HREF}/system/gc/${id}`) .pipe(catchError(error => observableThrowError(error))); } public getJobs(): Observable { - return this.http.get(`${this.config.gcEndpoint}`) + return this.http.get(`${CURRENT_BASE_HREF}/system/gc`) .pipe(catchError(error => observableThrowError(error))); } public getLogLink(id) { - return `${this.config.gcEndpoint}/${id}/log`; + return `${CURRENT_BASE_HREF}/system/gc/${id}/log`; } } diff --git a/src/portal/src/lib/components/config/gc/gc.component.html b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.html similarity index 100% rename from src/portal/src/lib/components/config/gc/gc.component.html rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.html diff --git a/src/portal/src/lib/components/config/gc/gc.component.scss b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.scss similarity index 100% rename from src/portal/src/lib/components/config/gc/gc.component.scss rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.scss diff --git a/src/portal/src/lib/components/config/gc/gc.component.spec.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.spec.ts similarity index 79% rename from src/portal/src/lib/components/config/gc/gc.component.spec.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.spec.ts index 08ea2b5c98..12e112bdaf 100644 --- a/src/portal/src/lib/components/config/gc/gc.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.spec.ts @@ -1,24 +1,20 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { GcComponent } from './gc.component'; -import { SERVICE_CONFIG, IServiceConfig } from '../../../entities/service.config'; import { GcApiRepository, GcApiDefaultRepository} from './gc.api.repository'; import { GcRepoService } from './gc.service'; -import { SharedModule } from "../../../utils/shared/shared.module"; -import { ErrorHandler } from '../../../utils/error-handler/error-handler'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; import { GcViewModelFactory } from './gc.viewmodel.factory'; -import { CronScheduleComponent } from '../../cron-schedule/cron-schedule.component'; -import { CronTooltipComponent } from "../../cron-schedule/cron-tooltip/cron-tooltip.component"; +import { CronScheduleComponent } from '../../../../shared/components/cron-schedule'; +import { CronTooltipComponent } from "../../../../shared/components/cron-schedule"; import { of } from 'rxjs'; import { GcJobData } from './gcLog'; -import { CURRENT_BASE_HREF } from "../../../utils/utils"; +import { CURRENT_BASE_HREF } from "../../../../shared/units/utils"; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('GcComponent', () => { let component: GcComponent; let fixture: ComponentFixture; let gcRepoService: GcRepoService; - let config: IServiceConfig = { - systemInfoEndpoint: CURRENT_BASE_HREF + "/system/gc" - }; let mockSchedule = []; let mockJobs: GcJobData[] = [ { @@ -48,12 +44,11 @@ describe('GcComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule + SharedTestingModule ], declarations: [ GcComponent, CronScheduleComponent, CronTooltipComponent], providers: [ { provide: GcApiRepository, useClass: GcApiDefaultRepository }, - { provide: SERVICE_CONFIG, useValue: config }, { provide: ErrorHandler, useValue: fakedErrorHandler }, GcRepoService, GcViewModelFactory diff --git a/src/portal/src/lib/components/config/gc/gc.component.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.ts similarity index 94% rename from src/portal/src/lib/components/config/gc/gc.component.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.ts index b6b311d392..6d17e50338 100644 --- a/src/portal/src/lib/components/config/gc/gc.component.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.component.ts @@ -15,9 +15,9 @@ import { ONE_MINITUE, THREE_SECONDS, GCSchedule } from "./gc.const"; -import { ErrorHandler } from "../../../utils/error-handler"; -import { CronScheduleComponent } from "../../cron-schedule/cron-schedule.component"; -import { OriginCron } from '../../../services/interface'; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { CronScheduleComponent } from "../../../../shared/components/cron-schedule/cron-schedule.component"; +import { OriginCron } from '../../../../shared/services/interface'; import { finalize } from "rxjs/operators"; @Component({ selector: "gc-config", diff --git a/src/portal/src/lib/components/config/gc/gc.const.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.const.ts similarity index 86% rename from src/portal/src/lib/components/config/gc/gc.const.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc.const.ts index 121d40b4cd..d16beb88e5 100644 --- a/src/portal/src/lib/components/config/gc/gc.const.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.const.ts @@ -1,4 +1,4 @@ -import { OriginCron } from "../../../services"; +import { OriginCron } from "../../../../shared/services"; export const SCHEDULE_TYPE_NONE = "None"; diff --git a/src/portal/src/lib/components/config/gc/gc.service.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.service.ts similarity index 94% rename from src/portal/src/lib/components/config/gc/gc.service.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc.service.ts index 7d3f1c8752..ee5ab69eac 100644 --- a/src/portal/src/lib/components/config/gc/gc.service.ts +++ b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable, Subscription, Subject, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; import { GcApiRepository } from './gc.api.repository'; -import { ErrorHandler } from '../../../utils/error-handler'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; import { GcJobData } from './gcLog'; @@ -11,8 +11,7 @@ export class GcRepoService { constructor( private gcApiRepository: GcApiRepository, - private errorHandler: ErrorHandler) { - } + ) {} public manualGc(shouldDeleteUntagged: boolean, isDryRun: boolean): Observable { const param = { diff --git a/src/portal/src/lib/components/config/gc/gc.viewmodel.factory.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gc.viewmodel.factory.ts similarity index 100% rename from src/portal/src/lib/components/config/gc/gc.viewmodel.factory.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gc.viewmodel.factory.ts diff --git a/src/portal/src/lib/components/config/gc/gcLog.ts b/src/portal/src/app/base/left-side-nav/gc-page/gc/gcLog.ts similarity index 100% rename from src/portal/src/lib/components/config/gc/gcLog.ts rename to src/portal/src/app/base/left-side-nav/gc-page/gc/gcLog.ts diff --git a/src/portal/src/app/group/add-group-modal/add-group-modal.component.html b/src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.html similarity index 100% rename from src/portal/src/app/group/add-group-modal/add-group-modal.component.html rename to src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.html diff --git a/src/portal/src/app/group/add-group-modal/add-group-modal.component.scss b/src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.scss similarity index 100% rename from src/portal/src/app/group/add-group-modal/add-group-modal.component.scss rename to src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.scss diff --git a/src/portal/src/app/group/add-group-modal/add-group-modal.component.spec.ts b/src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.spec.ts similarity index 84% rename from src/portal/src/app/group/add-group-modal/add-group-modal.component.spec.ts rename to src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.spec.ts index f5556590bf..1c50479f2b 100644 --- a/src/portal/src/app/group/add-group-modal/add-group-modal.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.spec.ts @@ -1,13 +1,12 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ClarityModule } from '@clr/angular'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { GroupService } from "../group.service"; -import { MessageHandlerService } from "./../../shared/message-handler/message-handler.service"; -import { SessionService } from "./../../shared/session.service"; -import { UserGroup } from "./../group"; -import { AppConfigService } from "../../services/app-config.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; +import { SessionService } from "../../../../shared/services/session.service"; +import { AppConfigService } from "../../../../services/app-config.service"; import { AddGroupModalComponent } from './add-group-modal.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/src/portal/src/app/group/add-group-modal/add-group-modal.component.ts b/src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.ts similarity index 89% rename from src/portal/src/app/group/add-group-modal/add-group-modal.component.ts rename to src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.ts index 5ebd2eb9e8..8f4d4188a9 100644 --- a/src/portal/src/app/group/add-group-modal/add-group-modal.component.ts +++ b/src/portal/src/app/base/left-side-nav/group/add-group-modal/add-group-modal.component.ts @@ -4,11 +4,11 @@ import { Subscription } from "rxjs"; import { Component, OnInit, EventEmitter, Output, ChangeDetectorRef, OnDestroy, ViewChild } from "@angular/core"; import { NgForm } from "@angular/forms"; import { GroupService } from "../group.service"; -import { MessageHandlerService } from "./../../shared/message-handler/message-handler.service"; -import { SessionService } from "./../../shared/session.service"; -import { UserGroup } from "./../group"; -import { AppConfigService } from "../../services/app-config.service"; -import { GroupType } from "../../../lib/entities/shared.const"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; +import { SessionService } from "../../../../shared/services/session.service"; +import { UserGroup } from "../group"; +import { AppConfigService } from "../../../../services/app-config.service"; +import { GroupType } from "../../../../shared/entities/shared.const"; @Component({ selector: "hbr-add-group-modal", diff --git a/src/portal/src/app/group/group.component.html b/src/portal/src/app/base/left-side-nav/group/group.component.html similarity index 100% rename from src/portal/src/app/group/group.component.html rename to src/portal/src/app/base/left-side-nav/group/group.component.html diff --git a/src/portal/src/app/group/group.component.scss b/src/portal/src/app/base/left-side-nav/group/group.component.scss similarity index 100% rename from src/portal/src/app/group/group.component.scss rename to src/portal/src/app/base/left-side-nav/group/group.component.scss diff --git a/src/portal/src/app/group/group.component.spec.ts b/src/portal/src/app/base/left-side-nav/group/group.component.spec.ts similarity index 82% rename from src/portal/src/app/group/group.component.spec.ts rename to src/portal/src/app/base/left-side-nav/group/group.component.spec.ts index fb832c463e..dc907d3cad 100644 --- a/src/portal/src/app/group/group.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/group/group.component.spec.ts @@ -4,13 +4,13 @@ import { ClarityModule } from '@clr/angular'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { SessionService } from "./../shared/session.service"; +import { SessionService } from "../../../shared/services/session.service"; import { GroupService } from "./group.service"; import { of } from "rxjs"; -import { ConfirmationDialogService } from "./../shared/confirmation-dialog/confirmation-dialog.service"; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; -import { AppConfigService } from '../services/app-config.service'; -import { OperationService } from "../../lib/components/operation/operation.service"; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { AppConfigService } from '../../../services/app-config.service'; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; describe('GroupComponent', () => { let component: GroupComponent; diff --git a/src/portal/src/app/group/group.component.ts b/src/portal/src/app/base/left-side-nav/group/group.component.ts similarity index 87% rename from src/portal/src/app/group/group.component.ts rename to src/portal/src/app/base/left-side-nav/group/group.component.ts index d0067e0c54..fbfdbd5bbd 100644 --- a/src/portal/src/app/group/group.component.ts +++ b/src/portal/src/app/base/left-side-nav/group/group.component.ts @@ -1,26 +1,25 @@ import { of, Subscription, forkJoin } from "rxjs"; import { flatMap, catchError } from "rxjs/operators"; -import { SessionService } from "./../shared/session.service"; +import { SessionService } from "../../../shared/services/session.service"; import { TranslateService } from "@ngx-translate/core"; import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core"; -import { - ConfirmationTargets, - ConfirmationState, - ConfirmationButtons -} from "../shared/shared.const"; - -import { ConfirmationMessage } from "../shared/confirmation-dialog/confirmation-message"; -import { ConfirmationDialogService } from "./../shared/confirmation-dialog/confirmation-dialog.service"; import { AddGroupModalComponent } from "./add-group-modal/add-group-modal.component"; import { UserGroup } from "./group"; import { GroupService } from "./group.service"; -import { MessageHandlerService } from "../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; import { throwError as observableThrowError } from "rxjs"; -import { AppConfigService } from '../services/app-config.service'; -import { OperationService } from "../../lib/components/operation/operation.service"; -import { operateChanges, OperateInfo, OperationState } from "../../lib/components/operation/operate"; -import { errorHandler } from "../../lib/utils/shared/shared.utils"; -import { GroupType } from "../../lib/entities/shared.const"; +import { AppConfigService } from '../../../services/app-config.service'; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { operateChanges, OperateInfo, OperationState } from "../../../shared/components/operation/operate"; +import { + ConfirmationButtons, + ConfirmationState, + ConfirmationTargets, + GroupType +} from "../../../shared/entities/shared.const"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { errorHandler } from "../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; @Component({ selector: "app-group", diff --git a/src/portal/src/app/base/left-side-nav/group/group.module.ts b/src/portal/src/app/base/left-side-nav/group/group.module.ts new file mode 100644 index 0000000000..baf0736471 --- /dev/null +++ b/src/portal/src/app/base/left-side-nav/group/group.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../../shared/shared.module'; +import { GroupComponent } from './group.component'; +import { AddGroupModalComponent } from './add-group-modal/add-group-modal.component'; +import { RouterModule, Routes } from "@angular/router"; + +const routes: Routes = [ + { + path: '', + component: GroupComponent, + } +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes), + ], + declarations: [ + GroupComponent, + AddGroupModalComponent + ] +}) +export class GroupModule { } diff --git a/src/portal/src/app/group/group.service.spec.ts b/src/portal/src/app/base/left-side-nav/group/group.service.spec.ts similarity index 100% rename from src/portal/src/app/group/group.service.spec.ts rename to src/portal/src/app/base/left-side-nav/group/group.service.spec.ts diff --git a/src/portal/src/app/group/group.service.ts b/src/portal/src/app/base/left-side-nav/group/group.service.ts similarity index 96% rename from src/portal/src/app/group/group.service.ts rename to src/portal/src/app/base/left-side-nav/group/group.service.ts index 9876b4ec69..4d042473a4 100644 --- a/src/portal/src/app/group/group.service.ts +++ b/src/portal/src/app/base/left-side-nav/group/group.service.ts @@ -3,12 +3,14 @@ import {catchError, map} from 'rxjs/operators'; import { Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; import { UserGroup } from "./group"; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../../lib/utils/utils"; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../../../shared/units/utils"; const userGroupEndpoint = CURRENT_BASE_HREF + "/usergroups"; const ldapGroupSearchEndpoint = CURRENT_BASE_HREF + "/ldap/groups/search?groupname="; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class GroupService { constructor(private http: HttpClient) {} diff --git a/src/portal/src/app/group/group.ts b/src/portal/src/app/base/left-side-nav/group/group.ts similarity index 100% rename from src/portal/src/app/group/group.ts rename to src/portal/src/app/base/left-side-nav/group/group.ts diff --git a/src/portal/src/app/interrogation-services/interrogation-services.component.html b/src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.html similarity index 100% rename from src/portal/src/app/interrogation-services/interrogation-services.component.html rename to src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.html diff --git a/src/portal/src/app/interrogation-services/interrogation-services.component.scss b/src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.scss similarity index 100% rename from src/portal/src/app/interrogation-services/interrogation-services.component.scss rename to src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.scss diff --git a/src/portal/src/app/interrogation-services/interrogation-services.component.spec.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.spec.ts similarity index 92% rename from src/portal/src/app/interrogation-services/interrogation-services.component.spec.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.spec.ts index c087ce0611..82bd9f416b 100644 --- a/src/portal/src/app/interrogation-services/interrogation-services.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.spec.ts @@ -1,6 +1,6 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { InterrogationServicesComponent } from './interrogation-services.component'; -import { SharedModule } from "../shared/shared.module"; +import { SharedTestingModule } from "../../../shared/shared.module"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ClarityModule } from "@clr/angular"; import { TranslateService } from "@ngx-translate/core"; @@ -12,7 +12,7 @@ describe('InterrogationServicesComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, BrowserAnimationsModule, ClarityModule, ], diff --git a/src/portal/src/app/interrogation-services/interrogation-services.component.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.ts similarity index 100% rename from src/portal/src/app/interrogation-services/interrogation-services.component.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.component.ts diff --git a/src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.module.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.module.ts new file mode 100644 index 0000000000..254e6d3351 --- /dev/null +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/interrogation-services.module.ts @@ -0,0 +1,70 @@ +// Copyright Project Harbor Authors +// +// 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. + +import { NgModule } from "@angular/core"; +import { SharedModule } from "../../../shared/shared.module"; +import { NewScannerModalComponent } from "./scanner/new-scanner-modal/new-scanner-modal.component"; +import { ScannerMetadataComponent } from "./scanner/scanner-metadata/scanner-metadata.component"; +import { NewScannerFormComponent } from "./scanner/new-scanner-form/new-scanner-form.component"; +import { ConfigScannerService } from "./scanner/config-scanner.service"; +import { RouterModule, Routes } from "@angular/router"; +import { ConfigurationScannerComponent } from "./scanner/config-scanner.component"; +import { VulnerabilityConfigComponent } from "./vulnerability/vulnerability-config.component"; +import { InterrogationServicesComponent } from "./interrogation-services.component"; +import { ScanAllRepoService } from "./vulnerability/scanAll.service"; +import { ScanApiDefaultRepository, ScanApiRepository } from "./vulnerability/scanAll.api.repository"; + + +const routes: Routes = [ + { + path: '', + component: InterrogationServicesComponent, + children: [ + { + path: 'scanners', + component: ConfigurationScannerComponent + }, + { + path: 'vulnerability', + component: VulnerabilityConfigComponent + }, + { + path: '', + redirectTo: 'scanners', + pathMatch: 'full' + }, + ] + } +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes), + ], + declarations: [ + NewScannerModalComponent, + NewScannerFormComponent, + ScannerMetadataComponent, + ConfigurationScannerComponent, + InterrogationServicesComponent, + VulnerabilityConfigComponent + ], + providers: [ + ConfigScannerService, + ScanAllRepoService, + {provide: ScanApiRepository, useClass: ScanApiDefaultRepository }, + ] +}) +export class InterrogationServicesModule { +} diff --git a/src/portal/src/app/config/scanner/config-scanner.component.html b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.html similarity index 100% rename from src/portal/src/app/config/scanner/config-scanner.component.html rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.html diff --git a/src/portal/src/app/config/scanner/config-scanner.component.scss b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.scss similarity index 100% rename from src/portal/src/app/config/scanner/config-scanner.component.scss rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.scss diff --git a/src/portal/src/app/config/scanner/config-scanner.component.spec.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.spec.ts similarity index 89% rename from src/portal/src/app/config/scanner/config-scanner.component.spec.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.spec.ts index 36200f1d81..b28e225dc2 100644 --- a/src/portal/src/app/config/scanner/config-scanner.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.spec.ts @@ -4,14 +4,14 @@ import { ClarityModule } from "@clr/angular"; import { of } from "rxjs"; import { ConfigurationScannerComponent } from "./config-scanner.component"; import { ConfigScannerService } from "./config-scanner.service"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { ConfirmationDialogService } from "../../shared/confirmation-dialog/confirmation-dialog.service"; -import { SharedModule } from "../../shared/shared.module"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; +import { SharedTestingModule } from "../../../../shared/shared.module"; import { ScannerMetadataComponent } from "./scanner-metadata/scanner-metadata.component"; import { NewScannerModalComponent } from "./new-scanner-modal/new-scanner-modal.component"; import { NewScannerFormComponent } from "./new-scanner-form/new-scanner-form.component"; import { TranslateService } from "@ngx-translate/core"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { ConfirmationDialogService } from "../../../global-confirmation-dialog/confirmation-dialog.service"; describe('ConfigurationScannerComponent', () => { let mockScannerMetadata = { @@ -47,7 +47,7 @@ describe('ConfigurationScannerComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, BrowserAnimationsModule, ClarityModule, ], diff --git a/src/portal/src/app/config/scanner/config-scanner.component.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.ts similarity index 92% rename from src/portal/src/app/config/scanner/config-scanner.component.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.ts index bc077e9105..1311a61e76 100644 --- a/src/portal/src/app/config/scanner/config-scanner.component.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.component.ts @@ -3,17 +3,17 @@ import { Scanner } from "./scanner"; import { NewScannerModalComponent } from "./new-scanner-modal/new-scanner-modal.component"; import { ConfigScannerService, SCANNERS_DOC } from "./config-scanner.service"; import { finalize } from "rxjs/operators"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../shared/shared.const"; -import { ConfirmationDialogService } from "../../shared/confirmation-dialog/confirmation-dialog.service"; -import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { clone } from "../../../lib/utils/utils"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { clone } from "../../../../shared/units/utils"; +import { ConfirmationDialogService } from "../../../global-confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../../shared/entities/shared.const"; +import { ConfirmationMessage } from "../../../global-confirmation-dialog/confirmation-message"; @Component({ selector: 'config-scanner', templateUrl: "config-scanner.component.html", - styleUrls: ['./config-scanner.component.scss', '../config.component.scss'] + styleUrls: ['./config-scanner.component.scss', '../../config/config.component.scss'] }) export class ConfigurationScannerComponent implements OnInit, OnDestroy { scanners: Scanner[] = []; diff --git a/src/portal/src/app/config/scanner/config-scanner.service.spec.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.service.spec.ts similarity index 81% rename from src/portal/src/app/config/scanner/config-scanner.service.spec.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.service.spec.ts index 2c50aab4eb..05af33fde9 100644 --- a/src/portal/src/app/config/scanner/config-scanner.service.spec.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.service.spec.ts @@ -1,12 +1,12 @@ import { TestBed, inject } from '@angular/core/testing'; -import { SharedModule } from "../../shared/shared.module"; +import { SharedTestingModule } from "../../../../shared/shared.module"; import { ConfigScannerService } from "./config-scanner.service"; describe('TagService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - SharedModule + SharedTestingModule ], providers: [ ConfigScannerService diff --git a/src/portal/src/app/config/scanner/config-scanner.service.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.service.ts similarity index 97% rename from src/portal/src/app/config/scanner/config-scanner.service.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.service.ts index 582cbe3089..bac505dbf1 100644 --- a/src/portal/src/app/config/scanner/config-scanner.service.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/config-scanner.service.ts @@ -4,11 +4,13 @@ import { forkJoin, Observable, throwError as observableThrowError } from "rxjs"; import { catchError, map } from "rxjs/operators"; import { HttpClient } from "@angular/common/http"; import { ScannerMetadata } from "./scanner-metadata"; -import { CURRENT_BASE_HREF } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF } from "../../../../shared/units/utils"; export const SCANNERS_DOC: string = "https://goharbor.io/blog/harbor-1.10-release/#vulnerability-scanning-with-pluggable-scanners"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class ConfigScannerService { constructor( private http: HttpClient) {} diff --git a/src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.html b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.html similarity index 100% rename from src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.html rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.html diff --git a/src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.scss b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.scss similarity index 100% rename from src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.scss rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.scss diff --git a/src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.spec.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.spec.ts similarity index 97% rename from src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.spec.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.spec.ts index cbc24883f6..9637851504 100644 --- a/src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.spec.ts @@ -3,7 +3,7 @@ import { NewScannerFormComponent } from "./new-scanner-form.component"; import { FormBuilder } from "@angular/forms"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ClarityModule } from "@clr/angular"; -import { SharedModule } from "../../../shared/shared.module"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; import { ConfigScannerService } from "../config-scanner.service"; import { of } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; @@ -29,7 +29,7 @@ describe('NewScannerFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, BrowserAnimationsModule, ClarityModule, ], diff --git a/src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.ts similarity index 100% rename from src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-form/new-scanner-form.component.ts diff --git a/src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.html b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-modal/new-scanner-modal.component.html similarity index 100% rename from src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.html rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-modal/new-scanner-modal.component.html diff --git a/src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts similarity index 95% rename from src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts index 72dee4a928..bf5352e1f1 100644 --- a/src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts @@ -2,14 +2,13 @@ import { ComponentFixture, ComponentFixtureAutoDetect, fakeAsync, TestBed, tick import { ClrLoadingState } from "@clr/angular"; import { ConfigScannerService } from "../config-scanner.service"; import { NewScannerModalComponent } from "./new-scanner-modal.component"; -import { MessageHandlerService } from "../../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../../../shared/services/message-handler.service"; import { NewScannerFormComponent } from "../new-scanner-form/new-scanner-form.component"; import { FormBuilder } from "@angular/forms"; import { of, Subscription } from "rxjs"; import { delay } from "rxjs/operators"; -import { SharedModule as AppSharedModule } from "../../../shared/shared.module"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; import { Scanner } from "../scanner"; -import { SharedModule } from "../../../../lib/utils/shared/shared.module"; describe('NewScannerModalComponent', () => { let component: NewScannerModalComponent; @@ -38,8 +37,7 @@ describe('NewScannerModalComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, - AppSharedModule + SharedTestingModule, ], declarations: [ NewScannerFormComponent, diff --git a/src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-modal/new-scanner-modal.component.ts similarity index 97% rename from src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-modal/new-scanner-modal.component.ts index e768b6cc8d..287932b7ce 100644 --- a/src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/new-scanner-modal/new-scanner-modal.component.ts @@ -4,14 +4,14 @@ import { NewScannerFormComponent } from "../new-scanner-form/new-scanner-form.co import { ConfigScannerService } from "../config-scanner.service"; import { ClrLoadingState } from "@clr/angular"; import { finalize } from "rxjs/operators"; -import { InlineAlertComponent } from "../../../shared/inline-alert/inline-alert.component"; -import { MessageHandlerService } from "../../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../../../shared/services/message-handler.service"; import { TranslateService } from "@ngx-translate/core"; +import { InlineAlertComponent } from "../../../../../shared/components/inline-alert/inline-alert.component"; @Component({ selector: "new-scanner-modal", templateUrl: "new-scanner-modal.component.html", - styleUrls: ['../../../common.scss'] + styleUrls: ['../../../../../common.scss'] }) export class NewScannerModalComponent { testMap: any = {}; diff --git a/src/portal/src/app/config/scanner/scanner-metadata.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata.ts similarity index 100% rename from src/portal/src/app/config/scanner/scanner-metadata.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata.ts diff --git a/src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.spec.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.component.spec.ts similarity index 90% rename from src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.spec.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.component.spec.ts index ee9130904a..cf956bfc36 100644 --- a/src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.component.spec.ts @@ -1,11 +1,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ClarityModule } from "@clr/angular"; -import { SharedModule } from "../../../shared/shared.module"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; import { ConfigScannerService } from "../config-scanner.service"; import { of } from "rxjs"; import { ScannerMetadataComponent } from "./scanner-metadata.component"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; describe('ScannerMetadataComponent', () => { let mockScannerMetadata = { @@ -29,7 +29,7 @@ describe('ScannerMetadataComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, BrowserAnimationsModule, ClarityModule, ], diff --git a/src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.component.ts similarity index 92% rename from src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.component.ts index 9ae5236562..c24385088e 100644 --- a/src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.component.ts @@ -6,9 +6,8 @@ import { ConfigScannerService } from "../config-scanner.service"; import { finalize } from "rxjs/operators"; import { ScannerMetadata } from "../scanner-metadata"; import { DatePipe } from "@angular/common"; -import { TranslateService } from "@ngx-translate/core"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import {DATABASE_NEXT_UPDATE_PROPERTY, DATABASE_UPDATED_PROPERTY} from "../../../../lib/utils/utils"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import {DATABASE_NEXT_UPDATE_PROPERTY, DATABASE_UPDATED_PROPERTY} from "../../../../../shared/units/utils"; @Component({ selector: 'scanner-metadata', diff --git a/src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.html b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.html similarity index 100% rename from src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.html rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.html diff --git a/src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.scss b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.scss similarity index 100% rename from src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.scss rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner-metadata/scanner-metadata.scss diff --git a/src/portal/src/app/config/scanner/scanner.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner.ts similarity index 100% rename from src/portal/src/app/config/scanner/scanner.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/scanner/scanner.ts diff --git a/src/portal/src/lib/components/config/vulnerability/scanAll.api.repository.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/scanAll.api.repository.ts similarity index 64% rename from src/portal/src/lib/components/config/vulnerability/scanAll.api.repository.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/scanAll.api.repository.ts index a1b3115dd5..0c009f2747 100644 --- a/src/portal/src/lib/components/config/vulnerability/scanAll.api.repository.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/scanAll.api.repository.ts @@ -1,9 +1,9 @@ - -import { Injectable, Inject } from '@angular/core'; +import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { throwError as observableThrowError, Observable } from 'rxjs'; -import { catchError, map } from 'rxjs/operators'; -import { SERVICE_CONFIG, IServiceConfig } from "../../../entities/service.config"; +import { catchError } from 'rxjs/operators'; +import { CURRENT_BASE_HREF } from "../../../../shared/units/utils"; + export abstract class ScanApiRepository { abstract postSchedule(param): Observable; @@ -18,23 +18,22 @@ export abstract class ScanApiRepository { export class ScanApiDefaultRepository extends ScanApiRepository { constructor( private http: HttpClient, - @Inject(SERVICE_CONFIG) private config: IServiceConfig ) { super(); } public postSchedule(param): Observable { - return this.http.post(`${this.config.ScanAllEndpoint}/schedule`, param) + return this.http.post(`${CURRENT_BASE_HREF}/system/scanAll/schedule`, param) .pipe(catchError(error => observableThrowError(error))); } public putSchedule(param): Observable { - return this.http.put(`${this.config.ScanAllEndpoint}/schedule`, param) + return this.http.put(`${CURRENT_BASE_HREF}/system/scanAll/schedule`, param) .pipe(catchError(error => observableThrowError(error))); } public getSchedule(): Observable { - return this.http.get(`${this.config.ScanAllEndpoint}/schedule`) + return this.http.get(`${CURRENT_BASE_HREF}/system/scanAll/schedule`) .pipe(catchError(error => observableThrowError(error))); } diff --git a/src/portal/src/lib/components/config/vulnerability/scanAll.service.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/scanAll.service.ts similarity index 87% rename from src/portal/src/lib/components/config/vulnerability/scanAll.service.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/scanAll.service.ts index 1baf7ee15c..c3cde3482e 100644 --- a/src/portal/src/lib/components/config/vulnerability/scanAll.service.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/scanAll.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import {Observable, throwError as observableThrowError} from 'rxjs'; import { ScanApiRepository } from './scanAll.api.repository'; -import { ErrorHandler } from '../../../utils/error-handler'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; import {HttpClient} from "@angular/common/http"; -import {ScanningMetrics} from "../config"; +import {ScanningMetrics} from "../../config/config"; import {catchError, map} from "rxjs/operators"; -import { CURRENT_BASE_HREF } from "../../../utils/utils"; +import { CURRENT_BASE_HREF } from "../../../../shared/units/utils"; @Injectable() @@ -13,8 +13,7 @@ export class ScanAllRepoService { constructor( private http: HttpClient, - private scanApiRepository: ScanApiRepository, - private errorHandler: ErrorHandler) { + private scanApiRepository: ScanApiRepository) { } public manualScan(): Observable { diff --git a/src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.html b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.html similarity index 100% rename from src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.html rename to src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.html diff --git a/src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.scss b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.scss similarity index 84% rename from src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.scss rename to src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.scss index c41c45d90b..c77f407d49 100644 --- a/src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.scss +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.scss @@ -109,3 +109,27 @@ .badge { min-width: 30px; } +.info-tips-icon { + color: grey; +} + +.info-tips-icon:hover { + color: #007CBB; +} + +.replication-config { + margin-top: 0; + margin-bottom: 0; +} + +.replication-text { + font-size: 14px; + font-weight: 600; +} + +.replication-tooltip { + top: -8px; +} +.margin-top-3px { + margin-top: 3px; +} diff --git a/src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.spec.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.spec.ts similarity index 80% rename from src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.spec.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.spec.ts index 837ad5fbd6..401b7e547f 100644 --- a/src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.spec.ts @@ -1,20 +1,15 @@ -import { ComponentFixture, TestBed, waitForAsync, fakeAsync, tick, ComponentFixtureAutoDetect } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync, ComponentFixtureAutoDetect } from '@angular/core/testing'; import { VulnerabilityConfigComponent } from "./vulnerability-config.component"; import { ScanAllRepoService } from "./scanAll.service"; import { of } from "rxjs"; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../entities/service.config"; -import { ScanningMetrics, Triggers } from "../config"; -import { SharedModule } from "../../../utils/shared/shared.module"; -import { ErrorHandler } from "../../../utils/error-handler"; -import { CURRENT_BASE_HREF } from "../../../utils/utils"; -import { Scanner } from "../../../../app/config/scanner/scanner"; +import { ScanningMetrics, Triggers } from "../../config/config"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { Scanner } from "../scanner/scanner"; +import { SharedTestingModule } from "../../../../shared/shared.module"; let component: VulnerabilityConfigComponent; let fixture: ComponentFixture; -let config: IServiceConfig = { - configurationEndpoint: CURRENT_BASE_HREF + '/configurations/testing' -}; let mockedSchedule = {"schedule": null}; let mockedScheduledMetrics: ScanningMetrics = { total: 50, @@ -66,7 +61,7 @@ describe('VulnerabilityConfigComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, ], schemas: [ CUSTOM_ELEMENTS_SCHEMA @@ -77,7 +72,6 @@ describe('VulnerabilityConfigComponent', () => { providers: [ {provide: ErrorHandler, useValue: fakedErrorHandler}, {provide: ScanAllRepoService, useValue: fakedScanAllRepoService}, - { provide: SERVICE_CONFIG, useValue: config }, // open auto detect { provide: ComponentFixtureAutoDetect, useValue: true } ] diff --git a/src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.ts b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.ts similarity index 90% rename from src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.ts rename to src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.ts index 8d8c011d85..523430217f 100644 --- a/src/portal/src/lib/components/config/vulnerability/vulnerability-config.component.ts +++ b/src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.ts @@ -1,20 +1,20 @@ import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { finalize } from "rxjs/operators"; -import { ScanningMetrics, Triggers } from '../config'; -import { ErrorHandler } from '../../../utils/error-handler'; +import { ScanningMetrics, Triggers } from '../../config/config'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; import { TranslateService } from '@ngx-translate/core'; import { ScanAllRepoService } from './scanAll.service'; -import { OriginCron } from '../../../services'; -import { CronScheduleComponent } from "../../cron-schedule"; -import { DATABASE_UPDATED_PROPERTY, VULNERABILITY_SCAN_STATUS } from "../../../utils/utils"; -import { errorHandler as errorHandFn} from "../../../utils/shared/shared.utils"; +import { OriginCron } from '../../../../shared/services'; +import { CronScheduleComponent } from "../../../../shared/components/cron-schedule"; +import { DATABASE_UPDATED_PROPERTY, VULNERABILITY_SCAN_STATUS } from "../../../../shared/units/utils"; import { DatePipe } from "@angular/common"; +import { errorHandler } from "../../../../shared/units/shared.utils"; const SCHEDULE_TYPE_NONE = "None"; @Component({ selector: 'vulnerability-config', templateUrl: './vulnerability-config.component.html', - styleUrls: ['./vulnerability-config.component.scss', '../registry-config.component.scss'] + styleUrls: ['./vulnerability-config.component.scss'] }) export class VulnerabilityConfigComponent implements OnInit, OnDestroy { onGoing: boolean; @@ -43,7 +43,7 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy { hasDefaultScanner: boolean = false; constructor( private scanningService: ScanAllRepoService, - private errorHandler: ErrorHandler, + private errorHandlerEntity: ErrorHandler, private translate: TranslateService, ) { } @@ -89,7 +89,7 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy { .subscribe(schedule => { this.initSchedule(schedule); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } getScanners() { @@ -114,7 +114,7 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy { this.onGettingUpdatedTimeStr = false; this.translate.get("SCANNER.NO_DEFAULT_SCANNER") .subscribe(res => { - this.errorHandler.warning(res); + this.errorHandlerEntity.warning(res); } ); } @@ -232,7 +232,7 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy { .pipe(finalize(() => this.onSubmitting = false)) .subscribe(() => { this.translate.get("CONFIG.SCANNING.TRIGGER_SCAN_ALL_SUCCESS").subscribe((res: string) => { - this.errorHandler.info(res); + this.errorHandlerEntity.info(res); }); // reset metrics and then get new metrics this.scanningMetrics = null; @@ -241,11 +241,11 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy { , error => { if (error && error.status && error.status === 412) { this.translate.get("CONFIG.SCANNING.TRIGGER_SCAN_ALL_FAIL", - { error: '' + errorHandFn(error) }).subscribe((res: string) => { - this.errorHandler.error(res); + { error: '' + errorHandler(error) }).subscribe((res: string) => { + this.errorHandlerEntity.error(res); }); } else { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); } }); } @@ -267,26 +267,26 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy { this.translate .get("CONFIG.SAVE_SUCCESS") .subscribe((res) => { - this.errorHandler.info(res); + this.errorHandlerEntity.info(res); this.CronScheduleComponent.resetSchedule(); }); this.reset(cron); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); } ); } else { this.scanningService.postSchedule(this.CronScheduleComponent.scheduleType, cron) .subscribe(response => { this.translate.get("CONFIG.SAVE_SUCCESS").subscribe((res) => { - this.errorHandler.info(res); + this.errorHandlerEntity.info(res); this.CronScheduleComponent.resetSchedule(); }); this.reset(cron); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); } ); } diff --git a/src/portal/src/app/labels/labels.component.html b/src/portal/src/app/base/left-side-nav/labels/labels.component.html similarity index 100% rename from src/portal/src/app/labels/labels.component.html rename to src/portal/src/app/base/left-side-nav/labels/labels.component.html diff --git a/src/portal/src/app/labels/labels.component.spec.ts b/src/portal/src/app/base/left-side-nav/labels/labels.component.spec.ts similarity index 91% rename from src/portal/src/app/labels/labels.component.spec.ts rename to src/portal/src/app/base/left-side-nav/labels/labels.component.spec.ts index 3f9915d172..a54c9159ff 100644 --- a/src/portal/src/app/labels/labels.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/labels/labels.component.spec.ts @@ -5,7 +5,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; import { TranslateService } from "@ngx-translate/core"; import { ClarityModule } from "@clr/angular"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { SharedModule } from "../shared/shared.module"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('LabelsComponent', () => { let component: LabelsComponent; @@ -14,7 +14,7 @@ describe('LabelsComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, BrowserAnimationsModule, ClarityModule, ], diff --git a/src/portal/src/app/labels/labels.component.ts b/src/portal/src/app/base/left-side-nav/labels/labels.component.ts similarity index 100% rename from src/portal/src/app/labels/labels.component.ts rename to src/portal/src/app/base/left-side-nav/labels/labels.component.ts diff --git a/src/portal/src/app/log/log-page.component.ts b/src/portal/src/app/base/left-side-nav/labels/labels.module.ts similarity index 55% rename from src/portal/src/app/log/log-page.component.ts rename to src/portal/src/app/base/left-side-nav/labels/labels.module.ts index a688f3880f..3465b9be9e 100644 --- a/src/portal/src/app/log/log-page.component.ts +++ b/src/portal/src/app/base/left-side-nav/labels/labels.module.ts @@ -11,12 +11,27 @@ // 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. -import { Component } from '@angular/core'; -@Component({ - selector: 'log-page', - templateUrl: './log-page.component.html' +import { NgModule } from "@angular/core"; +import { SharedModule } from "../../../shared/shared.module";; +import { RouterModule, Routes } from "@angular/router"; +import { LabelsComponent } from "./labels.component"; + + +const routes: Routes = [ + { + path: '', + component: LabelsComponent + }, +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes), + ], + declarations: [ + LabelsComponent, + ], }) - -export class LogPageComponent { +export class LabelsModule { } diff --git a/src/portal/src/app/log/log.module.ts b/src/portal/src/app/base/left-side-nav/log/log.module.ts similarity index 66% rename from src/portal/src/app/log/log.module.ts rename to src/portal/src/app/base/left-side-nav/log/log.module.ts index 3712d7e457..2c62127b3c 100644 --- a/src/portal/src/app/log/log.module.ts +++ b/src/portal/src/app/base/left-side-nav/log/log.module.ts @@ -12,18 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. import { NgModule } from '@angular/core'; -import { AuditLogComponent } from './audit-log.component'; -import { SharedModule } from '../shared/shared.module'; -import { LogPageComponent } from './log-page.component'; +import { SharedModule } from '../../../shared/shared.module'; +import { RecentLogComponent } from "./recent-log.component"; +import { RouterModule, Routes } from "@angular/router"; +const routes: Routes = [ + { + path: '', + component: RecentLogComponent + }, +]; @NgModule({ - imports: [SharedModule], - declarations: [ - AuditLogComponent, - LogPageComponent + imports: [ + SharedModule, + RouterModule.forChild(routes), ], - exports: [ - AuditLogComponent, - LogPageComponent] + declarations: [ + RecentLogComponent, + ] }) export class LogModule { } diff --git a/src/portal/src/lib/components/log/recent-log.component.html b/src/portal/src/app/base/left-side-nav/log/recent-log.component.html similarity index 100% rename from src/portal/src/lib/components/log/recent-log.component.html rename to src/portal/src/app/base/left-side-nav/log/recent-log.component.html diff --git a/src/portal/src/lib/components/log/recent-log.component.scss b/src/portal/src/app/base/left-side-nav/log/recent-log.component.scss similarity index 100% rename from src/portal/src/lib/components/log/recent-log.component.scss rename to src/portal/src/app/base/left-side-nav/log/recent-log.component.scss diff --git a/src/portal/src/lib/components/log/recent-log.component.spec.ts b/src/portal/src/app/base/left-side-nav/log/recent-log.component.spec.ts similarity index 85% rename from src/portal/src/lib/components/log/recent-log.component.spec.ts rename to src/portal/src/app/base/left-side-nav/log/recent-log.component.spec.ts index 9bc35b46cc..75eaae60bb 100644 --- a/src/portal/src/lib/components/log/recent-log.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/log/recent-log.component.spec.ts @@ -1,25 +1,20 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { DebugElement } from '@angular/core'; import { RecentLogComponent } from './recent-log.component'; -import { SERVICE_CONFIG, IServiceConfig } from '../../entities/service.config'; -import { ErrorHandler } from '../../utils/error-handler'; -import { SharedModule } from '../../utils/shared/shared.module'; -import { FilterComponent } from '../filter/filter.component'; -import { click, CURRENT_BASE_HREF } from '../../utils/utils'; +import { ErrorHandler } from '../../../shared/units/error-handler'; +import { FilterComponent } from '../../../shared/components/filter/filter.component'; +import { click } from '../../../shared/units/utils'; import { of } from 'rxjs'; -import { AuditLog } from "../../../../ng-swagger-gen/models/audit-log"; -import { AuditlogService } from "../../../../ng-swagger-gen/services/auditlog.service"; +import { AuditLog } from "../../../../../ng-swagger-gen/models/audit-log"; +import { AuditlogService } from "../../../../../ng-swagger-gen/services/auditlog.service"; import { HttpHeaders, HttpResponse } from "@angular/common/http"; import { delay } from "rxjs/operators"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('RecentLogComponent (inline template)', () => { let component: RecentLogComponent; let fixture: ComponentFixture; - let serviceConfig: IServiceConfig; let auditlogService: AuditlogService; - let testConfig: IServiceConfig = { - logBaseEndpoint: CURRENT_BASE_HREF + "/logs/testing" - }; const fakedErrorHandler = { error() { return undefined; @@ -76,13 +71,12 @@ describe('RecentLogComponent (inline template)', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule + SharedTestingModule ], declarations: [FilterComponent, RecentLogComponent], providers: [ { provide: ErrorHandler, useValue: fakedErrorHandler }, { provide: AuditlogService, useValue: fakedAuditlogService }, - { provide: SERVICE_CONFIG, useValue: testConfig }, ] }); @@ -91,7 +85,6 @@ describe('RecentLogComponent (inline template)', () => { beforeEach(() => { fixture = TestBed.createComponent(RecentLogComponent); component = fixture.componentInstance; - serviceConfig = TestBed.get(SERVICE_CONFIG); auditlogService = fixture.debugElement.injector.get(AuditlogService); fixture.detectChanges(); }); @@ -99,12 +92,6 @@ describe('RecentLogComponent (inline template)', () => { it('should be created', () => { expect(component).toBeTruthy(); }); - - it('should inject the SERVICE_CONFIG', () => { - expect(serviceConfig).toBeTruthy(); - expect(serviceConfig.logBaseEndpoint).toEqual(CURRENT_BASE_HREF + "/logs/testing"); - }); - it('should get data from AccessLogService', waitForAsync(() => { expect(auditlogService).toBeTruthy(); fixture.detectChanges(); diff --git a/src/portal/src/lib/components/log/recent-log.component.ts b/src/portal/src/app/base/left-side-nav/log/recent-log.component.ts similarity index 90% rename from src/portal/src/lib/components/log/recent-log.component.ts rename to src/portal/src/app/base/left-side-nav/log/recent-log.component.ts index b6440e310b..a00b7767b3 100644 --- a/src/portal/src/lib/components/log/recent-log.component.ts +++ b/src/portal/src/app/base/left-side-nav/log/recent-log.component.ts @@ -11,11 +11,11 @@ // 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. -import { Component, OnInit, Input } from '@angular/core'; -import { ErrorHandler } from '../../utils/error-handler'; +import { Component, OnInit } from '@angular/core'; +import { ErrorHandler } from '../../../shared/units/error-handler'; import { finalize } from "rxjs/operators"; -import { AuditlogService } from "../../../../ng-swagger-gen/services/auditlog.service"; -import { AuditLog } from "../../../../ng-swagger-gen/models/audit-log"; +import { AuditlogService } from "../../../../../ng-swagger-gen/services/auditlog.service"; +import { AuditLog } from "../../../../../ng-swagger-gen/models/audit-log"; import ListAuditLogsParams = AuditlogService.ListAuditLogsParams; import { ClrDatagridStateInterface } from '@clr/angular'; @@ -31,7 +31,6 @@ export class RecentLogComponent implements OnInit { currentTerm: string; defaultFilter = "username"; isOpenFilterTag: boolean; - @Input() withTitle: boolean = false; pageSize: number = 15; currentPage: number = 1; // Double bound to pagination component totalCount: number = 0; diff --git a/src/portal/src/app/project-quotas/project-quotas.component.html b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.html similarity index 100% rename from src/portal/src/app/project-quotas/project-quotas.component.html rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.html diff --git a/src/portal/src/app/project-quotas/project-quotas.component.scss b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.scss similarity index 100% rename from src/portal/src/app/project-quotas/project-quotas.component.scss rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.scss diff --git a/src/portal/src/app/project-quotas/project-quotas.component.spec.ts b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.spec.ts similarity index 63% rename from src/portal/src/app/project-quotas/project-quotas.component.spec.ts rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.spec.ts index 477442e56f..00d7080909 100644 --- a/src/portal/src/app/project-quotas/project-quotas.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.spec.ts @@ -1,17 +1,17 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ProjectQuotasComponent } from './project-quotas.component'; -import { TranslateModule } from "@ngx-translate/core"; +import { ProjectQuotasContainerComponent } from './project-quotas-container.component'; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; -import { MessageHandlerService } from "../shared/message-handler/message-handler.service"; -import { SessionService } from "../shared/session.service"; -import { SessionUser } from "../shared/session-user"; -import { ConfigurationService } from "../config/config.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; +import { SessionService } from "../../../shared/services/session.service"; +import { SessionUser } from "../../../shared/entities/session-user"; +import { ConfigurationService } from "../../../services/config.service"; import { of } from "rxjs"; -import { Configuration } from "../../lib/components/config/config"; +import { Configuration } from "../config/config"; +import { SharedTestingModule } from "../../../shared/shared.module"; -describe('ProjectQuotasComponent', () => { - let component: ProjectQuotasComponent; - let fixture: ComponentFixture; +describe('ProjectQuotasContainerComponent', () => { + let component: ProjectQuotasContainerComponent; + let fixture: ComponentFixture; const mockedUser: SessionUser = { user_id: 1, username: 'admin', @@ -41,11 +41,10 @@ describe('ProjectQuotasComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - TranslateModule.forRoot() + SharedTestingModule ], - declarations: [ ProjectQuotasComponent ], + declarations: [ ProjectQuotasContainerComponent ], providers: [ - MessageHandlerService, {provide: MessageHandlerService, useValue: fakedMessageHandlerService}, {provide: SessionService, useValue: fakedSessionService}, {provide: ConfigurationService, useValue: fakedConfigurationService} @@ -58,7 +57,7 @@ describe('ProjectQuotasComponent', () => { })); beforeEach(() => { - fixture = TestBed.createComponent(ProjectQuotasComponent); + fixture = TestBed.createComponent(ProjectQuotasContainerComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/portal/src/app/project-quotas/project-quotas.component.ts b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.ts similarity index 66% rename from src/portal/src/app/project-quotas/project-quotas.component.ts rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.ts index 81aee065be..2c4b9ccf1c 100644 --- a/src/portal/src/app/project-quotas/project-quotas.component.ts +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas-container.component.ts @@ -1,16 +1,16 @@ import { Component, OnInit } from '@angular/core'; -import { SessionService } from "../shared/session.service"; -import { ConfigurationService } from "../config/config.service"; -import { MessageHandlerService } from "../shared/message-handler/message-handler.service"; +import { SessionService } from "../../../shared/services/session.service"; +import { ConfigurationService } from "../../../services/config.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; import { finalize } from "rxjs/operators"; -import { Configuration } from "../../lib/components/config/config"; +import { Configuration } from "../config/config"; @Component({ selector: 'app-project-quotas', - templateUrl: './project-quotas.component.html', - styleUrls: ['./project-quotas.component.scss'] + templateUrl: './project-quotas-container.component.html', + styleUrls: ['./project-quotas-container.component.scss'] }) -export class ProjectQuotasComponent implements OnInit { +export class ProjectQuotasContainerComponent implements OnInit { allConfig: Configuration = new Configuration(); loading: boolean = false; constructor(private session: SessionService, diff --git a/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas.module.ts b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas.module.ts new file mode 100644 index 0000000000..7f317552a0 --- /dev/null +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas.module.ts @@ -0,0 +1,42 @@ +// Copyright Project Harbor Authors +// +// 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. + +import { NgModule } from "@angular/core"; +import { SharedModule } from "../../../shared/shared.module"; +import { RouterModule, Routes } from "@angular/router"; +import { ProjectQuotasContainerComponent } from "./project-quotas-container.component"; +import { ProjectQuotasComponent } from "./project-quotas/project-quotas.component"; +import { EditProjectQuotasComponent } from "./project-quotas/edit-project-quotas/edit-project-quotas.component"; +import { QuotaService } from "../../../shared/services"; + + +const routes: Routes = [ + { + path: '', + component: ProjectQuotasContainerComponent + }, +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes), + ], + declarations: [ + ProjectQuotasContainerComponent, + ProjectQuotasComponent, + EditProjectQuotasComponent + ], +}) +export class ProjectQuotasModule { +} diff --git a/src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.html b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.html similarity index 98% rename from src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.html rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.html index 98f3365a81..8aedc89804 100644 --- a/src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.html +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.html @@ -1,6 +1,6 @@

{{ defaultTextsObj.editQuota }}

- +
diff --git a/src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.scss b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.scss similarity index 100% rename from src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.scss rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.scss diff --git a/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.spec.ts b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.spec.ts new file mode 100644 index 0000000000..a5f0d6f5f1 --- /dev/null +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.spec.ts @@ -0,0 +1,38 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { EditProjectQuotasComponent } from './edit-project-quotas.component'; +import { EditQuotaQuotaInterface } from '../../../../../shared/services'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { ErrorHandler } from '../../../../../shared/units/error-handler'; +import { SharedTestingModule } from "../../../../../shared/shared.module"; + +describe('EditProjectQuotasComponent', () => { + let component: EditProjectQuotasComponent; + let fixture: ComponentFixture; + const mockedEditQuota: EditQuotaQuotaInterface = { + editQuota: "Edit Default Project Quotas", + setQuota: "Set the default project quotas when creating new projects", + storageQuota: "Default storage consumption", + quotaHardLimitValue: {storageLimit: -1, storageUnit: "Byte"}, + isSystemDefaultQuota: true + }; + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + SharedTestingModule, + ], + declarations: [ + EditProjectQuotasComponent + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditProjectQuotasComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.ts b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.ts similarity index 93% rename from src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.ts rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.ts index 24c2222762..b3d4b6f65d 100644 --- a/src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.ts +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/edit-project-quotas/edit-project-quotas.component.ts @@ -6,13 +6,14 @@ import { OnInit, } from '@angular/core'; import { NgForm, Validators } from '@angular/forms'; - -import { InlineAlertComponent } from '../../../inline-alert/inline-alert.component'; - -import { QuotaUnits, QuotaUnlimited, QUOTA_DANGER_COEFFICIENT, QUOTA_WARNING_COEFFICIENT } from "../../../../entities/shared.const"; - -import { clone, getSuitableUnit, getByte, GetIntegerAndUnit, validateLimit } from '../../../../utils/utils'; -import { EditQuotaQuotaInterface, QuotaHardLimitInterface } from '../../../../services'; +import { InlineAlertComponent } from '../../../../../shared/components/inline-alert/inline-alert.component'; +import { + QuotaUnits, + QuotaUnlimited, + QUOTA_DANGER_COEFFICIENT, + QUOTA_WARNING_COEFFICIENT } from "../../../../../shared/entities/shared.const"; +import { clone, getSuitableUnit, getByte, GetIntegerAndUnit, validateLimit } from '../../../../../shared/units/utils'; +import { EditQuotaQuotaInterface, QuotaHardLimitInterface } from '../../../../../shared/services'; import { distinctUntilChanged } from 'rxjs/operators'; @Component({ diff --git a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.html b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.html similarity index 99% rename from src/portal/src/lib/components/config/project-quotas/project-quotas.component.html rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.html index c2a15ee9b3..3203044fc4 100644 --- a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.html +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.scss b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.scss similarity index 100% rename from src/portal/src/lib/components/config/project-quotas/project-quotas.component.scss rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.scss diff --git a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.spec.ts b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.spec.ts similarity index 65% rename from src/portal/src/lib/components/config/project-quotas/project-quotas.component.spec.ts rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.spec.ts index 43c67f456d..5ca3bfa8ed 100644 --- a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.spec.ts @@ -1,30 +1,25 @@ -import { waitForAsync, ComponentFixture, ComponentFixtureAutoDetect, TestBed } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ProjectQuotasComponent } from './project-quotas.component'; -import { IServiceConfig, SERVICE_CONFIG } from '../../../entities/service.config'; import { Router } from '@angular/router'; import { - ConfigurationService, ConfigurationDefaultService, QuotaService + QuotaService , QuotaDefaultService, Quota, RequestQueryParams -} from '../../../services'; -import { ErrorHandler } from '../../../utils/error-handler'; +} from '../../../../shared/services'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; -import {APP_BASE_HREF} from '@angular/common'; -import { HarborLibraryModule } from '../../../harbor-library.module'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CURRENT_BASE_HREF } from "../../../utils/utils"; +import { APP_BASE_HREF } from '@angular/common'; +import { SharedTestingModule } from "../../../../shared/shared.module"; +import { EditProjectQuotasComponent } from "./edit-project-quotas/edit-project-quotas.component"; + + describe('ProjectQuotasComponent', () => { let spy: jasmine.Spy; let spyUpdate: jasmine.Spy; let spyRoute: jasmine.Spy; let quotaService: QuotaService; - let component: ProjectQuotasComponent; let fixture: ComponentFixture; - - let config: IServiceConfig = { - quotaUrl: CURRENT_BASE_HREF + "/quotas/testing" - }; let mockQuotaList: Quota[] = [{ id: 1111, ref: { @@ -61,13 +56,14 @@ describe('ProjectQuotasComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - HarborLibraryModule, - BrowserAnimationsModule + SharedTestingModule, + ], + declarations: [ + ProjectQuotasComponent, + EditProjectQuotasComponent ], providers: [ { provide: ErrorHandler, useValue: fakedErrorHandler }, - { provide: SERVICE_CONFIG, useValue: config }, - { provide: ConfigurationService, useClass: ConfigurationDefaultService }, { provide: QuotaService, useClass: QuotaDefaultService }, { provide: APP_BASE_HREF, useValue : '/' }, { provide: Router, useValue: fakedRouter } @@ -116,27 +112,6 @@ describe('ProjectQuotasComponent', () => { const modal: HTMLElement = fixture.nativeElement.querySelector("clr-modal"); expect(modal).toBeTruthy(); }); - // ToDo update it with storage edit? - // it('edit quota', async () => { - // // wait getting list and rendering - // await timeout(10); - // fixture.detectChanges(); - // await fixture.whenStable(); - // component.selectedRow = [component.quotaList[0]]; - // component.editQuota(); - // fixture.detectChanges(); - // await fixture.whenStable(); - // const countInput: HTMLInputElement = fixture.nativeElement.querySelector('#count'); - // countInput.value = "100"; - // countInput.dispatchEvent(new Event("input")); - // fixture.detectChanges(); - // await fixture.whenStable(); - // const saveButton: HTMLInputElement = fixture.nativeElement.querySelector('#edit-quota-save'); - // saveButton.dispatchEvent(new Event("click")); - // fixture.detectChanges(); - // await fixture.whenStable(); - // expect(spyUpdate.calls.count()).toEqual(1); - // }); it('should call navigate function', async () => { // wait getting list and rendering await timeout(10); diff --git a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.ts b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.ts similarity index 94% rename from src/portal/src/lib/components/config/project-quotas/project-quotas.component.ts rename to src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.ts index 75115542ef..f51c727a9a 100644 --- a/src/portal/src/lib/components/config/project-quotas/project-quotas.component.ts +++ b/src/portal/src/app/base/left-side-nav/project-quotas/project-quotas/project-quotas.component.ts @@ -1,24 +1,22 @@ import { Component, Input, Output, EventEmitter, ViewChild, SimpleChanges, OnChanges } from '@angular/core'; -import { Configuration } from '../config'; +import { Configuration } from '../../config/config'; import { Quota, State, Comparator, ClrDatagridComparatorInterface, QuotaHardLimitInterface, QuotaHard -} from '../../../services/interface'; +} from '../../../../shared/services'; import { clone, isEmpty, getChanges, getSuitableUnit, calculatePage, CustomComparator , getByte, GetIntegerAndUnit -} from '../../../utils/utils'; -import { ErrorHandler } from '../../../utils/error-handler'; -import { QuotaUnits, QuotaUnlimited, QUOTA_DANGER_COEFFICIENT, QUOTA_WARNING_COEFFICIENT } from '../../../entities/shared.const'; +} from '../../../../shared/units/utils'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; +import { QuotaUnits, QuotaUnlimited, QUOTA_DANGER_COEFFICIENT, QUOTA_WARNING_COEFFICIENT } from '../../../../shared/entities/shared.const'; import { EditProjectQuotasComponent } from './edit-project-quotas/edit-project-quotas.component'; -import { - ConfigurationService -} from '../../../services'; import { TranslateService } from '@ngx-translate/core'; import { forkJoin } from 'rxjs'; -import { QuotaService } from "../../../services/quota.service"; +import { QuotaService } from "../../../../shared/services"; import { Router } from '@angular/router'; import { finalize } from 'rxjs/operators'; import { ClrDatagridStateInterface } from '@clr/angular'; +import { ConfigurationService } from "../../../../services/config.service"; const quotaSort = { storage: "used.storage", sortType: 'string' @@ -123,7 +121,7 @@ export class ProjectQuotasComponent implements OnChanges { let changes = this.getChanges(); if (!isEmpty(changes)) { this.loading = true; - this.configService.saveConfigurations(changes) + this.configService.saveConfiguration(changes) .pipe(finalize(() => { this.loading = false; this.editQuotaDialog.openEditQuota = false; diff --git a/src/portal/src/app/project/create-project/create-project.component.html b/src/portal/src/app/base/left-side-nav/projects/create-project/create-project.component.html similarity index 100% rename from src/portal/src/app/project/create-project/create-project.component.html rename to src/portal/src/app/base/left-side-nav/projects/create-project/create-project.component.html diff --git a/src/portal/src/app/project/create-project/create-project.component.spec.ts b/src/portal/src/app/base/left-side-nav/projects/create-project/create-project.component.spec.ts similarity index 87% rename from src/portal/src/app/project/create-project/create-project.component.spec.ts rename to src/portal/src/app/base/left-side-nav/projects/create-project/create-project.component.spec.ts index fa21d3bce4..7e73962081 100644 --- a/src/portal/src/app/project/create-project/create-project.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/projects/create-project/create-project.component.spec.ts @@ -1,19 +1,19 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CreateProjectComponent } from './create-project.component'; -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; -import { EndpointDefaultService, EndpointService, ProjectService } from '../../../lib/services'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; +import { ProjectService } from '../../../../shared/services'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; -import { ErrorHandler } from '../../../lib/utils/error-handler'; -import { IServiceConfig, SERVICE_CONFIG } from '../../../lib/entities/service.config'; -import { CURRENT_BASE_HREF } from '../../../lib/utils/utils'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; +import { CURRENT_BASE_HREF } from '../../../../shared/units/utils'; import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { EndpointDefaultService, EndpointService } from "../../../../shared/services/endpoint.service"; describe('CreateProjectComponent', () => { let component: CreateProjectComponent; @@ -34,10 +34,6 @@ describe('CreateProjectComponent', () => { showSuccess: function() { } }; - const config: IServiceConfig = { - systemInfoEndpoint: CURRENT_BASE_HREF + "/endpoints/testing" - }; - beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ @@ -53,7 +49,6 @@ describe('CreateProjectComponent', () => { ], providers: [ TranslateService, - { provide: SERVICE_CONFIG, useValue: config }, {provide: ProjectService, useValue: mockProjectService}, {provide: MessageHandlerService, useValue: mockMessageHandlerService}, { provide: EndpointService, useClass: EndpointDefaultService }, diff --git a/src/portal/src/app/project/create-project/create-project.component.ts b/src/portal/src/app/base/left-side-nav/projects/create-project/create-project.component.ts similarity index 93% rename from src/portal/src/app/project/create-project/create-project.component.ts rename to src/portal/src/app/base/left-side-nav/projects/create-project/create-project.component.ts index e9a2101669..b73fc55682 100644 --- a/src/portal/src/app/project/create-project/create-project.component.ts +++ b/src/portal/src/app/base/left-side-nav/projects/create-project/create-project.component.ts @@ -26,13 +26,14 @@ import { import { NgForm, Validators } from "@angular/forms"; import { fromEvent, Subscription } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { InlineAlertComponent } from "../../shared/inline-alert/inline-alert.component"; -import { Project } from "../project"; -import { QuotaUnits, QuotaUnlimited } from "../../../lib/entities/shared.const"; -import { Endpoint, EndpointService, ProjectService, QuotaHardInterface } from '../../../lib/services'; -import { clone, getByte, GetIntegerAndUnit, validateLimit } from "../../../lib/utils/utils"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; +import { Project } from "../../../project/project"; +import { QuotaUnits, QuotaUnlimited } from "../../../../shared/entities/shared.const"; +import { Endpoint, ProjectService, QuotaHardInterface } from '../../../../shared/services'; +import { clone, getByte, GetIntegerAndUnit, validateLimit } from "../../../../shared/units/utils"; import { HttpParams } from '@angular/common/http'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { EndpointService } from "../../../../shared/services/endpoint.service"; @Component({ diff --git a/src/portal/src/app/project/create-project/create-project.scss b/src/portal/src/app/base/left-side-nav/projects/create-project/create-project.scss similarity index 100% rename from src/portal/src/app/project/create-project/create-project.scss rename to src/portal/src/app/base/left-side-nav/projects/create-project/create-project.scss diff --git a/src/portal/src/app/project/list-project/list-project.component.html b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.html similarity index 100% rename from src/portal/src/app/project/list-project/list-project.component.html rename to src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.html diff --git a/src/portal/src/app/project/list-project/list-project.component.spec.ts b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.spec.ts similarity index 84% rename from src/portal/src/app/project/list-project/list-project.component.spec.ts rename to src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.spec.ts index fa6384cd28..2a1d701923 100644 --- a/src/portal/src/app/project/list-project/list-project.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.spec.ts @@ -4,18 +4,18 @@ import { ListProjectComponent } from './list-project.component'; import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef } from '@angular/core'; import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; -import { SessionService } from "../../shared/session.service"; -import { AppConfigService } from "../../services/app-config.service"; +import { SessionService } from "../../../../shared/services/session.service"; +import { AppConfigService } from "../../../../services/app-config.service"; import { RouterTestingModule } from '@angular/router/testing'; -import { SearchTriggerService } from "../../base/global-search/search-trigger.service"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { StatisticHandler } from "../../shared/statictics/statistic-handler.service"; -import { ConfirmationDialogService } from "../../shared/confirmation-dialog/confirmation-dialog.service"; +import { SearchTriggerService } from "../../../../shared/components/global-search/search-trigger.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; +import { StatisticHandler } from "../statictics/statistic-handler.service"; import { of } from 'rxjs'; import { BrowserAnimationsModule, NoopAnimationsModule } from "@angular/platform-browser/animations"; import { delay } from 'rxjs/operators'; -import { ProjectService } from "../../../lib/services"; -import { OperationService } from "../../../lib/components/operation/operation.service"; +import { ProjectService } from "../../../../shared/services"; +import { OperationService } from "../../../../shared/components/operation/operation.service"; +import { ConfirmationDialogService } from "../../../global-confirmation-dialog/confirmation-dialog.service"; describe('ListProjectComponent', () => { let component: ListProjectComponent; let fixture: ComponentFixture; diff --git a/src/portal/src/app/project/list-project/list-project.component.ts b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.ts similarity index 89% rename from src/portal/src/app/project/list-project/list-project.component.ts rename to src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.ts index 3cf92dc585..961a0aa801 100644 --- a/src/portal/src/app/project/list-project/list-project.component.ts +++ b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.ts @@ -18,25 +18,29 @@ import { OnDestroy, EventEmitter } from "@angular/core"; import { Router } from "@angular/router"; -import { Comparator, ProjectService, State } from "../../../lib/services"; +import { Comparator, ProjectService, State } from "../../../../shared/services"; import {TranslateService} from "@ngx-translate/core"; -import { RoleInfo, ConfirmationTargets, ConfirmationState, ConfirmationButtons } from "../../shared/shared.const"; -import { SessionService } from "../../shared/session.service"; -import { StatisticHandler } from "../../shared/statictics/statistic-handler.service"; -import { ConfirmationDialogService } from "../../shared/confirmation-dialog/confirmation-dialog.service"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { ConfirmationMessage } from "../../shared/confirmation-dialog/confirmation-message"; -import { SearchTriggerService } from "../../base/global-search/search-trigger.service"; -import { AppConfigService } from "../../services/app-config.service"; -import { Project } from "../project"; +import { SessionService } from "../../../../shared/services/session.service"; +import { StatisticHandler } from "../statictics/statistic-handler.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; +import { SearchTriggerService } from "../../../../shared/components/global-search/search-trigger.service"; +import { AppConfigService } from "../../../../services/app-config.service"; +import { Project } from "../../../project/project"; import { map, catchError, finalize } from "rxjs/operators"; -import { throwError as observableThrowError } from "rxjs"; -import { calculatePage, CustomComparator, doFiltering, doSorting } from "../../../lib/utils/utils"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { operateChanges, OperateInfo, OperationState } from "../../../lib/components/operation/operate"; -import { errorHandler } from "../../../lib/utils/shared/shared.utils"; +import { calculatePage, CustomComparator, doFiltering, doSorting } from "../../../../shared/units/utils"; +import { OperationService } from "../../../../shared/components/operation/operation.service"; +import { operateChanges, OperateInfo, OperationState } from "../../../../shared/components/operation/operate"; import {HttpErrorResponse} from "@angular/common/http"; import { ClrDatagridStateInterface } from '@clr/angular'; +import { + ConfirmationButtons, + ConfirmationState, + ConfirmationTargets, + RoleInfo +} from "../../../../shared/entities/shared.const"; +import { ConfirmationDialogService } from "../../../global-confirmation-dialog/confirmation-dialog.service"; +import { errorHandler } from "../../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../../global-confirmation-dialog/confirmation-message"; @Component({ selector: "list-project", diff --git a/src/portal/src/app/project/project.component.html b/src/portal/src/app/base/left-side-nav/projects/projects.component.html similarity index 100% rename from src/portal/src/app/project/project.component.html rename to src/portal/src/app/base/left-side-nav/projects/projects.component.html diff --git a/src/portal/src/app/project/project.component.scss b/src/portal/src/app/base/left-side-nav/projects/projects.component.scss similarity index 92% rename from src/portal/src/app/project/project.component.scss rename to src/portal/src/app/base/left-side-nav/projects/projects.component.scss index 7d6ab397fd..07bf081bc7 100644 --- a/src/portal/src/app/project/project.component.scss +++ b/src/portal/src/app/base/left-side-nav/projects/projects.component.scss @@ -1,4 +1,4 @@ -@import "../../lib/mixin"; +@import "../../../shared/mixin"; .header-title { margin-top: 34px; margin-bottom: -34px; diff --git a/src/portal/src/app/project/project.component.spec.ts b/src/portal/src/app/base/left-side-nav/projects/projects.component.spec.ts similarity index 92% rename from src/portal/src/app/project/project.component.spec.ts rename to src/portal/src/app/base/left-side-nav/projects/projects.component.spec.ts index 307f2ed99b..f1f36b241e 100644 --- a/src/portal/src/app/project/project.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/projects/projects.component.spec.ts @@ -1,22 +1,22 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { ProjectComponent } from './project.component'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { ConfigurationService } from '../config/config.service'; -import { SessionService } from "../shared/session.service"; +import { ConfigurationService } from '../../../services/config.service'; +import { SessionService } from "../../../shared/services/session.service"; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; -import { ProjectService } from '../../lib/services'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; -import { FilterComponent } from '../../lib/components/filter/filter.component'; +import { ProjectService } from '../../../shared/services'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { FilterComponent } from '../../../shared/components/filter/filter.component'; +import { ProjectsComponent } from "./projects.component"; describe('ProjectComponent', () => { - let component: ProjectComponent; - let fixture: ComponentFixture; + let component: ProjectsComponent; + let fixture: ComponentFixture; const mockSessionService = { getCurrentUser: () => { return of({ @@ -242,7 +242,7 @@ describe('ProjectComponent', () => { HttpClientTestingModule ], declarations: [ - ProjectComponent, + ProjectsComponent, FilterComponent ], providers: [ @@ -258,7 +258,7 @@ describe('ProjectComponent', () => { })); beforeEach(() => { - fixture = TestBed.createComponent(ProjectComponent); + fixture = TestBed.createComponent(ProjectsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/portal/src/app/project/project.component.ts b/src/portal/src/app/base/left-side-nav/projects/projects.component.ts similarity index 85% rename from src/portal/src/app/project/project.component.ts rename to src/portal/src/app/base/left-side-nav/projects/projects.component.ts index 8332d97cb4..a4eba8d796 100644 --- a/src/portal/src/app/project/project.component.ts +++ b/src/portal/src/app/base/left-side-nav/projects/projects.component.ts @@ -14,23 +14,23 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { CreateProjectComponent } from './create-project/create-project.component'; import { ListProjectComponent } from './list-project/list-project.component'; -import { ProjectTypes } from '../shared/shared.const'; -import { ConfigurationService } from '../config/config.service'; -import { SessionService } from "../shared/session.service"; -import { ProjectService, QuotaHardInterface } from "../../lib/services"; -import { Configuration } from "../../lib/components/config/config"; -import { FilterComponent } from '../../lib/components/filter/filter.component'; +import { ConfigurationService } from '../../../services/config.service'; +import { SessionService } from "../../../shared/services/session.service"; +import { ProjectService, QuotaHardInterface } from "../../../shared/services"; +import { Configuration } from "../config/config"; +import { FilterComponent } from '../../../shared/components/filter/filter.component'; import { Subscription } from 'rxjs'; import { debounceTime, distinctUntilChanged, finalize, switchMap } from 'rxjs/operators'; -import { Project } from './project'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; +import { Project } from '../../project/project'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { ProjectTypes } from "../../../shared/entities/shared.const"; @Component({ - selector: 'project', - templateUrl: 'project.component.html', - styleUrls: ['./project.component.scss'] + selector: 'projects', + templateUrl: 'projects.component.html', + styleUrls: ['./projects.component.scss'] }) -export class ProjectComponent implements OnInit, OnDestroy { +export class ProjectsComponent implements OnInit, OnDestroy { projectTypes = ProjectTypes; quotaObj: QuotaHardInterface; @ViewChild(CreateProjectComponent) diff --git a/src/portal/src/app/base/left-side-nav/projects/projects.module.ts b/src/portal/src/app/base/left-side-nav/projects/projects.module.ts new file mode 100644 index 0000000000..ff32645981 --- /dev/null +++ b/src/portal/src/app/base/left-side-nav/projects/projects.module.ts @@ -0,0 +1,45 @@ +// Copyright Project Harbor Authors +// +// 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. +import { NgModule } from "@angular/core"; +import { SharedModule } from "../../../shared/shared.module"; +import { ProjectsComponent } from "./projects.component"; +import { ListProjectComponent } from "./list-project/list-project.component"; +import { CreateProjectComponent } from "./create-project/create-project.component"; +import { RouterModule, Routes } from "@angular/router"; +import { StatisticsPanelComponent } from "./statictics/statistics-panel.component"; +import { StatisticsComponent } from "./statictics/statistics.component"; + +const routes: Routes = [ + { + path: '', + component: ProjectsComponent + }, +]; + +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes), + ], + declarations: [ + ProjectsComponent, + ListProjectComponent, + CreateProjectComponent, + StatisticsPanelComponent, + StatisticsComponent + ], + providers: [] +}) +export class ProjectsModule { +} diff --git a/src/portal/src/app/shared/statictics/statistic-handler.service.spec.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistic-handler.service.spec.ts similarity index 100% rename from src/portal/src/app/shared/statictics/statistic-handler.service.spec.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistic-handler.service.spec.ts diff --git a/src/portal/src/app/shared/statictics/statistic-handler.service.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistic-handler.service.ts similarity index 95% rename from src/portal/src/app/shared/statictics/statistic-handler.service.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistic-handler.service.ts index 2590af0e45..b4e64bf5e3 100644 --- a/src/portal/src/app/shared/statictics/statistic-handler.service.ts +++ b/src/portal/src/app/base/left-side-nav/projects/statictics/statistic-handler.service.ts @@ -14,7 +14,9 @@ import { Injectable } from '@angular/core'; import { Subject } from "rxjs"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class StatisticHandler { refreshSource = new Subject(); diff --git a/src/portal/src/app/shared/statictics/statistics-panel.component.html b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.html similarity index 100% rename from src/portal/src/app/shared/statictics/statistics-panel.component.html rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.html diff --git a/src/portal/src/app/shared/statictics/statistics-panel.component.spec.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.spec.ts similarity index 92% rename from src/portal/src/app/shared/statictics/statistics-panel.component.spec.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.spec.ts index a67b17896c..4dcafd3bf9 100644 --- a/src/portal/src/app/shared/statictics/statistics-panel.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.spec.ts @@ -10,10 +10,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { StatisticsService } from "./statistics.service"; -import { SessionService } from "../session.service"; -import { MessageHandlerService } from "../message-handler/message-handler.service"; +import { SessionService } from "../../../../shared/services/session.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; import { StatisticHandler } from "./statistic-handler.service"; -import { AppConfigService } from "../../services/app-config.service"; +import { AppConfigService } from "../../../../services/app-config.service"; import { Statistics } from './statistics'; import { Volumes } from './volumes'; describe('StatisticsPanelComponent', () => { diff --git a/src/portal/src/app/shared/statictics/statistics-panel.component.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.ts similarity index 94% rename from src/portal/src/app/shared/statictics/statistics-panel.component.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.ts index 7df534cdbb..87aacf15d9 100644 --- a/src/portal/src/app/shared/statictics/statistics-panel.component.ts +++ b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics-panel.component.ts @@ -17,12 +17,12 @@ import { Subscription } from "rxjs"; import { StatisticsService } from "./statistics.service"; import { Statistics } from "./statistics"; -import { SessionService } from "../session.service"; +import { SessionService } from "../../../../shared/services/session.service"; import { Volumes } from "./volumes"; -import { MessageHandlerService } from "../message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; import { StatisticHandler } from "./statistic-handler.service"; -import { AppConfigService } from "../../services/app-config.service"; +import { AppConfigService } from "../../../../services/app-config.service"; @Component({ diff --git a/src/portal/src/app/shared/statictics/statistics.component.html b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics.component.html similarity index 100% rename from src/portal/src/app/shared/statictics/statistics.component.html rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics.component.html diff --git a/src/portal/src/app/shared/statictics/statistics.component.scss b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics.component.scss similarity index 100% rename from src/portal/src/app/shared/statictics/statistics.component.scss rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics.component.scss diff --git a/src/portal/src/app/shared/statictics/statistics.component.spec.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics.component.spec.ts similarity index 100% rename from src/portal/src/app/shared/statictics/statistics.component.spec.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics.component.spec.ts diff --git a/src/portal/src/app/shared/statictics/statistics.component.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics.component.ts similarity index 100% rename from src/portal/src/app/shared/statictics/statistics.component.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics.component.ts diff --git a/src/portal/src/app/shared/statictics/statistics.service.spec.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics.service.spec.ts similarity index 100% rename from src/portal/src/app/shared/statictics/statistics.service.spec.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics.service.spec.ts diff --git a/src/portal/src/app/shared/statictics/statistics.service.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics.service.ts similarity index 95% rename from src/portal/src/app/shared/statictics/statistics.service.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics.service.ts index 3557e1969d..45525fbf94 100644 --- a/src/portal/src/app/shared/statictics/statistics.service.ts +++ b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics.service.ts @@ -17,7 +17,7 @@ import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; import { Statistics } from './statistics'; import { Volumes } from './volumes'; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS } from "../../../../shared/units/utils"; const statisticsEndpoint = CURRENT_BASE_HREF + "/statistics"; diff --git a/src/portal/src/app/shared/statictics/statistics.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/statistics.ts similarity index 100% rename from src/portal/src/app/shared/statictics/statistics.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/statistics.ts diff --git a/src/portal/src/app/shared/statictics/volumes.ts b/src/portal/src/app/base/left-side-nav/projects/statictics/volumes.ts similarity index 100% rename from src/portal/src/app/shared/statictics/volumes.ts rename to src/portal/src/app/base/left-side-nav/projects/statictics/volumes.ts diff --git a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.html b/src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.html similarity index 98% rename from src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.html rename to src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.html index 49a5e706a3..08d344caf0 100644 --- a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.html +++ b/src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.html @@ -1,7 +1,7 @@

{{modalTitle}}

- +
diff --git a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.scss b/src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.scss similarity index 100% rename from src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.scss rename to src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.scss diff --git a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.spec.ts b/src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.spec.ts similarity index 90% rename from src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.spec.ts rename to src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.spec.ts index 45076e0e1b..516f709088 100644 --- a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.spec.ts @@ -3,21 +3,19 @@ import { TestBed, waitForAsync, } from "@angular/core/testing"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; -import { SharedModule } from "../../utils/shared/shared.module"; -import { FilterComponent } from "../filter/filter.component"; +import { FilterComponent } from "../../../../shared/components/filter/filter.component"; import { CreateEditEndpointComponent } from "./create-edit-endpoint.component"; -import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; -import { Endpoint } from "../../services/interface"; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { Endpoint } from "../../../../shared/services"; import { EndpointService, EndpointDefaultService -} from "../../services/endpoint.service"; -import { IServiceConfig, SERVICE_CONFIG } from "../../entities/service.config"; +} from "../../../../shared/services/endpoint.service"; import { of } from "rxjs"; import { HttpClient } from "@angular/common/http"; -import { CURRENT_BASE_HREF } from "../../utils/utils"; -import { AppConfigService } from '../../../app/services/app-config.service'; +import { AppConfigService } from '../../../../services/app-config.service'; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe("CreateEditEndpointComponent (inline template)", () => { let mockData: Endpoint = { @@ -254,17 +252,10 @@ describe("CreateEditEndpointComponent (inline template)", () => { } }; let mockAdapters = ['harbor', 'docker hub']; - let comp: CreateEditEndpointComponent; let fixture: ComponentFixture; - - let config: IServiceConfig = { - systemInfoEndpoint: CURRENT_BASE_HREF + "/endpoints/testing" - }; - let endpointService: EndpointService; let http: HttpClient; - let spy: jasmine.Spy; let spyAdapter: jasmine.Spy; const mockAppConfigService = { @@ -277,7 +268,7 @@ describe("CreateEditEndpointComponent (inline template)", () => { }; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [SharedModule, NoopAnimationsModule], + imports: [SharedTestingModule, NoopAnimationsModule], declarations: [ FilterComponent, CreateEditEndpointComponent, @@ -285,7 +276,6 @@ describe("CreateEditEndpointComponent (inline template)", () => { ], providers: [ ErrorHandler, - { provide: SERVICE_CONFIG, useValue: config }, { provide: EndpointService, useClass: EndpointDefaultService }, { provide: HttpClient, useValue: fakedHttp }, { provide: AppConfigService, useValue: mockAppConfigService } @@ -337,9 +327,4 @@ describe("CreateEditEndpointComponent (inline template)", () => { expect(comp.target.name).toEqual("target_01"); }); })); - - it("should endpoint be initialized", () => { - fixture.detectChanges(); - expect(config.systemInfoEndpoint).toEqual(CURRENT_BASE_HREF + "/endpoints/testing"); - }); }); diff --git a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.ts b/src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.ts similarity index 96% rename from src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.ts rename to src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.ts index e7adc9d040..0ed3324799 100644 --- a/src/portal/src/lib/components/create-edit-endpoint/create-edit-endpoint.component.ts +++ b/src/portal/src/app/base/left-side-nav/registries/create-edit-endpoint/create-edit-endpoint.component.ts @@ -24,15 +24,14 @@ import { import { NgForm } from "@angular/forms"; import { Subscription, throwError as observableThrowError } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; - -import {EndpointService, HELM_HUB} from "../../services/endpoint.service"; -import { ErrorHandler } from "../../utils/error-handler"; -import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; -import { Endpoint, PingEndpoint } from "../../services/interface"; -import { clone, compareValue, CURRENT_BASE_HREF, isEmptyObject } from "../../utils/utils"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { Endpoint, PingEndpoint } from "../../../../shared/services/interface"; +import { clone, compareValue, CURRENT_BASE_HREF, isEmptyObject } from "../../../../shared/units/utils"; import { HttpClient } from "@angular/common/http"; import { catchError } from "rxjs/operators"; -import { AppConfigService } from '../../../app/services/app-config.service'; +import { AppConfigService } from '../../../../services/app-config.service'; +import { EndpointService, HELM_HUB } from "../../../../shared/services/endpoint.service"; const FAKE_PASSWORD = "rjGcfuRu"; const FAKE_JSON_KEY = "No Change"; diff --git a/src/portal/src/lib/components/endpoint/endpoint.component.html b/src/portal/src/app/base/left-side-nav/registries/endpoint.component.html similarity index 98% rename from src/portal/src/lib/components/endpoint/endpoint.component.html rename to src/portal/src/app/base/left-side-nav/registries/endpoint.component.html index e7a024742a..d27004c971 100644 --- a/src/portal/src/lib/components/endpoint/endpoint.component.html +++ b/src/portal/src/app/base/left-side-nav/registries/endpoint.component.html @@ -1,4 +1,5 @@ -
+

{{'SIDE_NAV.SYSTEM_MGMT.REGISTRY' | translate}}

+
diff --git a/src/portal/src/lib/components/endpoint/endpoint.component.scss b/src/portal/src/app/base/left-side-nav/registries/endpoint.component.scss similarity index 91% rename from src/portal/src/lib/components/endpoint/endpoint.component.scss rename to src/portal/src/app/base/left-side-nav/registries/endpoint.component.scss index 17982de08b..f3466c3201 100644 --- a/src/portal/src/lib/components/endpoint/endpoint.component.scss +++ b/src/portal/src/app/base/left-side-nav/registries/endpoint.component.scss @@ -32,4 +32,7 @@ } .margin-right-2px { margin-right: 2px; -} \ No newline at end of file +} +.content-top { + margin-top: 4px; +} diff --git a/src/portal/src/lib/components/endpoint/endpoint.component.spec.ts b/src/portal/src/app/base/left-side-nav/registries/endpoint.component.spec.ts similarity index 90% rename from src/portal/src/lib/components/endpoint/endpoint.component.spec.ts rename to src/portal/src/app/base/left-side-nav/registries/endpoint.component.spec.ts index 9f645a5b9b..243a723803 100644 --- a/src/portal/src/lib/components/endpoint/endpoint.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/registries/endpoint.component.spec.ts @@ -2,27 +2,21 @@ import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing"; import { By } from "@angular/platform-browser"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { DebugElement } from "@angular/core"; - -import { SharedModule } from "../../utils/shared/shared.module"; import { EndpointComponent } from "./endpoint.component"; -import { FilterComponent } from "../filter/filter.component"; -import { ConfirmationDialogComponent } from "../confirmation-dialog/confirmation-dialog.component"; -import { CreateEditEndpointComponent } from "../create-edit-endpoint/create-edit-endpoint.component"; -import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; -import { Endpoint } from "../../services/interface"; -import { - EndpointService, - EndpointDefaultService -} from "../../services/endpoint.service"; -import { IServiceConfig, SERVICE_CONFIG } from "../../entities/service.config"; -import { OperationService } from "../operation/operation.service"; - -import { click, CURRENT_BASE_HREF } from "../../utils/utils"; +import { FilterComponent } from "../../../shared/components/filter/filter.component"; +import { ConfirmationDialogComponent } from "../../../shared/components/confirmation-dialog/confirmation-dialog.component"; +import { CreateEditEndpointComponent } from "./create-edit-endpoint/create-edit-endpoint.component"; +import { InlineAlertComponent } from "../../../shared/components/inline-alert/inline-alert.component"; +import { ErrorHandler } from "../../../shared/units/error-handler"; +import { Endpoint } from "../../../shared/services"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { click } from "../../../shared/units/utils"; import { of } from "rxjs"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { HttpClient } from "@angular/common/http"; -import { AppConfigService } from '../../../app/services/app-config.service'; +import { AppConfigService } from '../../../services/app-config.service'; +import { SharedTestingModule } from "../../../shared/shared.module"; +import { EndpointDefaultService, EndpointService } from "../../../shared/services/endpoint.service"; describe("EndpointComponent (inline template)", () => { let adapterInfoMockData = { @@ -315,14 +309,9 @@ describe("EndpointComponent (inline template)", () => { url: "https://10.117.4.151" } ]; - let mockAdapters = ['harbor', 'docker hub']; - let comp: EndpointComponent; let fixture: ComponentFixture; - let config: IServiceConfig = { - systemInfoEndpoint: CURRENT_BASE_HREF + "/endpoints/testing" - }; const mockAppConfigService = { getConfig: () => { return { @@ -339,7 +328,7 @@ describe("EndpointComponent (inline template)", () => { let spyOne: jasmine.Spy; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [SharedModule, NoopAnimationsModule, HttpClientTestingModule], + imports: [SharedTestingModule, NoopAnimationsModule, HttpClientTestingModule], declarations: [ FilterComponent, ConfirmationDialogComponent, @@ -349,7 +338,6 @@ describe("EndpointComponent (inline template)", () => { ], providers: [ ErrorHandler, - { provide: SERVICE_CONFIG, useValue: config }, { provide: EndpointService, useClass: EndpointDefaultService }, { provide: OperationService }, { provide: HttpClient, useValue: fakedHttp }, @@ -384,12 +372,6 @@ describe("EndpointComponent (inline template)", () => { fixture.detectChanges(); expect(spy.calls.any()).toBeTruthy(); }); - - it("should endpoint be initialized", () => { - fixture.detectChanges(); - expect(config.systemInfoEndpoint).toEqual(CURRENT_BASE_HREF + "/endpoints/testing"); - }); - it("should open create endpoint modal", waitForAsync(() => { fixture.detectChanges(); fixture.whenStable().then(() => { diff --git a/src/portal/src/lib/components/endpoint/endpoint.component.ts b/src/portal/src/app/base/left-side-nav/registries/endpoint.component.ts similarity index 85% rename from src/portal/src/lib/components/endpoint/endpoint.component.ts rename to src/portal/src/app/base/left-side-nav/registries/endpoint.component.ts index c72fd99d30..fc6bd57b01 100644 --- a/src/portal/src/lib/components/endpoint/endpoint.component.ts +++ b/src/portal/src/app/base/left-side-nav/registries/endpoint.component.ts @@ -21,29 +21,24 @@ import { } from "@angular/core"; import { Subscription, Observable, forkJoin, throwError as observableThrowError } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; -import { Comparator } from "../../services/interface"; - -import { Endpoint } from "../../services/interface"; -import {EndpointService, HELM_HUB} from "../../services/endpoint.service"; - -import { ErrorHandler } from "../../utils/error-handler"; +import { Comparator } from "../../../shared/services"; +import { Endpoint } from "../../../shared/services"; +import { ErrorHandler } from "../../../shared/units/error-handler"; import { map, catchError, finalize } from "rxjs/operators"; -import { ConfirmationMessage } from "../confirmation-dialog/confirmation-message"; -import { ConfirmationAcknowledgement } from "../confirmation-dialog/confirmation-state-message"; -import { ConfirmationDialogComponent } from "../confirmation-dialog/confirmation-dialog.component"; - +import { ConfirmationDialogComponent } from "../../../shared/components/confirmation-dialog"; import { ConfirmationTargets, ConfirmationState, ConfirmationButtons -} from "../../entities/shared.const"; - -import { CreateEditEndpointComponent } from "../create-edit-endpoint/create-edit-endpoint.component"; -import { CustomComparator } from "../../utils/utils"; -import { errorHandler as errorHandFn } from "../../utils/shared/shared.utils"; - -import { operateChanges, OperateInfo, OperationState } from "../operation/operate"; -import { OperationService } from "../operation/operation.service"; +} from "../../../shared/entities/shared.const"; +import { CreateEditEndpointComponent } from "./create-edit-endpoint/create-edit-endpoint.component"; +import { CustomComparator } from "../../../shared/units/utils"; +import { operateChanges, OperateInfo, OperationState } from "../../../shared/components/operation/operate"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { errorHandler } from "../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../global-confirmation-dialog/confirmation-state-message"; +import { EndpointService, HELM_HUB } from "../../../shared/services/endpoint.service"; @Component({ @@ -91,7 +86,7 @@ export class EndpointComponent implements OnInit, OnDestroy { } constructor(private endpointService: EndpointService, - private errorHandler: ErrorHandler, + private errorHandlerEntity: ErrorHandler, private translateService: TranslateService, private operationService: OperationService, private ref: ChangeDetectorRef) { @@ -122,7 +117,7 @@ export class EndpointComponent implements OnInit, OnDestroy { .subscribe(targets => { this.targets = targets || []; }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } @@ -192,7 +187,7 @@ export class EndpointComponent implements OnInit, OnDestroy { })) .subscribe((item) => { }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } } @@ -216,7 +211,7 @@ export class EndpointComponent implements OnInit, OnDestroy { }); }) , catchError(error => { - const message = errorHandFn(error); + const message = errorHandler(error); this.translateService.get(message).subscribe(res => operateChanges(operMessage, OperationState.failure, res) ); diff --git a/src/portal/src/app/base/footer/footer.component.ts b/src/portal/src/app/base/left-side-nav/registries/endpoint.module.ts similarity index 50% rename from src/portal/src/app/base/footer/footer.component.ts rename to src/portal/src/app/base/left-side-nav/registries/endpoint.module.ts index c06c077c72..7230adf119 100644 --- a/src/portal/src/app/base/footer/footer.component.ts +++ b/src/portal/src/app/base/left-side-nav/registries/endpoint.module.ts @@ -11,12 +11,26 @@ // 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. -import { Component } from '@angular/core'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../../shared/shared.module'; +import { EndpointComponent } from "./endpoint.component"; +import { CreateEditEndpointComponent } from "./create-edit-endpoint/create-edit-endpoint.component"; -@Component({ - selector: 'footer', - templateUrl: "footer.component.html" +const routes: Routes = [ + { + path: '', + component: EndpointComponent + }, +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes), + ], + declarations: [ + EndpointComponent, + CreateEditEndpointComponent + ], }) -export class FooterComponent { - // constructor(private router: Router){} -} +export class EndpointModule { } diff --git a/src/portal/src/app/base/left-side-nav/replication/replication.module.ts b/src/portal/src/app/base/left-side-nav/replication/replication.module.ts new file mode 100644 index 0000000000..b8a500b680 --- /dev/null +++ b/src/portal/src/app/base/left-side-nav/replication/replication.module.ts @@ -0,0 +1,55 @@ +// Copyright Project Harbor Authors +// +// 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. +import { NgModule } from '@angular/core'; +import { ReactiveFormsModule } from "@angular/forms"; +import { SharedModule } from "../../../shared/shared.module"; +import { TotalReplicationPageComponent } from "./total-replication-page.component"; +import { ReplicationComponent } from "./replication/replication.component"; +import { ReplicationTasksComponent } from "./replication/replication-tasks/replication-tasks.component"; +import { ReplicationDefaultService } from "../../../shared/services"; +import { ReplicationTasksRoutingResolverService } from "../../../services/routing-resolvers/replication-tasks-routing-resolver.service"; +import { RouterModule, Routes } from "@angular/router"; +import { ListReplicationRuleComponent } from "./replication/list-replication-rule/list-replication-rule.component"; +import { CreateEditRuleComponent } from "./replication/create-edit-rule/create-edit-rule.component"; +const routes: Routes = [ + { + path: '', + component: TotalReplicationPageComponent + }, + { + path: ':id/tasks', + component: ReplicationTasksComponent, + resolve: { + replicationTasksRoutingResolver: ReplicationTasksRoutingResolverService + }, + } +]; +@NgModule({ + imports: [ + SharedModule, + ReactiveFormsModule, + RouterModule.forChild(routes), + ], + declarations: [ + TotalReplicationPageComponent, + ReplicationComponent, + ReplicationTasksComponent, + ListReplicationRuleComponent, + CreateEditRuleComponent + ], + providers: [ + ReplicationDefaultService + ] +}) +export class ReplicationModule { } diff --git a/src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html similarity index 99% rename from src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.html rename to src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html index 10d3270642..2d9fe24a6e 100644 --- a/src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.html +++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html @@ -1,7 +1,7 @@

{{headerTitle | translate}}

- +
diff --git a/src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.scss b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.scss similarity index 100% rename from src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.scss rename to src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.scss diff --git a/src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.spec.ts b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.spec.ts similarity index 78% rename from src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.spec.ts rename to src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.spec.ts index 0f7c7bea78..c882ede75d 100644 --- a/src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.spec.ts @@ -1,43 +1,28 @@ import {ComponentFixture, fakeAsync, TestBed, tick, waitForAsync} from "@angular/core/testing"; -import { By } from "@angular/platform-browser"; -import { DebugElement } from "@angular/core"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; -import { SharedModule } from "../../utils/shared/shared.module"; -import { ConfirmationDialogComponent } from "../confirmation-dialog/confirmation-dialog.component"; -import { ReplicationComponent } from "../replication/replication.component"; -import { CronTooltipComponent } from "../cron-schedule/cron-tooltip/cron-tooltip.component"; +import { ConfirmationDialogComponent } from "../../../../../shared/components/confirmation-dialog"; +import { CronTooltipComponent } from "../../../../../shared/components/cron-schedule"; import { CreateEditRuleComponent } from "./create-edit-rule.component"; -import { DatePickerComponent } from "../datetime-picker/datetime-picker.component"; -import { FilterComponent } from "../filter/filter.component"; -import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; +import { DatePickerComponent } from "../../../../../shared/components/datetime-picker/datetime-picker.component"; +import { FilterComponent } from "../../../../../shared/components/filter/filter.component"; +import { InlineAlertComponent } from "../../../../../shared/components/inline-alert/inline-alert.component"; import { ReplicationRule, ReplicationJob, Endpoint, ReplicationJobItem -} from "../../services/interface"; - -import { ErrorHandler } from "../../utils/error-handler/error-handler"; -import { SERVICE_CONFIG, IServiceConfig } from "../../entities/service.config"; +} from "../../../../../shared/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; import { ReplicationService, - JobLogService, - JobLogDefaultService -} from "../../services"; -import { - EndpointService, - EndpointDefaultService -} from "../../services/endpoint.service"; - -import { OperationService } from "../operation/operation.service"; -import {FilterLabelComponent} from "./filter-label.component"; -import {LabelService} from "../../services/label.service"; -import {LabelPieceComponent} from "../label-piece/label-piece.component"; +} from "../../../../../shared/services"; +import {LabelPieceComponent} from "../../../../../shared/components/label/label-piece/label-piece.component"; import { RouterTestingModule } from '@angular/router/testing'; import { of } from "rxjs"; -import { CURRENT_BASE_HREF } from "../../utils/utils"; import {HttpHeaders, HttpResponse} from "@angular/common/http"; import {delay} from "rxjs/operators"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; +import { EndpointService } from "../../../../../shared/services/endpoint.service"; describe("CreateEditRuleComponent (inline template)", () => { let mockRules: ReplicationRule[] = [ @@ -203,10 +188,6 @@ describe("CreateEditRuleComponent (inline template)", () => { }; let fixture: ComponentFixture; let comp: CreateEditRuleComponent; - let config: IServiceConfig = { - replicationBaseEndpoint: CURRENT_BASE_HREF + "/replication/testing", - targetBaseEndpoint: CURRENT_BASE_HREF + "/registries/testing" - }; const fakedErrorHandler = { error() { } @@ -240,7 +221,7 @@ describe("CreateEditRuleComponent (inline template)", () => { }; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [SharedModule, NoopAnimationsModule, RouterTestingModule], + imports: [SharedTestingModule, NoopAnimationsModule, RouterTestingModule], declarations: [ CreateEditRuleComponent, CronTooltipComponent, @@ -248,12 +229,10 @@ describe("CreateEditRuleComponent (inline template)", () => { DatePickerComponent, FilterComponent, InlineAlertComponent, - FilterLabelComponent, LabelPieceComponent ], providers: [ { provide: ErrorHandler, useValue: fakedErrorHandler }, - { provide: SERVICE_CONFIG, useValue: config }, { provide: ReplicationService, useValue: fakedReplicationService }, { provide: EndpointService, useValue: fakedEndpointService }, ] diff --git a/src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.ts b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts similarity index 96% rename from src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.ts rename to src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts index 08d61617af..bd17829f7a 100644 --- a/src/portal/src/lib/components/create-edit-rule/create-edit-rule.component.ts +++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts @@ -16,23 +16,22 @@ import { OnInit, OnDestroy, ViewChild, - ChangeDetectorRef, Input, EventEmitter, Output } from "@angular/core"; -import { Filter, ReplicationRule, Endpoint } from "../../services/interface"; +import { Filter, ReplicationRule, Endpoint } from "../../../../../shared/services/interface"; import { Subject, Subscription, Observable, zip } from "rxjs"; import { debounceTime, distinctUntilChanged, finalize } from "rxjs/operators"; import { FormArray, FormBuilder, FormGroup, Validators, FormControl } from "@angular/forms"; -import { clone, compareValue, isEmptyObject } from "../../utils/utils"; -import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; -import { ReplicationService } from "../../services/replication.service"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; +import { clone, compareValue, isEmptyObject } from "../../../../../shared/units/utils"; +import { InlineAlertComponent } from "../../../../../shared/components/inline-alert/inline-alert.component"; +import { ReplicationService } from "../../../../../shared/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; import { TranslateService } from "@ngx-translate/core"; -import { EndpointService } from "../../services/endpoint.service"; -import { cronRegex } from "../../utils/utils"; -import { FilterType } from "../../entities/shared.const"; +import { cronRegex } from "../../../../../shared/units/utils"; +import { FilterType } from "../../../../../shared/entities/shared.const"; +import { EndpointService } from "../../../../../shared/services/endpoint.service"; const PREFIX: string = '0 '; @Component({ diff --git a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.html similarity index 100% rename from src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.html rename to src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.html diff --git a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.scss b/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.scss similarity index 100% rename from src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.scss rename to src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.scss diff --git a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.spec.ts b/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.spec.ts similarity index 85% rename from src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.spec.ts rename to src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.spec.ts index f0ce1984e2..8a08e4bdf3 100644 --- a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.spec.ts @@ -1,23 +1,16 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; - -import { DebugElement } from '@angular/core'; - -import { SharedModule } from '../../utils/shared/shared.module'; -import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; - +import { ConfirmationDialogComponent } from '../../../../../shared/components/confirmation-dialog'; import { ListReplicationRuleComponent } from './list-replication-rule.component'; -import { ReplicationRule } from '../../services/interface'; - -import { ErrorHandler } from '../../utils/error-handler/error-handler'; -import { SERVICE_CONFIG, IServiceConfig } from '../../entities/service.config'; -import { ReplicationService } from '../../services/replication.service'; -import { OperationService } from "../operation/operation.service"; +import { ReplicationRule } from '../../../../../shared/services'; +import { ErrorHandler } from '../../../../../shared/units/error-handler'; +import { ReplicationService } from '../../../../../shared/services'; +import { OperationService } from "../../../../../shared/components/operation/operation.service"; import { of } from 'rxjs'; -import { CURRENT_BASE_HREF } from "../../utils/utils"; +import { CURRENT_BASE_HREF } from "../../../../../shared/units/utils"; import { delay } from "rxjs/operators"; import {HttpHeaders, HttpResponse} from "@angular/common/http"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; describe('ListReplicationRuleComponent (inline template)', () => { @@ -53,9 +46,6 @@ describe('ListReplicationRuleComponent (inline template)', () => { let fixture: ComponentFixture; let comp: ListReplicationRuleComponent; - let config: IServiceConfig = { - replicationRuleEndpoint: CURRENT_BASE_HREF + '/policies/replication/testing' - }; const fakedReplicationService = { updateReplicationRule() { return of(true).pipe(delay(0)); @@ -86,7 +76,7 @@ describe('ListReplicationRuleComponent (inline template)', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, NoopAnimationsModule ], declarations: [ @@ -95,7 +85,6 @@ describe('ListReplicationRuleComponent (inline template)', () => { ], providers: [ {provide: ErrorHandler, useValue: fakedErrorHandler}, - {provide: SERVICE_CONFIG, useValue: config}, {provide: ReplicationService, useValue: fakedReplicationService}, {provide: OperationService, useValue: fakedOperationService} ] diff --git a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.ts b/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.ts similarity index 87% rename from src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.ts rename to src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.ts index 1354357548..c89ceb0262 100644 --- a/src/portal/src/lib/components/list-replication-rule/list-replication-rule.component.ts +++ b/src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.ts @@ -21,24 +21,25 @@ import { import { TranslateService } from "@ngx-translate/core"; import { map, catchError, finalize } from "rxjs/operators"; import { Observable, forkJoin, throwError as observableThrowError } from "rxjs"; -import {HELM_HUB, ReplicationService} from "../../services"; +import { ReplicationService } from "../../../../../shared/services"; import { ReplicationRule -} from "../../services"; -import { ConfirmationDialogComponent } from "../confirmation-dialog"; -import { ConfirmationMessage } from "../confirmation-dialog"; -import { ConfirmationAcknowledgement } from "../confirmation-dialog"; +} from "../../../../../shared/services"; +import { ConfirmationDialogComponent } from "../../../../../shared/components/confirmation-dialog"; import { ConfirmationState, ConfirmationTargets, ConfirmationButtons -} from "../../entities/shared.const"; -import { ErrorHandler } from "../../utils/error-handler"; -import { clone } from "../../utils/utils"; -import { operateChanges, OperateInfo, OperationState } from "../operation/operate"; -import { OperationService } from "../operation/operation.service"; -import { errorHandler as errorHandFn} from "../../utils/shared/shared.utils"; +} from "../../../../../shared/entities/shared.const"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { clone } from "../../../../../shared/units/utils"; +import { operateChanges, OperateInfo, OperationState } from "../../../../../shared/components/operation/operate"; +import { OperationService } from "../../../../../shared/components/operation/operation.service"; import { ClrDatagridStateInterface } from '@clr/angular'; +import { errorHandler } from "../../../../../shared/units/shared.utils"; +import { ConfirmationAcknowledgement } from "../../../../global-confirmation-dialog/confirmation-state-message"; +import { ConfirmationMessage } from "../../../../global-confirmation-dialog/confirmation-message"; +import { HELM_HUB } from "../../../../../shared/services/endpoint.service"; @Component({ selector: "hbr-list-replication-rule", templateUrl: "./list-replication-rule.component.html", @@ -72,7 +73,7 @@ export class ListReplicationRuleComponent { constructor(private replicationService: ReplicationService, private translateService: TranslateService, - private errorHandler: ErrorHandler, + private errorHandlerEntity: ErrorHandler, private operationService: OperationService) { } @@ -110,15 +111,15 @@ export class ListReplicationRuleComponent { this.translateService.get(rule.enabled ? 'REPLICATION.ENABLE_SUCCESS' : 'REPLICATION.DISABLE_SUCCESS') .subscribe(msg => { operateChanges(opeMessage, OperationState.success); - this.errorHandler.info(msg); + this.errorHandlerEntity.info(msg); this.refreshRule(); }); }, error => { - const errMessage = errorHandFn(error); + const errMessage = errorHandler(error); this.translateService.get(rule.enabled ? 'REPLICATION.ENABLE_FAILED' : 'REPLICATION.DISABLE_FAILED') .subscribe(msg => { operateChanges(opeMessage, OperationState.failure, msg); - this.errorHandler.error(errMessage); + this.errorHandlerEntity.error(errMessage); }); } ); @@ -167,7 +168,7 @@ export class ListReplicationRuleComponent { this.selectedRow = null; this.refreshRule(); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } } @@ -188,7 +189,7 @@ export class ListReplicationRuleComponent { .subscribe(res => operateChanges(operMessage, OperationState.success)); }) , catchError(error => { - const message = errorHandFn(error); + const message = errorHandler(error); this.translateService.get(message).subscribe(res => operateChanges(operMessage, OperationState.failure, res) ); @@ -247,7 +248,7 @@ export class ListReplicationRuleComponent { } this.rules = response.body as ReplicationRule[]; }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } refreshRule() { diff --git a/src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.html similarity index 100% rename from src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.html rename to src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.html diff --git a/src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.scss b/src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.scss similarity index 100% rename from src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.scss rename to src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.scss diff --git a/src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.spec.ts b/src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.spec.ts similarity index 90% rename from src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.spec.ts rename to src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.spec.ts index df63e36713..abd8815ab6 100644 --- a/src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.spec.ts @@ -1,18 +1,18 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core'; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; -import { ReplicationExecution } from "../../../../../ng-swagger-gen/models/replication-execution"; +import { ReplicationExecution } from "../../../../../../../ng-swagger-gen/models/replication-execution"; import { ReplicationTasksComponent } from "./replication-tasks.component"; import { ActivatedRoute } from "@angular/router"; -import { ReplicationService } from "../../../../../ng-swagger-gen/services"; -import { ErrorHandler } from "../../../utils/error-handler"; +import { ReplicationService } from "../../../../../../../ng-swagger-gen/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; import { RouterTestingModule } from "@angular/router/testing"; import { TranslateModule } from "@ngx-translate/core"; import { of, Subscription } from "rxjs"; import { delay } from "rxjs/operators"; import { HttpHeaders, HttpResponse } from "@angular/common/http"; -import { ClarityModule, ClrDatagridStateInterface } from "@clr/angular"; -import { ReplicationTask } from "../../../../../ng-swagger-gen/models/replication-task"; +import { ClarityModule } from "@clr/angular"; +import { ReplicationTask } from "../../../../../../../ng-swagger-gen/models/replication-task"; describe('ReplicationTasksComponent', () => { diff --git a/src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.ts b/src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.ts similarity index 92% rename from src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.ts rename to src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.ts index c6263cfaf9..4e3d5451eb 100644 --- a/src/portal/src/lib/components/replication/replication-tasks/replication-tasks.component.ts +++ b/src/portal/src/app/base/left-side-nav/replication/replication/replication-tasks/replication-tasks.component.ts @@ -3,15 +3,15 @@ import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { finalize } from "rxjs/operators"; import { Subscription, timer } from "rxjs"; -import { ErrorHandler } from "../../../utils/error-handler"; -import { ClrDatagridComparatorInterface, ReplicationJob, ReplicationTasks } from "../../../services"; -import { CURRENT_BASE_HREF, CustomComparator, DEFAULT_PAGE_SIZE, doFiltering, doSorting } from "../../../utils/utils"; -import { REFRESH_TIME_DIFFERENCE } from '../../../entities/shared.const'; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { ClrDatagridComparatorInterface, ReplicationJob, ReplicationTasks } from "../../../../../shared/services"; +import { CURRENT_BASE_HREF, CustomComparator, DEFAULT_PAGE_SIZE, doFiltering, doSorting } from "../../../../../shared/units/utils"; +import { REFRESH_TIME_DIFFERENCE } from '../../../../../shared/entities/shared.const'; import { ClrDatagridStateInterface } from '@clr/angular'; -import { ReplicationExecution } from "../../../../../ng-swagger-gen/models/replication-execution"; -import { ReplicationService } from "../../../../../ng-swagger-gen/services"; +import { ReplicationExecution } from "../../../../../../../ng-swagger-gen/models/replication-execution"; +import { ReplicationService } from "../../../../../../../ng-swagger-gen/services"; import ListReplicationTasksParams = ReplicationService.ListReplicationTasksParams; -import { ReplicationTask } from "../../../../../ng-swagger-gen/models/replication-task"; +import { ReplicationTask } from "../../../../../../../ng-swagger-gen/models/replication-task"; const executionStatus = 'InProgress'; const STATUS_MAP = { diff --git a/src/portal/src/lib/components/replication/replication.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/replication.component.html similarity index 100% rename from src/portal/src/lib/components/replication/replication.component.html rename to src/portal/src/app/base/left-side-nav/replication/replication/replication.component.html diff --git a/src/portal/src/lib/components/replication/replication.component.scss b/src/portal/src/app/base/left-side-nav/replication/replication/replication.component.scss similarity index 100% rename from src/portal/src/lib/components/replication/replication.component.scss rename to src/portal/src/app/base/left-side-nav/replication/replication/replication.component.scss diff --git a/src/portal/src/lib/components/replication/replication.component.spec.ts b/src/portal/src/app/base/left-side-nav/replication/replication/replication.component.spec.ts similarity index 80% rename from src/portal/src/lib/components/replication/replication.component.spec.ts rename to src/portal/src/app/base/left-side-nav/replication/replication/replication.component.spec.ts index dc6d2d3b9d..3aa2a1fb5f 100644 --- a/src/portal/src/lib/components/replication/replication.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/replication/replication/replication.component.spec.ts @@ -1,23 +1,21 @@ -import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; -import {DebugElement, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA} from '@angular/core'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { DebugElement, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core'; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; - -import { SharedModule } from '../../utils/shared/shared.module'; -import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; +import { ConfirmationDialogComponent } from '../../../../shared/components/confirmation-dialog'; import { ReplicationComponent } from './replication.component'; -import { CronScheduleComponent } from '../cron-schedule/cron-schedule.component'; -import {ReplicationRule, ReplicationJob, Endpoint} from '../../services/interface'; -import { CronTooltipComponent } from "../cron-schedule/cron-tooltip/cron-tooltip.component"; -import { ErrorHandler } from '../../utils/error-handler/error-handler'; -import { SERVICE_CONFIG, IServiceConfig } from '../../entities/service.config'; -import { ReplicationService } from '../../services/replication.service'; -import { ReplicationJobItem } from '../../services'; -import {OperationService} from "../operation/operation.service"; +import { CronScheduleComponent } from '../../../../shared/components/cron-schedule'; +import { ReplicationRule, ReplicationJob, Endpoint} from '../../../../shared/services'; +import { CronTooltipComponent } from "../../../../shared/components/cron-schedule"; +import { ErrorHandler } from '../../../../shared/units/error-handler'; +import { ReplicationService } from '../../../../shared/services'; +import { ReplicationJobItem } from '../../../../shared/services'; +import { OperationService } from "../../../../shared/components/operation/operation.service"; import { RouterTestingModule } from '@angular/router/testing'; -import {of, Subscription} from 'rxjs'; -import { CURRENT_BASE_HREF } from "../../utils/utils"; -import {HttpHeaders, HttpResponse} from "@angular/common/http"; -import {delay} from "rxjs/operators"; +import { of, Subscription } from 'rxjs'; +import { CURRENT_BASE_HREF } from "../../../../shared/units/utils"; +import { HttpHeaders, HttpResponse } from "@angular/common/http"; +import { delay } from "rxjs/operators"; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('Replication Component (inline template)', () => { @@ -123,9 +121,6 @@ describe('Replication Component (inline template)', () => { let fixture: ComponentFixture; let comp: ReplicationComponent; let deJobs: DebugElement; - let config: IServiceConfig = { - replicationRuleEndpoint: CURRENT_BASE_HREF + '/policies/replication/testing' - }; const fakedErrorHandler = { error() { } @@ -152,7 +147,7 @@ describe('Replication Component (inline template)', () => { schemas: [ CUSTOM_ELEMENTS_SCHEMA , NO_ERRORS_SCHEMA], imports: [ - SharedModule, + SharedTestingModule, NoopAnimationsModule, RouterTestingModule ], @@ -164,7 +159,6 @@ describe('Replication Component (inline template)', () => { ], providers: [ { provide: ErrorHandler, useValue: fakedErrorHandler }, - { provide: SERVICE_CONFIG, useValue: config }, { provide: ReplicationService, useValue: fakedReplicationService }, { provide: OperationService } ] diff --git a/src/portal/src/lib/components/replication/replication.component.ts b/src/portal/src/app/base/left-side-nav/replication/replication/replication.component.ts similarity index 90% rename from src/portal/src/lib/components/replication/replication.component.ts rename to src/portal/src/app/base/left-side-nav/replication/replication/replication.component.ts index be39488724..a4d26f9ad4 100644 --- a/src/portal/src/lib/components/replication/replication.component.ts +++ b/src/portal/src/app/base/left-side-nav/replication/replication/replication.component.ts @@ -20,19 +20,19 @@ import { OnDestroy, EventEmitter } from "@angular/core"; -import { finalize, catchError, map, debounceTime, distinctUntilChanged, switchMap, delay } from "rxjs/operators"; -import { Subscription, forkJoin, timer, Observable, throwError as observableThrowError, observable } from "rxjs"; +import { finalize, catchError, map, debounceTime, distinctUntilChanged, switchMap } from "rxjs/operators"; +import { Subscription, forkJoin, timer, Observable, throwError as observableThrowError } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; -import { ListReplicationRuleComponent } from "../list-replication-rule/list-replication-rule.component"; -import { CreateEditRuleComponent } from "../create-edit-rule/create-edit-rule.component"; -import { ErrorHandler } from "../../utils/error-handler"; -import { Comparator, ReplicationService } from "../../services"; -import { RequestQueryParams } from "../../services"; +import { ListReplicationRuleComponent } from "./list-replication-rule/list-replication-rule.component"; +import { CreateEditRuleComponent } from "./create-edit-rule/create-edit-rule.component"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { Comparator, ReplicationService } from "../../../../shared/services"; +import { RequestQueryParams } from "../../../../shared/services"; import { ReplicationRule, ReplicationJob, ReplicationJobItem -} from "../../services"; +} from "../../../../shared/services"; import { CustomComparator, @@ -40,27 +40,28 @@ import { doFiltering, doSorting, calculatePage -} from "../../utils/utils"; +} from "../../../../shared/units/utils"; import { ConfirmationTargets, ConfirmationButtons, ConfirmationState, REFRESH_TIME_DIFFERENCE -} from "../../entities/shared.const"; -import { ConfirmationMessage } from "../confirmation-dialog/confirmation-message"; -import { ConfirmationDialogComponent } from "../confirmation-dialog/confirmation-dialog.component"; -import { ConfirmationAcknowledgement } from "../confirmation-dialog/confirmation-state-message"; +} from "../../../../shared/entities/shared.const"; +import { ConfirmationDialogComponent } from "../../../../shared/components/confirmation-dialog"; import { operateChanges, OperationState, OperateInfo -} from "../operation/operate"; -import { OperationService } from "../operation/operation.service"; +} from "../../../../shared/components/operation/operate"; +import { OperationService } from "../../../../shared/components/operation/operation.service"; import { Router } from "@angular/router"; -import { errorHandler as errorHandFn } from "../../utils/shared/shared.utils"; -import { FilterComponent } from "../filter/filter.component"; +import { FilterComponent } from "../../../../shared/components/filter/filter.component"; import { ClrDatagridStateInterface } from '@clr/angular'; +import { errorHandler } from "../../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../../global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../../global-confirmation-dialog/confirmation-state-message"; + const ONE_HOUR_SECONDS: number = 3600; const ONE_MINUTE_SECONDS: number = 60; const ONE_DAY_SECONDS: number = 24 * ONE_HOUR_SECONDS; @@ -149,7 +150,7 @@ export class ReplicationComponent implements OnInit, OnDestroy { constructor( private router: Router, - private errorHandler: ErrorHandler, + private errorHandlerEntity: ErrorHandler, private replicationService: ReplicationService, private operationService: OperationService, private translateService: TranslateService @@ -182,7 +183,7 @@ export class ReplicationComponent implements OnInit, OnDestroy { this.listReplicationRule.rules = response.body as ReplicationRule[]; this.listReplicationRule.loading = false; }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); this.listReplicationRule.loading = false; }); } @@ -271,7 +272,7 @@ export class ReplicationComponent implements OnInit, OnDestroy { }, error => { this.jobsLoading = false; - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); } ); } @@ -332,7 +333,7 @@ export class ReplicationComponent implements OnInit, OnDestroy { forkJoin(this.replicationOperate(rule)).subscribe(item => { this.selectOneRule(rule); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } } @@ -356,7 +357,7 @@ export class ReplicationComponent implements OnInit, OnDestroy { ); }), catchError(error => { - const message = errorHandFn(error); + const message = errorHandler(error); this.translateService.get(message).subscribe(res => operateChanges(operMessage, OperationState.failure, res) ); @@ -429,7 +430,7 @@ export class ReplicationComponent implements OnInit, OnDestroy { ) .subscribe(() => { } , error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } } @@ -453,7 +454,7 @@ export class ReplicationComponent implements OnInit, OnDestroy { ); }), catchError(error => { - const message = errorHandFn(error); + const message = errorHandler(error); this.translateService.get(message).subscribe(res => operateChanges(operMessage, OperationState.failure, res) ); diff --git a/src/portal/src/app/replication/total-replication/total-replication-page.component.html b/src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.html similarity index 100% rename from src/portal/src/app/replication/total-replication/total-replication-page.component.html rename to src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.html diff --git a/src/portal/src/app/replication/total-replication/total-replication.component.scss b/src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.scss similarity index 100% rename from src/portal/src/app/replication/total-replication/total-replication.component.scss rename to src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.scss diff --git a/src/portal/src/app/replication/total-replication/total-replication-page.component.spec.ts b/src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.spec.ts similarity index 94% rename from src/portal/src/app/replication/total-replication/total-replication-page.component.spec.ts rename to src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.spec.ts index 9dc016b137..6b560a15b9 100644 --- a/src/portal/src/app/replication/total-replication/total-replication-page.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.spec.ts @@ -8,8 +8,8 @@ import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import {SessionService} from "../../shared/session.service"; -import {AppConfigService} from "../../services/app-config.service"; +import {SessionService} from "../../../shared/services/session.service"; +import {AppConfigService} from "../../../services/app-config.service"; describe('TotalReplicationPageComponent', () => { let component: TotalReplicationPageComponent; diff --git a/src/portal/src/app/replication/total-replication/total-replication-page.component.ts b/src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.ts similarity index 85% rename from src/portal/src/app/replication/total-replication/total-replication-page.component.ts rename to src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.ts index 979e661bee..a66f19e4b6 100644 --- a/src/portal/src/app/replication/total-replication/total-replication-page.component.ts +++ b/src/portal/src/app/base/left-side-nav/replication/total-replication-page.component.ts @@ -13,14 +13,14 @@ // limitations under the License. import { Component } from '@angular/core'; import {Router, ActivatedRoute} from "@angular/router"; -import {SessionService} from "../../shared/session.service"; -import {AppConfigService} from "../../services/app-config.service"; -import { ReplicationRule } from "../../../lib/services"; +import {SessionService} from "../../../shared/services/session.service"; +import {AppConfigService} from "../../../services/app-config.service"; +import { ReplicationRule } from "../../../shared/services"; @Component({ selector: 'total-replication', templateUrl: 'total-replication-page.component.html', - styleUrls: [ './total-replication.component.scss' ] + styleUrls: [ './total-replication-page.component.scss' ] }) export class TotalReplicationPageComponent { diff --git a/src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.html b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.html similarity index 100% rename from src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.html rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.html diff --git a/src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.scss b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.scss similarity index 100% rename from src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.scss rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.scss diff --git a/src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.spec.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.spec.ts similarity index 92% rename from src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.spec.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.spec.ts index c7f7c474d9..fffe59d532 100644 --- a/src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.spec.ts @@ -4,9 +4,9 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ClarityModule } from "@clr/angular"; import { RouterTestingModule } from "@angular/router/testing"; import { TranslateModule } from "@ngx-translate/core"; -import { clone } from "../../../lib/utils/utils"; +import { clone } from "../../../../shared/units/utils"; import { INITIAL_ACCESSES } from "../system-robot-util"; -import { Project } from "../../../../ng-swagger-gen/models/project"; +import { Project } from "../../../../../../ng-swagger-gen/models/project"; describe('ListAllProjectsComponent', () => { let component: ListAllProjectsComponent; diff --git a/src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.ts similarity index 92% rename from src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.ts index 4656903d87..c7e0bf454c 100644 --- a/src/portal/src/app/system-robot-accounts/list-all-projects/list-all-projects.component.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/list-all-projects/list-all-projects.component.ts @@ -1,16 +1,15 @@ import { Component, Input, OnInit, } from '@angular/core'; -import { Project } from "../../../../ng-swagger-gen/models/project"; -import { clone, CustomComparator } from "../../../lib/utils/utils"; +import { Project } from "../../../../../../ng-swagger-gen/models/project"; +import { clone, CustomComparator } from "../../../../shared/units/utils"; import { ClrDatagridComparatorInterface } from "@clr/angular"; import { Router } from "@angular/router"; - import { ACTION_RESOURCE_I18N_MAP, FrontAccess, FrontProjectForAdd, INITIAL_ACCESSES, PermissionsKinds } from "../system-robot-util"; -import { RobotPermission } from "../../../../ng-swagger-gen/models"; +import { RobotPermission } from "../../../../../../ng-swagger-gen/models/robot-permission"; @Component({ selector: 'app-list-all-projects', diff --git a/src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.html b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.html similarity index 100% rename from src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.html rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.html diff --git a/src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.scss b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.scss similarity index 100% rename from src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.scss rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.scss diff --git a/src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.spec.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.spec.ts similarity index 88% rename from src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.spec.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.spec.ts index 9c29061a30..9b3b70267b 100644 --- a/src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.spec.ts @@ -4,17 +4,17 @@ import { NO_ERRORS_SCHEMA } from "@angular/core"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ClarityModule } from "@clr/angular"; import { TranslateModule } from "@ngx-translate/core"; -import { Robot } from "../../../../ng-swagger-gen/models/robot"; +import { Robot } from "../../../../../../ng-swagger-gen/models/robot"; import { Action, INITIAL_ACCESSES, PermissionsKinds, Resource } from "../system-robot-util"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { RobotService } from "../../../../ng-swagger-gen/services/robot.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; +import { OperationService } from "../../../../shared/components/operation/operation.service"; +import { RobotService } from "../../../../../../ng-swagger-gen/services/robot.service"; import { of } from "rxjs"; import { delay } from "rxjs/operators"; -import { ConfigurationService } from "../../config/config.service"; -import { Configuration } from "../../../lib/components/config/config"; +import { ConfigurationService } from "../../../../services/config.service"; +import { Configuration } from "../../config/config"; import { FormsModule } from "@angular/forms"; -import { clone } from "../../../lib/utils/utils"; +import { clone } from "../../../../shared/units/utils"; describe('NewRobotComponent', () => { let component: NewRobotComponent; diff --git a/src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.ts similarity index 94% rename from src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.ts index 64be3590db..8f02b08290 100644 --- a/src/portal/src/app/system-robot-accounts/new-robot/new-robot.component.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.ts @@ -6,27 +6,27 @@ import { Output, ViewChild } from '@angular/core'; -import { ConfigurationService } from "../../config/config.service"; -import { Robot } from "../../../../ng-swagger-gen/models/robot"; +import { ConfigurationService } from "../../../../services/config.service"; +import { Robot } from "../../../../../../ng-swagger-gen/models/robot"; import { ListAllProjectsComponent } from "../list-all-projects/list-all-projects.component"; import { NgForm } from "@angular/forms"; import { debounceTime, distinctUntilChanged, filter, finalize, switchMap } from "rxjs/operators"; -import { InlineAlertComponent } from "../../shared/inline-alert/inline-alert.component"; -import { Access } from "../../../../ng-swagger-gen/models/access"; +import { Access } from "../../../../../../ng-swagger-gen/models/access"; import { ACTION_RESOURCE_I18N_MAP, ExpirationType, FrontAccess, INITIAL_ACCESSES, NAMESPACE_ALL_PROJECTS, onlyHasPushPermission, PermissionsKinds, } from "../system-robot-util"; -import { clone } from "../../../lib/utils/utils"; -import { RobotService } from "../../../../ng-swagger-gen/services/robot.service"; +import { clone } from "../../../../shared/units/utils"; +import { RobotService } from "../../../../../../ng-swagger-gen/services/robot.service"; import { ClrLoadingState } from "@clr/angular"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; import { Subject, Subscription } from "rxjs"; -import { operateChanges, OperateInfo, OperationState } from "../../../lib/components/operation/operate"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { errorHandler } from "../../../lib/utils/shared/shared.utils"; +import { operateChanges, OperateInfo, OperationState } from "../../../../shared/components/operation/operate"; +import { OperationService } from "../../../../shared/components/operation/operation.service"; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { errorHandler } from "../../../../shared/units/shared.utils"; const MINI_SECONDS_ONE_DAY: number = 60 * 24 * 60 * 1000; @@ -229,6 +229,7 @@ export class NewRobotComponent implements OnInit, OnDestroy { }); } open(isEditMode: boolean) { + this.isNameExisting = false; this.isEditMode = isEditMode; this.addRobotOpened = true; this.inlineAlertComponent.close(); diff --git a/src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.html b/src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.html similarity index 100% rename from src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.html rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.html diff --git a/src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.scss b/src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.scss similarity index 100% rename from src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.scss rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.scss diff --git a/src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.spec.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.spec.ts similarity index 92% rename from src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.spec.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.spec.ts index 6c79e481b5..b08e286bec 100644 --- a/src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.spec.ts @@ -4,9 +4,9 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ClarityModule } from "@clr/angular"; import { TranslateModule } from "@ngx-translate/core"; import { RouterTestingModule } from "@angular/router/testing"; -import { Project } from "../../../../ng-swagger-gen/models/project"; +import { Project } from "../../../../../../ng-swagger-gen/models/project"; import { Action, PermissionsKinds, Resource } from "../system-robot-util"; -import { RobotPermission } from "../../../../ng-swagger-gen/models"; +import { RobotPermission } from "../../../../../../ng-swagger-gen/models/robot-permission"; describe('ProjectsModalComponent', () => { let component: ProjectsModalComponent; diff --git a/src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.ts similarity index 81% rename from src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.ts index a4b507f15b..bca1d798f4 100644 --- a/src/portal/src/app/system-robot-accounts/projects-modal/projects-modal.component.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/projects-modal/projects-modal.component.ts @@ -1,8 +1,8 @@ -import { Component, OnInit } from '@angular/core'; -import { Project } from "../../../../ng-swagger-gen/models/project"; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Project } from "../../../../../../ng-swagger-gen/models/project"; import { Router } from "@angular/router"; import { ACTION_RESOURCE_I18N_MAP } from "../system-robot-util"; -import { RobotPermission } from "../../../../ng-swagger-gen/models"; +import { RobotPermission } from "../../../../../../ng-swagger-gen/models/robot-permission"; @Component({ selector: 'app-projects-modal', diff --git a/src/portal/src/app/system-robot-accounts/system-robot-accounts.component.html b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.html similarity index 100% rename from src/portal/src/app/system-robot-accounts/system-robot-accounts.component.html rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.html diff --git a/src/portal/src/app/system-robot-accounts/system-robot-accounts.component.scss b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.scss similarity index 100% rename from src/portal/src/app/system-robot-accounts/system-robot-accounts.component.scss rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.scss diff --git a/src/portal/src/app/system-robot-accounts/system-robot-accounts.component.spec.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.spec.ts similarity index 87% rename from src/portal/src/app/system-robot-accounts/system-robot-accounts.component.spec.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.spec.ts index b794ce82c9..99d71330ec 100644 --- a/src/portal/src/app/system-robot-accounts/system-robot-accounts.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.spec.ts @@ -4,18 +4,18 @@ import { ClarityModule } from "@clr/angular"; import { TranslateModule } from "@ngx-translate/core"; import { NO_ERRORS_SCHEMA } from "@angular/core"; import { SystemRobotAccountsComponent } from './system-robot-accounts.component'; -import { RobotService } from "../../../ng-swagger-gen/services/robot.service"; +import { RobotService } from "../../../../../ng-swagger-gen/services/robot.service"; import { HttpHeaders, HttpResponse } from "@angular/common/http"; import { of, Subscription } from "rxjs"; import { delay } from "rxjs/operators"; -import { Robot } from "../../../ng-swagger-gen/models/robot"; +import { Robot } from "../../../../../ng-swagger-gen/models/robot"; import { Action, PermissionsKinds, Resource } from "./system-robot-util"; -import { Project } from "../../../ng-swagger-gen/models/project"; -import { ProjectService } from "../../../ng-swagger-gen/services/project.service"; -import { MessageHandlerService } from "../shared/message-handler/message-handler.service"; -import { ConfirmationDialogService } from "../shared/confirmation-dialog/confirmation-dialog.service"; -import { OperationService } from "../../lib/components/operation/operation.service"; +import { Project } from "../../../../../ng-swagger-gen/models/project"; +import { ProjectService } from "../../../../../ng-swagger-gen/services/project.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; +import { OperationService } from "../../../shared/components/operation/operation.service"; import { HttpClientTestingModule } from "@angular/common/http/testing"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; describe('SystemRobotAccountsComponent', () => { let component: SystemRobotAccountsComponent; diff --git a/src/portal/src/app/system-robot-accounts/system-robot-accounts.component.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.ts similarity index 91% rename from src/portal/src/app/system-robot-accounts/system-robot-accounts.component.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.ts index e9bed8d7bf..511487d4d2 100644 --- a/src/portal/src/app/system-robot-accounts/system-robot-accounts.component.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.component.ts @@ -1,12 +1,12 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { NewRobotComponent } from './new-robot/new-robot.component'; -import { ViewTokenComponent } from './view-token/view-token.component'; -import { RobotService } from "../../../ng-swagger-gen/services/robot.service"; -import { Robot } from "../../../ng-swagger-gen/models/robot"; -import { clone, DEFAULT_PAGE_SIZE } from "../../lib/utils/utils"; +import { ViewTokenComponent } from '../../../shared/components/view-token/view-token.component'; +import { RobotService } from "../../../../../ng-swagger-gen/services/robot.service"; +import { Robot } from "../../../../../ng-swagger-gen/models/robot"; +import { clone, DEFAULT_PAGE_SIZE } from "../../../shared/units/utils"; import { ClrDatagridStateInterface, ClrLoadingState } from "@clr/angular"; import { catchError, debounceTime, distinctUntilChanged, finalize, map, switchMap } from "rxjs/operators"; -import { MessageHandlerService } from "../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; import { ACTION_RESOURCE_I18N_MAP, FrontRobot, @@ -15,19 +15,20 @@ import { } from "./system-robot-util"; import { ProjectsModalComponent } from "./projects-modal/projects-modal.component"; import { forkJoin, Observable, of, Subscription } from "rxjs"; -import { FilterComponent } from "../../lib/components/filter/filter.component"; -import { ProjectService } from "../../../ng-swagger-gen/services/project.service"; -import { ConfirmationMessage } from "../shared/confirmation-dialog/confirmation-message"; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../shared/shared.const"; -import { ConfirmationDialogService } from "../shared/confirmation-dialog/confirmation-dialog.service"; +import { FilterComponent } from "../../../shared/components/filter/filter.component"; +import { ProjectService } from "../../../../../ng-swagger-gen/services/project.service"; import { HttpErrorResponse } from "@angular/common/http"; -import { errorHandler } from "../../lib/utils/shared/shared.utils"; -import { operateChanges, OperateInfo, OperationState } from "../../lib/components/operation/operate"; -import { OperationService } from "../../lib/components/operation/operation.service"; -import { Project } from "../../../ng-swagger-gen/models/project"; +import { operateChanges, OperateInfo, OperationState } from "../../../shared/components/operation/operate"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { Project } from "../../../../../ng-swagger-gen/models/project"; import { DomSanitizer } from "@angular/platform-browser"; import { TranslateService } from "@ngx-translate/core"; -import { RobotPermission } from "../../../ng-swagger-gen/models"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../shared/entities/shared.const"; +import { errorHandler } from "../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; +import { RobotPermission } from "../../../../../ng-swagger-gen/models/robot-permission"; + const FIRST_PROJECTS_PAGE_SIZE: number = 100; @Component({ selector: 'system-robot-accounts', @@ -45,7 +46,7 @@ export class SystemRobotAccountsComponent implements OnInit, OnDestroy { loadingData: boolean = false; addBtnState: ClrLoadingState = ClrLoadingState.DEFAULT; hasGetAllProjects: boolean = false; - @ViewChild(NewRobotComponent) + @ViewChild(NewRobotComponent, {static: true}) newRobotComponent: NewRobotComponent; @ViewChild(ViewTokenComponent) viewTokenComponent: ViewTokenComponent; diff --git a/src/portal/src/app/system-robot-accounts/system-robot-accounts.module.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.module.ts similarity index 70% rename from src/portal/src/app/system-robot-accounts/system-robot-accounts.module.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.module.ts index b74e81dfee..8ca6656f8c 100644 --- a/src/portal/src/app/system-robot-accounts/system-robot-accounts.module.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-accounts.module.ts @@ -1,13 +1,17 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { SystemRobotAccountsComponent } from './system-robot-accounts.component'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '../../../shared/shared.module'; import { NewRobotComponent } from './new-robot/new-robot.component'; -import { ProjectModule } from '../project/project.module'; import { ListAllProjectsComponent } from './list-all-projects/list-all-projects.component'; import { ProjectsModalComponent } from './projects-modal/projects-modal.component'; +import { RouterModule, Routes } from "@angular/router"; - +const routes: Routes = [ + { + path: '', + component: SystemRobotAccountsComponent + } +]; @NgModule({ declarations: [ @@ -17,9 +21,8 @@ import { ProjectsModalComponent } from './projects-modal/projects-modal.componen ProjectsModalComponent ], imports: [ - CommonModule, SharedModule, - ProjectModule + RouterModule.forChild(routes) ] }) export class SystemRobotAccountsModule { } diff --git a/src/portal/src/app/system-robot-accounts/system-robot-util.ts b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-util.ts similarity index 93% rename from src/portal/src/app/system-robot-accounts/system-robot-util.ts rename to src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-util.ts index da0db77387..38f4fdfad8 100644 --- a/src/portal/src/app/system-robot-accounts/system-robot-util.ts +++ b/src/portal/src/app/base/left-side-nav/system-robot-accounts/system-robot-util.ts @@ -1,6 +1,6 @@ -import { Robot } from "../../../ng-swagger-gen/models/robot"; -import { Access } from "../../../ng-swagger-gen/models/access"; -import { Project } from "../../../ng-swagger-gen/models/project"; +import { Robot } from "../../../../../ng-swagger-gen/models/robot"; +import { Access } from "../../../../../ng-swagger-gen/models/access"; +import { Project } from "../../../../../ng-swagger-gen/models/project"; export interface FrontRobot extends Robot { permissionScope?: { diff --git a/src/portal/src/app/user/change-password/change-password.component.html b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.html similarity index 100% rename from src/portal/src/app/user/change-password/change-password.component.html rename to src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.html diff --git a/src/portal/src/app/user/change-password/change-password.component.scss b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.scss similarity index 100% rename from src/portal/src/app/user/change-password/change-password.component.scss rename to src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.scss diff --git a/src/portal/src/app/user/change-password/change-password.component.spec.ts b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.spec.ts similarity index 87% rename from src/portal/src/app/user/change-password/change-password.component.spec.ts rename to src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.spec.ts index d627d5c5b2..6eb48e6cca 100644 --- a/src/portal/src/app/user/change-password/change-password.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.spec.ts @@ -1,10 +1,9 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; import { ClarityModule } from '@clr/angular'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { UserService } from "../user.service"; -import { SharedModule } from '../../shared/shared.module'; +import { SharedTestingModule } from '../../../../shared/shared.module'; import { ChangePasswordComponent } from './change-password.component'; describe('ChangePasswordComponent', () => { @@ -20,7 +19,7 @@ describe('ChangePasswordComponent', () => { ], imports: [ ClarityModule, - SharedModule, + SharedTestingModule, TranslateModule.forRoot() ], providers: [ diff --git a/src/portal/src/app/user/change-password/change-password.component.ts b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.ts similarity index 94% rename from src/portal/src/app/user/change-password/change-password.component.ts rename to src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.ts index 8c0bc3aafe..4c54c5bd19 100644 --- a/src/portal/src/app/user/change-password/change-password.component.ts +++ b/src/portal/src/app/base/left-side-nav/user/change-password/change-password.component.ts @@ -13,16 +13,15 @@ // limitations under the License. import { Component, ViewChild, ChangeDetectorRef } from '@angular/core'; import { NgForm } from '@angular/forms'; - -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { UserService } from "../user.service"; import { TranslateService } from "@ngx-translate/core"; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; @Component({ selector: 'change-password', templateUrl: "change-password.component.html", - styleUrls: ['./change-password.component.scss', '../../common.scss'] + styleUrls: ['./change-password.component.scss', '../../../../common.scss'] }) export class ChangePasswordComponent { opened: boolean = false; diff --git a/src/portal/src/app/user/new-user-madal.component.scss b/src/portal/src/app/base/left-side-nav/user/new-user-madal.component.scss similarity index 100% rename from src/portal/src/app/user/new-user-madal.component.scss rename to src/portal/src/app/base/left-side-nav/user/new-user-madal.component.scss diff --git a/src/portal/src/app/user/new-user-modal.component.html b/src/portal/src/app/base/left-side-nav/user/new-user-modal.component.html similarity index 100% rename from src/portal/src/app/user/new-user-modal.component.html rename to src/portal/src/app/base/left-side-nav/user/new-user-modal.component.html diff --git a/src/portal/src/app/user/new-user-modal.component.spec.ts b/src/portal/src/app/base/left-side-nav/user/new-user-modal.component.spec.ts similarity index 85% rename from src/portal/src/app/user/new-user-modal.component.spec.ts rename to src/portal/src/app/base/left-side-nav/user/new-user-modal.component.spec.ts index da924a50d1..0d79903d48 100644 --- a/src/portal/src/app/user/new-user-modal.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/user/new-user-modal.component.spec.ts @@ -3,9 +3,9 @@ import { ClarityModule } from '@clr/angular'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { UserService } from './user.service'; -import { SessionService } from '../shared/session.service'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; -import { SharedModule } from '../shared/shared.module'; +import { SessionService } from '../../../shared/services/session.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { SharedTestingModule } from '../../../shared/shared.module'; import { NewUserModalComponent } from './new-user-modal.component'; describe('NewUserModalComponent', () => { @@ -22,7 +22,7 @@ describe('NewUserModalComponent', () => { declarations: [NewUserModalComponent], imports: [ ClarityModule, - SharedModule, + SharedTestingModule, TranslateModule.forRoot() ], schemas: [ diff --git a/src/portal/src/app/user/new-user-modal.component.ts b/src/portal/src/app/base/left-side-nav/user/new-user-modal.component.ts similarity index 89% rename from src/portal/src/app/user/new-user-modal.component.ts rename to src/portal/src/app/base/left-side-nav/user/new-user-modal.component.ts index dc1141823d..4dd487e826 100644 --- a/src/portal/src/app/user/new-user-modal.component.ts +++ b/src/portal/src/app/base/left-side-nav/user/new-user-modal.component.ts @@ -12,19 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Component, ViewChild, Output, EventEmitter } from '@angular/core'; - -import { NewUserFormComponent } from '../shared/new-user-form/new-user-form.component'; +import { NewUserFormComponent } from '../../../shared/components/new-user-form/new-user-form.component'; import { User } from './user'; - -import { SessionService } from '../shared/session.service'; +import { SessionService } from '../../../shared/services/session.service'; import { UserService } from './user.service'; -import { InlineAlertComponent } from '../shared/inline-alert/inline-alert.component'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { InlineAlertComponent } from "../../../shared/components/inline-alert/inline-alert.component"; @Component({ selector: "new-user-modal", templateUrl: "new-user-modal.component.html", - styleUrls: ['../common.scss', "./new-user-madal.component.scss"] + styleUrls: ['../../../common.scss', "./new-user-madal.component.scss"] }) export class NewUserModalComponent { diff --git a/src/portal/src/app/user/user.component.html b/src/portal/src/app/base/left-side-nav/user/user.component.html similarity index 100% rename from src/portal/src/app/user/user.component.html rename to src/portal/src/app/base/left-side-nav/user/user.component.html diff --git a/src/portal/src/app/user/user.component.scss b/src/portal/src/app/base/left-side-nav/user/user.component.scss similarity index 100% rename from src/portal/src/app/user/user.component.scss rename to src/portal/src/app/base/left-side-nav/user/user.component.scss diff --git a/src/portal/src/app/user/user.component.spec.ts b/src/portal/src/app/base/left-side-nav/user/user.component.spec.ts similarity index 81% rename from src/portal/src/app/user/user.component.spec.ts rename to src/portal/src/app/base/left-side-nav/user/user.component.spec.ts index 90b367920a..d5aba120ee 100644 --- a/src/portal/src/app/user/user.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/user/user.component.spec.ts @@ -4,12 +4,12 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { UserService } from './user.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; -import { AppConfigService } from '../services/app-config.service'; -import { SessionService } from '../shared/session.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { AppConfigService } from '../../../services/app-config.service'; +import { SessionService } from '../../../shared/services/session.service'; import { UserComponent } from './user.component'; -import { OperationService } from "../../lib/components/operation/operation.service"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; describe('UserComponent', () => { let component: UserComponent; diff --git a/src/portal/src/app/user/user.component.ts b/src/portal/src/app/base/left-side-nav/user/user.component.ts similarity index 93% rename from src/portal/src/app/user/user.component.ts rename to src/portal/src/app/base/left-side-nav/user/user.component.ts index 13769933c9..2e45191632 100644 --- a/src/portal/src/app/user/user.component.ts +++ b/src/portal/src/app/base/left-side-nav/user/user.component.ts @@ -14,22 +14,27 @@ import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core'; import { Subscription, Observable, forkJoin } from "rxjs"; import { TranslateService } from '@ngx-translate/core'; -import { ConfirmationState, ConfirmationTargets, ConfirmationButtons } from '../shared/shared.const'; -import { ConfirmationDialogService } from '../shared/confirmation-dialog/confirmation-dialog.service'; -import { ConfirmationMessage } from '../shared/confirmation-dialog/confirmation-message'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; -import { SessionService } from '../shared/session.service'; -import { AppConfigService } from '../services/app-config.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { SessionService } from '../../../shared/services/session.service'; +import { AppConfigService } from '../../../services/app-config.service'; import { NewUserModalComponent } from './new-user-modal.component'; import { UserService } from './user.service'; import { User } from './user'; import { ChangePasswordComponent } from "./change-password/change-password.component"; import { map, catchError } from 'rxjs/operators'; import { throwError as observableThrowError } from "rxjs"; -import { OperationService } from "../../lib/components/operation/operation.service"; -import { operateChanges, OperateInfo, OperationState } from "../../lib/components/operation/operate"; -import { errorHandler } from "../../lib/utils/shared/shared.utils"; -import { CONFIG_AUTH_MODE } from "../../lib/entities/shared.const"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { operateChanges, OperateInfo, OperationState } from "../../../shared/components/operation/operate"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { + CONFIG_AUTH_MODE, + ConfirmationButtons, + ConfirmationState, + ConfirmationTargets +} from "../../../shared/entities/shared.const"; +import { errorHandler } from "../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; + /** * NOTES: diff --git a/src/portal/src/app/user/user.module.ts b/src/portal/src/app/base/left-side-nav/user/user.module.ts similarity index 73% rename from src/portal/src/app/user/user.module.ts rename to src/portal/src/app/base/left-side-nav/user/user.module.ts index 3e56363280..2d05d7f48b 100644 --- a/src/portal/src/app/user/user.module.ts +++ b/src/portal/src/app/base/left-side-nav/user/user.module.ts @@ -12,15 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. import { NgModule } from '@angular/core'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '../../../shared/shared.module'; import { UserComponent } from './user.component'; import { NewUserModalComponent } from './new-user-modal.component'; -import { UserService } from './user.service'; -import {ChangePasswordComponent} from "./change-password/change-password.component"; +import { ChangePasswordComponent } from "./change-password/change-password.component"; +import { RouterModule, Routes } from "@angular/router"; +const routes: Routes = [ + { + path: '', + component: UserComponent + } +]; @NgModule({ imports: [ - SharedModule + SharedModule, + RouterModule.forChild(routes) ], declarations: [ UserComponent, @@ -30,7 +37,6 @@ import {ChangePasswordComponent} from "./change-password/change-password.compone exports: [ UserComponent ], - providers: [UserService] }) export class UserModule { diff --git a/src/portal/src/app/user/user.service.spec.ts b/src/portal/src/app/base/left-side-nav/user/user.service.spec.ts similarity index 100% rename from src/portal/src/app/user/user.service.spec.ts rename to src/portal/src/app/base/left-side-nav/user/user.service.spec.ts diff --git a/src/portal/src/app/user/user.service.ts b/src/portal/src/app/base/left-side-nav/user/user.service.ts similarity index 98% rename from src/portal/src/app/user/user.service.ts rename to src/portal/src/app/base/left-side-nav/user/user.service.ts index 4dccfc3c6c..a284fc820e 100644 --- a/src/portal/src/app/user/user.service.ts +++ b/src/portal/src/app/base/left-side-nav/user/user.service.ts @@ -22,7 +22,7 @@ import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS -} from "../../lib/utils/utils"; +} from "../../../shared/units/utils"; const userMgmtEndpoint = CURRENT_BASE_HREF + '/users'; @@ -35,7 +35,9 @@ const ldapUserEndpoint = CURRENT_BASE_HREF + '/ldap/users'; ** * class SessionService */ -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class UserService { constructor(private http: HttpClient) { } diff --git a/src/portal/src/app/user/user.ts b/src/portal/src/app/base/left-side-nav/user/user.ts similarity index 100% rename from src/portal/src/app/user/user.ts rename to src/portal/src/app/base/left-side-nav/user/user.ts diff --git a/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.html b/src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.html similarity index 100% rename from src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.html rename to src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.html diff --git a/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.scss b/src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.scss similarity index 100% rename from src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.scss rename to src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.scss diff --git a/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.spec.ts b/src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.spec.ts similarity index 95% rename from src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.spec.ts rename to src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.spec.ts index e80ceb6fee..0e262c550b 100644 --- a/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.spec.ts +++ b/src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.spec.ts @@ -5,10 +5,10 @@ import { ClarityModule } from "@clr/angular"; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { PasswordSettingService } from '../password-setting.service'; -import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; -import { ErrorHandler } from '../../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../../shared/units/error-handler'; +import { InlineAlertComponent } from "../../../shared/components/inline-alert/inline-alert.component"; describe('ForgotPasswordComponent', () => { let component: ForgotPasswordComponent; diff --git a/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.ts b/src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.ts similarity index 96% rename from src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.ts rename to src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.ts index 6026d0b8e0..df25999bef 100644 --- a/src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.ts +++ b/src/portal/src/app/base/password-setting/forgot-password/forgot-password.component.ts @@ -13,9 +13,8 @@ // limitations under the License. import { Component, ViewChild } from '@angular/core'; import { NgForm } from '@angular/forms'; - import { PasswordSettingService } from '../password-setting.service'; -import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; +import { InlineAlertComponent } from "../../../shared/components/inline-alert/inline-alert.component"; @Component({ selector: 'forgot-password', diff --git a/src/portal/src/app/account/password-setting/password-setting.component.html b/src/portal/src/app/base/password-setting/password-setting.component.html similarity index 100% rename from src/portal/src/app/account/password-setting/password-setting.component.html rename to src/portal/src/app/base/password-setting/password-setting.component.html diff --git a/src/portal/src/app/account/password-setting/password-setting.component.scss b/src/portal/src/app/base/password-setting/password-setting.component.scss similarity index 100% rename from src/portal/src/app/account/password-setting/password-setting.component.scss rename to src/portal/src/app/base/password-setting/password-setting.component.scss diff --git a/src/portal/src/app/account/password-setting/password-setting.component.spec.ts b/src/portal/src/app/base/password-setting/password-setting.component.spec.ts similarity index 94% rename from src/portal/src/app/account/password-setting/password-setting.component.spec.ts rename to src/portal/src/app/base/password-setting/password-setting.component.spec.ts index 6b934d2984..7f59c87710 100644 --- a/src/portal/src/app/account/password-setting/password-setting.component.spec.ts +++ b/src/portal/src/app/base/password-setting/password-setting.component.spec.ts @@ -1,16 +1,16 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { PasswordSettingService } from './password-setting.service'; -import { SessionService } from '../../shared/session.service'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { SessionService } from '../../shared/services/session.service'; +import { MessageHandlerService } from '../../shared/services/message-handler.service'; import { PasswordSettingComponent } from './password-setting.component'; import { ClarityModule } from "@clr/angular"; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; -import { ErrorHandler } from '../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../shared/units/error-handler'; +import { InlineAlertComponent } from "../../shared/components/inline-alert/inline-alert.component"; describe('PasswordSettingComponent', () => { let component: PasswordSettingComponent; diff --git a/src/portal/src/app/account/password-setting/password-setting.component.ts b/src/portal/src/app/base/password-setting/password-setting.component.ts similarity index 94% rename from src/portal/src/app/account/password-setting/password-setting.component.ts rename to src/portal/src/app/base/password-setting/password-setting.component.ts index baf8666a2f..15b8c83da9 100644 --- a/src/portal/src/app/account/password-setting/password-setting.component.ts +++ b/src/portal/src/app/base/password-setting/password-setting.component.ts @@ -13,12 +13,11 @@ // limitations under the License. import { Component, ViewChild, AfterViewChecked } from '@angular/core'; import { NgForm } from '@angular/forms'; - import { PasswordSettingService } from './password-setting.service'; -import { SessionService } from '../../shared/session.service'; -import { isEmptyForm } from '../../shared/shared.utils'; -import { InlineAlertComponent } from '../../shared/inline-alert/inline-alert.component'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { SessionService } from '../../shared/services/session.service'; +import { isEmptyForm } from '../../shared/units/shared.utils'; +import { MessageHandlerService } from '../../shared/services/message-handler.service'; +import { InlineAlertComponent } from "../../shared/components/inline-alert/inline-alert.component"; @Component({ selector: 'password-setting', diff --git a/src/portal/src/app/account/password-setting/password-setting.service.spec.ts b/src/portal/src/app/base/password-setting/password-setting.service.spec.ts similarity index 96% rename from src/portal/src/app/account/password-setting/password-setting.service.spec.ts rename to src/portal/src/app/base/password-setting/password-setting.service.spec.ts index 6e5cb0c321..22f2053169 100644 --- a/src/portal/src/app/account/password-setting/password-setting.service.spec.ts +++ b/src/portal/src/app/base/password-setting/password-setting.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed, inject, getTestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { PasswordSettingService } from './password-setting.service'; -import { CURRENT_BASE_HREF } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF } from "../../shared/units/utils"; describe('PasswordSettingService', () => { let injector: TestBed; diff --git a/src/portal/src/app/account/password-setting/password-setting.service.ts b/src/portal/src/app/base/password-setting/password-setting.service.ts similarity index 96% rename from src/portal/src/app/account/password-setting/password-setting.service.ts rename to src/portal/src/app/base/password-setting/password-setting.service.ts index 3f86e175de..b4c1552c90 100644 --- a/src/portal/src/app/account/password-setting/password-setting.service.ts +++ b/src/portal/src/app/base/password-setting/password-setting.service.ts @@ -16,13 +16,15 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; import { PasswordSetting } from './password-setting'; -import { CURRENT_BASE_HREF, HTTP_FORM_OPTIONS, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF, HTTP_FORM_OPTIONS, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../../shared/units/utils"; const passwordChangeEndpoint = CURRENT_BASE_HREF + "/users/:user_id/password"; const sendEmailEndpoint = "/c/sendEmail"; const resetPasswordEndpoint = "/c/reset"; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class PasswordSettingService { constructor(private http: HttpClient) { } diff --git a/src/portal/src/app/account/password-setting/password-setting.ts b/src/portal/src/app/base/password-setting/password-setting.ts similarity index 100% rename from src/portal/src/app/account/password-setting/password-setting.ts rename to src/portal/src/app/base/password-setting/password-setting.ts diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.html diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.scss similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.scss diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.spec.ts similarity index 73% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.spec.ts index 9e498ac428..bdd3a0d5f8 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.spec.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.spec.ts @@ -1,11 +1,10 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { ClarityModule } from '@clr/angular'; import { ActivatedRoute, Router } from "@angular/router"; -import { SessionService } from './../../../shared/session.service'; +import { SessionService } from '../../../../shared/services/session.service'; import { of } from 'rxjs'; import { HelmChartDetailComponent } from './chart-detail.component'; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('ChartDetailComponent', () => { let component: HelmChartDetailComponent; @@ -24,26 +23,30 @@ describe('ChartDetailComponent', () => { CUSTOM_ELEMENTS_SCHEMA ], imports: [ - ClarityModule, - TranslateModule.forRoot() + SharedTestingModule ], providers: [ { provide: ActivatedRoute, useValue: { paramMap: of({ get: (key) => 'value' }), snapshot: { - params: { id: 1, chart: 'chart', version: 1.0 }, - data: { - projectResolver: { - role_name: 'admin' - } - } + parent: { + data: { + projectResolver: { + role_name: 'admin' + } + }, + params: { id: 1}, + }, + params: { + chart: 'chart', + version: 1.0 + }, } } }, { provide: Router, useValue: fakeRouter }, { provide: SessionService, useValue: fakeSessionService }, - TranslateService ] }).compileComponents(); })); diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.ts similarity index 82% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.ts index 3f8718368e..4cd488def1 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail.component.ts @@ -1,8 +1,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { Component, OnInit } from "@angular/core"; import { Project } from '../../project'; -import { SessionService } from './../../../shared/session.service'; -import { SessionUser } from './../../../shared/session-user'; +import { SessionService } from '../../../../shared/services/session.service'; +import { SessionUser } from '../../../../shared/entities/session-user'; @Component({ selector: "project-chart-detail", @@ -27,13 +27,13 @@ export class HelmChartDetailComponent implements OnInit { ) {} ngOnInit() { - // Get projectId from route params snapshot. - this.projectId = +this.route.snapshot.params['id']; + // Get projectId from router-guard params snapshot. + this.projectId = +this.route.snapshot.parent.params['id']; this.chartName = this.route.snapshot.params['chart']; this.chartVersion = this.route.snapshot.params['version']; // Get current user from registered resolver. this.currentUser = this.session.getCurrentUser(); - let resolverData = this.route.snapshot.data; + let resolverData = this.route.snapshot.parent.data; if (resolverData) { this.project = (resolverData["projectResolver"]); this.roleName = this.project.role_name; diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.html diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.scss similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.scss diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.spec.ts similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.spec.ts diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.ts similarity index 86% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.ts index fa52309e33..cfd0447f75 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.ts @@ -5,7 +5,7 @@ import { ChangeDetectionStrategy } from "@angular/core"; -import { HelmChartDependency } from "../../helm-chart.interface.service"; +import { HelmChartDependency } from "../helm-chart.interface.service"; @Component({ selector: "hbr-chart-detail-dependency", diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.html diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.scss similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.scss diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.spec.ts similarity index 87% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.spec.ts index 4785fc3595..2ae5fe6725 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.spec.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.spec.ts @@ -5,8 +5,9 @@ import { ClarityModule } from '@clr/angular'; import { CUSTOM_ELEMENTS_SCHEMA, SecurityContext } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MarkedOptions, MarkdownModule } from 'ngx-markdown'; -import { HelmChartService } from '../../helm-chart.service'; -import { DefaultErrorHandler, ErrorHandler } from "../../../../../lib/utils/error-handler"; +import { HelmChartService } from '../helm-chart.service'; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { MessageHandlerService } from "../../../../../shared/services/message-handler.service"; describe('ChartDetailSummaryComponent', () => { let component: ChartDetailSummaryComponent; let fixture: ComponentFixture; @@ -30,7 +31,7 @@ describe('ChartDetailSummaryComponent', () => { providers: [ TranslateService, { provide: MarkedOptions, useValue: {} }, - { provide: ErrorHandler, useValue: DefaultErrorHandler }, + { provide: ErrorHandler, useValue: MessageHandlerService }, { provide: HelmChartService, useValue: mockHelmChartService }, ] }).compileComponents(); diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.ts similarity index 85% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.ts index 4d118ffc47..e7ed014634 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.ts @@ -4,11 +4,11 @@ import { ChangeDetectionStrategy, Input } from "@angular/core"; -import { HelmChartMetaData, HelmChartSecurity } from "./../../helm-chart.interface.service"; -import { HelmChartService } from "../../helm-chart.service"; -import { Label } from "../../../../../lib/services"; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { downloadFile } from "../../../../../lib/utils/utils"; +import { HelmChartMetaData, HelmChartSecurity } from "../helm-chart.interface.service"; +import { HelmChartService } from "../helm-chart.service"; +import { Label } from "../../../../../shared/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { downloadFile } from "../../../../../shared/units/utils"; @Component({ selector: "hbr-chart-detail-summary", diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.html diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.scss similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.scss diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.spec.ts similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.spec.ts diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.ts similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.ts diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.html diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.scss similarity index 91% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.scss index f28e843057..8096907ab4 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.scss +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.scss @@ -1,4 +1,4 @@ -@import "../../../../../lib/mixin"; +@import "../../../../../shared/mixin"; .title-container { display: flex; diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.spec.ts similarity index 96% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.spec.ts index 366788622a..95da4fee8f 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.spec.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.spec.ts @@ -4,10 +4,10 @@ import { ChartDetailComponent } from './chart-detail.component'; import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { HelmChartService } from "../../helm-chart.service"; +import { HelmChartService } from "../helm-chart.service"; import { of } from 'rxjs'; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { SystemInfoService } from "../../../../../lib/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { SystemInfoService } from "../../../../../shared/services"; describe('ChartDetailComponent', () => { let component: ChartDetailComponent; let fixture: ComponentFixture; diff --git a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.ts similarity index 78% rename from src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.ts index 85bb37323d..015da9d01d 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.ts @@ -1,24 +1,21 @@ import { Component, OnInit, - ChangeDetectionStrategy, Input, - ChangeDetectorRef } from "@angular/core"; import { Project } from "../../../project"; -import { HelmChartService } from "../../helm-chart.service"; -import { HelmChartDetail } from "../../helm-chart.interface.service"; +import { HelmChartService } from "../helm-chart.service"; +import { HelmChartDetail } from "../helm-chart.interface.service"; import { finalize } from "rxjs/operators"; -import { SystemInfo, SystemInfoService } from "../../../../../lib/services"; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { downloadFile } from "../../../../../lib/utils/utils"; +import { SystemInfo, SystemInfoService } from "../../../../../shared/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { downloadFile } from "../../../../../shared/units/utils"; @Component({ selector: "hbr-chart-detail", templateUrl: "./chart-detail.component.html", styleUrls: ["./chart-detail.component.scss"], - changeDetection: ChangeDetectionStrategy.OnPush }) export class ChartDetailComponent implements OnInit { @Input() projectId: number; @@ -40,7 +37,6 @@ export class ChartDetailComponent implements OnInit { private errorHandler: ErrorHandler, private systemInfoService: SystemInfoService, private helmChartService: HelmChartService, - private cdr: ChangeDetectorRef ) { } ngOnInit(): void { @@ -64,7 +60,7 @@ export class ChartDetailComponent implements OnInit { } public get isChartExist() { - return this.chartDetail ? true : false; + return !!this.chartDetail; } refresh() { @@ -73,8 +69,6 @@ export class ChartDetailComponent implements OnInit { .getChartDetail(this.project.name, this.chartName, this.chartVersion) .pipe(finalize(() => { this.loading = false; - let hnd = setInterval(() => this.cdr.markForCheck(), 100); - setTimeout(() => clearInterval(hnd), 2000); })) .subscribe( chartDetail => { diff --git a/src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart-detail.module.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart-detail.module.ts new file mode 100644 index 0000000000..de3957c6d3 --- /dev/null +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart-detail.module.ts @@ -0,0 +1,54 @@ +// Copyright Project Harbor Authors +// +// 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. +import { NgModule } from '@angular/core'; +import { LabelFilterComponent } from './label-filter/label-filter.component'; +import { LabelMarkerComponent } from './label-marker/label-marker.component'; +import { ListChartVersionsComponent } from './list-chart-versions/list-chart-versions.component'; +import { ChartVersionComponent } from './list-chart-versions/helm-chart-versions-detail/helm-chart-version.component'; +import { ChartDetailDependencyComponent } from './chart-detail/chart-detail-dependency.component'; +import { ChartDetailSummaryComponent } from './chart-detail/chart-detail-summary.component'; +import { ChartDetailValueComponent } from './chart-detail/chart-detail-value.component'; +import { ChartDetailComponent } from './chart-detail/chart-detail.component'; +import { HelmChartDetailComponent } from './chart-detail.component'; +import { SharedModule } from '../../../../shared/shared.module'; +import { RouterModule, Routes } from "@angular/router"; + +const routes: Routes = [ + { + path: ':chart/versions', + component: ListChartVersionsComponent + }, + { + path: ':chart/versions/:version', + component: HelmChartDetailComponent, + }, +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes) + ], + declarations: [ + LabelFilterComponent, + LabelMarkerComponent, + ListChartVersionsComponent, + ChartVersionComponent, + ChartDetailDependencyComponent, + ChartDetailSummaryComponent, + ChartDetailValueComponent, + ChartDetailComponent, + HelmChartDetailComponent, + ], +}) +export class HelmChartListModule { } diff --git a/src/portal/src/app/project/helm-chart/helm-chart.interface.service.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart.interface.service.ts similarity index 97% rename from src/portal/src/app/project/helm-chart/helm-chart.interface.service.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart.interface.service.ts index 168f347ac0..2af2c5269a 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart.interface.service.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart.interface.service.ts @@ -1,4 +1,4 @@ -import { Label } from "../../../lib/services"; +import { Label } from "../../../../shared/services"; export interface HelmChartSearchResultItem { Name: string; diff --git a/src/portal/src/app/project/helm-chart/helm-chart.service.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart.service.spec.ts similarity index 100% rename from src/portal/src/app/project/helm-chart/helm-chart.service.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart.service.spec.ts diff --git a/src/portal/src/app/project/helm-chart/helm-chart.service.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart.service.ts similarity index 82% rename from src/portal/src/app/project/helm-chart/helm-chart.service.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart.service.ts index 5f4a85fccd..bc6408a8cb 100644 --- a/src/portal/src/app/project/helm-chart/helm-chart.service.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/helm-chart.service.ts @@ -4,9 +4,8 @@ import { HttpClient } from "@angular/common/http"; import { map, catchError } from "rxjs/operators"; import {HttpErrorResponse} from "@angular/common/http"; import { HelmChartItem, HelmChartVersion, HelmChartDetail } from "./helm-chart.interface.service"; -import { RequestQueryParams } from "../../../lib/services"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../lib/entities/service.config"; -import { HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../../../lib/utils/utils"; +import { RequestQueryParams } from "../../../../shared/services"; +import { HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS, V1_BASE_HREF } from "../../../../shared/units/utils"; /** * Define service methods for handling the helmchart related things. @@ -98,7 +97,6 @@ export abstract class HelmChartService { export class HelmChartDefaultService extends HelmChartService { constructor( private http: HttpClient, - @Inject(SERVICE_CONFIG) private config: IServiceConfig ) { super(); } @@ -116,7 +114,7 @@ export class HelmChartDefaultService extends HelmChartService { } return this.http - .get(`${this.config.helmChartEndpoint}/${projectName}/charts`, HTTP_GET_OPTIONS) + .get(`${V1_BASE_HREF + "/chartrepo"}/${projectName}/charts`, HTTP_GET_OPTIONS) .pipe( map(response => response || []), catchError(error => this.handleErrorObservable(error)) @@ -129,7 +127,7 @@ export class HelmChartDefaultService extends HelmChartService { } return this.http - .delete(`${this.config.helmChartEndpoint}/${projectId}/charts/${chartName}`) + .delete(`${V1_BASE_HREF + "/chartrepo"}/${projectId}/charts/${chartName}`) .pipe(map(response => { return response || []; })) @@ -140,7 +138,7 @@ export class HelmChartDefaultService extends HelmChartService { projectName: string, chartName: string, ): Observable { - return this.http.get(`${this.config.helmChartEndpoint}/${projectName}/charts/${chartName}`, HTTP_GET_OPTIONS) + return this.http.get(`${V1_BASE_HREF + "/chartrepo"}/${projectName}/charts/${chartName}`, HTTP_GET_OPTIONS) .pipe( map(response => response || []), catchError(this.handleErrorObservable) @@ -148,7 +146,7 @@ export class HelmChartDefaultService extends HelmChartService { } public deleteChartVersion(projectName: string, chartName: string, version: string): any { - return this.http.delete(`${this.config.helmChartEndpoint}/${projectName}/charts/${chartName}/${version}`, HTTP_JSON_OPTIONS) + return this.http.delete(`${V1_BASE_HREF + "/chartrepo"}/${projectName}/charts/${chartName}/${version}`, HTTP_JSON_OPTIONS) .pipe(map(response => { return response || []; })) @@ -160,7 +158,7 @@ export class HelmChartDefaultService extends HelmChartService { chartName: string, version: string, ): Observable { - return this.http.get(`${this.config.helmChartEndpoint}/${projectName}/charts/${chartName}/${version}`) + return this.http.get(`${V1_BASE_HREF + "/chartrepo"}/${projectName}/charts/${chartName}/${version}`) .pipe(catchError(this.handleErrorObservable)); } @@ -172,9 +170,9 @@ export class HelmChartDefaultService extends HelmChartService { let chartFileRegexPattern = new RegExp('^http.*/chartrepo/(.*)'); if (chartFileRegexPattern.test(filename)) { let match = filename.match('^http.*/chartrepo/(.*)'); - url = `${this.config.downloadChartEndpoint}/${match[1]}`; + url = `${V1_BASE_HREF + "/chartrepo"}/${match[1]}`; } else { - url = `${this.config.downloadChartEndpoint}/${projectName}/${filename}`; + url = `${V1_BASE_HREF + "/chartrepo"}/${projectName}/${filename}`; } return this.http.get(url, { responseType: 'blob', @@ -195,14 +193,14 @@ export class HelmChartDefaultService extends HelmChartService { prov?: File ): Observable { let formData = new FormData(); - let uploadURL = `${this.config.helmChartEndpoint}/${projectName}/charts`; + let uploadURL = `${V1_BASE_HREF + "/chartrepo"}/${projectName}/charts`; if (chart) { formData.append('chart', chart); } if (prov) { formData.append('prov', prov); if (!chart) { - uploadURL = `${this.config.helmChartEndpoint}/${projectName}/prov`; + uploadURL = `${V1_BASE_HREF + "/chartrepo"}/${projectName}/prov`; } } return this.http.post(uploadURL, formData, { diff --git a/src/portal/src/app/project/helm-chart/label-filter/label-filter.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/label-filter/label-filter.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.html diff --git a/src/portal/src/app/project/helm-chart/label-filter/label-filter.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.scss similarity index 100% rename from src/portal/src/app/project/helm-chart/label-filter/label-filter.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.scss diff --git a/src/portal/src/app/project/helm-chart/label-filter/label-filter.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.spec.ts similarity index 100% rename from src/portal/src/app/project/helm-chart/label-filter/label-filter.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.spec.ts diff --git a/src/portal/src/app/project/helm-chart/label-filter/label-filter.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.ts similarity index 91% rename from src/portal/src/app/project/helm-chart/label-filter/label-filter.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.ts index 20ffed19fb..b6e0172a2e 100644 --- a/src/portal/src/app/project/helm-chart/label-filter/label-filter.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-filter/label-filter.component.ts @@ -3,9 +3,9 @@ import {ClrDatagridFilterInterface} from "@clr/angular"; import { fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; import { HelmChartVersion } from '../helm-chart.interface.service'; -import { ResourceType } from '../../../shared/shared.const'; -import { Label } from "../../../../lib/services"; -import { Artifact } from "../../../../../ng-swagger-gen/models/artifact"; +import { Label } from "../../../../../shared/services"; +import { Artifact } from "../../../../../../../ng-swagger-gen/models/artifact"; +import { ResourceType } from "../../../../../shared/entities/shared.const"; @Component({ selector: "hbr-chart-version-label-filter", diff --git a/src/portal/src/app/project/helm-chart/label-marker/label-marker.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.html similarity index 89% rename from src/portal/src/app/project/helm-chart/label-marker/label-marker.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.html index f9eda16b69..c0e22cf13d 100644 --- a/src/portal/src/app/project/helm-chart/label-marker/label-marker.component.html +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.html @@ -1,7 +1,7 @@
- +
diff --git a/src/portal/src/app/project/helm-chart/label-marker/label-marker.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.scss similarity index 100% rename from src/portal/src/app/project/helm-chart/label-marker/label-marker.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.scss diff --git a/src/portal/src/app/project/helm-chart/label-marker/label-marker.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.spec.ts similarity index 93% rename from src/portal/src/app/project/helm-chart/label-marker/label-marker.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.spec.ts index b35566c952..136c69c5b3 100644 --- a/src/portal/src/app/project/helm-chart/label-marker/label-marker.component.spec.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.spec.ts @@ -5,8 +5,8 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; import { of } from 'rxjs'; -import { LabelService } from "../../../../lib/services"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; +import { LabelService } from "../../../../../shared/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; describe('LabelMarkerComponent', () => { const mockErrorHandler = null; diff --git a/src/portal/src/app/project/helm-chart/label-marker/label-marker.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.ts similarity index 95% rename from src/portal/src/app/project/helm-chart/label-marker/label-marker.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.ts index eaca58a5a4..a765404bf7 100644 --- a/src/portal/src/app/project/helm-chart/label-marker/label-marker.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/label-marker/label-marker.component.ts @@ -2,9 +2,9 @@ import { Component, Input, Output, OnInit, EventEmitter, ChangeDetectorRef, View import { fromEvent, Subject } from 'rxjs'; import { debounceTime, finalize } from 'rxjs/operators'; import { HelmChartVersion } from '../helm-chart.interface.service'; -import { ResourceType } from '../../../shared/shared.const'; -import { Label, LabelService } from "../../../../lib/services"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; +import { Label, LabelService } from "../../../../../shared/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { ResourceType } from "../../../../../shared/entities/shared.const"; @Component({ selector: 'hbr-resource-label-marker', diff --git a/src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.html diff --git a/src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.scss similarity index 98% rename from src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.scss index 662314f9d6..4728a0adee 100644 --- a/src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.scss +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.scss @@ -1,4 +1,4 @@ -@import "../../../../../lib/mixin"; +@import "../../../../../../shared/mixin"; .title-container { display: flex; diff --git a/src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.spec.ts similarity index 94% rename from src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.spec.ts index acde0e9819..dffde4f0c2 100644 --- a/src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.spec.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.spec.ts @@ -7,9 +7,9 @@ import { FormsModule } from '@angular/forms'; import { HelmChartService } from "../../helm-chart.service"; import { LabelFilterComponent } from "../../label-filter/label-filter.component"; import { of } from 'rxjs'; -import { LabelService, SystemInfoService, UserPermissionService } from "../../../../../lib/services"; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { OperationService } from "../../../../../lib/components/operation/operation.service"; +import { LabelService, SystemInfoService, UserPermissionService } from "../../../../../../shared/services"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; +import { OperationService } from "../../../../../../shared/components/operation/operation.service"; import { delay } from "rxjs/operators"; describe('ChartVersionComponent', () => { diff --git a/src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts similarity index 89% rename from src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts index 34bbb75670..331020ea27 100644 --- a/src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts @@ -3,8 +3,6 @@ import { Input, OnInit, ViewChild, - ChangeDetectionStrategy, - ChangeDetectorRef, Output, EventEmitter } from "@angular/core"; @@ -13,16 +11,6 @@ import { finalize, map, catchError } from "rxjs/operators"; import { TranslateService } from "@ngx-translate/core"; import { HelmChartVersion, HelmChartMaintainer } from "../../helm-chart.interface.service"; import { HelmChartService } from "../../helm-chart.service"; -import { ConfirmationAcknowledgement } from "../../../../shared/confirmation-dialog/confirmation-state-message"; -import { ConfirmationDialogComponent } from "../../../../shared/confirmation-dialog/confirmation-dialog.component"; -import { ConfirmationMessage } from "../../../../shared/confirmation-dialog/confirmation-message"; -import { - ConfirmationButtons, - ConfirmationTargets, - ConfirmationState, - DefaultHelmIcon, - ResourceType, -} from "../../../../shared/shared.const"; import { Label, LabelService, @@ -30,12 +18,21 @@ import { SystemInfo, SystemInfoService, UserPermissionService, USERSTATICPERMISSION -} from "../../../../../lib/services"; -import { DEFAULT_PAGE_SIZE, downloadFile } from "../../../../../lib/utils/utils"; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { OperationService } from "../../../../../lib/components/operation/operation.service"; -import { operateChanges, OperateInfo, OperationState } from "../../../../../lib/components/operation/operate"; -import { errorHandler as errorHandlerFn } from "../../../../../lib/utils/shared/shared.utils"; +} from "../../../../../../shared/services"; +import { DEFAULT_PAGE_SIZE, downloadFile } from "../../../../../../shared/units/utils"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; +import { OperationService } from "../../../../../../shared/components/operation/operation.service"; +import { operateChanges, OperateInfo, OperationState } from "../../../../../../shared/components/operation/operate"; +import { + ConfirmationButtons, ConfirmationState, + ConfirmationTargets, + DefaultHelmIcon, + ResourceType +} from "../../../../../../shared/entities/shared.const"; +import { errorHandler } from "../../../../../../shared/units/shared.utils"; +import { ConfirmationDialogComponent } from "../../../../../../shared/components/confirmation-dialog"; +import { ConfirmationMessage } from "../../../../../global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../../../../global-confirmation-dialog/confirmation-state-message"; @Component({ selector: "hbr-helm-chart-version", @@ -82,7 +79,7 @@ export class ChartVersionComponent implements OnInit { hasDownloadHelmChartVersionPermission: boolean; hasDeleteHelmChartVersionPermission: boolean; constructor( - private errorHandler: ErrorHandler, + private errorHandlerEntity: ErrorHandler, private systemInfoService: SystemInfoService, private helmChartService: HelmChartService, private resrouceLabelService: LabelService, @@ -99,7 +96,7 @@ export class ChartVersionComponent implements OnInit { // Get system info for tag views this.systemInfoService.getSystemInfo() .subscribe(systemInfo => (this.systemInfo = systemInfo) - , error => this.errorHandler.error(error)); + , error => this.errorHandlerEntity.error(error)); this.refresh(); this.getLabels(); this.lastFilteredVersionName = ""; @@ -133,7 +130,7 @@ export class ChartVersionComponent implements OnInit { this.totalCount = versions.length; }, err => { - this.errorHandler.error(err); + this.errorHandlerEntity.error(err); } ); } @@ -168,7 +165,7 @@ export class ChartVersionComponent implements OnInit { .pipe(map( () => operateChanges(operateMsg, OperationState.success)), catchError( error => { - const message = errorHandlerFn(error); + const message = errorHandler(error); this.translateService.get(message).subscribe(res => operateChanges(operateMsg, OperationState.failure, res) ); @@ -192,7 +189,7 @@ export class ChartVersionComponent implements OnInit { this.backEvt.emit(); } }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } @@ -221,7 +218,7 @@ export class ChartVersionComponent implements OnInit { downloadFile(res); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); } ); } @@ -341,6 +338,6 @@ export class ChartVersionComponent implements OnInit { this.hasAddRemoveHelmChartVersionPermission = permissions[0] as boolean; this.hasDownloadHelmChartVersionPermission = permissions[1] as boolean; this.hasDeleteHelmChartVersionPermission = permissions[2] as boolean; - }, error => this.errorHandler.error(error)); + }, error => this.errorHandlerEntity.error(error)); } } diff --git a/src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.html diff --git a/src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.scss similarity index 100% rename from src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.scss diff --git a/src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.spec.ts similarity index 87% rename from src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.spec.ts index 0db7ac9e21..658d6c8117 100644 --- a/src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.spec.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.spec.ts @@ -4,8 +4,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { ActivatedRoute } from '@angular/router'; import { Router } from '@angular/router'; -import { of } from 'rxjs'; -import { SessionService } from './../../../shared/session.service'; +import { SessionService } from '../../../../../shared/services/session.service'; import { ListChartVersionsComponent } from './list-chart-versions.component'; describe('ListChartVersionsComponent', () => { @@ -32,8 +31,13 @@ describe('ListChartVersionsComponent', () => { { provide: ActivatedRoute, useValue: { snapshot: { + parent: { + params: { + id: 1, + }, + data: null + }, params: { - id: 1, chart: 'chart' } } diff --git a/src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.ts similarity index 77% rename from src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.ts index d0771eb7fa..5f619411d1 100644 --- a/src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-detail/list-chart-versions/list-chart-versions.component.ts @@ -2,9 +2,9 @@ import { Router } from '@angular/router'; import { ActivatedRoute } from '@angular/router'; import { Component, OnInit } from '@angular/core'; -import { Project } from '../../project'; -import { SessionUser } from '../../../shared/session-user'; -import { SessionService } from '../../../shared/session.service'; +import { Project } from '../../../project'; +import { SessionUser } from '../../../../../shared/entities/session-user'; +import { SessionService } from '../../../../../shared/services/session.service'; @Component({ selector: 'list-chart-version', @@ -29,12 +29,12 @@ export class ListChartVersionsComponent implements OnInit { private session: SessionService) {} ngOnInit() { - // Get projectId from route params snapshot. - this.projectId = +this.route.snapshot.params['id']; + // Get projectId from router-guard params snapshot. + this.projectId = +this.route.snapshot.parent.params['id']; this.chartName = this.route.snapshot.params['chart']; // Get current user from registered resolver. this.currentUser = this.session.getCurrentUser(); - let resolverData = this.route.snapshot.data; + let resolverData = this.route.snapshot.parent.data; if (resolverData) { let project = (resolverData["projectResolver"]); this.roleName = project.role_name; diff --git a/src/portal/src/app/base/project/helm-chart/helm-chart-list/helm-chart-list.module.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-list/helm-chart-list.module.ts new file mode 100644 index 0000000000..6b6a614c2d --- /dev/null +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-list/helm-chart-list.module.ts @@ -0,0 +1,37 @@ +// Copyright Project Harbor Authors +// +// 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. +import { NgModule } from '@angular/core'; +import { ListChartsComponent } from './list-charts.component'; +import { HelmChartComponent } from './list-charts-detail/helm-chart.component'; +import { SharedModule } from '../../../../shared/shared.module'; +import { RouterModule, Routes } from "@angular/router"; + + +const routes: Routes = [ + { + path: '', + component: ListChartsComponent + } +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes) + ], + declarations: [ + ListChartsComponent, + HelmChartComponent, + ], +}) +export class HelmChartListModule { } diff --git a/src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.html diff --git a/src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.scss similarity index 98% rename from src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.scss index f989289bec..bfb1c13246 100644 --- a/src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.scss +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.scss @@ -1,4 +1,4 @@ -@import "../../../../lib/mixin"; +@import "../../../../../shared/mixin"; $size24:24px; $size60:60px; diff --git a/src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.spec.ts similarity index 92% rename from src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.spec.ts index f0b1fca010..9151e2d3c8 100644 --- a/src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.spec.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.spec.ts @@ -5,10 +5,10 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; import { of } from 'rxjs'; -import { HelmChartService } from "../helm-chart.service"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import { SystemInfoService, UserPermissionService } from "../../../../lib/services"; -import { OperationService } from "../../../../lib/components/operation/operation.service"; +import { HelmChartService } from "../../helm-chart-detail/helm-chart.service"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { SystemInfoService, UserPermissionService } from "../../../../../shared/services"; +import { OperationService } from "../../../../../shared/components/operation/operation.service"; describe('HelmChartComponent', () => { let component: HelmChartComponent; diff --git a/src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.ts similarity index 85% rename from src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.ts index d729808bef..afbfd169ac 100644 --- a/src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts-detail/helm-chart.component.ts @@ -10,30 +10,30 @@ import { NgForm } from '@angular/forms'; import { TranslateService } from "@ngx-translate/core"; import { forkJoin, throwError as observableThrowError, Observable } from "rxjs"; import { finalize, map, catchError } from "rxjs/operators"; -import { HelmChartItem } from "../helm-chart.interface.service"; -import { HelmChartService } from "../helm-chart.service"; -import { DefaultHelmIcon, Roles } from "../../../shared/shared.const"; - -import { ConfirmationAcknowledgement } from "../../../shared/confirmation-dialog/confirmation-state-message"; -import { ConfirmationDialogComponent } from "../../../shared/confirmation-dialog/confirmation-dialog.component"; -import { ConfirmationMessage } from "../../../shared/confirmation-dialog/confirmation-message"; -import { - ConfirmationButtons, - ConfirmationTargets, - ConfirmationState, -} from "../../../shared/shared.const"; +import { HelmChartItem } from "../../helm-chart-detail/helm-chart.interface.service"; +import { HelmChartService } from "../../helm-chart-detail/helm-chart.service"; import { State, SystemInfo, SystemInfoService, UserPermissionService, USERSTATICPERMISSION -} from "../../../../lib/services"; -import { DEFAULT_PAGE_SIZE, downloadFile } from "../../../../lib/utils/utils"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import { OperationService } from "../../../../lib/components/operation/operation.service"; -import { operateChanges, OperateInfo, OperationState } from "../../../../lib/components/operation/operate"; -import { errorHandler as errorHandlerFn } from "../../../../lib/utils/shared/shared.utils"; +} from "../../../../../shared/services"; +import { DEFAULT_PAGE_SIZE, downloadFile } from "../../../../../shared/units/utils"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { OperationService } from "../../../../../shared/components/operation/operation.service"; +import { operateChanges, OperateInfo, OperationState } from "../../../../../shared/components/operation/operate"; +import { + ConfirmationButtons, ConfirmationState, + ConfirmationTargets, + DefaultHelmIcon, + Roles +} from "../../../../../shared/entities/shared.const"; +import { errorHandler } from "../../../../../shared/units/shared.utils"; +import { ConfirmationDialogComponent } from "../../../../../shared/components/confirmation-dialog"; +import { ConfirmationMessage } from "../../../../global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../../../global-confirmation-dialog/confirmation-state-message"; + @Component({ selector: "hbr-helm-chart", @@ -81,7 +81,7 @@ export class HelmChartComponent implements OnInit { hasDownloadHelmChartsPermission: boolean; hasDeleteHelmChartsPermission: boolean; constructor( - private errorHandler: ErrorHandler, + private errorHandlerEntity: ErrorHandler, private translateService: TranslateService, private systemInfoService: SystemInfoService, private helmChartService: HelmChartService, @@ -97,7 +97,7 @@ export class HelmChartComponent implements OnInit { // Get system info for tag views this.systemInfoService.getSystemInfo() .subscribe(systemInfo => (this.systemInfo = systemInfo) - , error => this.errorHandler.error(error)); + , error => this.errorHandlerEntity.error(error)); this.lastFilteredChartName = ""; this.refresh(); this.getHelmPermissionRule(this.projectId); @@ -113,7 +113,7 @@ export class HelmChartComponent implements OnInit { this.hasUploadHelmChartsPermission = permissions[0] as boolean; this.hasDownloadHelmChartsPermission = permissions[1] as boolean; this.hasDeleteHelmChartsPermission = permissions[2] as boolean; - }, error => this.errorHandler.error(error)); + }, error => this.errorHandlerEntity.error(error)); } updateFilterValue(value: string) { this.lastFilteredChartName = value; @@ -135,7 +135,7 @@ export class HelmChartComponent implements OnInit { this.totalCount = charts.length; }, err => { - this.errorHandler.error(err); + this.errorHandlerEntity.error(err); } ); } @@ -176,9 +176,9 @@ export class HelmChartComponent implements OnInit { .subscribe(() => { this.translateService .get("HELM_CHART.FILE_UPLOADED") - .subscribe(res => this.errorHandler.info(res)); + .subscribe(res => this.errorHandlerEntity.info(res)); }, - err => this.errorHandler.error(err) + err => this.errorHandlerEntity.error(err) ); } @@ -206,7 +206,7 @@ export class HelmChartComponent implements OnInit { .pipe(map( () => operateChanges(operateMsg, OperationState.success)), catchError( error => { - const message = errorHandlerFn(error); + const message = errorHandler(error); this.translateService.get(message).subscribe(res => operateChanges(operateMsg, OperationState.failure, res) ); @@ -226,7 +226,7 @@ export class HelmChartComponent implements OnInit { })) .subscribe(() => { } , error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } @@ -254,7 +254,7 @@ export class HelmChartComponent implements OnInit { downloadFile(res); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); } ); } diff --git a/src/portal/src/app/project/helm-chart/list-charts.component.html b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.html similarity index 100% rename from src/portal/src/app/project/helm-chart/list-charts.component.html rename to src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.html diff --git a/src/portal/src/app/project/helm-chart/list-charts.component.scss b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.scss similarity index 100% rename from src/portal/src/app/project/helm-chart/list-charts.component.scss rename to src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.scss diff --git a/src/portal/src/app/project/helm-chart/list-charts.component.spec.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.spec.ts similarity index 75% rename from src/portal/src/app/project/helm-chart/list-charts.component.spec.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.spec.ts index bfd6f22e5d..41b230376e 100644 --- a/src/portal/src/app/project/helm-chart/list-charts.component.spec.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.spec.ts @@ -1,10 +1,9 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ClarityModule } from '@clr/angular'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../../../../shared/services/session.service'; import { ListChartsComponent } from './list-charts.component'; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('ListChartsComponent', () => { let component: ListChartsComponent; @@ -19,8 +18,7 @@ describe('ListChartsComponent', () => { TestBed.configureTestingModule({ declarations: [ListChartsComponent], imports: [ - ClarityModule, - TranslateModule.forRoot() + SharedTestingModule ], schemas: [ CUSTOM_ELEMENTS_SCHEMA @@ -30,9 +28,11 @@ describe('ListChartsComponent', () => { provide: ActivatedRoute, useValue: { snapshot: { parent: { - params: { - id: 1, - data: 'chart' + parent: { + params: { + id: 1, + }, + data: null } } } diff --git a/src/portal/src/app/project/helm-chart/list-charts.component.ts b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.ts similarity index 72% rename from src/portal/src/app/project/helm-chart/list-charts.component.ts rename to src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.ts index f5dfa879ab..78fe8ce160 100644 --- a/src/portal/src/app/project/helm-chart/list-charts.component.ts +++ b/src/portal/src/app/base/project/helm-chart/helm-chart-list/list-charts.component.ts @@ -1,9 +1,9 @@ -import { Project } from '../project'; +import { Project } from '../../project'; import { Component, OnInit } from "@angular/core"; import { ActivatedRoute, Router } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; -import { SessionUser } from '../../shared/session-user'; +import { SessionService } from '../../../../shared/services/session.service'; +import { SessionUser } from '../../../../shared/entities/session-user'; @Component({ @@ -26,11 +26,11 @@ export class ListChartsComponent implements OnInit { private session: SessionService) {} ngOnInit() { - // Get projectId from route params snapshot. - this.projectId = +this.route.snapshot.parent.params["id"]; + // Get projectId from router-guard params snapshot. + this.projectId = +this.route.snapshot.parent.parent.params["id"]; // Get current user from registered resolver. this.currentUser = this.session.getCurrentUser(); - let resolverData = this.route.snapshot.parent.data; + let resolverData = this.route.snapshot.parent.parent.data; if (resolverData) { let project = (resolverData["projectResolver"]); this.projectName = project.name; diff --git a/src/portal/src/app/project/member/add-group/add-group.component.html b/src/portal/src/app/base/project/member/add-group/add-group.component.html similarity index 100% rename from src/portal/src/app/project/member/add-group/add-group.component.html rename to src/portal/src/app/base/project/member/add-group/add-group.component.html diff --git a/src/portal/src/app/project/member/add-group/add-group.component.scss b/src/portal/src/app/base/project/member/add-group/add-group.component.scss similarity index 100% rename from src/portal/src/app/project/member/add-group/add-group.component.scss rename to src/portal/src/app/base/project/member/add-group/add-group.component.scss diff --git a/src/portal/src/app/project/member/add-group/add-group.component.spec.ts b/src/portal/src/app/base/project/member/add-group/add-group.component.spec.ts similarity index 85% rename from src/portal/src/app/project/member/add-group/add-group.component.spec.ts rename to src/portal/src/app/base/project/member/add-group/add-group.component.spec.ts index 62c33e47f8..1c23c19140 100644 --- a/src/portal/src/app/project/member/add-group/add-group.component.spec.ts +++ b/src/portal/src/app/base/project/member/add-group/add-group.component.spec.ts @@ -4,10 +4,10 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { AddGroupComponent } from './add-group.component'; -import { GroupService } from "../../../group/group.service"; +import { GroupService } from "../../../left-side-nav/group/group.service"; import { MemberService } from "../member.service"; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { OperationService } from "../../../../lib/components/operation/operation.service"; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; +import { OperationService } from "../../../../shared/components/operation/operation.service"; describe('AddGroupComponent', () => { let component: AddGroupComponent; diff --git a/src/portal/src/app/project/member/add-group/add-group.component.ts b/src/portal/src/app/base/project/member/add-group/add-group.component.ts similarity index 89% rename from src/portal/src/app/project/member/add-group/add-group.component.ts rename to src/portal/src/app/base/project/member/add-group/add-group.component.ts index d6a5f6bc6b..610e2d18a0 100644 --- a/src/portal/src/app/project/member/add-group/add-group.component.ts +++ b/src/portal/src/app/base/project/member/add-group/add-group.component.ts @@ -4,16 +4,16 @@ import { ChangeDetectorRef, ChangeDetectionStrategy, ViewChild } from "@angular/ import { Component, OnInit, Input, Output, EventEmitter } from "@angular/core"; import { NgForm } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; -import { UserGroup } from "./../../../group/group"; -import { MemberService } from "./../member.service"; -import { GroupService } from "../../../group/group.service"; -import { ProjectRoles } from "../../../shared/shared.const"; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { UserGroup } from "../../../left-side-nav/group/group"; +import { MemberService } from "../member.service"; +import { GroupService } from "../../../left-side-nav/group/group.service"; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { Member } from "../member"; import { throwError as observableThrowError } from "rxjs"; -import { OperationService } from "../../../../lib/components/operation/operation.service"; -import { operateChanges, OperateInfo, OperationState } from "../../../../lib/components/operation/operate"; -import { errorHandler } from "../../../../lib/utils/shared/shared.utils"; +import { OperationService } from "../../../../shared/components/operation/operation.service"; +import { operateChanges, OperateInfo, OperationState } from "../../../../shared/components/operation/operate"; +import { ProjectRoles } from "../../../../shared/entities/shared.const"; +import { errorHandler } from "../../../../shared/units/shared.utils"; @Component({ selector: "add-group", templateUrl: "./add-group.component.html", diff --git a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.html b/src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.html similarity index 100% rename from src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.html rename to src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.html diff --git a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.scss b/src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.scss similarity index 100% rename from src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.scss rename to src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.scss diff --git a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts b/src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts similarity index 78% rename from src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts rename to src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts index 7ff50d532b..f7f33c6976 100644 --- a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts +++ b/src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts @@ -1,12 +1,11 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from "rxjs"; import { MemberService } from '../member.service'; -import { AppConfigService } from "../../../services/app-config.service"; -import { ClarityModule } from '@clr/angular'; +import { AppConfigService } from "../../../../services/app-config.service"; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { TranslateService } from '@ngx-translate/core'; import { AddHttpAuthGroupComponent } from './add-http-auth-group.component'; -import { HarborLibraryModule } from "../../../../lib/harbor-library.module"; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('AddHttpAuthGroupComponent', () => { let component: AddHttpAuthGroupComponent; @@ -28,9 +27,7 @@ describe('AddHttpAuthGroupComponent', () => { CUSTOM_ELEMENTS_SCHEMA ], imports: [ - ClarityModule, - HarborLibraryModule, - TranslateModule.forRoot() + SharedTestingModule ], providers: [ TranslateService, diff --git a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.ts b/src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.ts similarity index 85% rename from src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.ts rename to src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.ts index d563aa02d2..0ef4a6e0fa 100644 --- a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.ts +++ b/src/portal/src/app/base/project/member/add-http-auth-group/add-http-auth-group.component.ts @@ -22,14 +22,14 @@ import { } from '@angular/core'; import { NgForm } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; -import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; -import { UserService } from '../../../user/user.service'; +import { UserService } from '../../../left-side-nav/user/user.service'; import { MemberService } from '../member.service'; -import { UserGroup } from "../../../group/group"; -import { AppConfigService } from "../../../services/app-config.service"; -import { ProjectRootInterface } from "../../../../lib/services"; -import { GroupType, PROJECT_ROOTS } from "../../../../lib/entities/shared.const"; -import { errorHandler } from "../../../../lib/utils/shared/shared.utils"; +import { UserGroup } from "../../../left-side-nav/group/group"; +import { AppConfigService } from "../../../../services/app-config.service"; +import { ProjectRootInterface } from "../../../../shared/services"; +import { GroupType, PROJECT_ROOTS } from "../../../../shared/entities/shared.const"; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { errorHandler } from "../../../../shared/units/shared.utils"; @Component({ diff --git a/src/portal/src/app/project/member/add-member/add-member.component.html b/src/portal/src/app/base/project/member/add-member/add-member.component.html similarity index 100% rename from src/portal/src/app/project/member/add-member/add-member.component.html rename to src/portal/src/app/base/project/member/add-member/add-member.component.html diff --git a/src/portal/src/app/project/member/add-member/add-member.component.scss b/src/portal/src/app/base/project/member/add-member/add-member.component.scss similarity index 100% rename from src/portal/src/app/project/member/add-member/add-member.component.scss rename to src/portal/src/app/base/project/member/add-member/add-member.component.scss diff --git a/src/portal/src/app/project/member/add-member/add-member.component.spec.ts b/src/portal/src/app/base/project/member/add-member/add-member.component.spec.ts similarity index 65% rename from src/portal/src/app/project/member/add-member/add-member.component.spec.ts rename to src/portal/src/app/base/project/member/add-member/add-member.component.spec.ts index b7ec173dcb..815ee8f391 100644 --- a/src/portal/src/app/project/member/add-member/add-member.component.spec.ts +++ b/src/portal/src/app/base/project/member/add-member/add-member.component.spec.ts @@ -1,18 +1,12 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { AddMemberComponent } from './add-member.component'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from "@angular/common/http/testing"; import { MemberService } from '../member.service'; -import { UserService } from '../../../user/user.service'; +import { UserService } from '../../../left-side-nav/user/user.service'; import { of } from 'rxjs'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { ActivatedRoute } from '@angular/router'; -import { ErrorHandler } from '../../../../lib/utils/error-handler'; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('AddMemberComponent', () => { let component: AddMemberComponent; @@ -41,29 +35,23 @@ describe('AddMemberComponent', () => { CUSTOM_ELEMENTS_SCHEMA ], imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HttpClientTestingModule + SharedTestingModule ], declarations: [AddMemberComponent], providers: [ - TranslateService, { provide: MemberService, useValue: mockMemberService }, { provide: UserService, useValue: mockUserService }, { provide: MessageHandlerService, useValue: mockMessageHandlerService }, - ErrorHandler, { provide: ActivatedRoute, useValue: { RouterparamMap: of({ get: (key) => 'value' }), snapshot: { parent: { - params: { id: 1 } + parent: { + params: { id: 1 }, + data: null + } }, - data: 1 } } } diff --git a/src/portal/src/app/project/member/add-member/add-member.component.ts b/src/portal/src/app/base/project/member/add-member/add-member.component.ts similarity index 83% rename from src/portal/src/app/project/member/add-member/add-member.component.ts rename to src/portal/src/app/base/project/member/add-member/add-member.component.ts index 06395d3eb6..563cceba15 100644 --- a/src/portal/src/app/project/member/add-member/add-member.component.ts +++ b/src/portal/src/app/base/project/member/add-member/add-member.component.ts @@ -20,24 +20,20 @@ import { ViewChild, AfterViewChecked, OnInit, - OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef + OnDestroy, } from '@angular/core'; import { NgForm } from '@angular/forms'; -import {ActivatedRoute} from "@angular/router"; +import { ActivatedRoute } from "@angular/router"; import { Subject, forkJoin } from "rxjs"; - - - import { TranslateService } from '@ngx-translate/core'; - -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; -import { UserService } from '../../../user/user.service'; -import {User} from "../../../user/user"; -import {Project} from "../../project"; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; +import { UserService } from '../../../left-side-nav/user/user.service'; +import { User } from "../../../left-side-nav/user/user"; +import { Project } from "../../project"; import { Member } from '../member'; import { MemberService } from '../member.service'; -import { ErrorHandler } from '../../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; @Component({ @@ -45,7 +41,6 @@ import { ErrorHandler } from '../../../../lib/utils/error-handler'; templateUrl: 'add-member.component.html', styleUrls: ['add-member.component.scss'], providers: [UserService], - changeDetection: ChangeDetectionStrategy.Default }) export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy { @@ -82,11 +77,10 @@ export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy { private errorHandle: ErrorHandler, private messageHandlerService: MessageHandlerService, private translateService: TranslateService, - private route: ActivatedRoute, - private ref: ChangeDetectorRef) { } + private route: ActivatedRoute) { } ngOnInit(): void { - let resolverData = this.route.snapshot.parent.data; + let resolverData = this.route.snapshot.parent.parent.data; let hasProjectAdminRole: boolean; if (resolverData) { hasProjectAdminRole = (resolverData['projectResolver']).has_project_admin_role; @@ -101,7 +95,6 @@ export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy { this.isMemberNameValid = cont.valid; if (cont.valid) { this.checkOnGoing = true; - this.ref.detectChanges(); forkJoin(this.userService.getUsersNameList(cont.value, 20), this.memberService .listMembers(this.projectId, cont.value)).subscribe((res: Array) => { this.userLists = res[0]; @@ -120,13 +113,8 @@ export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy { } }); } - let changeTimer = setInterval(() => this.ref.detectChanges(), 200); - setTimeout(() => { - clearInterval(changeTimer); - }, 2000); }, error => { this.checkOnGoing = false; - this.ref.detectChanges(); }); } else { this.memberTooltip = 'MEMBER.USERNAME_IS_REQUIRED'; @@ -147,11 +135,6 @@ export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy { finalize(() => { this.addMemberOpened = false; this.member.role_id = null; - - let changeTimer = setInterval(() => this.ref.detectChanges(), 200); - setTimeout(() => { - clearInterval(changeTimer); - }, 2000); } )) .subscribe( diff --git a/src/portal/src/app/project/member/member.component.html b/src/portal/src/app/base/project/member/member.component.html similarity index 100% rename from src/portal/src/app/project/member/member.component.html rename to src/portal/src/app/base/project/member/member.component.html diff --git a/src/portal/src/app/project/member/member.component.scss b/src/portal/src/app/base/project/member/member.component.scss similarity index 100% rename from src/portal/src/app/project/member/member.component.scss rename to src/portal/src/app/base/project/member/member.component.scss diff --git a/src/portal/src/app/project/member/member.component.spec.ts b/src/portal/src/app/base/project/member/member.component.spec.ts similarity index 71% rename from src/portal/src/app/project/member/member.component.spec.ts rename to src/portal/src/app/base/project/member/member.component.spec.ts index 71baed5fbf..c391f6cc93 100644 --- a/src/portal/src/app/project/member/member.component.spec.ts +++ b/src/portal/src/app/base/project/member/member.component.spec.ts @@ -1,22 +1,17 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { MemberComponent } from './member.component'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ActivatedRoute } from "@angular/router"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { ConfirmationDialogService } from "../../shared/confirmation-dialog/confirmation-dialog.service"; -import { SessionService } from "../../shared/session.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; +import { SessionService } from "../../../shared/services/session.service"; import { MemberService } from "./member.service"; -import { AppConfigService } from "../../services/app-config.service"; +import { AppConfigService } from "../../../services/app-config.service"; import { of } from 'rxjs'; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { UserPermissionService } from "../../../lib/services"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { UserPermissionService } from "../../../shared/services"; +import { ErrorHandler } from "../../../shared/units/error-handler"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('MemberComponent', () => { let component: MemberComponent; @@ -85,17 +80,10 @@ describe('MemberComponent', () => { CUSTOM_ELEMENTS_SCHEMA ], imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HttpClientTestingModule + SharedTestingModule ], declarations: [MemberComponent], providers: [ - TranslateService, { provide: MemberService, useValue: mockMemberService }, { provide: MessageHandlerService, useValue: mockMessageHandlerService }, { provide: ConfirmationDialogService, useValue: mockConfirmationDialogService }, @@ -109,9 +97,10 @@ describe('MemberComponent', () => { RouterparamMap: of({ get: (key) => 'value' }), snapshot: { parent: { - params: { id: 1 } + parent: { + params: { id: 1 } + } }, - data: 1 } } } diff --git a/src/portal/src/app/project/member/member.component.ts b/src/portal/src/app/base/project/member/member.component.ts similarity index 85% rename from src/portal/src/app/project/member/member.component.ts rename to src/portal/src/app/base/project/member/member.component.ts index abbeb623c5..6e2850d22b 100644 --- a/src/portal/src/app/project/member/member.component.ts +++ b/src/portal/src/app/base/project/member/member.component.ts @@ -12,34 +12,37 @@ // See the License for the specific language governing permissions and // limitations under the License. import { finalize } from 'rxjs/operators'; -import { Component, OnInit, ViewChild, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef } from "@angular/core"; +import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { Subscription, forkJoin, Observable } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { ConfirmationTargets, ConfirmationState, ConfirmationButtons } from "../../shared/shared.const"; -import { ConfirmationDialogService } from "../../shared/confirmation-dialog/confirmation-dialog.service"; -import { ConfirmationMessage } from "../../shared/confirmation-dialog/confirmation-message"; -import { SessionService } from "../../shared/session.service"; -import { RoleInfo } from "../../shared/shared.const"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; +import { SessionService } from "../../../shared/services/session.service"; import { Member } from "./member"; -import { SessionUser } from "../../shared/session-user"; +import { SessionUser } from "../../../shared/entities/session-user"; import { AddGroupComponent } from './add-group/add-group.component'; import { AddHttpAuthGroupComponent } from './add-http-auth-group/add-http-auth-group.component'; import { MemberService } from "./member.service"; import { AddMemberComponent } from "./add-member/add-member.component"; -import { AppConfigService } from "../../services/app-config.service"; +import { AppConfigService } from "../../../services/app-config.service"; import { map, catchError } from "rxjs/operators"; import { throwError as observableThrowError } from "rxjs"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { UserPermissionService, USERSTATICPERMISSION } from "../../../lib/services"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { operateChanges, OperateInfo, OperationState } from "../../../lib/components/operation/operate"; -import { errorHandler as errorHandlerFn } from "../../../lib/utils/shared/shared.utils"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { UserPermissionService, USERSTATICPERMISSION } from "../../../shared/services"; +import { ErrorHandler } from "../../../shared/units/error-handler"; +import { operateChanges, OperateInfo, OperationState } from "../../../shared/components/operation/operate"; +import { + ConfirmationButtons, + ConfirmationState, + ConfirmationTargets, + RoleInfo +} from "../../../shared/entities/shared.const"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { errorHandler } from "../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; @Component({ templateUrl: "member.component.html", styleUrls: ["./member.component.scss"], - changeDetection: ChangeDetectionStrategy.OnPush }) export class MemberComponent implements OnInit, OnDestroy { @@ -84,9 +87,7 @@ export class MemberComponent implements OnInit, OnDestroy { private operationService: OperationService, private appConfigService: AppConfigService, private userPermissionService: UserPermissionService, - private errorHandler: ErrorHandler, - private ref: ChangeDetectorRef) { - + private errorHandlerEntity: ErrorHandler) { this.delSub = OperateDialogService.confirmationConfirm$.subscribe(message => { if (message && message.state === ConfirmationState.CONFIRMED && @@ -96,8 +97,6 @@ export class MemberComponent implements OnInit, OnDestroy { } } }); - let hnd = setInterval(() => ref.markForCheck(), 100); - setTimeout(() => clearInterval(hnd), 1000); } ngOnDestroy() { @@ -107,8 +106,8 @@ export class MemberComponent implements OnInit, OnDestroy { } ngOnInit() { - // Get projectId from route params snapshot. - this.projectId = +this.route.snapshot.parent.params["id"]; + // Get projectId from router-guard params snapshot. + this.projectId = +this.route.snapshot.parent.parent.params["id"]; // Get current user from registered resolver. this.currentUser = this.session.getCurrentUser(); this.retrieve(this.projectId, ""); @@ -140,8 +139,6 @@ export class MemberComponent implements OnInit, OnDestroy { .listMembers(projectId, username).pipe( finalize(() => { this.loading = false; - let hnd = setInterval(() => this.ref.markForCheck(), 100); - setTimeout(() => clearInterval(hnd), 1000); })) .subscribe( response => { @@ -274,7 +271,7 @@ export class MemberComponent implements OnInit, OnDestroy { operateChanges(operMessage, OperationState.success); }); }), catchError(error => { - const message = errorHandlerFn(error); + const message = errorHandler(error); this.translate.get(message).subscribe(res => operateChanges(operMessage, OperationState.failure, res) ); @@ -290,7 +287,7 @@ export class MemberComponent implements OnInit, OnDestroy { this.batchOps = 'idle'; this.retrieve(this.projectId, ""); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } getMemberPermissionRule(projectId: number): void { @@ -304,6 +301,6 @@ export class MemberComponent implements OnInit, OnDestroy { this.hasCreateMemberPermission = MemberRule[0] as boolean; this.hasUpdateMemberPermission = MemberRule[1] as boolean; this.hasDeleteMemberPermission = MemberRule[2] as boolean; - }, error => this.errorHandler.error(error)); + }, error => this.errorHandlerEntity.error(error)); } } diff --git a/src/portal/src/app/base/project/member/member.module.ts b/src/portal/src/app/base/project/member/member.module.ts new file mode 100644 index 0000000000..4e9ece9cba --- /dev/null +++ b/src/portal/src/app/base/project/member/member.module.ts @@ -0,0 +1,31 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { MemberComponent } from "./member.component"; +import { AddMemberComponent } from "./add-member/add-member.component"; +import { AddHttpAuthGroupComponent } from "./add-http-auth-group/add-http-auth-group.component"; +import { AddGroupComponent } from "./add-group/add-group.component"; +import { MemberService } from "./member.service"; + +const routes: Routes = [ + { + path: '', + component: MemberComponent + } +]; +@NgModule({ + declarations: [ + MemberComponent, + AddMemberComponent, + AddHttpAuthGroupComponent, + AddGroupComponent + ], + imports: [ + RouterModule.forChild(routes), + SharedModule + ], + providers: [ + MemberService + ] +}) +export class MemberModule { } diff --git a/src/portal/src/app/project/member/member.service.spec.ts b/src/portal/src/app/base/project/member/member.service.spec.ts similarity index 100% rename from src/portal/src/app/project/member/member.service.spec.ts rename to src/portal/src/app/base/project/member/member.service.spec.ts diff --git a/src/portal/src/app/project/member/member.service.ts b/src/portal/src/app/base/project/member/member.service.ts similarity index 96% rename from src/portal/src/app/project/member/member.service.ts rename to src/portal/src/app/base/project/member/member.service.ts index b1d34d4c1d..a5e02454cb 100644 --- a/src/portal/src/app/project/member/member.service.ts +++ b/src/portal/src/app/base/project/member/member.service.ts @@ -13,11 +13,11 @@ // limitations under the License. import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { User } from '../../user/user'; +import { User } from '../../left-side-nav/user/user'; import { Member } from './member'; import {throwError as observableThrowError, Observable } from "rxjs"; import {map, catchError} from 'rxjs/operators'; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../../../shared/units/utils"; @Injectable() export class MemberService { diff --git a/src/portal/src/app/project/member/member.ts b/src/portal/src/app/base/project/member/member.ts similarity index 100% rename from src/portal/src/app/project/member/member.ts rename to src/portal/src/app/base/project/member/member.ts diff --git a/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html b/src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html similarity index 100% rename from src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html rename to src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.html diff --git a/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.scss b/src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.scss similarity index 100% rename from src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.scss rename to src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.scss diff --git a/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.spec.ts b/src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.spec.ts similarity index 92% rename from src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.spec.ts rename to src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.spec.ts index 37477c3222..c61b041dcb 100644 --- a/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.spec.ts +++ b/src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.spec.ts @@ -8,15 +8,15 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { AddP2pPolicyComponent } from './add-p2p-policy.component'; import { P2pProviderService } from '../p2p-provider.service'; -import { ErrorHandler } from '../../../../lib/utils/error-handler'; -import { PreheatService } from '../../../../../ng-swagger-gen/services/preheat.service'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; +import { PreheatService } from '../../../../../../ng-swagger-gen/services/preheat.service'; import { ActivatedRoute } from '@angular/router'; -import { SessionService } from '../../../shared/session.service'; -import { AppConfigService } from '../../../services/app-config.service'; -import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; +import { SessionService } from '../../../../shared/services/session.service'; +import { AppConfigService } from '../../../../services/app-config.service'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; -import { ProjectService } from '../../../../lib/services'; +import { ProjectService } from '../../../../shared/services'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; describe('AddP2pPolicyComponent', () => { let component: AddP2pPolicyComponent; let fixture: ComponentFixture; diff --git a/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.ts b/src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.ts similarity index 93% rename from src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.ts rename to src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.ts index 83ad9de964..b25b216de4 100644 --- a/src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.ts +++ b/src/portal/src/app/base/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.ts @@ -1,20 +1,20 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild, } from '@angular/core'; -import { PreheatPolicy } from '../../../../../ng-swagger-gen/models/preheat-policy'; -import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; +import { PreheatPolicy } from '../../../../../../ng-swagger-gen/models/preheat-policy'; import { NgForm } from '@angular/forms'; -import { OriginCron, ProjectService } from '../../../../lib/services'; -import { CronScheduleComponent } from '../../../../lib/components/cron-schedule'; -import { PreheatService } from '../../../../../ng-swagger-gen/services/preheat.service'; +import { OriginCron, ProjectService } from '../../../../shared/services'; +import { CronScheduleComponent } from '../../../../shared/components/cron-schedule'; +import { PreheatService } from '../../../../../../ng-swagger-gen/services/preheat.service'; import { debounceTime, distinctUntilChanged, filter, finalize, switchMap } from 'rxjs/operators'; -import { deleteEmptyKey } from '../../../../lib/utils/utils'; +import { deleteEmptyKey } from '../../../../shared/units/utils'; import { ClrLoadingState } from '@clr/angular'; -import { SessionService } from '../../../shared/session.service'; +import { SessionService } from '../../../../shared/services/session.service'; import { Project } from '../../project'; import { ActivatedRoute } from '@angular/router'; import { FILTER_TYPE, PROJECT_SEVERITY_LEVEL_MAP, TRIGGER, TRIGGER_I18N_MAP } from '../p2p-provider.service'; -import { ProviderUnderProject } from '../../../../../ng-swagger-gen/models/provider-under-project'; -import { AppConfigService } from '../../../services/app-config.service'; +import { ProviderUnderProject } from '../../../../../../ng-swagger-gen/models/provider-under-project'; +import { AppConfigService } from '../../../../services/app-config.service'; import { Subject, Subscription } from 'rxjs'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; const SCHEDULE_TYPE = { NONE: "None", diff --git a/src/portal/src/app/base/project/p2p-provider/p2p-provider.module.ts b/src/portal/src/app/base/project/p2p-provider/p2p-provider.module.ts new file mode 100644 index 0000000000..52eb05ccf6 --- /dev/null +++ b/src/portal/src/app/base/project/p2p-provider/p2p-provider.module.ts @@ -0,0 +1,35 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { TaskListComponent } from "./task-list/task-list.component"; +import { PolicyComponent } from "./policy/policy.component"; +import { AddP2pPolicyComponent } from "./add-p2p-policy/add-p2p-policy.component"; +import { P2pProviderService } from "./p2p-provider.service"; + + +const routes: Routes = [ + { + path: 'policies', + component: PolicyComponent + }, + { + path: ':preheatPolicyName/executions/:executionId/tasks', + component: TaskListComponent + }, + { path: '', redirectTo: 'policies', pathMatch: 'full' } +]; +@NgModule({ + declarations: [ + TaskListComponent, + PolicyComponent, + AddP2pPolicyComponent + ], + imports: [ + RouterModule.forChild(routes), + SharedModule + ], + providers: [ + P2pProviderService + ] +}) +export class P2pProviderModule { } diff --git a/src/portal/src/app/project/p2p-provider/p2p-provider.service.spec.ts b/src/portal/src/app/base/project/p2p-provider/p2p-provider.service.spec.ts similarity index 100% rename from src/portal/src/app/project/p2p-provider/p2p-provider.service.spec.ts rename to src/portal/src/app/base/project/p2p-provider/p2p-provider.service.spec.ts diff --git a/src/portal/src/app/project/p2p-provider/p2p-provider.service.ts b/src/portal/src/app/base/project/p2p-provider/p2p-provider.service.ts similarity index 100% rename from src/portal/src/app/project/p2p-provider/p2p-provider.service.ts rename to src/portal/src/app/base/project/p2p-provider/p2p-provider.service.ts diff --git a/src/portal/src/app/project/p2p-provider/policy/policy.component.html b/src/portal/src/app/base/project/p2p-provider/policy/policy.component.html similarity index 100% rename from src/portal/src/app/project/p2p-provider/policy/policy.component.html rename to src/portal/src/app/base/project/p2p-provider/policy/policy.component.html diff --git a/src/portal/src/app/project/p2p-provider/policy/policy.component.scss b/src/portal/src/app/base/project/p2p-provider/policy/policy.component.scss similarity index 100% rename from src/portal/src/app/project/p2p-provider/policy/policy.component.scss rename to src/portal/src/app/base/project/p2p-provider/policy/policy.component.scss diff --git a/src/portal/src/app/project/p2p-provider/policy/policy.component.spec.ts b/src/portal/src/app/base/project/p2p-provider/policy/policy.component.spec.ts similarity index 88% rename from src/portal/src/app/project/p2p-provider/policy/policy.component.spec.ts rename to src/portal/src/app/base/project/p2p-provider/policy/policy.component.spec.ts index 9121bc9fd1..ec791869fb 100644 --- a/src/portal/src/app/project/p2p-provider/policy/policy.component.spec.ts +++ b/src/portal/src/app/base/project/p2p-provider/policy/policy.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ActivatedRoute } from '@angular/router'; -import { MessageHandlerService } from "../../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; import { of } from 'rxjs'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; @@ -10,19 +10,19 @@ import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { delay } from "rxjs/operators"; -import { InlineAlertComponent } from "../../../shared/inline-alert/inline-alert.component"; -import { ConfirmationDialogComponent } from "../../../../lib/components/confirmation-dialog"; -import { ProjectService, UserPermissionService } from '../../../../lib/services'; +import { ConfirmationDialogComponent } from "../../../../shared/components/confirmation-dialog"; +import { ProjectService, UserPermissionService } from '../../../../shared/services'; import { PolicyComponent } from './policy.component'; -import { PreheatService } from '../../../../../ng-swagger-gen/services/preheat.service'; +import { PreheatService } from '../../../../../../ng-swagger-gen/services/preheat.service'; import { AddP2pPolicyComponent } from '../add-p2p-policy/add-p2p-policy.component'; -import { PreheatPolicy } from '../../../../../ng-swagger-gen/models/preheat-policy'; -import { Execution } from '../../../../../ng-swagger-gen/models/execution'; -import { ProviderUnderProject } from '../../../../../ng-swagger-gen/models/provider-under-project'; +import { PreheatPolicy } from '../../../../../../ng-swagger-gen/models/preheat-policy'; +import { Execution } from '../../../../../../ng-swagger-gen/models/execution'; +import { ProviderUnderProject } from '../../../../../../ng-swagger-gen/models/provider-under-project'; import { P2pProviderService } from '../p2p-provider.service'; -import { SessionService } from '../../../shared/session.service'; -import { AppConfigService } from '../../../services/app-config.service'; -import { ErrorHandler } from '../../../../lib/utils/error-handler'; +import { SessionService } from '../../../../shared/services/session.service'; +import { AppConfigService } from '../../../../services/app-config.service'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; describe('PolicyComponent', () => { let component: PolicyComponent; diff --git a/src/portal/src/app/project/p2p-provider/policy/policy.component.ts b/src/portal/src/app/base/project/p2p-provider/policy/policy.component.ts similarity index 94% rename from src/portal/src/app/project/p2p-provider/policy/policy.component.ts rename to src/portal/src/app/base/project/p2p-provider/policy/policy.component.ts index cd14b84be9..d7c1679844 100644 --- a/src/portal/src/app/project/p2p-provider/policy/policy.component.ts +++ b/src/portal/src/app/base/project/p2p-provider/policy/policy.component.ts @@ -11,22 +11,19 @@ // 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. -import { debounceTime, distinctUntilChanged, finalize, switchMap } from 'rxjs/operators'; +import { debounceTime, finalize, switchMap } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { Project } from '../../project'; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../../shared/shared.const'; -import { ConfirmationMessage } from '../../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationDialogComponent } from '../../../shared/confirmation-dialog/confirmation-dialog.component'; -import {clone, CustomComparator, DEFAULT_PAGE_SIZE} from '../../../../lib/utils/utils'; +import { clone, CustomComparator, DEFAULT_PAGE_SIZE } from '../../../../shared/units/utils'; import { forkJoin, Observable, Subject, Subscription } from 'rxjs'; import { ClrDatagridComparatorInterface, UserPermissionService, USERSTATICPERMISSION -} from '../../../../lib/services'; +} from '../../../../shared/services'; import {ClrDatagridStateInterface, ClrLoadingState} from '@clr/angular'; import { EXECUTION_STATUS, @@ -37,12 +34,15 @@ import { TRIGGER, TRIGGER_I18N_MAP } from '../p2p-provider.service'; -import { PreheatPolicy } from '../../../../../ng-swagger-gen/models/preheat-policy'; -import { PreheatService } from '../../../../../ng-swagger-gen/services/preheat.service'; +import { PreheatPolicy } from '../../../../../../ng-swagger-gen/models/preheat-policy'; +import { PreheatService } from '../../../../../../ng-swagger-gen/services/preheat.service'; import { AddP2pPolicyComponent } from '../add-p2p-policy/add-p2p-policy.component'; -import { Execution } from '../../../../../ng-swagger-gen/models/execution'; -import { Metrics } from '../../../../../ng-swagger-gen/models/metrics'; -import { ProviderUnderProject } from '../../../../../ng-swagger-gen/models/provider-under-project'; +import { Execution } from '../../../../../../ng-swagger-gen/models/execution'; +import { Metrics } from '../../../../../../ng-swagger-gen/models/metrics'; +import { ProviderUnderProject } from '../../../../../../ng-swagger-gen/models/provider-under-project'; +import { ConfirmationDialogComponent } from "../../../../shared/components/confirmation-dialog"; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../../shared/entities/shared.const"; +import { ConfirmationMessage } from "../../../global-confirmation-dialog/confirmation-message"; @Component({ templateUrl: './policy.component.html', diff --git a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.html b/src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.html similarity index 100% rename from src/portal/src/app/project/p2p-provider/task-list/task-list.component.html rename to src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.html diff --git a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.scss b/src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.scss similarity index 100% rename from src/portal/src/app/project/p2p-provider/task-list/task-list.component.scss rename to src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.scss diff --git a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.spec.ts b/src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.spec.ts similarity index 88% rename from src/portal/src/app/project/p2p-provider/task-list/task-list.component.spec.ts rename to src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.spec.ts index 07c7192c44..038e03adba 100644 --- a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.spec.ts +++ b/src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.spec.ts @@ -7,16 +7,16 @@ import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { P2pProviderService } from '../p2p-provider.service'; -import { PreheatService } from '../../../../../ng-swagger-gen/services/preheat.service'; +import { PreheatService } from '../../../../../../ng-swagger-gen/services/preheat.service'; import { ActivatedRoute } from '@angular/router'; -import { SessionService } from '../../../shared/session.service'; +import { SessionService } from '../../../../shared/services/session.service'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; -import { Execution } from '../../../../../ng-swagger-gen/models/execution'; +import { Execution } from '../../../../../../ng-swagger-gen/models/execution'; import { TaskListComponent } from './task-list.component'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; -import { UserPermissionService } from '../../../../lib/services'; -import { Task } from '../../../../../ng-swagger-gen/models/task'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; +import { UserPermissionService } from '../../../../shared/services'; +import { Task } from '../../../../../../ng-swagger-gen/models/task'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; describe('TaskListComponent', () => { let component: TaskListComponent; diff --git a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.ts b/src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.ts similarity index 95% rename from src/portal/src/app/project/p2p-provider/task-list/task-list.component.ts rename to src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.ts index 394852e1e2..c505763999 100644 --- a/src/portal/src/app/project/p2p-provider/task-list/task-list.component.ts +++ b/src/portal/src/app/base/project/p2p-provider/task-list/task-list.component.ts @@ -2,16 +2,16 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { debounceTime, finalize, switchMap } from 'rxjs/operators'; -import { clone, DEFAULT_PAGE_SIZE } from '../../../../lib/utils/utils'; -import { Task } from '../../../../../ng-swagger-gen/models/task'; -import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service'; +import { clone, DEFAULT_PAGE_SIZE } from '../../../../shared/units/utils'; +import { Task } from '../../../../../../ng-swagger-gen/models/task'; +import { MessageHandlerService } from '../../../../shared/services/message-handler.service'; import { Project } from '../../project'; -import { UserPermissionService, USERSTATICPERMISSION } from '../../../../lib/services'; -import { Execution } from '../../../../../ng-swagger-gen/models/execution'; -import { PreheatService } from '../../../../../ng-swagger-gen/services/preheat.service'; +import { UserPermissionService, USERSTATICPERMISSION } from '../../../../shared/services'; +import { Execution } from '../../../../../../ng-swagger-gen/models/execution'; +import { PreheatService } from '../../../../../../ng-swagger-gen/services/preheat.service'; import { EXECUTION_STATUS, P2pProviderService, TIME_OUT } from '../p2p-provider.service'; import { forkJoin, Observable, Subject, Subscription } from 'rxjs'; -import {ClrDatagridStateInterface, ClrLoadingState} from '@clr/angular'; +import { ClrDatagridStateInterface, ClrLoadingState } from '@clr/angular'; @Component({ selector: 'task-list', diff --git a/src/portal/src/app/project/project-config/project-config.component.html b/src/portal/src/app/base/project/project-config/project-config.component.html similarity index 100% rename from src/portal/src/app/project/project-config/project-config.component.html rename to src/portal/src/app/base/project/project-config/project-config.component.html diff --git a/src/portal/src/app/project/project-config/project-config.component.scss b/src/portal/src/app/base/project/project-config/project-config.component.scss similarity index 100% rename from src/portal/src/app/project/project-config/project-config.component.scss rename to src/portal/src/app/base/project/project-config/project-config.component.scss diff --git a/src/portal/src/app/project/project-config/project-config.component.spec.ts b/src/portal/src/app/base/project/project-config/project-config.component.spec.ts similarity index 76% rename from src/portal/src/app/project/project-config/project-config.component.spec.ts rename to src/portal/src/app/base/project/project-config/project-config.component.spec.ts index d32c0235b8..3e12996324 100644 --- a/src/portal/src/app/project/project-config/project-config.component.spec.ts +++ b/src/portal/src/app/base/project/project-config/project-config.component.spec.ts @@ -1,11 +1,10 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { ClarityModule } from '@clr/angular'; import { ActivatedRoute, Router } from "@angular/router"; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../../../shared/services/session.service'; import { of } from 'rxjs'; import { ProjectConfigComponent } from './project-config.component'; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('ProjectConfigComponent', () => { let component: ProjectConfigComponent; @@ -24,8 +23,7 @@ describe('ProjectConfigComponent', () => { CUSTOM_ELEMENTS_SCHEMA ], imports: [ - ClarityModule, - TranslateModule.forRoot() + SharedTestingModule ], providers: [ { @@ -33,19 +31,20 @@ describe('ProjectConfigComponent', () => { paramMap: of({ get: (key) => 'value' }), snapshot: { parent: { - params: { id: 1, chart: 'chart', version: 1.0 } - }, - data: { - projectResolver: { - role_name: 'admin' + parent: { + params: { id: 1, chart: 'chart', version: 1.0 }, + data: { + projectResolver: { + role_name: 'admin' + } + } } - } + }, } } }, { provide: Router, useValue: fakeRouter }, { provide: SessionService, useValue: fakeSessionService }, - TranslateService ] }).compileComponents(); })); diff --git a/src/portal/src/app/project/project-config/project-config.component.ts b/src/portal/src/app/base/project/project-config/project-config.component.ts similarity index 84% rename from src/portal/src/app/project/project-config/project-config.component.ts rename to src/portal/src/app/base/project/project-config/project-config.component.ts index 36ffdf4eb0..97cf26ca29 100644 --- a/src/portal/src/app/project/project-config/project-config.component.ts +++ b/src/portal/src/app/base/project/project-config/project-config.component.ts @@ -13,8 +13,8 @@ // limitations under the License. import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; -import { SessionUser } from '../../shared/session-user'; +import { SessionService } from '../../../shared/services/session.service'; +import { SessionUser } from '../../../shared/entities/session-user'; import { Project } from '../project'; @Component({ @@ -35,10 +35,10 @@ export class ProjectConfigComponent implements OnInit { private session: SessionService) {} ngOnInit() { - this.projectId = +this.route.snapshot.parent.params['id']; + this.projectId = +this.route.snapshot.parent.parent.params['id']; this.currentUser = this.session.getCurrentUser(); this.hasSignedIn = this.session.getCurrentUser() !== null; - let resolverData = this.route.snapshot.parent.data; + let resolverData = this.route.snapshot.parent.parent.data; if (resolverData) { let pro: Project = resolverData['projectResolver']; this.projectName = pro.name; diff --git a/src/portal/src/app/base/project/project-config/project-config.module.ts b/src/portal/src/app/base/project/project-config/project-config.module.ts new file mode 100644 index 0000000000..e867109fb5 --- /dev/null +++ b/src/portal/src/app/base/project/project-config/project-config.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { ProjectConfigComponent } from "./project-config.component"; +import { ProjectPolicyConfigComponent } from "./project-policy-config/project-policy-config.component"; + +const routes: Routes = [ + { + path: '', + component: ProjectConfigComponent + } +]; +@NgModule({ + declarations: [ + ProjectConfigComponent, + ProjectPolicyConfigComponent + ], + imports: [ + RouterModule.forChild(routes), + SharedModule + ] +}) +export class ProjectConfigModule { } diff --git a/src/portal/src/lib/components/project-policy-config/project-policy-config.component.html b/src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.html similarity index 100% rename from src/portal/src/lib/components/project-policy-config/project-policy-config.component.html rename to src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.html diff --git a/src/portal/src/lib/components/project-policy-config/project-policy-config.component.scss b/src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.scss similarity index 100% rename from src/portal/src/lib/components/project-policy-config/project-policy-config.component.scss rename to src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.scss diff --git a/src/portal/src/lib/components/project-policy-config/project-policy-config.component.spec.ts b/src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.spec.ts similarity index 79% rename from src/portal/src/lib/components/project-policy-config/project-policy-config.component.spec.ts rename to src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.spec.ts index 5b06969536..222de53b1a 100644 --- a/src/portal/src/lib/components/project-policy-config/project-policy-config.component.spec.ts +++ b/src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.spec.ts @@ -1,16 +1,15 @@ -import { SystemInfoService } from '../../services/system-info.service'; +import { SystemInfoService } from '../../../../shared/services'; import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ErrorHandler } from '../../utils/error-handler/error-handler'; -import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; +import { ConfirmationDialogComponent } from '../../../../shared/components/confirmation-dialog'; import { ProjectPolicyConfigComponent } from './project-policy-config.component'; -import { SharedModule } from '../../utils/shared/shared.module'; -import { ProjectService } from '../../services/project.service'; -import { SERVICE_CONFIG, IServiceConfig} from '../../entities/service.config'; -import {SystemCVEAllowlist, SystemInfo} from '../../services/interface'; +import { ProjectService } from '../../../../shared/services'; +import {SystemCVEAllowlist, SystemInfo} from '../../../../shared/services'; import { Project } from './project'; -import { UserPermissionService } from '../../services/permission.service'; +import { UserPermissionService } from '../../../../shared/services'; import { of } from 'rxjs'; -import { CURRENT_BASE_HREF } from "../../utils/utils"; +import { CURRENT_BASE_HREF } from "../../../../shared/units/utils"; +import { SharedTestingModule } from "../../../../shared/shared.module"; const mockSystemInfo: SystemInfo[] = [ { @@ -80,10 +79,6 @@ const mockSystemAllowlist: SystemCVEAllowlist = { "items": [], "project_id": 0 }; -const config: IServiceConfig = { - projectPolicyEndpoint: CURRENT_BASE_HREF + '/projects/testing', - systemInfoEndpoint: CURRENT_BASE_HREF + '/systeminfo/testing', -}; const projectService = { getProject() { return of(mockProjectPolicies[1]); @@ -115,7 +110,7 @@ describe('ProjectPolicyConfigComponent', () => { } beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [SharedModule], + imports: [SharedTestingModule], declarations: [ ProjectPolicyConfigComponent, ConfirmationDialogComponent, @@ -123,7 +118,6 @@ describe('ProjectPolicyConfigComponent', () => { ], providers: [ ErrorHandler, - { provide: SERVICE_CONFIG, useValue: config }, { provide: ProjectService, useValue: projectService }, { provide: SystemInfoService, useValue: systemInfoService}, { provide: UserPermissionService, useValue: userPermissionService}, diff --git a/src/portal/src/lib/components/project-policy-config/project-policy-config.component.ts b/src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.ts similarity index 92% rename from src/portal/src/lib/components/project-policy-config/project-policy-config.component.ts rename to src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.ts index d6fc20aa90..2a281e499c 100644 --- a/src/portal/src/lib/components/project-policy-config/project-policy-config.component.ts +++ b/src/portal/src/app/base/project/project-config/project-policy-config/project-policy-config.component.ts @@ -1,20 +1,17 @@ import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core'; - -import {compareValue, clone} from '../../utils/utils'; -import {ProjectService} from '../../services/project.service'; -import {ErrorHandler} from '../../utils/error-handler/error-handler'; -import {State, SystemCVEAllowlist} from '../../services/interface'; - -import {ConfirmationState, ConfirmationTargets} from '../../entities/shared.const'; -import {ConfirmationMessage} from '../confirmation-dialog/confirmation-message'; -import {ConfirmationDialogComponent} from '../confirmation-dialog/confirmation-dialog.component'; -import {ConfirmationAcknowledgement} from '../confirmation-dialog/confirmation-state-message'; +import {compareValue, clone} from '../../../../shared/units/utils'; +import {ProjectService} from '../../../../shared/services'; +import {ErrorHandler} from '../../../../shared/units/error-handler'; +import {State, SystemCVEAllowlist} from '../../../../shared/services'; +import {ConfirmationState, ConfirmationTargets} from '../../../../shared/entities/shared.const'; +import {ConfirmationMessage} from '../../../global-confirmation-dialog/confirmation-message'; +import {ConfirmationDialogComponent} from '../../../../shared/components/confirmation-dialog'; +import {ConfirmationAcknowledgement} from '../../../global-confirmation-dialog/confirmation-state-message'; import {TranslateService} from '@ngx-translate/core'; - import {Project} from './project'; -import {SystemInfo, SystemInfoService} from '../../services'; -import {UserPermissionService} from '../../services/permission.service'; -import {USERSTATICPERMISSION} from '../../services/permission-static'; +import {SystemInfo, SystemInfoService} from '../../../../shared/services'; +import {UserPermissionService} from '../../../../shared/services'; +import {USERSTATICPERMISSION} from '../../../../shared/services'; const ONE_THOUSAND: number = 1000; @@ -38,13 +35,13 @@ export class ProjectPolicy { } initByProject(pro: Project) { - this.Public = pro.metadata.public === 'true' ? true : false; - this.ContentTrust = pro.metadata.enable_content_trust === 'true' ? true : false; - this.PreventVulImg = pro.metadata.prevent_vul === 'true' ? true : false; + this.Public = pro.metadata.public === 'true'; + this.ContentTrust = pro.metadata.enable_content_trust === 'true'; + this.PreventVulImg = pro.metadata.prevent_vul === 'true'; if (pro.metadata.severity) { this.PreventVulImgSeverity = pro.metadata.severity; } - this.ScanImgOnPush = pro.metadata.auto_scan === 'true' ? true : false; + this.ScanImgOnPush = pro.metadata.auto_scan === 'true'; } } diff --git a/src/portal/src/lib/components/project-policy-config/project.ts b/src/portal/src/app/base/project/project-config/project-policy-config/project.ts similarity index 100% rename from src/portal/src/lib/components/project-policy-config/project.ts rename to src/portal/src/app/base/project/project-config/project-policy-config/project.ts diff --git a/src/portal/src/app/project/project-detail/project-detail.component.html b/src/portal/src/app/base/project/project-detail/project-detail.component.html similarity index 100% rename from src/portal/src/app/project/project-detail/project-detail.component.html rename to src/portal/src/app/base/project/project-detail/project-detail.component.html diff --git a/src/portal/src/app/project/project-detail/project-detail.component.scss b/src/portal/src/app/base/project/project-detail/project-detail.component.scss similarity index 100% rename from src/portal/src/app/project/project-detail/project-detail.component.scss rename to src/portal/src/app/base/project/project-detail/project-detail.component.scss diff --git a/src/portal/src/app/project/project-detail/project-detail.component.spec.ts b/src/portal/src/app/base/project/project-detail/project-detail.component.spec.ts similarity index 93% rename from src/portal/src/app/project/project-detail/project-detail.component.spec.ts rename to src/portal/src/app/base/project/project-detail/project-detail.component.spec.ts index 21130b4401..b685baef08 100644 --- a/src/portal/src/app/project/project-detail/project-detail.component.spec.ts +++ b/src/portal/src/app/base/project/project-detail/project-detail.component.spec.ts @@ -9,10 +9,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; -import { AppConfigService } from "../../services/app-config.service"; -import { ProjectService, UserPermissionService } from "../../../lib/services"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; +import { SessionService } from '../../../shared/services/session.service'; +import { AppConfigService } from "../../../services/app-config.service"; +import { ProjectService, UserPermissionService } from "../../../shared/services"; +import { ErrorHandler } from "../../../shared/units/error-handler"; describe('ProjectDetailComponent', () => { let component: ProjectDetailComponent; diff --git a/src/portal/src/app/project/project-detail/project-detail.component.ts b/src/portal/src/app/base/project/project-detail/project-detail.component.ts similarity index 97% rename from src/portal/src/app/project/project-detail/project-detail.component.ts rename to src/portal/src/app/base/project/project-detail/project-detail.component.ts index 8df30d4ce8..ba50c76382 100644 --- a/src/portal/src/app/project/project-detail/project-detail.component.ts +++ b/src/portal/src/app/base/project/project-detail/project-detail.component.ts @@ -14,11 +14,11 @@ import { Component, OnInit, HostListener, AfterViewInit, OnDestroy, ChangeDetectorRef } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Project } from '../project'; -import { SessionService } from '../../shared/session.service'; -import { AppConfigService } from "../../services/app-config.service"; +import { SessionService } from '../../../shared/services/session.service'; +import { AppConfigService } from "../../../services/app-config.service"; import { forkJoin, Subject, Subscription } from "rxjs"; -import { UserPermissionService, USERSTATICPERMISSION } from "../../../lib/services"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; +import { UserPermissionService, USERSTATICPERMISSION } from "../../../shared/services"; +import { ErrorHandler } from "../../../shared/units/error-handler"; import { debounceTime } from 'rxjs/operators'; import { DOWN, SHOW_ELLIPSIS_WIDTH, UP } from './project-detail.const'; diff --git a/src/portal/src/app/project/project-detail/project-detail.const.ts b/src/portal/src/app/base/project/project-detail/project-detail.const.ts similarity index 100% rename from src/portal/src/app/project/project-detail/project-detail.const.ts rename to src/portal/src/app/base/project/project-detail/project-detail.const.ts diff --git a/src/portal/src/app/project/project-label/project-label.component.html b/src/portal/src/app/base/project/project-label/project-label.component.html similarity index 100% rename from src/portal/src/app/project/project-label/project-label.component.html rename to src/portal/src/app/base/project/project-label/project-label.component.html diff --git a/src/portal/src/app/project/project-label/project-label.component.scss b/src/portal/src/app/base/project/project-label/project-label.component.scss similarity index 100% rename from src/portal/src/app/project/project-label/project-label.component.scss rename to src/portal/src/app/base/project/project-label/project-label.component.scss diff --git a/src/portal/src/app/project/project-label/project-label.component.spec.ts b/src/portal/src/app/base/project/project-label/project-label.component.spec.ts similarity index 79% rename from src/portal/src/app/project/project-label/project-label.component.spec.ts rename to src/portal/src/app/base/project/project-label/project-label.component.spec.ts index 835084690a..dcc722ca17 100644 --- a/src/portal/src/app/project/project-label/project-label.component.spec.ts +++ b/src/portal/src/app/base/project/project-label/project-label.component.spec.ts @@ -3,9 +3,9 @@ import { Router, ActivatedRoute } from '@angular/router'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { of } from 'rxjs'; import { ProjectLabelComponent } from './project-label.component'; -import { SessionService } from '../../shared/session.service'; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { UserPermissionService } from "../../../lib/services"; +import { SessionService } from '../../../shared/services/session.service'; +import { UserPermissionService } from "../../../shared/services"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('ProjectLabelComponent', () => { let component: ProjectLabelComponent; @@ -28,15 +28,19 @@ describe('ProjectLabelComponent', () => { schemas: [ CUSTOM_ELEMENTS_SCHEMA ], + imports: [ + SharedTestingModule + ], providers: [ - ErrorHandler, { provide: Router, useValue: fakeRouter }, { provide: ActivatedRoute, useValue: { snapshot: { parent: { - params: { - id: 1 + parent: { + params: { + id: 1 + } } } } diff --git a/src/portal/src/app/project/project-label/project-label.component.ts b/src/portal/src/app/base/project/project-label/project-label.component.ts similarity index 89% rename from src/portal/src/app/project/project-label/project-label.component.ts rename to src/portal/src/app/base/project/project-label/project-label.component.ts index 709e8d95fd..876ffa1cd0 100644 --- a/src/portal/src/app/project/project-label/project-label.component.ts +++ b/src/portal/src/app/base/project/project-label/project-label.component.ts @@ -13,11 +13,11 @@ // limitations under the License. import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; -import { SessionUser } from '../../shared/session-user'; +import { SessionService } from '../../../shared/services/session.service'; +import { SessionUser } from '../../../shared/entities/session-user'; import { forkJoin } from 'rxjs'; -import { UserPermissionService, USERSTATICPERMISSION } from "../../../lib/services"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; +import { UserPermissionService, USERSTATICPERMISSION } from "../../../shared/services"; +import { ErrorHandler } from "../../../shared/units/error-handler"; @Component({ selector: 'app-project-config', @@ -42,7 +42,7 @@ export class ProjectLabelComponent implements OnInit { private session: SessionService) {} ngOnInit() { - this.projectId = +this.route.snapshot.parent.params['id']; + this.projectId = +this.route.snapshot.parent.parent.params['id']; this.currentUser = this.session.getCurrentUser(); this.hasSignedIn = this.session.getCurrentUser() !== null; this.getLabelPermissionRule(this.projectId); diff --git a/src/portal/src/app/base/project/project-label/project-label.module.ts b/src/portal/src/app/base/project/project-label/project-label.module.ts new file mode 100644 index 0000000000..4af88593ea --- /dev/null +++ b/src/portal/src/app/base/project/project-label/project-label.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { ProjectLabelComponent } from "./project-label.component"; + +const routes: Routes = [ + { + path: '', + component: ProjectLabelComponent + } +]; +@NgModule({ + declarations: [ProjectLabelComponent], + imports: [ + RouterModule.forChild(routes), + SharedModule + ] +}) +export class ProjectLabelModule { } diff --git a/src/portal/src/app/log/audit-log.component.html b/src/portal/src/app/base/project/project-log/audit-log.component.html similarity index 100% rename from src/portal/src/app/log/audit-log.component.html rename to src/portal/src/app/base/project/project-log/audit-log.component.html diff --git a/src/portal/src/app/log/audit-log.component.scss b/src/portal/src/app/base/project/project-log/audit-log.component.scss similarity index 100% rename from src/portal/src/app/log/audit-log.component.scss rename to src/portal/src/app/base/project/project-log/audit-log.component.scss diff --git a/src/portal/src/app/log/audit-log.component.spec.ts b/src/portal/src/app/base/project/project-log/audit-log.component.spec.ts similarity index 83% rename from src/portal/src/app/log/audit-log.component.spec.ts rename to src/portal/src/app/base/project/project-log/audit-log.component.spec.ts index 465802a6fd..2a8dd527c6 100644 --- a/src/portal/src/app/log/audit-log.component.spec.ts +++ b/src/portal/src/app/base/project/project-log/audit-log.component.spec.ts @@ -1,20 +1,15 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { AuditLogComponent } from './audit-log.component'; -import { ClarityModule } from '@clr/angular'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; import { ActivatedRoute, Router } from '@angular/router'; import { of } from 'rxjs'; import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { RouterTestingModule } from '@angular/router/testing'; import { delay } from 'rxjs/operators'; -import { HarborLibraryModule } from "../../lib/harbor-library.module"; -import { AuditLog } from "../../../ng-swagger-gen/models/audit-log"; +import { AuditLog } from "../../../../../ng-swagger-gen/models/audit-log"; import { HttpHeaders, HttpResponse } from "@angular/common/http"; -import { ProjectService } from "../../../ng-swagger-gen/services/project.service"; -import { click } from "../../lib/utils/utils"; -import { FormsModule } from "@angular/forms"; +import { ProjectService } from "../../../../../ng-swagger-gen/services/project.service"; +import { click } from "../../../shared/units/utils"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('AuditLogComponent', () => { let component: AuditLogComponent; @@ -24,8 +19,10 @@ describe('AuditLogComponent', () => { }; const mockActivatedRoute = { parent: { - snapshot: { - data: null + parent: { + snapshot: { + data: null + } } }, snapshot: { @@ -82,17 +79,10 @@ describe('AuditLogComponent', () => { CUSTOM_ELEMENTS_SCHEMA ], imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HarborLibraryModule + SharedTestingModule ], declarations: [AuditLogComponent], providers: [ - TranslateService, { provide: ActivatedRoute, useValue: mockActivatedRoute }, { provide: Router, useValue: mockRouter }, { provide: ProjectService, useValue: fakedAuditlogService }, diff --git a/src/portal/src/app/log/audit-log.component.ts b/src/portal/src/app/base/project/project-log/audit-log.component.ts similarity index 92% rename from src/portal/src/app/log/audit-log.component.ts rename to src/portal/src/app/base/project/project-log/audit-log.component.ts index 2567a21885..8a39e9becd 100644 --- a/src/portal/src/app/log/audit-log.component.ts +++ b/src/portal/src/app/base/project/project-log/audit-log.component.ts @@ -13,13 +13,13 @@ // limitations under the License. import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { SessionUser } from '../shared/session-user'; -import { MessageHandlerService } from '../shared/message-handler/message-handler.service'; -import { ProjectService } from "../../../ng-swagger-gen/services/project.service"; -import { AuditLog } from "../../../ng-swagger-gen/models/audit-log"; -import { Project } from "../project/project"; +import { SessionUser } from '../../../shared/entities/session-user'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; +import { ProjectService } from "../../../../../ng-swagger-gen/services/project.service"; +import { AuditLog } from "../../../../../ng-swagger-gen/models/audit-log"; +import { Project } from "../project"; import { finalize } from "rxjs/operators"; -import {DEFAULT_PAGE_SIZE} from "../../lib/utils/utils"; +import {DEFAULT_PAGE_SIZE} from "../../../shared/units/utils"; import {ClrDatagridStateInterface} from "@clr/angular"; const optionalSearch: {} = { 0: 'AUDIT_LOG.ADVANCED', 1: 'AUDIT_LOG.SIMPLE' }; @@ -93,7 +93,7 @@ export class AuditLogComponent implements OnInit { } ngOnInit(): void { - const resolverData = this.route.parent.snapshot.data; + const resolverData = this.route.parent.parent.snapshot.data; if (resolverData) { const pro: Project = resolverData['projectResolver']; this.projectName = pro.name; diff --git a/src/portal/src/app/base/project/project-log/audit-log.module.ts b/src/portal/src/app/base/project/project-log/audit-log.module.ts new file mode 100644 index 0000000000..618018a2cd --- /dev/null +++ b/src/portal/src/app/base/project/project-log/audit-log.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { AuditLogComponent } from "./audit-log.component"; + + +const routes: Routes = [ + { + path: '', + component: AuditLogComponent + } +]; +@NgModule({ + declarations: [AuditLogComponent], + imports: [ + RouterModule.forChild(routes), + SharedModule + ] +}) +export class AuditLogModule { } diff --git a/src/portal/src/app/base/project/project.module.ts b/src/portal/src/app/base/project/project.module.ts new file mode 100644 index 0000000000..e50eb01c86 --- /dev/null +++ b/src/portal/src/app/base/project/project.module.ts @@ -0,0 +1,177 @@ +// Copyright Project Harbor Authors +// +// 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. +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../shared/shared.module'; +import { ProjectDetailComponent } from './project-detail/project-detail.component'; +import { MemberPermissionGuard } from "../../shared/router-guard/member-permission-guard-activate.service"; +import { USERSTATICPERMISSION } from "../../shared/services"; + +const routes: Routes = [ + { + path: '', + component: ProjectDetailComponent, + children: [ + { + path: 'summary', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.PROJECT.KEY, + action: USERSTATICPERMISSION.PROJECT.VALUE.READ + } + }, + loadChildren: () => import('./summary/summary.module').then(m => m.SummaryModule), + }, + { + path: 'repositories', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.REPOSITORY.KEY, + action: USERSTATICPERMISSION.REPOSITORY.VALUE.LIST + } + }, + loadChildren: () => import('./repository/repository.module').then(m => m.RepositoryModule), + }, + { + path: 'helm-charts', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.HELM_CHART.KEY, + action: USERSTATICPERMISSION.HELM_CHART.VALUE.LIST + } + }, + loadChildren: () => import('./helm-chart/helm-chart-list/helm-chart-list.module').then(m => m.HelmChartListModule), + }, + { + path: 'members', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.MEMBER.KEY, + action: USERSTATICPERMISSION.MEMBER.VALUE.LIST + } + }, + loadChildren: () => import('./member/member.module').then(m => m.MemberModule), + }, + { + path: 'logs', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.LOG.KEY, + action: USERSTATICPERMISSION.LOG.VALUE.LIST + } + }, + loadChildren: () => import('./project-log/audit-log.module').then(m => m.AuditLogModule), + }, + { + path: 'labels', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.LABEL.KEY, + action: USERSTATICPERMISSION.LABEL.VALUE.CREATE + } + }, + loadChildren: () => import('./project-label/project-label.module').then(m => m.ProjectLabelModule), + }, + { + path: 'configs', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.CONFIGURATION.KEY, + action: USERSTATICPERMISSION.CONFIGURATION.VALUE.READ + } + }, + loadChildren: () => import('./project-config/project-config.module').then(m => m.ProjectConfigModule), + }, + { + path: 'robot-account', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.ROBOT.KEY, + action: USERSTATICPERMISSION.ROBOT.VALUE.LIST + } + }, + loadChildren: () => import('./robot-account/project-robot-account.module').then(m => m.ProjectRobotAccountModule), + }, + { + path: 'tag-strategy', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.TAG_RETENTION.KEY, + action: USERSTATICPERMISSION.TAG_RETENTION.VALUE.READ + } + }, + loadChildren: () => import('./tag-feature-integration/tag-feature-integration.module').then(m => m.TagFeatureIntegrationModule), + }, + { + path: 'webhook', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.WEBHOOK.KEY, + action: USERSTATICPERMISSION.WEBHOOK.VALUE.LIST + } + }, + loadChildren: () => import('./webhook/webhook.module').then(m => m.WebhookModule), + }, + { + path: 'scanner', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.SCANNER.KEY, + action: USERSTATICPERMISSION.SCANNER.VALUE.READ + } + }, + loadChildren: () => import('./scanner/project-scanner.module').then(m => m.ProjectScannerModule), + }, + { + path: 'p2p-provider', + canActivate: [MemberPermissionGuard], + data: { + permissionParam: { + resource: USERSTATICPERMISSION.P2P_PROVIDER.KEY, + action: USERSTATICPERMISSION.P2P_PROVIDER.VALUE.READ + } + }, + loadChildren: () => import('./p2p-provider/p2p-provider.module').then(m => m.P2pProviderModule), + }, + { + path: '', + redirectTo: 'repositories', + pathMatch: 'full' + }, + ] + } +]; +@NgModule({ + imports: [ + RouterModule.forChild(routes), + SharedModule, + ], + declarations: [ + ProjectDetailComponent, + ] +}) +export class ProjectModule { + +} diff --git a/src/portal/src/app/project/project.ts b/src/portal/src/app/base/project/project.ts similarity index 100% rename from src/portal/src/app/project/project.ts rename to src/portal/src/app/base/project/project.ts diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/additions.service.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/additions.service.spec.ts similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/additions.service.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/additions.service.spec.ts diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/additions.service.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/additions.service.ts similarity index 88% rename from src/portal/src/app/project/repository/artifact/artifact-additions/additions.service.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/additions.service.ts index 8599febf8f..9d187496ab 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/additions.service.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/additions.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; import { Observable } from "rxjs"; -import { DEFAULT_SUPPORTED_MIME_TYPES } from "../../../../../lib/utils/utils"; +import { DEFAULT_SUPPORTED_MIME_TYPES } from "../../../../../shared/units/utils"; @Injectable({ providedIn: 'root', diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.spec.ts similarity index 69% rename from src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.spec.ts index ff9d913a97..f319adba54 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.spec.ts @@ -1,9 +1,9 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtifactAdditionsComponent } from './artifact-additions.component'; -import { AdditionLinks } from "../../../../../../ng-swagger-gen/models/addition-links"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../../lib/entities/service.config"; -import { ProjectModule } from "../../../project.module"; -import { CURRENT_BASE_HREF } from "../../../../../lib/utils/utils"; +import { AdditionLinks } from "../../../../../../../ng-swagger-gen/models/addition-links"; +import { CURRENT_BASE_HREF } from "../../../../../shared/units/utils"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; +import { NO_ERRORS_SCHEMA } from "@angular/core"; describe('ArtifactAdditionsComponent', () => { @@ -13,20 +13,20 @@ describe('ArtifactAdditionsComponent', () => { href: CURRENT_BASE_HREF + "/test" } }; - const config: IServiceConfig = { - baseEndpoint: CURRENT_BASE_HREF - }; let component: ArtifactAdditionsComponent; let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - ProjectModule + SharedTestingModule + ], + declarations: [ + ArtifactAdditionsComponent + ], + schemas: [ + NO_ERRORS_SCHEMA ], - providers: [ - { provide: SERVICE_CONFIG, useValue: config }, - ] }) .compileComponents(); })); diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.ts similarity index 85% rename from src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.ts index 253c2f038e..8f920350f0 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-additions.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-additions.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit, Input } from '@angular/core'; import { ADDITIONS } from "./models"; -import { AdditionLinks } from "../../../../../../ng-swagger-gen/models/addition-links"; -import { AdditionLink } from "../../../../../../ng-swagger-gen/models/addition-link"; -import { Artifact } from "../../../../../../ng-swagger-gen/models/artifact"; +import { AdditionLinks } from "../../../../../../../ng-swagger-gen/models/addition-links"; +import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; +import { Artifact } from "../../../../../../../ng-swagger-gen/models/artifact"; @Component({ selector: 'artifact-additions', diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.spec.ts similarity index 90% rename from src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.spec.ts index 7b42fe05a6..f7eb52cee1 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.spec.ts @@ -12,12 +12,12 @@ import { SystemInfoService, UserPermissionService, VulnerabilityItem -} from "../../../../../../lib/services"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; -import { ChannelService } from "../../../../../../lib/services/channel.service"; -import {SessionService} from "../../../../../shared/session.service"; -import {SessionUser} from "../../../../../shared/session-user"; +} from "../../../../../../shared/services"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; +import { ChannelService } from "../../../../../../shared/services/channel.service"; +import {SessionService} from "../../../../../../shared/services/session.service"; +import {SessionUser} from "../../../../../../shared/entities/session-user"; import {delay} from "rxjs/operators"; diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.ts similarity index 93% rename from src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.ts index 18e51be081..4c79424efa 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { AdditionsService } from "../additions.service"; import { ClrDatagridComparatorInterface, ClrLoadingState } from "@clr/angular"; import { finalize } from "rxjs/operators"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; import { ProjectService, ScannerVo, @@ -10,17 +10,17 @@ import { UserPermissionService, USERSTATICPERMISSION, VulnerabilityItem -} from "../../../../../../lib/services"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; +} from "../../../../../../shared/services"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; import { SEVERITY_LEVEL_MAP, VULNERABILITY_SEVERITY -} from "../../../../../../lib/utils/utils"; -import { ChannelService } from "../../../../../../lib/services/channel.service"; -import { ResultBarChartComponent } from "../../../vulnerability-scanning/result-bar-chart.component"; +} from "../../../../../../shared/units/utils"; +import { ChannelService } from "../../../../../../shared/services/channel.service"; +import { ResultBarChartComponent } from "../../vulnerability-scanning/result-bar-chart.component"; import { Subscription } from "rxjs"; -import { Artifact } from "../../../../../../../ng-swagger-gen/models/artifact"; -import {SessionService} from "../../../../../shared/session.service"; +import { Artifact } from "../../../../../../../../ng-swagger-gen/models/artifact"; +import {SessionService} from "../../../../../../shared/services/session.service"; @Component({ selector: 'hbr-artifact-vulnerabilities', diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.spec.ts similarity index 92% rename from src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.spec.ts index 9687b717e1..a242f9c6a1 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.spec.ts @@ -7,8 +7,8 @@ import { TranslateFakeLoader, TranslateLoader, TranslateModule } from "@ngx-tran import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { BuildHistoryComponent } from "./build-history.component"; import { ArtifactBuildHistory } from "../models"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; describe('BuildHistoryComponent', () => { let component: BuildHistoryComponent; diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.ts similarity index 91% rename from src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.ts index 0ae0e76cef..bc7a3c3387 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/build-history/build-history.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/build-history/build-history.component.ts @@ -2,8 +2,8 @@ import { Component, Input, OnInit } from "@angular/core"; import { AdditionsService } from "../additions.service"; import { ArtifactBuildHistory } from "../models"; import { finalize } from "rxjs/operators"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; @Component({ selector: "hbr-artifact-build-history", diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.spec.ts similarity index 81% rename from src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.spec.ts index f1a1097684..0e5a1fd5b0 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.spec.ts @@ -4,11 +4,10 @@ import { DependenciesComponent } from "./dependencies.component"; import { AdditionsService } from '../additions.service'; import { of } from 'rxjs'; import { ArtifactDependency } from "../models"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../../../lib/entities/service.config"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; import { ClarityModule } from "@clr/angular"; -import { CURRENT_BASE_HREF } from "../../../../../../lib/utils/utils"; +import { CURRENT_BASE_HREF } from "../../../../../../shared/units/utils"; describe('DependenciesComponent', () => { @@ -36,9 +35,6 @@ describe('DependenciesComponent', () => { absolute: false, href: '/test' }; - const config: IServiceConfig = { - repositoryBaseEndpoint: CURRENT_BASE_HREF + "/repositories/testing" - }; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ @@ -48,8 +44,6 @@ describe('DependenciesComponent', () => { declarations: [DependenciesComponent], providers: [ TranslateService, - { provide: SERVICE_CONFIG, useValue: config }, - { provide: ErrorHandler, useValue: mockErrorHandler }, diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.ts similarity index 86% rename from src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.ts index 4b969c6a93..a1b737f326 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/dependencies/dependencies.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/dependencies/dependencies.component.ts @@ -5,9 +5,8 @@ import { } from "@angular/core"; import { ArtifactDependency } from "../models"; import { AdditionsService } from "../additions.service"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; -import { pipe } from "rxjs"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; import { finalize } from "rxjs/operators"; diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/models.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/models.ts similarity index 95% rename from src/portal/src/app/project/repository/artifact/artifact-additions/models.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/models.ts index ff9bfb8db9..bd788d1263 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/models.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/models.ts @@ -1,4 +1,4 @@ -import { HelmChartMaintainer } from "../../../helm-chart/helm-chart.interface.service"; +import { HelmChartMaintainer } from "../../../helm-chart/helm-chart-detail/helm-chart.interface.service"; export class ArtifactBuildHistory { created: Date; diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.spec.ts similarity index 96% rename from src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.spec.ts index 056937f716..835f5c407c 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.spec.ts @@ -3,11 +3,9 @@ import { NO_ERRORS_SCHEMA } from "@angular/core"; import { AdditionsService } from "../additions.service"; import { of } from "rxjs"; import { SummaryComponent } from "./summary.component"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../../../lib/entities/service.config"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; -import { ProjectModule } from "../../../../project.module"; -import { CURRENT_BASE_HREF } from "../../../../../../lib/utils/utils"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; +import { SharedTestingModule } from "../../../../../../shared/shared.module"; describe('SummaryComponent', () => { let component: SummaryComponent; @@ -160,18 +158,17 @@ describe('SummaryComponent', () => { return of(readme); } }; - const config: IServiceConfig = { - repositoryBaseEndpoint: CURRENT_BASE_HREF + "/repositories/testing" - }; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - ProjectModule + SharedTestingModule + ], + declarations: [ + SummaryComponent ], providers: [ ErrorHandler, { provide: AdditionsService, useValue: fakedAdditionsService }, - { provide: SERVICE_CONFIG, useValue: config }, ], schemas: [ NO_ERRORS_SCHEMA diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.ts similarity index 85% rename from src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.ts index f87eaa7d55..e5caf6099a 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/summary/summary.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/summary/summary.component.ts @@ -4,8 +4,8 @@ import { Input } from "@angular/core"; import { AdditionsService } from "../additions.service"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; import { finalize } from "rxjs/operators"; diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.spec.ts similarity index 92% rename from src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.spec.ts index f99f88941b..815eb123e9 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.spec.ts @@ -8,8 +8,8 @@ import { BrowserModule } from '@angular/platform-browser'; import { ValuesComponent } from "./values.component"; import { AdditionsService } from "../additions.service"; import { of } from "rxjs"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; describe('ValuesComponent', () => { diff --git a/src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.ts similarity index 90% rename from src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.ts index 1e4d172a94..e51c9007da 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-additions/values/values.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-additions/values/values.component.ts @@ -4,11 +4,11 @@ import { OnInit, } from "@angular/core"; import { AdditionsService } from "../additions.service"; -import { AdditionLink } from "../../../../../../../ng-swagger-gen/models/addition-link"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; +import { AdditionLink } from "../../../../../../../../ng-swagger-gen/models/addition-link"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; import * as yaml from "js-yaml"; import { finalize } from "rxjs/operators"; -import { isObject } from "../../../../../../lib/utils/utils"; +import { isObject } from "../../../../../../shared/units/utils"; @Component({ selector: "hbr-artifact-values", diff --git a/src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.spec.ts similarity index 95% rename from src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.spec.ts index 2edbc7deb0..ab903c3a84 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.spec.ts @@ -4,7 +4,7 @@ import { ArtifactCommonPropertiesComponent } from './artifact-common-properties. import { ClarityModule } from "@clr/angular"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateFakeLoader, TranslateLoader, TranslateModule, TranslateService } from "@ngx-translate/core"; -import { ExtraAttrs } from "../../../../../../ng-swagger-gen/models/extra-attrs"; +import { ExtraAttrs } from "../../../../../../../ng-swagger-gen/models/extra-attrs"; describe('ArtifactCommonPropertiesComponent', () => { let component: ArtifactCommonPropertiesComponent; diff --git a/src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.ts similarity index 90% rename from src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.ts index c0d3fe67b1..03132ade76 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-common-properties/artifact-common-properties.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core'; import { DatePipe } from "@angular/common"; -import { TranslateService } from "@ngx-translate/core"; -import { Artifact } from "../../../../../../ng-swagger-gen/models/artifact"; -import { isObject } from "../../../../../lib/utils/utils"; +import { Artifact } from "../../../../../../../ng-swagger-gen/models/artifact"; enum Types { CREATED = 'created', diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.html diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.scss diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.spec.ts similarity index 83% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.spec.ts index fecfb9f6b7..a3cc4f4681 100644 --- a/src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.spec.ts @@ -8,12 +8,11 @@ import { FormsModule } from '@angular/forms'; import { of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ActivatedRoute, Router } from '@angular/router'; -import { SessionService } from "../../../shared/session.service"; -import { AppConfigService } from "../../../services/app-config.service"; -import { ArtifactService } from "../../../../../ng-swagger-gen/services/artifact.service"; -import { ArtifactDefaultService } from "../artifact/artifact.service"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../lib/entities/service.config"; -import { CURRENT_BASE_HREF } from "../../../../lib/utils/utils"; +import { SessionService } from "../../../../../shared/services/session.service"; +import { AppConfigService } from "../../../../../services/app-config.service"; +import { ArtifactService } from "../../../../../../../ng-swagger-gen/services/artifact.service"; +import { ArtifactDefaultService } from "../artifact.service"; +import { CURRENT_BASE_HREF } from "../../../../../shared/units/utils"; describe('ArtifactListPageComponent', () => { let component: ArtifactListPageComponent; @@ -70,9 +69,6 @@ describe('ArtifactListPageComponent', () => { } } }; - const config: IServiceConfig = { - repositoryBaseEndpoint: CURRENT_BASE_HREF + "/repositories/testing" - }; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ schemas: [ @@ -90,7 +86,6 @@ describe('ArtifactListPageComponent', () => { providers: [ TranslateService, ArtifactDefaultService, - { provide: SERVICE_CONFIG, useValue: config }, { provide: SessionService, useValue: mockSessionService }, { provide: AppConfigService, useValue: mockAppConfigService }, { provide: Router, useValue: mockRouter }, diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.ts similarity index 86% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.ts index 69ab5e54e6..314cf01ba7 100644 --- a/src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list-page.component.ts @@ -14,11 +14,11 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ArtifactListComponent } from "./artifact-list/artifact-list.component"; -import { ArtifactDefaultService } from "../artifact/artifact.service"; -import { AppConfigService } from "../../../services/app-config.service"; -import { SessionService } from "../../../shared/session.service"; -import { ArtifactClickEvent } from "../../../../lib/services"; -import { Project } from "../../project"; +import { ArtifactDefaultService } from "../artifact.service"; +import { AppConfigService } from "../../../../../services/app-config.service"; +import { SessionService } from "../../../../../shared/services/session.service"; +import { ArtifactClickEvent } from "../../../../../shared/services"; +import { Project } from "../../../project"; @Component({ selector: 'artifact-list-page', @@ -55,11 +55,8 @@ export class ArtifactListPageComponent implements OnInit { } ngOnInit() { - this.projectId = this.route.snapshot.params['id']; - if (!this.projectId) { - this.projectId = this.route.snapshot.parent.params['id']; - } - let resolverData = this.route.snapshot.data; + this.projectId = this.route.snapshot.parent.params['id']; + let resolverData = this.route.snapshot.parent.data; if (resolverData) { this.projectName = (resolverData['projectResolver']).name; this.hasProjectAdminRole = (resolverData['projectResolver']).has_project_admin_role; diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html similarity index 99% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html index 3bd76827c1..00736937dc 100644 --- a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html @@ -257,7 +257,7 @@ {{'ARTIFACT.SCAN_UNSUPPORTED' | translate}} - diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.scss diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.spec.ts similarity index 89% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.spec.ts index f6e0443c21..aa4494f3e9 100644 --- a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.spec.ts @@ -7,7 +7,7 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { HttpClientTestingModule } from "@angular/common/http/testing"; import { HttpClient, HttpHeaders, HttpResponse } from "@angular/common/http"; import { ActivatedRoute, Router } from "@angular/router"; -import { ArtifactDefaultService, ArtifactService } from "../../../artifact/artifact.service"; +import { ArtifactDefaultService, ArtifactService } from "../../../artifact.service"; import { Label, LabelDefaultService, @@ -19,20 +19,18 @@ import { UserPermissionDefaultService, UserPermissionService, USERSTATICPERMISSION -} from "../../../../../../lib/services"; -import { ArtifactFront as Artifact } from "../../../artifact/artifact"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../../../lib/entities/service.config"; -import { SharedModule } from "../../../../../../lib/utils/shared/shared.module"; -import { LabelPieceComponent } from "../../../../../../lib/components/label-piece/label-piece.component"; -import { ConfirmationDialogComponent } from "../../../../../../lib/components/confirmation-dialog"; -import { ImageNameInputComponent } from "../../../../../../lib/components/image-name-input/image-name-input.component"; -import { CopyInputComponent } from "../../../../../../lib/components/push-image/copy-input.component"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; -import { ChannelService } from "../../../../../../lib/services/channel.service"; -import { OperationService } from "../../../../../../lib/components/operation/operation.service"; -import { ArtifactService as NewArtifactService } from "../../../../../../../ng-swagger-gen/services/artifact.service"; -import { AllPipesModule } from "../../../../../all-pipes/all-pipes.module"; -import { Tag } from "../../../../../../../ng-swagger-gen/models/tag"; +} from "../../../../../../../shared/services"; +import { ArtifactFront as Artifact } from "../../../artifact"; +import { LabelPieceComponent } from "../../../../../../../shared/components/label/label-piece/label-piece.component"; +import { ConfirmationDialogComponent } from "../../../../../../../shared/components/confirmation-dialog"; +import { ImageNameInputComponent } from "../../../../../../../shared/components/image-name-input/image-name-input.component"; +import { CopyInputComponent } from "../../../../../../../shared/components/push-image/copy-input.component"; +import { ErrorHandler } from "../../../../../../../shared/units/error-handler"; +import { ChannelService } from "../../../../../../../shared/services/channel.service"; +import { OperationService } from "../../../../../../../shared/components/operation/operation.service"; +import { ArtifactService as NewArtifactService } from "../../../../../../../../../ng-swagger-gen/services/artifact.service"; +import { Tag } from "../../../../../../../../../ng-swagger-gen/models/tag"; +import { SharedTestingModule } from "../../../../../../../shared/shared.module"; describe("ArtifactListTabComponent (inline template)", () => { @@ -236,10 +234,6 @@ describe("ArtifactListTabComponent (inline template)", () => { update_time: "", } ]; - - let config: IServiceConfig = { - repositoryBaseEndpoint: "/api/repositories/testing" - }; let mockHasAddLabelImagePermission: boolean = true; let mockHasRetagImagePermission: boolean = true; let mockHasDeleteImagePermission: boolean = true; @@ -302,10 +296,9 @@ describe("ArtifactListTabComponent (inline template)", () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, BrowserAnimationsModule, HttpClientTestingModule, - AllPipesModule ], schemas: [ CUSTOM_ELEMENTS_SCHEMA @@ -322,7 +315,6 @@ describe("ArtifactListTabComponent (inline template)", () => { ChannelService, ArtifactDefaultService, { provide: Router, useValue: mockRouter }, - { provide: SERVICE_CONFIG, useValue: config }, { provide: ArtifactService, useValue: mockNewArtifactService }, { provide: ProjectService, useClass: ProjectDefaultService }, { provide: ScanningResultService, useClass: ScanningResultDefaultService }, diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts similarity index 95% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts index 177928ba47..cc4a267861 100644 --- a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts @@ -28,43 +28,41 @@ import { ActivatedRoute, Router } from "@angular/router"; import { Comparator, Label, LabelService, ScannerVo, ScanningResultService, UserPermissionService, USERSTATICPERMISSION, VulnerabilitySummary -} from "../../../../../../lib/services"; +} from "../../../../../../../shared/services"; import { calculatePage, clone, CustomComparator, DEFAULT_PAGE_SIZE, formatSize, VULNERABILITY_SCAN_STATUS, dbEncodeURIComponent, doSorting, DEFAULT_SUPPORTED_MIME_TYPES -} from "../../../../../../lib/utils/utils"; -import { - ConfirmationAcknowledgement, - ConfirmationDialogComponent, - ConfirmationMessage -} from "../../../../../../lib/components/confirmation-dialog"; -import { ImageNameInputComponent } from "../../../../../../lib/components/image-name-input/image-name-input.component"; -import { CopyInputComponent } from "../../../../../../lib/components/push-image/copy-input.component"; -import { ErrorHandler } from "../../../../../../lib/utils/error-handler"; -import { ArtifactService } from "../../../artifact/artifact.service"; -import { OperationService } from "../../../../../../lib/components/operation/operation.service"; -import { ChannelService } from "../../../../../../lib/services/channel.service"; +} from "../../../../../../../shared/units/utils"; +import { ImageNameInputComponent } from "../../../../../../../shared/components/image-name-input/image-name-input.component"; +import { CopyInputComponent } from "../../../../../../../shared/components/push-image/copy-input.component"; +import { ErrorHandler } from "../../../../../../../shared/units/error-handler"; +import { ArtifactService } from "../../../artifact.service"; +import { OperationService } from "../../../../../../../shared/components/operation/operation.service"; +import { ChannelService } from "../../../../../../../shared/services/channel.service"; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets -} from "../../../../../../lib/entities/shared.const"; -import { operateChanges, OperateInfo, OperationState } from "../../../../../../lib/components/operation/operate"; -import { errorHandler } from "../../../../../../lib/utils/shared/shared.utils"; +} from "../../../../../../../shared/entities/shared.const"; +import { operateChanges, OperateInfo, OperationState } from "../../../../../../../shared/components/operation/operate"; import { ArtifactFront as Artifact, mutipleFilter, artifactPullCommands, artifactDefault, ArtifactFront -} from '../../../artifact/artifact'; -import { Project } from "../../../../project"; -import { ArtifactService as NewArtifactService } from "../../../../../../../ng-swagger-gen/services/artifact.service"; -import { ADDITIONS } from "../../../artifact/artifact-additions/models"; -import { Platform } from "../../../../../../../ng-swagger-gen/models/platform"; +} from '../../../artifact'; +import { Project } from "../../../../../project"; +import { ArtifactService as NewArtifactService } from "../../../../../../../../../ng-swagger-gen/services/artifact.service"; +import { ADDITIONS } from "../../../artifact-additions/models"; +import { Platform } from "../../../../../../../../../ng-swagger-gen/models/platform"; import { SafeUrl } from '@angular/platform-browser'; +import { errorHandler } from "../../../../../../../shared/units/shared.utils"; +import { ConfirmationDialogComponent } from "../../../../../../../shared/components/confirmation-dialog"; +import { ConfirmationMessage } from "../../../../../../global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../../../../../global-confirmation-dialog/confirmation-state-message"; export interface LabelState { iconsShow: boolean; label: Label; diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.html diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.scss diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.spec.ts similarity index 76% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.spec.ts index def0034913..16799a5f38 100644 --- a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.spec.ts @@ -3,22 +3,19 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ArtifactListComponent } from './artifact-list.component'; import { of } from "rxjs"; import { delay } from 'rxjs/operators'; -import { ClarityModule } from '@clr/angular'; import { ActivatedRoute } from '@angular/router'; import { SystemInfo, SystemInfoDefaultService, SystemInfoService, -} from "../../../../../lib/services"; -import { ArtifactDefaultService, ArtifactService } from "../../artifact/artifact.service"; -import { ChannelService } from "../../../../../lib/services/channel.service"; - -import { TranslateFakeLoader, TranslateLoader, TranslateModule, TranslateService } from "@ngx-translate/core"; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../../lib/entities/service.config"; -import { SharedModule } from "../../../../../lib/utils/shared/shared.module"; +} from "../../../../../../shared/services"; +import { ArtifactDefaultService, ArtifactService } from "../../artifact.service"; +import { ChannelService } from "../../../../../../shared/services/channel.service"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; import { RepositoryService as NewRepositoryService -} from "../../../../../../ng-swagger-gen/services/repository.service"; +} from "../../../../../../../../ng-swagger-gen/services/repository.service"; +import { SharedTestingModule } from "../../../../../../shared/shared.module"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; describe('ArtifactListComponent (inline template)', () => { @@ -66,20 +63,11 @@ describe('ArtifactListComponent (inline template)', () => { const fakedErrorHandler = { error: () => {} }; - const config: IServiceConfig = { - repositoryBaseEndpoint: "/api/repositories/testing" - }; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - ClarityModule, - SharedModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateFakeLoader, - } - }) + HttpClientTestingModule, + SharedTestingModule, ], schemas: [ NO_ERRORS_SCHEMA @@ -88,13 +76,11 @@ describe('ArtifactListComponent (inline template)', () => { ArtifactListComponent ], providers: [ - TranslateService, { provide: ErrorHandler, useValue: fakedErrorHandler }, { provide: ChannelService, useValue: mockChannelService }, { provide: SystemInfoService, useClass: SystemInfoDefaultService }, { provide: ArtifactService, useClass: ArtifactDefaultService }, { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: SERVICE_CONFIG, useValue: config }, { provide: NewRepositoryService, useValue: newRepositoryService}, ] }); diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.ts similarity index 89% rename from src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.ts index dcbd4905f2..c499bd8392 100644 --- a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list.component.ts @@ -13,21 +13,21 @@ // limitations under the License. import { Component, OnInit, ViewChild, Input, Output, EventEmitter, OnDestroy } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { ArtifactClickEvent, State, SystemInfo, SystemInfoService } from "../../../../../lib/services"; +import { ArtifactClickEvent, State, SystemInfo, SystemInfoService } from "../../../../../../shared/services"; import { - ConfirmationAcknowledgement, ConfirmationDialogComponent, - ConfirmationMessage -} from "../../../../../lib/components/confirmation-dialog"; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { ArtifactService } from "../../artifact/artifact.service"; -import { ConfirmationState, ConfirmationTargets } from "../../../../../lib/entities/shared.const"; +} from "../../../../../../shared/components/confirmation-dialog"; +import { ErrorHandler } from "../../../../../../shared/units/error-handler"; +import { ArtifactService } from "../../artifact.service"; +import { ConfirmationState, ConfirmationTargets } from "../../../../../../shared/entities/shared.const"; import { ActivatedRoute } from "@angular/router"; -import { Project } from '../../../project'; +import { Project } from '../../../../project'; import { RepositoryService as NewRepositoryService -} from "../../../../../../ng-swagger-gen/services/repository.service"; -import { dbEncodeURIComponent } from '../../../../../lib/utils/utils'; +} from "../../../../../../../../ng-swagger-gen/services/repository.service"; +import { dbEncodeURIComponent } from '../../../../../../shared/units/utils'; +import { ConfirmationMessage } from "../../../../../global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../../../../global-confirmation-dialog/confirmation-state-message"; const TabLinkContentMap: { [index: string]: string } = { 'repo-info': 'info', 'repo-image': 'image' diff --git a/src/portal/src/app/project/repository/artifact/artifact-summary.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-summary.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-summary.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-summary.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-summary.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-summary.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-summary.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-summary.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-summary.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-summary.component.spec.ts similarity index 75% rename from src/portal/src/app/project/repository/artifact/artifact-summary.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-summary.component.spec.ts index 9cf796ae51..dcfacc69f9 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-summary.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-summary.component.spec.ts @@ -1,18 +1,14 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtifactSummaryComponent } from "./artifact-summary.component"; import { of } from "rxjs"; -import { ClarityModule } from "@clr/angular"; import { NO_ERRORS_SCHEMA } from "@angular/core"; -import { Artifact } from "../../../../../ng-swagger-gen/models/artifact"; -import { ProjectService } from "../../../../lib/services"; -import { ArtifactService } from "../../../../../ng-swagger-gen/services/artifact.service"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import { TranslateFakeLoader, TranslateLoader, TranslateModule } from "@ngx-translate/core"; +import { Artifact } from "../../../../../../ng-swagger-gen/models/artifact"; +import { ProjectService } from "../../../../shared/services"; import { ActivatedRoute, Router } from "@angular/router"; -import { AppConfigService } from "../../../services/app-config.service"; +import { AppConfigService } from "../../../../services/app-config.service"; import { Project } from "../../project"; -import { AllPipesModule } from "../../../all-pipes/all-pipes.module"; import { ArtifactDefaultService } from './artifact.service'; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('ArtifactSummaryComponent', () => { @@ -41,13 +37,17 @@ describe('ArtifactSummaryComponent', () => { RouterparamMap: of({ get: (key) => 'value' }), snapshot: { params: { - id: 1, repo: "test", digest: "ABC", subscribe: () => { return of(null); } }, + parent: { + params: { + id: 1 + } + }, data: { artifactResolver: [mockedArtifact, new Project()] } @@ -70,14 +70,7 @@ describe('ArtifactSummaryComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - ClarityModule, - AllPipesModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateFakeLoader, - } - }) + SharedTestingModule, ], declarations: [ ArtifactSummaryComponent @@ -91,7 +84,6 @@ describe('ArtifactSummaryComponent', () => { { provide: ActivatedRoute, useValue: mockActivatedRoute }, { provide: ProjectService, useValue: fakedProjectService }, { provide: ArtifactDefaultService, useValue: fakedArtifactDefaultService }, - ErrorHandler ] }) .compileComponents(); diff --git a/src/portal/src/app/project/repository/artifact/artifact-summary.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-summary.component.ts similarity index 88% rename from src/portal/src/app/project/repository/artifact/artifact-summary.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-summary.component.ts index 6213272aa2..9cac9e490b 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-summary.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-summary.component.ts @@ -1,10 +1,10 @@ import { Component, Output, EventEmitter, OnInit } from "@angular/core"; -import { Artifact } from "../../../../../ng-swagger-gen/models/artifact"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import { Label } from "../../../../../ng-swagger-gen/models/label"; -import { ProjectService } from "../../../../lib/services"; +import { Artifact } from "../../../../../../ng-swagger-gen/models/artifact"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { Label } from "../../../../../../ng-swagger-gen/models/label"; +import { ProjectService } from "../../../../shared/services"; import { ActivatedRoute, Router } from "@angular/router"; -import { AppConfigService } from "../../../services/app-config.service"; +import { AppConfigService } from "../../../../services/app-config.service"; import { Project } from "../../project"; import { artifactDefault } from './artifact'; import { SafeUrl } from '@angular/platform-browser'; @@ -75,7 +75,7 @@ export class ArtifactSummaryComponent implements OnInit { } this.repositoryName = this.route.snapshot.params["repo"]; this.artifactDigest = this.route.snapshot.params["digest"]; - this.projectId = this.route.snapshot.params["id"]; + this.projectId = this.route.snapshot.parent.params["id"]; if (this.repositoryName && this.artifactDigest) { const resolverData = this.route.snapshot.data; if (resolverData) { diff --git a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html b/src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.html similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html rename to src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.html diff --git a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.scss b/src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.scss similarity index 100% rename from src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.scss rename to src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.scss diff --git a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.spec.ts similarity index 73% rename from src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.spec.ts index bc27eebcf8..2b13066f9c 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.spec.ts @@ -4,15 +4,15 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { of } from 'rxjs'; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../../lib/entities/service.config"; -import { SharedModule } from "../../../../../lib/utils/shared/shared.module"; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { ArtifactService } from '../../../../../../ng-swagger-gen/services/artifact.service'; -import { OperationService } from "../../../../../lib/components/operation/operation.service"; -import { CURRENT_BASE_HREF } from "../../../../../lib/utils/utils"; -import { USERSTATICPERMISSION, UserPermissionService, UserPermissionDefaultService, SystemInfoService } from '../../../../../lib/services'; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { ArtifactService } from '../../../../../../../ng-swagger-gen/services/artifact.service'; +import { OperationService } from "../../../../../shared/components/operation/operation.service"; +import { + USERSTATICPERMISSION, + UserPermissionService, UserPermissionDefaultService, SystemInfoService } from '../../../../../shared/services'; import { delay } from 'rxjs/operators'; -import { AppConfigService } from "../../../../services/app-config.service"; +import { AppConfigService } from "../../../../../services/app-config.service"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; describe('ArtifactTagComponent', () => { let component: ArtifactTagComponent; @@ -26,9 +26,6 @@ describe('ArtifactTagComponent', () => { listTagsResponse: () => of([]).pipe(delay(0)) }; - const config: IServiceConfig = { - repositoryBaseEndpoint: CURRENT_BASE_HREF + "/repositories/testing" - }; const mockSystemInfoService = { getSystemInfo: () => of( false ) }; @@ -53,7 +50,7 @@ describe('ArtifactTagComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, BrowserAnimationsModule, HttpClientTestingModule ], @@ -62,9 +59,7 @@ describe('ArtifactTagComponent', () => { ], declarations: [ ArtifactTagComponent ], providers: [ - ErrorHandler, - { provide: SERVICE_CONFIG, useValue: config }, - { provide: mockErrorHandler, useValue: ErrorHandler }, + { provide: ErrorHandler, useValue: mockErrorHandler }, { provide: ArtifactService, useValue: mockArtifactService }, { provide: AppConfigService, useValue: mockAppConfigService }, { provide: SystemInfoService, useValue: mockSystemInfoService }, diff --git a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.ts similarity index 91% rename from src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.ts rename to src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.ts index e2d7385391..a2cde5a1c0 100644 --- a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-tag/artifact-tag.component.ts @@ -3,23 +3,17 @@ import { Observable, of, forkJoin, Subject, Subscription } from 'rxjs'; import { map, catchError, finalize, debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; import { NgForm } from '@angular/forms'; -import { AVAILABLE_TIME } from "../../artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component"; -import { - ConfirmationAcknowledgement, - ConfirmationDialogComponent, - ConfirmationMessage -} from "../../../../../lib/components/confirmation-dialog"; -import { OperationService } from "../../../../../lib/components/operation/operation.service"; -import { ErrorHandler } from "../../../../../lib/utils/error-handler"; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../../../lib/entities/shared.const"; -import { operateChanges, OperateInfo, OperationState } from "../../../../../lib/components/operation/operate"; -import { errorHandler } from "../../../../../lib/utils/shared/shared.utils"; +import { AVAILABLE_TIME } from "../artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component"; +import { OperationService } from "../../../../../shared/components/operation/operation.service"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../../../shared/entities/shared.const"; +import { operateChanges, OperateInfo, OperationState } from "../../../../../shared/components/operation/operate"; import { ArtifactFront as Artifact, artifactImages, artifactPullCommands } from '../artifact'; -import { ArtifactService } from '../../../../../../ng-swagger-gen/services/artifact.service'; -import { Tag } from '../../../../../../ng-swagger-gen/models/tag'; +import { ArtifactService } from '../../../../../../../ng-swagger-gen/services/artifact.service'; +import { Tag } from '../../../../../../../ng-swagger-gen/models/tag'; import { UserPermissionService, USERSTATICPERMISSION, SystemInfoService, SystemInfo -} from "../../../../../lib/services"; +} from "../../../../../shared/services"; import { ClrDatagridStateInterface } from '@clr/angular'; import { DEFAULT_PAGE_SIZE, @@ -27,8 +21,12 @@ import { dbEncodeURIComponent, doFiltering, doSorting -} from '../../../../../lib/utils/utils'; -import { AppConfigService } from "../../../../services/app-config.service"; +} from '../../../../../shared/units/utils'; +import { AppConfigService } from "../../../../../services/app-config.service"; +import { errorHandler } from "../../../../../shared/units/shared.utils"; +import { ConfirmationDialogComponent } from "../../../../../shared/components/confirmation-dialog"; +import { ConfirmationMessage } from "../../../../global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../../../global-confirmation-dialog/confirmation-state-message"; class InitTag { name = ""; diff --git a/src/portal/src/app/base/project/repository/artifact/artifact.module.ts b/src/portal/src/app/base/project/repository/artifact/artifact.module.ts new file mode 100644 index 0000000000..cda2a12b26 --- /dev/null +++ b/src/portal/src/app/base/project/repository/artifact/artifact.module.ts @@ -0,0 +1,75 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../../shared/shared.module"; +import { ArtifactListPageComponent } from "./artifact-list-page/artifact-list-page.component"; +import { ArtifactListComponent } from "./artifact-list-page/artifact-list/artifact-list.component"; +import { ArtifactListTabComponent } from "./artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component"; +import { ArtifactSummaryComponent } from "./artifact-summary.component"; +import { ArtifactTagComponent } from "./artifact-tag/artifact-tag.component"; +import { ArtifactCommonPropertiesComponent } from "./artifact-common-properties/artifact-common-properties.component"; +import { ArtifactAdditionsComponent } from "./artifact-additions/artifact-additions.component"; +import { ValuesComponent } from "./artifact-additions/values/values.component"; +import { SummaryComponent } from "./artifact-additions/summary/summary.component"; +import { DependenciesComponent } from "./artifact-additions/dependencies/dependencies.component"; +import { BuildHistoryComponent } from "./artifact-additions/build-history/build-history.component"; +import { ArtifactVulnerabilitiesComponent } from "./artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component"; +import { ArtifactDefaultService, ArtifactService } from "./artifact.service"; +import { ArtifactDetailRoutingResolverService } from "../../../../services/routing-resolvers/artifact-detail-routing-resolver.service"; +import { ResultTipComponent } from "./vulnerability-scanning/result-tip.component"; +import { ResultBarChartComponent } from "./vulnerability-scanning/result-bar-chart.component"; +import { ResultTipHistogramComponent } from "./vulnerability-scanning/result-tip-histogram/result-tip-histogram.component"; +import { HistogramChartComponent } from "./vulnerability-scanning/histogram-chart/histogram-chart.component"; + +const routes: Routes = [ + { + path: ':repo', + component: ArtifactListPageComponent, + }, + { + path: ':repo/depth/:depth', + component: ArtifactListPageComponent, + }, + { + path: ':repo/artifacts/:digest', + component: ArtifactSummaryComponent, + resolve: { + artifactResolver: ArtifactDetailRoutingResolverService + } + }, + { + path: ':repo/depth/:depth/artifacts/:digest', + component: ArtifactSummaryComponent, + resolve: { + artifactResolver: ArtifactDetailRoutingResolverService + } + }, +]; +@NgModule({ + declarations: [ + ArtifactListPageComponent, + ArtifactListComponent, + ArtifactListTabComponent, + ArtifactSummaryComponent, + ArtifactTagComponent, + ArtifactCommonPropertiesComponent, + ArtifactAdditionsComponent, + ValuesComponent, + SummaryComponent, + DependenciesComponent, + BuildHistoryComponent, + ArtifactVulnerabilitiesComponent, + ResultTipComponent, + ResultBarChartComponent, + ResultTipHistogramComponent, + HistogramChartComponent + ], + imports: [ + RouterModule.forChild(routes), + SharedModule + ], + providers: [ + ArtifactDefaultService, + {provide: ArtifactService, useClass: ArtifactDefaultService }, + ] +}) +export class ArtifactModule { } diff --git a/src/portal/src/app/project/repository/artifact/artifact.service.spec.ts b/src/portal/src/app/base/project/repository/artifact/artifact.service.spec.ts similarity index 58% rename from src/portal/src/app/project/repository/artifact/artifact.service.spec.ts rename to src/portal/src/app/base/project/repository/artifact/artifact.service.spec.ts index 6707f6b0fc..3eab81c633 100644 --- a/src/portal/src/app/project/repository/artifact/artifact.service.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact.service.spec.ts @@ -1,17 +1,17 @@ import { TestBed, inject } from '@angular/core/testing'; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../lib/entities/service.config"; -import { SharedModule } from "../../../../lib/utils/shared/shared.module"; -import { ArtifactDefaultService, ArtifactService } from "../artifact/artifact.service"; -import { CURRENT_BASE_HREF } from "../../../../lib/utils/utils"; -import { IconService } from '../../../../../ng-swagger-gen/services/icon.service'; +import { ArtifactDefaultService, ArtifactService } from "./artifact.service"; +import { IconService } from '../../../../../../ng-swagger-gen/services/icon.service'; import { DomSanitizer } from '@angular/platform-browser'; +import { SharedTestingModule } from "../../../../shared/shared.module"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; describe('ArtifactService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - SharedModule + SharedTestingModule, + HttpClientTestingModule ], providers: [ ArtifactDefaultService, diff --git a/src/portal/src/app/project/repository/artifact/artifact.service.ts b/src/portal/src/app/base/project/repository/artifact/artifact.service.ts similarity index 91% rename from src/portal/src/app/project/repository/artifact/artifact.service.ts rename to src/portal/src/app/base/project/repository/artifact/artifact.service.ts index 10257bf0ed..4a2c7a633c 100644 --- a/src/portal/src/app/project/repository/artifact/artifact.service.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact.service.ts @@ -1,8 +1,8 @@ import { Injectable, Inject } from "@angular/core"; import { Subject } from "rxjs"; import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; -import { Artifact } from '../../../../../ng-swagger-gen/models/artifact'; -import { IconService } from '../../../../../ng-swagger-gen/services/icon.service'; +import { Artifact } from '../../../../../../ng-swagger-gen/models/artifact'; +import { IconService } from '../../../../../../ng-swagger-gen/services/icon.service'; /** diff --git a/src/portal/src/app/project/repository/artifact/artifact.ts b/src/portal/src/app/base/project/repository/artifact/artifact.ts similarity index 90% rename from src/portal/src/app/project/repository/artifact/artifact.ts rename to src/portal/src/app/base/project/repository/artifact/artifact.ts index c54d36784e..78f4b6bfaf 100644 --- a/src/portal/src/app/project/repository/artifact/artifact.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact.ts @@ -1,5 +1,5 @@ -import { Artifact } from "../../../../../ng-swagger-gen/models/artifact"; -import { Platform } from "../../../../../ng-swagger-gen/models/platform"; +import { Artifact } from "../../../../../../ng-swagger-gen/models/artifact"; +import { Platform } from "../../../../../../ng-swagger-gen/models/platform"; export interface ArtifactFront extends Artifact { platform?: Platform; diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/histogram-chart/histogram-chart.component.html b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/histogram-chart/histogram-chart.component.html similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/histogram-chart/histogram-chart.component.html rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/histogram-chart/histogram-chart.component.html diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/histogram-chart/histogram-chart.component.scss b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/histogram-chart/histogram-chart.component.scss similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/histogram-chart/histogram-chart.component.scss rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/histogram-chart/histogram-chart.component.scss diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/histogram-chart/histogram-chart.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/histogram-chart/histogram-chart.component.spec.ts similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/histogram-chart/histogram-chart.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/histogram-chart/histogram-chart.component.spec.ts diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/histogram-chart/histogram-chart.component.ts b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/histogram-chart/histogram-chart.component.ts similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/histogram-chart/histogram-chart.component.ts rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/histogram-chart/histogram-chart.component.ts diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-bar-chart-component.html b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-bar-chart-component.html similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-bar-chart-component.html rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-bar-chart-component.html diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-bar-chart.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-bar-chart.component.spec.ts similarity index 79% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-bar-chart.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-bar-chart.component.spec.ts index 2b6e4a4b49..5ff726804a 100644 --- a/src/portal/src/app/project/repository/vulnerability-scanning/result-bar-chart.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-bar-chart.component.spec.ts @@ -3,27 +3,22 @@ import { ResultBarChartComponent } from './result-bar-chart.component'; import { ResultTipComponent } from './result-tip.component'; import { ResultTipHistogramComponent } from "./result-tip-histogram/result-tip-histogram.component"; import { HistogramChartComponent } from "./histogram-chart/histogram-chart.component"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../lib/entities/service.config"; import { JobLogDefaultService, JobLogService, ScanningResultDefaultService, ScanningResultService, -} from "../../../../lib/services"; -import { CURRENT_BASE_HREF, VULNERABILITY_SCAN_STATUS } from "../../../../lib/utils/utils"; -import { SharedModule } from "../../../../lib/utils/shared/shared.module"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import { ChannelService } from "../../../../lib/services/channel.service"; -import { ArtifactDefaultService, ArtifactService } from "../artifact/artifact.service"; -import { NativeReportSummary } from "../../../../../ng-swagger-gen/models/native-report-summary"; +} from "../../../../../shared/services"; +import { CURRENT_BASE_HREF, VULNERABILITY_SCAN_STATUS } from "../../../../../shared/units/utils"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { ChannelService } from "../../../../../shared/services/channel.service"; +import { ArtifactDefaultService, ArtifactService } from "../artifact.service"; +import { NativeReportSummary } from "../../../../../../../ng-swagger-gen/models/native-report-summary"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; describe('ResultBarChartComponent (inline template)', () => { let component: ResultBarChartComponent; let fixture: ComponentFixture; - let serviceConfig: IServiceConfig; - let testConfig: IServiceConfig = { - vulnerabilityScanningBaseEndpoint: CURRENT_BASE_HREF + "/vulnerability/testing" - }; let mockData: NativeReportSummary = { scan_status: VULNERABILITY_SCAN_STATUS.SUCCESS, severity: "High", @@ -41,7 +36,7 @@ describe('ResultBarChartComponent (inline template)', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule + SharedTestingModule ], declarations: [ ResultBarChartComponent, @@ -52,7 +47,6 @@ describe('ResultBarChartComponent (inline template)', () => { ErrorHandler, ChannelService, ArtifactDefaultService, - { provide: SERVICE_CONFIG, useValue: testConfig }, { provide: ArtifactService, useValue: ArtifactDefaultService }, { provide: ScanningResultService, useValue: ScanningResultDefaultService }, { provide: JobLogService, useValue: JobLogDefaultService} @@ -66,16 +60,11 @@ describe('ResultBarChartComponent (inline template)', () => { component = fixture.componentInstance; component.artifactDigest = "mockTag"; component.summary = mockData; - - serviceConfig = TestBed.get(SERVICE_CONFIG); - fixture.detectChanges(); }); it('should be created', () => { expect(component).toBeTruthy(); - expect(serviceConfig).toBeTruthy(); - expect(serviceConfig.vulnerabilityScanningBaseEndpoint).toEqual(CURRENT_BASE_HREF + "/vulnerability/testing"); }); it('should show "not scanned" if status is STOPPED', () => { diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-bar-chart.component.ts b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-bar-chart.component.ts similarity index 91% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-bar-chart.component.ts rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-bar-chart.component.ts index 5f255cd196..9156331270 100644 --- a/src/portal/src/app/project/repository/vulnerability-scanning/result-bar-chart.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-bar-chart.component.ts @@ -3,22 +3,22 @@ import { Input, OnInit, OnDestroy, - ChangeDetectorRef, Output, EventEmitter, + Output, EventEmitter, } from '@angular/core'; import { Subscription , timer} from "rxjs"; import { finalize } from "rxjs/operators"; -import { ScannerVo, ScanningResultService } from "../../../../lib/services"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import { ChannelService } from "../../../../lib/services/channel.service"; +import { ScannerVo, ScanningResultService } from "../../../../../shared/services"; +import { ErrorHandler } from "../../../../../shared/units/error-handler"; +import { ChannelService } from "../../../../../shared/services/channel.service"; import { clone, CURRENT_BASE_HREF, VULNERABILITY_SCAN_STATUS, dbEncodeURIComponent -} from "../../../../lib/utils/utils"; -import { ArtifactService } from "../../../../../ng-swagger-gen/services/artifact.service"; -import { Artifact } from "../../../../../ng-swagger-gen/models/artifact"; -import { NativeReportSummary } from "../../../../../ng-swagger-gen/models/native-report-summary"; +} from "../../../../../shared/units/utils"; +import { ArtifactService } from "../../../../../../../ng-swagger-gen/services/artifact.service"; +import { Artifact } from "../../../../../../../ng-swagger-gen/models/artifact"; +import { NativeReportSummary } from "../../../../../../../ng-swagger-gen/models/native-report-summary"; const STATE_CHECK_INTERVAL: number = 3000; // 3s diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.html b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.html similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.html rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.html diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.scss b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.scss similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.scss rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.scss diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.spec.ts similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.spec.ts diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.ts b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.ts similarity index 99% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.ts rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.ts index 49e184f412..08f7e57f7d 100644 --- a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { TranslateService } from "@ngx-translate/core"; -import { ScannerVo, VulnerabilitySummary } from "../../../../../lib/services"; -import { VULNERABILITY_SCAN_STATUS, VULNERABILITY_SEVERITY } from "../../../../../lib/utils/utils"; +import { ScannerVo, VulnerabilitySummary } from "../../../../../../shared/services"; +import { VULNERABILITY_SCAN_STATUS, VULNERABILITY_SEVERITY } from "../../../../../../shared/units/utils"; const MIN = 60; const MIN_STR = "min "; diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip.component.spec.ts b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip.component.spec.ts similarity index 79% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-tip.component.spec.ts rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip.component.spec.ts index 8c8512649d..6007043cdd 100644 --- a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip.component.spec.ts +++ b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip.component.spec.ts @@ -1,17 +1,13 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ResultTipComponent } from './result-tip.component'; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../lib/entities/service.config"; -import { UserPermissionDefaultService, UserPermissionService, VulnerabilitySummary } from "../../../../lib/services"; -import { CURRENT_BASE_HREF, VULNERABILITY_SCAN_STATUS } from "../../../../lib/utils/utils"; -import { SharedModule } from "../../../../lib/utils/shared/shared.module"; +import { UserPermissionDefaultService, UserPermissionService, VulnerabilitySummary } from "../../../../../shared/services"; +import { CURRENT_BASE_HREF, VULNERABILITY_SCAN_STATUS } from "../../../../../shared/units/utils"; +import { SharedTestingModule } from "../../../../../shared/shared.module"; describe('ResultTipComponent (inline template)', () => { let component: ResultTipComponent; let fixture: ComponentFixture; - let testConfig: IServiceConfig = { - vulnerabilityScanningBaseEndpoint: CURRENT_BASE_HREF + "/vulnerability/testing" - }; let mockData: VulnerabilitySummary = { scan_status: VULNERABILITY_SCAN_STATUS.SUCCESS, severity: "High", @@ -29,10 +25,10 @@ describe('ResultTipComponent (inline template)', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule + SharedTestingModule ], declarations: [ResultTipComponent], - providers: [{ provide: SERVICE_CONFIG, useValue: testConfig }, + providers: [ { provide: UserPermissionService, useClass: UserPermissionDefaultService }] }); diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip.component.ts b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip.component.ts similarity index 97% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-tip.component.ts rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip.component.ts index 789751dd18..fe046ef70f 100644 --- a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; -import { VulnerabilitySeverity, VulnerabilitySummary } from "../../../../lib/services"; -import { VULNERABILITY_SCAN_STATUS } from "../../../../lib/utils/utils"; +import { VulnerabilitySeverity, VulnerabilitySummary } from "../../../../../shared/services"; +import { VULNERABILITY_SCAN_STATUS } from "../../../../../shared/units/utils"; export const MIN_TIP_WIDTH = 5; export const MAX_TIP_WIDTH = 100; diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/result-tip.componnent.html b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip.componnent.html similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/result-tip.componnent.html rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/result-tip.componnent.html diff --git a/src/portal/src/app/project/repository/vulnerability-scanning/scanning.scss b/src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/scanning.scss similarity index 100% rename from src/portal/src/app/project/repository/vulnerability-scanning/scanning.scss rename to src/portal/src/app/base/project/repository/artifact/vulnerability-scanning/scanning.scss diff --git a/src/portal/src/app/project/repository/gridview/grid-view.component.html b/src/portal/src/app/base/project/repository/gridview/grid-view.component.html similarity index 100% rename from src/portal/src/app/project/repository/gridview/grid-view.component.html rename to src/portal/src/app/base/project/repository/gridview/grid-view.component.html diff --git a/src/portal/src/app/project/repository/gridview/grid-view.component.scss b/src/portal/src/app/base/project/repository/gridview/grid-view.component.scss similarity index 100% rename from src/portal/src/app/project/repository/gridview/grid-view.component.scss rename to src/portal/src/app/base/project/repository/gridview/grid-view.component.scss diff --git a/src/portal/src/app/project/repository/gridview/grid-view.component.spec.ts b/src/portal/src/app/base/project/repository/gridview/grid-view.component.spec.ts similarity index 79% rename from src/portal/src/app/project/repository/gridview/grid-view.component.spec.ts rename to src/portal/src/app/base/project/repository/gridview/grid-view.component.spec.ts index 75cc456245..303265ad95 100644 --- a/src/portal/src/app/project/repository/gridview/grid-view.component.spec.ts +++ b/src/portal/src/app/base/project/repository/gridview/grid-view.component.spec.ts @@ -11,28 +11,20 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { GridViewComponent } from './grid-view.component'; -import { IServiceConfig, SERVICE_CONFIG } from "../../../../lib/entities/service.config"; -import { SharedModule } from "../../../../lib/utils/shared/shared.module"; - +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('GridViewComponent', () => { let component: GridViewComponent; let fixture: ComponentFixture; - - let config: IServiceConfig = { - }; - beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, ], declarations: [ GridViewComponent, ], - providers: [{ - provide: SERVICE_CONFIG, useValue: config }] }).compileComponents(); })); diff --git a/src/portal/src/app/project/repository/gridview/grid-view.component.ts b/src/portal/src/app/base/project/repository/gridview/grid-view.component.ts similarity index 99% rename from src/portal/src/app/project/repository/gridview/grid-view.component.ts rename to src/portal/src/app/base/project/repository/gridview/grid-view.component.ts index 31c30684e1..70bdd78210 100644 --- a/src/portal/src/app/project/repository/gridview/grid-view.component.ts +++ b/src/portal/src/app/base/project/repository/gridview/grid-view.component.ts @@ -24,7 +24,7 @@ import { } from "@angular/core"; import { Subscription } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; -import { ScrollPosition } from "../../../../lib/services"; +import { ScrollPosition } from "../../../../shared/services"; @Component({ selector: "hbr-gridview", diff --git a/src/portal/src/app/project/repository/repository-gridview.component.html b/src/portal/src/app/base/project/repository/repository-gridview.component.html similarity index 100% rename from src/portal/src/app/project/repository/repository-gridview.component.html rename to src/portal/src/app/base/project/repository/repository-gridview.component.html diff --git a/src/portal/src/app/project/repository/repository-gridview.component.scss b/src/portal/src/app/base/project/repository/repository-gridview.component.scss similarity index 100% rename from src/portal/src/app/project/repository/repository-gridview.component.scss rename to src/portal/src/app/base/project/repository/repository-gridview.component.scss diff --git a/src/portal/src/app/project/repository/repository-gridview.component.spec.ts b/src/portal/src/app/base/project/repository/repository-gridview.component.spec.ts similarity index 74% rename from src/portal/src/app/project/repository/repository-gridview.component.spec.ts rename to src/portal/src/app/base/project/repository/repository-gridview.component.spec.ts index 09fd8c71d0..31f38fa4ea 100644 --- a/src/portal/src/app/project/repository/repository-gridview.component.spec.ts +++ b/src/portal/src/app/base/project/repository/repository-gridview.component.spec.ts @@ -1,24 +1,18 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { of } from "rxjs"; -import { RepositoryService as NewRepositoryService } from "../../../../ng-swagger-gen/services/repository.service"; +import { RepositoryService as NewRepositoryService } from "../../../../../ng-swagger-gen/services/repository.service"; import { RepositoryGridviewComponent } from "./repository-gridview.component"; import { ProjectDefaultService, ProjectService, SystemInfo, SystemInfoService, UserPermissionService -} from "../../../lib/services"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../lib/entities/service.config"; +} from "../../../shared/services"; import { delay } from 'rxjs/operators'; -import { SharedModule } from "../../../lib/utils/shared/shared.module"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { ProjectModule } from "../project.module"; +import { ErrorHandler } from "../../../shared/units/error-handler"; import { ActivatedRoute } from "@angular/router"; -import { Repository as NewRepository } from "../../../../ng-swagger-gen/models/repository"; -import { StrictHttpResponse as __StrictHttpResponse } from '../../../../ng-swagger-gen/strict-http-response'; -import { CURRENT_BASE_HREF } from "../../../lib/utils/utils"; +import { Repository as NewRepository } from "../../../../../ng-swagger-gen/models/repository"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('RepositoryComponentGridview (inline template)', () => { @@ -66,11 +60,6 @@ describe('RepositoryComponentGridview (inline template)', () => { let mockRepo: NewRepository[] = mockRepoData; let mockNginxRepo: NewRepository[] = mockRepoNginxData; - let config: IServiceConfig = { - repositoryBaseEndpoint: CURRENT_BASE_HREF + '/repository/testing', - systemInfoEndpoint: CURRENT_BASE_HREF + '/systeminfo/testing', - targetBaseEndpoint: CURRENT_BASE_HREF + '/tag/testing' - }; const fakedErrorHandler = { error() { return undefined; @@ -97,8 +86,10 @@ describe('RepositoryComponentGridview (inline template)', () => { const fakedActivatedRoute = { snapshot: { parent: { - params: { - id: "1" + parent: { + params: { + id: "1" + } } } } @@ -106,19 +97,18 @@ describe('RepositoryComponentGridview (inline template)', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, - RouterTestingModule, - ProjectModule + SharedTestingModule, + ], + declarations: [ + RepositoryGridviewComponent ], providers: [ { provide: ActivatedRoute, useValue: fakedActivatedRoute }, { provide: ErrorHandler, useValue: fakedErrorHandler }, - { provide: SERVICE_CONFIG, useValue: config }, { provide: NewRepositoryService, useValue: fakedRepositoryService }, { provide: ProjectService, useClass: ProjectDefaultService }, { provide: SystemInfoService, useValue: fakedSystemInfoService }, { provide: UserPermissionService, useValue: fakedUserPermissionService }, - { provide: OperationService }, ] }); })); diff --git a/src/portal/src/app/project/repository/repository-gridview.component.ts b/src/portal/src/app/base/project/repository/repository-gridview.component.ts similarity index 91% rename from src/portal/src/app/project/repository/repository-gridview.component.ts rename to src/portal/src/app/base/project/repository/repository-gridview.component.ts index 27b9ff5c15..6bc7c17c25 100644 --- a/src/portal/src/app/project/repository/repository-gridview.component.ts +++ b/src/portal/src/app/base/project/repository/repository-gridview.component.ts @@ -7,7 +7,7 @@ import { EventEmitter, OnChanges, SimpleChanges, - Inject, OnDestroy + OnDestroy } from "@angular/core"; import {forkJoin, of, Subscription} from "rxjs"; import { debounceTime, distinctUntilChanged, switchMap } from "rxjs/operators"; @@ -17,39 +17,38 @@ import { Observable } from "rxjs"; import { ClrDatagridStateInterface } from "@clr/angular"; import { RepositoryService as NewRepositoryService -} from "../../../../ng-swagger-gen/services/repository.service"; +} from "../../../../../ng-swagger-gen/services/repository.service"; import { SystemInfo, SystemInfoService, UserPermissionService, USERSTATICPERMISSION -} from "../../../lib/services"; -import { FilterComponent } from "../../../lib/components/filter/filter.component"; +} from "../../../shared/services"; +import { FilterComponent } from "../../../shared/components/filter/filter.component"; import { calculatePage, clone, DEFAULT_PAGE_SIZE, dbEncodeURIComponent, doFiltering, - doSorting -} from "../../../lib/utils/utils"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../lib/entities/service.config"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../lib/entities/shared.const"; -import { operateChanges, OperateInfo, OperationState } from "../../../lib/components/operation/operate"; + doSorting, CURRENT_BASE_HREF +} from "../../../shared/units/utils"; +import { ErrorHandler } from "../../../shared/units/error-handler"; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../shared/entities/shared.const"; +import { operateChanges, OperateInfo, OperationState } from "../../../shared/components/operation/operate"; import { - ConfirmationAcknowledgement, ConfirmationDialogComponent, - ConfirmationMessage -} from "../../../lib/components/confirmation-dialog"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { errorHandler } from "../../../lib/utils/shared/shared.utils"; +} from "../../../shared/components/confirmation-dialog"; +import { OperationService } from "../../../shared/components/operation/operation.service"; import { Project } from "../project"; import { ActivatedRoute, Router } from "@angular/router"; -import { SessionService } from "../../shared/session.service"; +import { SessionService } from "../../../shared/services/session.service"; import { GridViewComponent } from "./gridview/grid-view.component"; -import { Repository as NewRepository } from "../../../../ng-swagger-gen/models/repository"; -import { StrictHttpResponse as __StrictHttpResponse } from '../../../../ng-swagger-gen/strict-http-response'; +import { Repository as NewRepository } from "../../../../../ng-swagger-gen/models/repository"; +import { StrictHttpResponse as __StrictHttpResponse } from '../../../../../ng-swagger-gen/strict-http-response'; import {HttpErrorResponse} from "@angular/common/http"; +import { errorHandler } from "../../../shared/units/shared.utils"; +import { ConfirmationAcknowledgement } from "../../global-confirmation-dialog/confirmation-state-message"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; @Component({ @@ -96,7 +95,7 @@ export class RepositoryGridviewComponent implements OnChanges, OnInit, OnDestroy searchSub: Subscription; isProxyCacheProject: boolean = false; - constructor(@Inject(SERVICE_CONFIG) private configInfo: IServiceConfig, + constructor( private errorHandlerService: ErrorHandler, private translateService: TranslateService, private newRepoService: NewRepositoryService, @@ -107,9 +106,7 @@ export class RepositoryGridviewComponent implements OnChanges, OnInit, OnDestroy private session: SessionService, private router: Router, ) { - if (this.configInfo && this.configInfo.systemInfoEndpoint) { - this.downloadLink = this.configInfo.systemInfoEndpoint + "/getcert"; - } + this.downloadLink = CURRENT_BASE_HREF + "/systeminfo/getcert"; } public get registryUrl(): string { @@ -135,8 +132,8 @@ export class RepositoryGridviewComponent implements OnChanges, OnInit, OnDestroy } ngOnInit(): void { - this.projectId = this.route.snapshot.parent.params['id']; - let resolverData = this.route.snapshot.parent.data; + this.projectId = this.route.snapshot.parent.parent.params['id']; + let resolverData = this.route.snapshot.parent.parent.data; if (resolverData) { let pro: Project = resolverData['projectResolver']; this.hasProjectAdminRole = pro.has_project_admin_role; diff --git a/src/portal/src/app/base/project/repository/repository.module.ts b/src/portal/src/app/base/project/repository/repository.module.ts new file mode 100644 index 0000000000..334c4f06a6 --- /dev/null +++ b/src/portal/src/app/base/project/repository/repository.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { RepositoryGridviewComponent } from "./repository-gridview.component"; +import { GridViewComponent } from "./gridview/grid-view.component"; + +const routes: Routes = [ + { + path: '', + component: RepositoryGridviewComponent + } +]; +@NgModule({ + declarations: [ + RepositoryGridviewComponent, + GridViewComponent + ], + imports: [ + RouterModule.forChild(routes), + SharedModule + ] +}) +export class RepositoryModule { } diff --git a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.html b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html similarity index 100% rename from src/portal/src/app/project/robot-account/add-robot/add-robot.component.html rename to src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html diff --git a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.scss b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss similarity index 100% rename from src/portal/src/app/project/robot-account/add-robot/add-robot.component.scss rename to src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.scss diff --git a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.spec.ts b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.spec.ts similarity index 80% rename from src/portal/src/app/project/robot-account/add-robot/add-robot.component.spec.ts rename to src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.spec.ts index 51f01e4d0c..024fa14773 100644 --- a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.spec.ts +++ b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.spec.ts @@ -3,14 +3,14 @@ import { ClarityModule } from '@clr/angular'; import { AddRobotComponent } from './add-robot.component'; import { FormsModule } from '@angular/forms'; import { of } from "rxjs"; -import { MessageHandlerService } from "../../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; import { TranslateModule } from '@ngx-translate/core'; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { delay } from "rxjs/operators"; -import { RobotService } from "../../../../../ng-swagger-gen/services/robot.service"; -import { OperationService } from "../../../../lib/components/operation/operation.service"; +import { RobotService } from "../../../../../../ng-swagger-gen/services/robot.service"; +import { OperationService } from "../../../../shared/components/operation/operation.service"; import { NO_ERRORS_SCHEMA } from "@angular/core"; -import { SharedModule } from "../../../shared/shared.module"; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('AddRobotComponent', () => { let component: AddRobotComponent; @@ -34,7 +34,7 @@ describe('AddRobotComponent', () => { ClarityModule, TranslateModule.forRoot(), FormsModule, - SharedModule + SharedTestingModule ], providers: [ OperationService, diff --git a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.ts b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.ts similarity index 92% rename from src/portal/src/app/project/robot-account/add-robot/add-robot.component.ts rename to src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.ts index 0a758d2ed4..beed076221 100644 --- a/src/portal/src/app/project/robot-account/add-robot/add-robot.component.ts +++ b/src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.ts @@ -5,23 +5,23 @@ import { OnDestroy, Output, EventEmitter, ViewChild, } from "@angular/core"; import { debounceTime, distinctUntilChanged, filter, finalize, switchMap } from "rxjs/operators"; -import { MessageHandlerService } from "../../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; import { ACTION_RESOURCE_I18N_MAP, ExpirationType, FrontAccess, INITIAL_ACCESSES, onlyHasPushPermission, PermissionsKinds -} from "../../../system-robot-accounts/system-robot-util"; -import { Robot } from "../../../../../ng-swagger-gen/models/robot"; -import { InlineAlertComponent } from "../../../shared/inline-alert/inline-alert.component"; +} from "../../../left-side-nav/system-robot-accounts/system-robot-util"; +import { Robot } from "../../../../../../ng-swagger-gen/models/robot"; import { NgForm } from "@angular/forms"; import { ClrLoadingState } from "@clr/angular"; import { Subject, Subscription } from "rxjs"; -import { RobotService } from "../../../../../ng-swagger-gen/services/robot.service"; -import { OperationService } from "../../../../lib/components/operation/operation.service"; -import { clone } from "../../../../lib/utils/utils"; -import { operateChanges, OperateInfo, OperationState } from "../../../../lib/components/operation/operate"; -import { errorHandler } from "../../../../lib/utils/shared/shared.utils"; -import { Access } from "../../../../../ng-swagger-gen/models/access"; +import { RobotService } from "../../../../../../ng-swagger-gen/services/robot.service"; +import { OperationService } from "../../../../shared/components/operation/operation.service"; +import { clone } from "../../../../shared/units/utils"; +import { operateChanges, OperateInfo, OperationState } from "../../../../shared/components/operation/operate"; +import { Access } from "../../../../../../ng-swagger-gen/models/access"; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { errorHandler } from "../../../../shared/units/shared.utils"; const MINI_SECONDS_ONE_DAY: number = 60 * 24 * 60 * 1000; @Component({ diff --git a/src/portal/src/app/base/project/robot-account/project-robot-account.module.ts b/src/portal/src/app/base/project/robot-account/project-robot-account.module.ts new file mode 100644 index 0000000000..b7170c0f16 --- /dev/null +++ b/src/portal/src/app/base/project/robot-account/project-robot-account.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { RobotAccountComponent } from "./robot-account.component"; +import { AddRobotComponent } from "./add-robot/add-robot.component"; + + +const routes: Routes = [ + { + path: '', + component: RobotAccountComponent + } +]; +@NgModule({ + declarations: [ + AddRobotComponent, + RobotAccountComponent + ], + imports: [ + RouterModule.forChild(routes), + SharedModule + ] +}) +export class ProjectRobotAccountModule { } diff --git a/src/portal/src/app/project/robot-account/robot-account.component.html b/src/portal/src/app/base/project/robot-account/robot-account.component.html similarity index 100% rename from src/portal/src/app/project/robot-account/robot-account.component.html rename to src/portal/src/app/base/project/robot-account/robot-account.component.html diff --git a/src/portal/src/app/project/robot-account/robot-account.component.scss b/src/portal/src/app/base/project/robot-account/robot-account.component.scss similarity index 93% rename from src/portal/src/app/project/robot-account/robot-account.component.scss rename to src/portal/src/app/base/project/robot-account/robot-account.component.scss index 8bbdf9c81c..5beb6f0c09 100644 --- a/src/portal/src/app/project/robot-account/robot-account.component.scss +++ b/src/portal/src/app/base/project/robot-account/robot-account.component.scss @@ -1,4 +1,4 @@ -@import "../../../lib/mixin"; +@import "../../../shared/mixin"; .robot-space { margin-top: 28px; diff --git a/src/portal/src/app/project/robot-account/robot-account.component.spec.ts b/src/portal/src/app/base/project/robot-account/robot-account.component.spec.ts similarity index 78% rename from src/portal/src/app/project/robot-account/robot-account.component.spec.ts rename to src/portal/src/app/base/project/robot-account/robot-account.component.spec.ts index 7cff257681..a01f6a2434 100644 --- a/src/portal/src/app/project/robot-account/robot-account.component.spec.ts +++ b/src/portal/src/app/base/project/robot-account/robot-account.component.spec.ts @@ -1,21 +1,18 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { ClarityModule } from '@clr/angular'; import { of, Subscription } from 'rxjs'; import { ActivatedRoute } from "@angular/router"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { TranslateModule } from '@ngx-translate/core'; -import { ConfirmationDialogService } from "../../shared/confirmation-dialog/confirmation-dialog.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; import { RobotAccountComponent } from './robot-account.component'; -import { UserPermissionService } from "../../../lib/services"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { RobotService } from "../../../../ng-swagger-gen/services/robot.service"; +import { UserPermissionService } from "../../../shared/services"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { RobotService } from "../../../../../ng-swagger-gen/services/robot.service"; import { HttpHeaders, HttpResponse } from "@angular/common/http"; -import { Robot } from "../../../../ng-swagger-gen/models/robot"; +import { Robot } from "../../../../../ng-swagger-gen/models/robot"; import { delay } from "rxjs/operators"; -import { Action, PermissionsKinds, Resource } from "../../system-robot-accounts/system-robot-util"; -import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { HttpClientTestingModule } from "@angular/common/http/testing"; +import { Action, PermissionsKinds, Resource } from "../../left-side-nav/system-robot-accounts/system-robot-util"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('RobotAccountComponent', () => { let component: RobotAccountComponent; @@ -109,18 +106,17 @@ describe('RobotAccountComponent', () => { NO_ERRORS_SCHEMA ], imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - HttpClientTestingModule + SharedTestingModule, ], providers: [ { provide: ActivatedRoute, useValue: { snapshot: { parent: { - params: { id: 1 }, - data: null + parent: { + params: { id: 1 }, + data: null + } }, } } diff --git a/src/portal/src/app/project/robot-account/robot-account.component.ts b/src/portal/src/app/base/project/robot-account/robot-account.component.ts similarity index 90% rename from src/portal/src/app/project/robot-account/robot-account.component.ts rename to src/portal/src/app/base/project/robot-account/robot-account.component.ts index bf782e3cff..ed994126d4 100644 --- a/src/portal/src/app/project/robot-account/robot-account.component.ts +++ b/src/portal/src/app/base/project/robot-account/robot-account.component.ts @@ -2,29 +2,29 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ClrDatagridStateInterface, ClrLoadingState } from "@clr/angular"; import { catchError, debounceTime, distinctUntilChanged, finalize, map, switchMap } from "rxjs/operators"; import { forkJoin, Observable, of, Subscription } from "rxjs"; -import { UserPermissionService, USERSTATICPERMISSION } from "../../../lib/services"; +import { UserPermissionService, USERSTATICPERMISSION } from "../../../shared/services"; import { ACTION_RESOURCE_I18N_MAP, PermissionsKinds -} from "../../system-robot-accounts/system-robot-util"; -import { clone, DEFAULT_PAGE_SIZE } from "../../../lib/utils/utils"; -import { ViewTokenComponent } from "../../system-robot-accounts/view-token/view-token.component"; -import { FilterComponent } from "../../../lib/components/filter/filter.component"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { ConfirmationDialogService } from "../../shared/confirmation-dialog/confirmation-dialog.service"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../shared/shared.const"; -import { RobotService } from "../../../../ng-swagger-gen/services/robot.service"; -import { Robot } from "../../../../ng-swagger-gen/models/robot"; +} from "../../left-side-nav/system-robot-accounts/system-robot-util"; +import { clone, DEFAULT_PAGE_SIZE } from "../../../shared/units/utils"; +import { ViewTokenComponent } from "../../../shared/components/view-token/view-token.component"; +import { FilterComponent } from "../../../shared/components/filter/filter.component"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; +import { OperationService } from "../../../shared/components/operation/operation.service"; +import { RobotService } from "../../../../../ng-swagger-gen/services/robot.service"; +import { Robot } from "../../../../../ng-swagger-gen/models/robot"; import { ActivatedRoute } from "@angular/router"; -import { Project } from "../../../../ng-swagger-gen/models/project"; +import { Project } from "../../../../../ng-swagger-gen/models/project"; import { HttpErrorResponse } from "@angular/common/http"; -import { errorHandler } from "../../../lib/utils/shared/shared.utils"; -import { operateChanges, OperateInfo, OperationState } from "../../../lib/components/operation/operate"; -import { ConfirmationMessage } from "../../shared/confirmation-dialog/confirmation-message"; +import { operateChanges, OperateInfo, OperationState } from "../../../shared/components/operation/operate"; import { AddRobotComponent } from "./add-robot/add-robot.component"; import { TranslateService } from "@ngx-translate/core"; import { DomSanitizer } from "@angular/platform-browser"; +import { ConfirmationDialogService } from "../../global-confirmation-dialog/confirmation-dialog.service"; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../shared/entities/shared.const"; +import { errorHandler } from "../../../shared/units/shared.utils"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; @Component({ selector: "app-robot-account", @@ -65,8 +65,8 @@ export class RobotAccountComponent implements OnInit, OnDestroy { private sanitizer: DomSanitizer, ) {} ngOnInit() { - this.projectId = +this.route.snapshot.parent.params["id"]; - let resolverData = this.route.snapshot.parent.data; + this.projectId = +this.route.snapshot.parent.parent.params["id"]; + let resolverData = this.route.snapshot.parent.parent.data; if (resolverData) { let project = resolverData["projectResolver"]; this.projectName = project.name; diff --git a/src/portal/src/app/base/project/scanner/project-scanner.module.ts b/src/portal/src/app/base/project/scanner/project-scanner.module.ts new file mode 100644 index 0000000000..13e0a22aaf --- /dev/null +++ b/src/portal/src/app/base/project/scanner/project-scanner.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { ScannerComponent } from "./scanner.component"; + + +const routes: Routes = [ + { + path: '', + component: ScannerComponent + } +]; +@NgModule({ + declarations: [ScannerComponent], + imports: [ + RouterModule.forChild(routes), + SharedModule + ] +}) +export class ProjectScannerModule { } diff --git a/src/portal/src/app/project/scanner/scanner.component.html b/src/portal/src/app/base/project/scanner/scanner.component.html similarity index 100% rename from src/portal/src/app/project/scanner/scanner.component.html rename to src/portal/src/app/base/project/scanner/scanner.component.html diff --git a/src/portal/src/app/project/scanner/scanner.component.scss b/src/portal/src/app/base/project/scanner/scanner.component.scss similarity index 100% rename from src/portal/src/app/project/scanner/scanner.component.scss rename to src/portal/src/app/base/project/scanner/scanner.component.scss diff --git a/src/portal/src/app/project/scanner/scanner.component.spec.ts b/src/portal/src/app/base/project/scanner/scanner.component.spec.ts similarity index 81% rename from src/portal/src/app/project/scanner/scanner.component.spec.ts rename to src/portal/src/app/base/project/scanner/scanner.component.spec.ts index 52ad60c936..cfda67908f 100644 --- a/src/portal/src/app/project/scanner/scanner.component.spec.ts +++ b/src/portal/src/app/base/project/scanner/scanner.component.spec.ts @@ -1,15 +1,13 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { ClarityModule } from "@clr/angular"; import { of } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; import { ScannerComponent } from "./scanner.component"; -import { ConfigScannerService } from "../../config/scanner/config-scanner.service"; -import { SharedModule } from "../../shared/shared.module"; +import { ConfigScannerService } from "../../left-side-nav/interrogation-services/scanner/config-scanner.service"; +import { SharedTestingModule } from "../../../shared/shared.module"; import { ActivatedRoute } from "@angular/router"; -import { Scanner } from "../../config/scanner/scanner"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; +import { Scanner } from "../../left-side-nav/interrogation-services/scanner/scanner"; +import { ErrorHandler } from "../../../shared/units/error-handler"; describe('ScannerComponent', () => { const mockScanner1: Scanner = { @@ -47,8 +45,10 @@ describe('ScannerComponent', () => { let fakedRoute = { snapshot: { parent: { - params: { - id: 1 + parent: { + params: { + id: 1 + } } } } @@ -56,9 +56,7 @@ describe('ScannerComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, - BrowserAnimationsModule, - ClarityModule, + SharedTestingModule, ], declarations: [ ScannerComponent ], providers: [ diff --git a/src/portal/src/app/project/scanner/scanner.component.ts b/src/portal/src/app/base/project/scanner/scanner.component.ts similarity index 89% rename from src/portal/src/app/project/scanner/scanner.component.ts rename to src/portal/src/app/base/project/scanner/scanner.component.ts index 8da041a271..b7be97ae99 100644 --- a/src/portal/src/app/project/scanner/scanner.component.ts +++ b/src/portal/src/app/base/project/scanner/scanner.component.ts @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. import { Component, OnInit, ViewChild } from "@angular/core"; -import { ConfigScannerService } from "../../config/scanner/config-scanner.service"; -import { Scanner } from "../../config/scanner/scanner"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; +import { ConfigScannerService } from "../../left-side-nav/interrogation-services/scanner/config-scanner.service"; +import { Scanner } from "../../left-side-nav/interrogation-services/scanner/scanner"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; import { ActivatedRoute } from "@angular/router"; import { ClrLoadingState } from "@clr/angular"; -import { InlineAlertComponent } from "../../shared/inline-alert/inline-alert.component"; import { finalize } from "rxjs/operators"; import { TranslateService } from "@ngx-translate/core"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { UserPermissionService, USERSTATICPERMISSION } from "../../../lib/services"; +import { ErrorHandler } from "../../../shared/units/error-handler"; +import { UserPermissionService, USERSTATICPERMISSION } from "../../../shared/services"; +import { InlineAlertComponent } from "../../../shared/components/inline-alert/inline-alert.component"; @Component({ @@ -49,7 +49,7 @@ export class ScannerComponent implements OnInit { ) { } ngOnInit() { - this.projectId = +this.route.snapshot.parent.params['id']; + this.projectId = +this.route.snapshot.parent.parent.params['id']; this.getPermission(); this.init(); } diff --git a/src/portal/src/app/project/summary/summary.component.html b/src/portal/src/app/base/project/summary/summary.component.html similarity index 100% rename from src/portal/src/app/project/summary/summary.component.html rename to src/portal/src/app/base/project/summary/summary.component.html diff --git a/src/portal/src/app/project/summary/summary.component.scss b/src/portal/src/app/base/project/summary/summary.component.scss similarity index 100% rename from src/portal/src/app/project/summary/summary.component.scss rename to src/portal/src/app/base/project/summary/summary.component.scss diff --git a/src/portal/src/app/project/summary/summary.component.spec.ts b/src/portal/src/app/base/project/summary/summary.component.spec.ts similarity index 73% rename from src/portal/src/app/project/summary/summary.component.spec.ts rename to src/portal/src/app/base/project/summary/summary.component.spec.ts index bd540cfd8d..44d5f80e24 100644 --- a/src/portal/src/app/project/summary/summary.component.spec.ts +++ b/src/portal/src/app/base/project/summary/summary.component.spec.ts @@ -1,16 +1,14 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ClarityModule } from '@clr/angular'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { AppConfigService } from "../../services/app-config.service"; +import { AppConfigService } from "../../../services/app-config.service"; import { SummaryComponent } from './summary.component'; -import { EndpointDefaultService, EndpointService, ProjectService, UserPermissionService } from '../../../lib/services'; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { IServiceConfig, SERVICE_CONFIG } from '../../../lib/entities/service.config'; -import { CURRENT_BASE_HREF } from '../../../lib/utils/utils'; -import { SessionService } from '../../shared/session.service'; +import { ProjectService, UserPermissionService } from '../../../shared/services'; +import { ErrorHandler } from "../../../shared/units/error-handler"; +import { SessionService } from '../../../shared/services/session.service'; +import { EndpointService } from "../../../shared/services/endpoint.service"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('SummaryComponent', () => { @@ -34,10 +32,6 @@ describe('SummaryComponent', () => { return of([true, true]); } }; - const config: IServiceConfig = { - systemInfoEndpoint: CURRENT_BASE_HREF + "/endpoints/testing" - }; - const fakedSessionService = { getCurrentUser() { return { @@ -71,32 +65,30 @@ describe('SummaryComponent', () => { TestBed.configureTestingModule({ declarations: [SummaryComponent], imports: [ - ClarityModule, - TranslateModule.forRoot() + SharedTestingModule ], schemas: [ CUSTOM_ELEMENTS_SCHEMA ], providers: [ - TranslateService, { provide: AppConfigService, useValue: fakeAppConfigService }, { provide: ProjectService, useValue: fakeProjectService }, { provide: ErrorHandler, useValue: fakeErrorHandler }, { provide: UserPermissionService, useValue: fakeUserPermissionService }, { provide: EndpointService, useValue: fakedEndpointService }, - { provide: SERVICE_CONFIG, useValue: config }, { provide: SessionService, useValue: fakedSessionService}, { provide: ActivatedRoute, useValue: { paramMap: of({ get: (key) => 'value' }), - snapshot: { + parent: { parent: { - params: { id: 1 }, - data: { - projectResolver: {registry_id: 3} + snapshot: { + params: { id: 1 }, + data: { + projectResolver: {registry_id: 3} + }, } - }, - } + }}, } }, ] diff --git a/src/portal/src/app/project/summary/summary.component.ts b/src/portal/src/app/base/project/summary/summary.component.ts similarity index 81% rename from src/portal/src/app/project/summary/summary.component.ts rename to src/portal/src/app/base/project/summary/summary.component.ts index b7914d5955..a5ef0dedfe 100644 --- a/src/portal/src/app/project/summary/summary.component.ts +++ b/src/portal/src/app/base/project/summary/summary.component.ts @@ -1,18 +1,15 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { AppConfigService } from "../../services/app-config.service"; -import { QUOTA_DANGER_COEFFICIENT, QUOTA_WARNING_COEFFICIENT, QuotaUnits } from "../../../lib/entities/shared.const"; +import { AppConfigService } from "../../../services/app-config.service"; +import { QUOTA_DANGER_COEFFICIENT, QUOTA_WARNING_COEFFICIENT, QuotaUnits } from "../../../shared/entities/shared.const"; import { Endpoint, - EndpointService, ProjectService, UserPermissionService, USERSTATICPERMISSION -} from '../../../lib/services'; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { clone, GetIntegerAndUnit, getSuitableUnit as getSuitableUnitFn } from "../../../lib/utils/utils"; -import { SessionService } from '../../shared/session.service'; -import { Project } from '../project'; +} from '../../../shared/services'; +import { ErrorHandler } from "../../../shared/units/error-handler"; +import { clone, GetIntegerAndUnit, getSuitableUnit as getSuitableUnitFn } from "../../../shared/units/utils"; @Component({ selector: 'summary', @@ -37,7 +34,7 @@ export class SummaryComponent implements OnInit { ) { } ngOnInit() { - this.projectId = this.route.snapshot.parent.params['id']; + this.projectId = this.route.parent.parent.snapshot.params['id']; const permissions = [ {resource: USERSTATICPERMISSION.MEMBER.KEY, action: USERSTATICPERMISSION.MEMBER.VALUE.LIST}, {resource: USERSTATICPERMISSION.QUOTA.KEY, action: USERSTATICPERMISSION.QUOTA.VALUE.READ}, diff --git a/src/portal/src/app/base/project/summary/summary.module.ts b/src/portal/src/app/base/project/summary/summary.module.ts new file mode 100644 index 0000000000..f2ded633dc --- /dev/null +++ b/src/portal/src/app/base/project/summary/summary.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { SummaryComponent } from './summary.component'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; + +const routes: Routes = [ + { + path: '', + component: SummaryComponent + } +]; +@NgModule({ + declarations: [SummaryComponent], + imports: [ + RouterModule.forChild(routes), + SharedModule + ] +}) +export class SummaryModule { } diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.html b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.html similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.html rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.html diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.scss b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.scss similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.scss rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.scss diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.spec.ts b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.spec.ts similarity index 88% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.spec.ts rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.spec.ts index a99958abf3..6b1c7585fc 100644 --- a/src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.spec.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.spec.ts @@ -1,19 +1,19 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; -import { AddRuleComponent } from './add-rule.component'; import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { ImmutableTagService } from '../immutable-tag.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; -import { InlineAlertComponent } from "../../../../shared/inline-alert/inline-alert.component"; import { ImmutableRetentionRule } from "../../tag-retention/retention"; -import { ErrorHandler } from '../../../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../../../../shared/units/error-handler'; +import { InlineAlertComponent } from "../../../../../shared/components/inline-alert/inline-alert.component"; +import { AddImmutableRuleComponent } from "./add-immutable-rule.component"; describe('AddRuleComponent', () => { - let component: AddRuleComponent; - let fixture: ComponentFixture; + let component: AddImmutableRuleComponent; + let fixture: ComponentFixture; let mockRule = { "id": 1, "project_id": 1, @@ -43,7 +43,7 @@ describe('AddRuleComponent', () => { }; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [AddRuleComponent, InlineAlertComponent], + declarations: [AddImmutableRuleComponent, InlineAlertComponent], schemas: [ CUSTOM_ELEMENTS_SCHEMA ], @@ -66,7 +66,7 @@ describe('AddRuleComponent', () => { })); beforeEach(() => { - fixture = TestBed.createComponent(AddRuleComponent); + fixture = TestBed.createComponent(AddImmutableRuleComponent); component = fixture.componentInstance; fixture.detectChanges(); component.addRuleOpened = true; diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.ts b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.ts similarity index 93% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.ts rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.ts index 03353aa8f7..388acbda60 100644 --- a/src/portal/src/app/project/tag-feature-integration/immutable-tag/add-rule/add-rule.component.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/add-rule/add-immutable-rule.component.ts @@ -7,17 +7,17 @@ import { } from "@angular/core"; import { ImmutableRetentionRule, RuleMetadate } from "../../tag-retention/retention"; import { ImmutableTagService } from "../immutable-tag.service"; -import { compareValue } from "../../../../../lib/utils/utils"; -import { InlineAlertComponent } from "../../../../shared/inline-alert/inline-alert.component"; +import { compareValue } from "../../../../../shared/units/utils"; +import { InlineAlertComponent } from "../../../../../shared/components/inline-alert/inline-alert.component"; const EXISTING_RULE = "TAG_RETENTION.EXISTING_RULE"; const INVALID_RULE = "TAG_RETENTION.INVALID_RULE"; @Component({ - selector: 'app-add-rule', - templateUrl: './add-rule.component.html', - styleUrls: ['./add-rule.component.scss'] + selector: 'app-add-immutable-rule', + templateUrl: './add-immutable-rule.component.html', + styleUrls: ['./add-immutable-rule.component.scss'] }) -export class AddRuleComponent implements OnInit, OnDestroy { +export class AddImmutableRuleComponent implements OnInit, OnDestroy { addRuleOpened: boolean = false; @Output() clickAdd = new EventEmitter(); @Input() rules: ImmutableRetentionRule[]; diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.html b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html similarity index 96% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.html rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html index 3b62374cf9..f87f89e951 100644 --- a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.html +++ b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.html @@ -56,5 +56,5 @@
- +
diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.scss b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.scss similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.scss rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.scss diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.spec.ts b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.spec.ts similarity index 89% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.spec.ts rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.spec.ts index 27992cc21f..1a2f6e1ece 100644 --- a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.spec.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.spec.ts @@ -1,27 +1,22 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { InlineAlertComponent } from "../../../shared/inline-alert/inline-alert.component"; - import { ImmutableTagComponent } from './immutable-tag.component'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { AddRuleComponent } from './add-rule/add-rule.component'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; import { ImmutableTagService } from './immutable-tag.service'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { ActivatedRoute } from '@angular/router'; import { of, throwError } from 'rxjs'; -import { DefaultErrorHandler, ErrorHandler } from "../../../../lib/utils/error-handler"; -import { clone } from "../../../../lib/utils/utils"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { clone } from "../../../../shared/units/utils"; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; +import { AddImmutableRuleComponent } from "./add-rule/add-immutable-rule.component"; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('ImmutableTagComponent', () => { let component: ImmutableTagComponent; - let addRuleComponent: AddRuleComponent; + let addRuleComponent: AddImmutableRuleComponent; let immutableTagService: ImmutableTagService; let errorHandler: ErrorHandler; let fixture: ComponentFixture; - let fixtureAddrule: ComponentFixture; + let fixtureAddrule: ComponentFixture; let mockMetadata = { "templates": [ { @@ -206,16 +201,12 @@ describe('ImmutableTagComponent', () => { cloneDisableRule.disabled = true; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ImmutableTagComponent, AddRuleComponent, InlineAlertComponent], + declarations: [ImmutableTagComponent, AddImmutableRuleComponent, InlineAlertComponent], schemas: [ CUSTOM_ELEMENTS_SCHEMA ], imports: [ - NoopAnimationsModule, - ClarityModule, - FormsModule, - HttpClientTestingModule, - TranslateModule.forRoot() + SharedTestingModule ], providers: [ ImmutableTagService, @@ -225,15 +216,15 @@ describe('ImmutableTagComponent', () => { snapshot: { parent: { parent: { - params: { id: 1 } + parent: { + params: { id: 1 } + } } }, data: 1 } } }, - { provide: ErrorHandler, useClass: DefaultErrorHandler } - ] }) .compileComponents(); @@ -241,7 +232,7 @@ describe('ImmutableTagComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ImmutableTagComponent); - fixtureAddrule = TestBed.createComponent(AddRuleComponent); + fixtureAddrule = TestBed.createComponent(AddImmutableRuleComponent); component = fixture.componentInstance; addRuleComponent = fixtureAddrule.componentInstance; addRuleComponent.open = () => { @@ -249,8 +240,8 @@ describe('ImmutableTagComponent', () => { }; component.projectId = 1; - component.addRuleComponent = TestBed.createComponent(AddRuleComponent).componentInstance; - component.addRuleComponent = TestBed.createComponent(AddRuleComponent).componentInstance; + component.addRuleComponent = TestBed.createComponent(AddImmutableRuleComponent).componentInstance; + component.addRuleComponent = TestBed.createComponent(AddImmutableRuleComponent).componentInstance; component.addRuleComponent.open = () => { return null; }; diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.ts b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.ts similarity index 93% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.ts rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.ts index 35b4f5daa8..a152d685e9 100644 --- a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.component.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { AddRuleComponent } from "./add-rule/add-rule.component"; import { ImmutableTagService } from "./immutable-tag.service"; import { ImmutableRetentionRule } from "../tag-retention/retention"; import { finalize } from "rxjs/operators"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import { clone } from "../../../../lib/utils/utils"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { clone } from "../../../../shared/units/utils"; +import { AddImmutableRuleComponent } from "./add-rule/add-immutable-rule.component"; @Component({ selector: 'app-immutable-tag', @@ -21,7 +21,7 @@ export class ImmutableTagComponent implements OnInit { editIndex: number; loadingRule: boolean = false; - @ViewChild('addRule') addRuleComponent: AddRuleComponent; + @ViewChild('addRule') addRuleComponent: AddImmutableRuleComponent; constructor( private route: ActivatedRoute, private immutableTagService: ImmutableTagService, @@ -30,7 +30,7 @@ export class ImmutableTagComponent implements OnInit { } ngOnInit() { - this.projectId = +this.route.snapshot.parent.parent.params['id']; + this.projectId = +this.route.snapshot.parent.parent.parent.params['id']; this.getRules(); this.getMetadata(); } diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.service.spec.ts b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.service.spec.ts similarity index 99% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.service.spec.ts rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.service.spec.ts index 100b5046ad..1b0671cfdd 100644 --- a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.service.spec.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.service.spec.ts @@ -1,4 +1,3 @@ - import { ImmutableTagService } from './immutable-tag.service'; import { TestBed, inject } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.service.ts b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.service.ts similarity index 99% rename from src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.service.ts rename to src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.service.ts index ce02b245b2..347dc356d7 100644 --- a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.service.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/immutable-tag/immutable-tag.service.ts @@ -4,7 +4,7 @@ import { ImmutableRetentionRule, RuleMetadate } from "../tag-retention/retention import { Observable, throwError as observableThrowError } from "rxjs"; import { map, catchError } from "rxjs/operators"; import { Project } from "../../project"; -import { CURRENT_BASE_HREF, HTTP_JSON_OPTIONS } from "../../../../lib/utils/utils"; +import { CURRENT_BASE_HREF, HTTP_JSON_OPTIONS } from "../../../../shared/units/utils"; @Injectable() diff --git a/src/portal/src/app/project/tag-feature-integration/tag-feature-integration.component.html b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.html similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-feature-integration.component.html rename to src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.html diff --git a/src/portal/src/app/project/tag-feature-integration/tag-feature-integration.component.scss b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.scss similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-feature-integration.component.scss rename to src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.scss diff --git a/src/portal/src/app/project/tag-feature-integration/tag-feature-integration.component.spec.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.spec.ts similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-feature-integration.component.spec.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.spec.ts diff --git a/src/portal/src/app/project/tag-feature-integration/tag-feature-integration.component.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.ts similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-feature-integration.component.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.component.ts diff --git a/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.module.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.module.ts new file mode 100644 index 0000000000..82d5a76685 --- /dev/null +++ b/src/portal/src/app/base/project/tag-feature-integration/tag-feature-integration.module.ts @@ -0,0 +1,47 @@ +import { NgModule } from '@angular/core'; +import { TagFeatureIntegrationComponent } from './tag-feature-integration.component'; +import { TagRetentionComponent } from "./tag-retention/tag-retention.component"; +import { SharedModule } from '../../../shared/shared.module'; +import { AddRuleComponent } from "./tag-retention/add-rule/add-rule.component"; +import { RouterModule, Routes } from '@angular/router'; +import { TagRetentionService } from './tag-retention/tag-retention.service'; +import { ImmutableTagComponent } from "./immutable-tag/immutable-tag.component"; +import { ImmutableTagService } from "./immutable-tag/immutable-tag.service"; +import { AddImmutableRuleComponent } from "./immutable-tag/add-rule/add-immutable-rule.component"; + + +const routes: Routes = [ + { + path: '', + component: TagFeatureIntegrationComponent, + children: [ + { + path: 'tag-retention', + component: TagRetentionComponent + }, + { + path: 'immutable-tag', + component: ImmutableTagComponent + }, + { path: '', redirectTo: 'tag-retention', pathMatch: 'full' }, + ] + } +]; +@NgModule({ + imports: [ + RouterModule.forChild(routes), + SharedModule, + ], + declarations: [ + TagFeatureIntegrationComponent, + TagRetentionComponent, + AddRuleComponent, + ImmutableTagComponent, + AddImmutableRuleComponent + ], + providers: [ + TagRetentionService, + ImmutableTagService + ] +}) +export class TagFeatureIntegrationModule { } diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.html b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.html similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.html rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.html diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.scss b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.scss similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.scss rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.scss diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.spec.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.spec.ts similarity index 88% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.spec.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.spec.ts index 6f24c173c5..88737cefd4 100644 --- a/src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.spec.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.spec.ts @@ -6,12 +6,10 @@ import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; -import { of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TagRetentionService } from "../tag-retention.service"; -import { InlineAlertComponent } from "../../../../shared/inline-alert/inline-alert.component"; -import { delay } from 'rxjs/operators'; -import { ErrorHandler } from '../../../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../../../../shared/units/error-handler'; +import { InlineAlertComponent } from "../../../../../shared/components/inline-alert/inline-alert.component"; describe('AddRuleComponent', () => { let component: AddRuleComponent; let fixture: ComponentFixture; diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.ts similarity index 97% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.ts index 53c6007080..9b6a4c1fdc 100644 --- a/src/portal/src/app/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/add-rule/add-rule.component.ts @@ -20,11 +20,10 @@ import { } from "@angular/core"; import { Retention, Rule, RuleMetadate } from "../retention"; import { TagRetentionService } from "../tag-retention.service"; -import { InlineAlertComponent } from "../../../../shared/inline-alert/inline-alert.component"; -import { compareValue } from "../../../../../lib/utils/utils"; +import { compareValue } from "../../../../../shared/units/utils"; +import { InlineAlertComponent } from "../../../../../shared/components/inline-alert/inline-alert.component"; const EXISTING_RULE = "TAG_RETENTION.EXISTING_RULE"; -const ILLEGAL_RULE = "TAG_RETENTION.ILLEGAL_RULE"; const INVALID_RULE = "TAG_RETENTION.INVALID_RULE"; const MAX = 2100000000; @Component({ diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/retention.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/retention.ts similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/retention.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/retention.ts diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.html b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.html similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.html rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.html diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.scss b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.scss similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.scss rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.scss diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.spec.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.spec.ts similarity index 74% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.spec.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.spec.ts index 5d48677c70..5d8c8e73c5 100644 --- a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.spec.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.spec.ts @@ -1,19 +1,15 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { TranslateService } from '@ngx-translate/core'; import { TagRetentionComponent } from './tag-retention.component'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ActivatedRoute } from '@angular/router'; import { AddRuleComponent } from "./add-rule/add-rule.component"; import { TagRetentionService } from "./tag-retention.service"; import { RuleMetadate, Retention } from './retention'; import { delay } from 'rxjs/operators'; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { SharedTestingModule } from "../../../../shared/shared.module"; describe('TagRetentionComponent', () => { let component: TagRetentionComponent; @@ -43,11 +39,13 @@ describe('TagRetentionComponent', () => { snapshot: { parent: { parent: { - params: { id: 1 }, - data: { - projectResolver: { - metadata: { - retention_id: 1 + parent: { + params: { id: 1 }, + data: { + projectResolver: { + metadata: { + retention_id: 1 + } } } } @@ -64,13 +62,7 @@ describe('TagRetentionComponent', () => { CUSTOM_ELEMENTS_SCHEMA ], imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HttpClientTestingModule + SharedTestingModule ], declarations: [TagRetentionComponent, AddRuleComponent], providers: [ diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts similarity index 97% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts index 05ab254f94..29fe75e567 100644 --- a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.component.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.component.ts @@ -18,10 +18,10 @@ import {ClrDatagridStateInterface, ClrDatagridStringFilterInterface} from "@clr/ import { TagRetentionService } from "./tag-retention.service"; import { Retention, Rule } from "./retention"; import { finalize } from "rxjs/operators"; -import { CronScheduleComponent } from "../../../../lib/components/cron-schedule"; -import { ErrorHandler } from "../../../../lib/utils/error-handler"; -import { OriginCron } from "../../../../lib/services"; -import {clone, DEFAULT_PAGE_SIZE} from "../../../../lib/utils/utils"; +import { CronScheduleComponent } from "../../../../shared/components/cron-schedule"; +import { ErrorHandler } from "../../../../shared/units/error-handler"; +import { OriginCron } from "../../../../shared/services"; +import {clone, DEFAULT_PAGE_SIZE} from "../../../../shared/units/utils"; const MIN = 60000; const SEC = 1000; @@ -118,7 +118,7 @@ export class TagRetentionComponent implements OnInit { } ngOnInit() { - this.projectId = +this.route.snapshot.parent.parent.params['id']; + this.projectId = +this.route.snapshot.parent.parent.parent.params['id']; this.retention.scope = { level: "project", ref: this.projectId diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.service.spec.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.service.spec.ts similarity index 100% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.service.spec.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.service.spec.ts diff --git a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.service.ts b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.service.ts similarity index 99% rename from src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.service.ts rename to src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.service.ts index 53625a8b00..c4784dc89b 100644 --- a/src/portal/src/app/project/tag-feature-integration/tag-retention/tag-retention.service.ts +++ b/src/portal/src/app/base/project/tag-feature-integration/tag-retention/tag-retention.service.ts @@ -17,7 +17,7 @@ import { Retention, RuleMetadate } from "./retention"; import { Observable, throwError as observableThrowError } from "rxjs"; import { map, catchError } from "rxjs/operators"; import { Project } from "../../project"; -import { buildHttpRequestOptionsWithObserveResponse, CURRENT_BASE_HREF } from "../../../../lib/utils/utils"; +import { buildHttpRequestOptionsWithObserveResponse, CURRENT_BASE_HREF } from "../../../../shared/units/utils"; @Injectable() export class TagRetentionService { diff --git a/src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.html b/src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.html similarity index 100% rename from src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.html rename to src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.html diff --git a/src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.scss b/src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.scss similarity index 100% rename from src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.scss rename to src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.scss diff --git a/src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.spec.ts b/src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.spec.ts similarity index 94% rename from src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.spec.ts rename to src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.spec.ts index c84d0664b2..7a6ef655b4 100644 --- a/src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.spec.ts +++ b/src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.spec.ts @@ -7,11 +7,11 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; import { WebhookService } from "../webhook.service"; -import { MessageHandlerService } from "../../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../../shared/services/message-handler.service"; import { of } from 'rxjs'; import { Webhook } from "../webhook"; -import { InlineAlertComponent } from "../../../shared/inline-alert/inline-alert.component"; -import { ErrorHandler } from '../../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../../../shared/units/error-handler'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; describe('AddWebhookFormComponent', () => { let component: AddWebhookFormComponent; diff --git a/src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.ts b/src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.ts similarity index 94% rename from src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.ts rename to src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.ts index 1e6ff1378c..cf859310e1 100644 --- a/src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.ts +++ b/src/portal/src/app/base/project/webhook/add-webhook-form/add-webhook-form.component.ts @@ -11,8 +11,8 @@ import { NgForm } from "@angular/forms"; import { ClrLoadingState } from "@clr/angular"; import { finalize } from "rxjs/operators"; import { WebhookService } from "../webhook.service"; -import { InlineAlertComponent } from "../../../shared/inline-alert/inline-alert.component"; -import { compareValue } from '../../../../lib/utils/utils'; +import { compareValue } from '../../../../shared/units/utils'; +import { InlineAlertComponent } from "../../../../shared/components/inline-alert/inline-alert.component"; @Component({ selector: 'add-webhook-form', diff --git a/src/portal/src/app/project/webhook/add-webhook/add-webhook.component.html b/src/portal/src/app/base/project/webhook/add-webhook/add-webhook.component.html similarity index 100% rename from src/portal/src/app/project/webhook/add-webhook/add-webhook.component.html rename to src/portal/src/app/base/project/webhook/add-webhook/add-webhook.component.html diff --git a/src/portal/src/app/project/webhook/add-webhook/add-webhook.component.scss b/src/portal/src/app/base/project/webhook/add-webhook/add-webhook.component.scss similarity index 100% rename from src/portal/src/app/project/webhook/add-webhook/add-webhook.component.scss rename to src/portal/src/app/base/project/webhook/add-webhook/add-webhook.component.scss diff --git a/src/portal/src/app/project/webhook/add-webhook/add-webhook.component.spec.ts b/src/portal/src/app/base/project/webhook/add-webhook/add-webhook.component.spec.ts similarity index 100% rename from src/portal/src/app/project/webhook/add-webhook/add-webhook.component.spec.ts rename to src/portal/src/app/base/project/webhook/add-webhook/add-webhook.component.spec.ts diff --git a/src/portal/src/app/project/webhook/add-webhook/add-webhook.component.ts b/src/portal/src/app/base/project/webhook/add-webhook/add-webhook.component.ts similarity index 100% rename from src/portal/src/app/project/webhook/add-webhook/add-webhook.component.ts rename to src/portal/src/app/base/project/webhook/add-webhook/add-webhook.component.ts diff --git a/src/portal/src/app/project/webhook/last-trigger/last-trigger.component.html b/src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.html similarity index 100% rename from src/portal/src/app/project/webhook/last-trigger/last-trigger.component.html rename to src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.html diff --git a/src/portal/src/app/project/webhook/last-trigger/last-trigger.component.scss b/src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.scss similarity index 100% rename from src/portal/src/app/project/webhook/last-trigger/last-trigger.component.scss rename to src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.scss diff --git a/src/portal/src/app/project/webhook/last-trigger/last-trigger.component.spec.ts b/src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.spec.ts similarity index 94% rename from src/portal/src/app/project/webhook/last-trigger/last-trigger.component.spec.ts rename to src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.spec.ts index 0ccb4e103c..c99185c04f 100644 --- a/src/portal/src/app/project/webhook/last-trigger/last-trigger.component.spec.ts +++ b/src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.spec.ts @@ -1,11 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ClarityModule } from "@clr/angular"; -import { SharedModule } from "../../../shared/shared.module"; +import { SharedTestingModule } from "../../../../shared/shared.module"; import { LastTriggerComponent } from "./last-trigger.component"; import { LastTrigger } from "../webhook"; import { SimpleChange } from "@angular/core"; -import { of } from "rxjs"; import { WebhookService } from "../webhook.service"; describe('LastTriggerComponent', () => { @@ -35,7 +34,7 @@ describe('LastTriggerComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, BrowserAnimationsModule, ClarityModule, ], diff --git a/src/portal/src/app/project/webhook/last-trigger/last-trigger.component.ts b/src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.ts similarity index 100% rename from src/portal/src/app/project/webhook/last-trigger/last-trigger.component.ts rename to src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.ts diff --git a/src/portal/src/app/project/webhook/webhook.component.html b/src/portal/src/app/base/project/webhook/webhook.component.html similarity index 100% rename from src/portal/src/app/project/webhook/webhook.component.html rename to src/portal/src/app/base/project/webhook/webhook.component.html diff --git a/src/portal/src/app/project/webhook/webhook.component.scss b/src/portal/src/app/base/project/webhook/webhook.component.scss similarity index 100% rename from src/portal/src/app/project/webhook/webhook.component.scss rename to src/portal/src/app/base/project/webhook/webhook.component.scss diff --git a/src/portal/src/app/project/webhook/webhook.component.spec.ts b/src/portal/src/app/base/project/webhook/webhook.component.spec.ts similarity index 81% rename from src/portal/src/app/project/webhook/webhook.component.spec.ts rename to src/portal/src/app/base/project/webhook/webhook.component.spec.ts index a2c0296d13..10cac40070 100644 --- a/src/portal/src/app/project/webhook/webhook.component.spec.ts +++ b/src/portal/src/app/base/project/webhook/webhook.component.spec.ts @@ -1,24 +1,18 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { WebhookComponent } from './webhook.component'; import { ActivatedRoute } from '@angular/router'; import { WebhookService } from './webhook.service'; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; +import { MessageHandlerService } from "../../../shared/services/message-handler.service"; import { of } from 'rxjs'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; import { delay } from "rxjs/operators"; import { Webhook } from "./webhook"; import { AddWebhookFormComponent } from "./add-webhook-form/add-webhook-form.component"; -import { InlineAlertComponent } from "../../shared/inline-alert/inline-alert.component"; import { AddWebhookComponent } from "./add-webhook/add-webhook.component"; -import { ConfirmationDialogComponent } from "../../../lib/components/confirmation-dialog"; -import { UserPermissionService } from '../../../lib/services'; -import { ErrorHandler } from '../../../lib/utils/error-handler'; +import { ConfirmationDialogComponent } from "../../../shared/components/confirmation-dialog"; +import { UserPermissionService } from '../../../shared/services'; +import { InlineAlertComponent } from "../../../shared/components/inline-alert/inline-alert.component"; +import { SharedTestingModule } from "../../../shared/shared.module"; describe('WebhookComponent', () => { let component: WebhookComponent; @@ -85,11 +79,13 @@ describe('WebhookComponent', () => { RouterparamMap: of({ get: (key) => 'value' }), snapshot: { parent: { - params: { id: 1 }, - data: { - projectResolver: { - ismember: true, - name: 'library', + parent: { + params: { id: 1 }, + data: { + projectResolver: { + ismember: true, + name: 'library', + } } } } @@ -107,23 +103,16 @@ describe('WebhookComponent', () => { CUSTOM_ELEMENTS_SCHEMA ], imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HttpClientTestingModule + SharedTestingModule ], - declarations: [WebhookComponent, + declarations: [ + WebhookComponent, AddWebhookComponent, AddWebhookFormComponent, InlineAlertComponent, ConfirmationDialogComponent ], providers: [ - TranslateService, - ErrorHandler, { provide: WebhookService, useValue: mockWebhookService }, { provide: MessageHandlerService, useValue: mockMessageHandlerService }, { provide: ActivatedRoute, useValue: mockActivatedRoute }, diff --git a/src/portal/src/app/project/webhook/webhook.component.ts b/src/portal/src/app/base/project/webhook/webhook.component.ts similarity index 93% rename from src/portal/src/app/project/webhook/webhook.component.ts rename to src/portal/src/app/base/project/webhook/webhook.component.ts index d29d6d2899..dfc2e050cf 100644 --- a/src/portal/src/app/project/webhook/webhook.component.ts +++ b/src/portal/src/app/base/project/webhook/webhook.component.ts @@ -19,16 +19,15 @@ import { AddWebhookFormComponent } from './add-webhook-form/add-webhook-form.com import { ActivatedRoute } from '@angular/router'; import { LastTrigger, Webhook } from './webhook'; import { WebhookService } from './webhook.service'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { MessageHandlerService } from '../../../shared/services/message-handler.service'; import { Project } from '../project'; -import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const'; - -import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message'; -import { ConfirmationDialogComponent } from '../../shared/confirmation-dialog/confirmation-dialog.component'; -import { clone } from '../../../lib/utils/utils'; +import { clone } from '../../../shared/units/utils'; import { forkJoin, Observable } from 'rxjs'; -import { UserPermissionService, USERSTATICPERMISSION } from '../../../lib/services'; +import { UserPermissionService, USERSTATICPERMISSION } from '../../../shared/services'; import { ClrLoadingState } from '@clr/angular'; +import { ConfirmationDialogComponent } from "../../../shared/components/confirmation-dialog"; +import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../../shared/entities/shared.const"; +import { ConfirmationMessage } from "../../global-confirmation-dialog/confirmation-message"; @Component({ templateUrl: './webhook.component.html', @@ -59,11 +58,11 @@ export class WebhookComponent implements OnInit { private translate: TranslateService, private webhookService: WebhookService, private messageHandlerService: MessageHandlerService, - private userPermissionService: UserPermissionService,) { } + private userPermissionService: UserPermissionService) { } ngOnInit() { - this.projectId = +this.route.snapshot.parent.params['id']; - let resolverData = this.route.snapshot.parent.data; + this.projectId = +this.route.snapshot.parent.parent.params['id']; + let resolverData = this.route.snapshot.parent.parent.data; if (resolverData) { let project = (resolverData["projectResolver"]); this.projectName = project.name; diff --git a/src/portal/src/app/base/project/webhook/webhook.module.ts b/src/portal/src/app/base/project/webhook/webhook.module.ts new file mode 100644 index 0000000000..86dcda77d5 --- /dev/null +++ b/src/portal/src/app/base/project/webhook/webhook.module.ts @@ -0,0 +1,32 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../../../shared/shared.module"; +import { WebhookComponent } from "./webhook.component"; +import { LastTriggerComponent } from "./last-trigger/last-trigger.component"; +import { AddWebhookFormComponent } from "./add-webhook-form/add-webhook-form.component"; +import { AddWebhookComponent } from "./add-webhook/add-webhook.component"; +import { WebhookService } from "./webhook.service"; + + +const routes: Routes = [ + { + path: '', + component: WebhookComponent + } +]; +@NgModule({ + declarations: [ + WebhookComponent, + LastTriggerComponent, + AddWebhookFormComponent, + AddWebhookComponent + ], + imports: [ + RouterModule.forChild(routes), + SharedModule + ], + providers: [ + WebhookService + ] +}) +export class WebhookModule { } diff --git a/src/portal/src/app/project/webhook/webhook.service.spec.ts b/src/portal/src/app/base/project/webhook/webhook.service.spec.ts similarity index 100% rename from src/portal/src/app/project/webhook/webhook.service.spec.ts rename to src/portal/src/app/base/project/webhook/webhook.service.spec.ts diff --git a/src/portal/src/app/project/webhook/webhook.service.ts b/src/portal/src/app/base/project/webhook/webhook.service.ts similarity index 98% rename from src/portal/src/app/project/webhook/webhook.service.ts rename to src/portal/src/app/base/project/webhook/webhook.service.ts index c04e6a493a..d0c9f0e7cc 100644 --- a/src/portal/src/app/project/webhook/webhook.service.ts +++ b/src/portal/src/app/base/project/webhook/webhook.service.ts @@ -16,7 +16,7 @@ import { map, catchError, delay } from "rxjs/operators"; import { Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; import { Webhook, LastTrigger } from "./webhook"; -import { CURRENT_BASE_HREF } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF } from "../../../shared/units/utils"; const EVENT_TYPES_TEXT_MAP = { 'REPLICATION': 'Replication finished', diff --git a/src/portal/src/app/project/webhook/webhook.ts b/src/portal/src/app/base/project/webhook/webhook.ts similarity index 100% rename from src/portal/src/app/project/webhook/webhook.ts rename to src/portal/src/app/base/project/webhook/webhook.ts diff --git a/src/portal/src/app/core/core.module.ts b/src/portal/src/app/core/core.module.ts deleted file mode 100644 index 2de6bcf4b6..0000000000 --- a/src/portal/src/app/core/core.module.ts +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) 2017 VMware, Inc. All Rights Reserved. -// -// 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. -import { BrowserModule } from '@angular/platform-browser'; -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { CookieModule } from 'ngx-cookie'; -import { MarkdownModule } from 'ngx-markdown'; -import { ClarityIconsApi } from '@clr/icons/clr-icons-api'; - -// ClarityIcons is publicly accessible from the browser's window object. -declare const ClarityIcons: ClarityIconsApi; - -// Add custom icons to ClarityIcons -// Add robot head icon -ClarityIcons.add({"robot-head": ` - - - - - - - - -`}); - -@NgModule({ - imports: [ - BrowserModule, - FormsModule, - ClarityModule, - CookieModule.forRoot(), - MarkdownModule.forRoot(), - BrowserAnimationsModule - ], - exports: [ - BrowserModule, - FormsModule, - ClarityModule, - BrowserAnimationsModule, - MarkdownModule - ] -}) -export class CoreModule { -} diff --git a/src/portal/src/app/dev-center/dev-center-other.component.spec.ts b/src/portal/src/app/dev-center/dev-center-other.component.spec.ts deleted file mode 100644 index 9e04c2528c..0000000000 --- a/src/portal/src/app/dev-center/dev-center-other.component.spec.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { ComponentFixture, TestBed, getTestBed, waitForAsync } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { DevCenterOtherComponent } from './dev-center-other.component'; -import { CookieService } from 'ngx-cookie'; - -describe('DevCenterOtherComponent', () => { - let component: DevCenterOtherComponent; - let fixture: ComponentFixture; - const mockCookieService = { - get: () => { - return "xsrf"; - } - }; - let injector: TestBed; - let httpMock: HttpTestingController; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [DevCenterOtherComponent], - imports: [ - HttpClientTestingModule, - TranslateModule.forRoot() - ], - providers: [ - TranslateService, - { - provide: CookieService, useValue: mockCookieService - } - ], - }) - .compileComponents(); - injector = getTestBed(); - httpMock = injector.get(HttpTestingController); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DevCenterOtherComponent); - component = fixture.componentInstance; - fixture.autoDetectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - it('get swagger should return data', () => { - const req = httpMock.expectOne('/swagger3.json'); - expect(req.request.method).toBe('GET'); - req.flush({ - "host": '122.33', - }); - }); - -}); diff --git a/src/portal/src/app/dev-center/dev-center-other.component.ts b/src/portal/src/app/dev-center/dev-center-other.component.ts deleted file mode 100644 index 23c2e7bf4a..0000000000 --- a/src/portal/src/app/dev-center/dev-center-other.component.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { AfterViewInit, Component, ElementRef, OnInit } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { throwError as observableThrowError, forkJoin } from 'rxjs'; -import { catchError } from 'rxjs/operators'; -import { Title } from '@angular/platform-browser'; -import { TranslateService } from '@ngx-translate/core'; -import { CookieService } from "ngx-cookie"; -import * as SwaggerUI from 'swagger-ui'; -import { DevCenterBase } from './dev-center-base'; - -enum SwaggerJsonUrls { - CHARTMUSEUM = '/swagger3.json' -} - -@Component({ - selector: 'dev-center-other', - templateUrl: 'dev-center.component.html', - viewProviders: [Title], - styleUrls: ['dev-center.component.scss'] -}) -export class DevCenterOtherComponent extends DevCenterBase implements AfterViewInit, OnInit { - private ui: any; - constructor( - private el: ElementRef, - private http: HttpClient, - public translate: TranslateService, - public cookieService: CookieService, - public titleService: Title) { - super(translate, cookieService, titleService); - } - - ngAfterViewInit() { - this.getSwaggerUI(); - } - getSwaggerUI() { - const _this = this; - this.http.get(SwaggerJsonUrls.CHARTMUSEUM) - .pipe(catchError(error => observableThrowError(error))) - .subscribe(json => { - json['host'] = window.location.host; - const protocal = window.location.protocol; - json['schemes'] = [protocal.replace(":", "")]; - this.ui = SwaggerUI({ - spec: json, - domNode: this.el.nativeElement.querySelector('.swagger-container'), - deepLinking: true, - presets: [ - SwaggerUI.presets.apis - ], - requestInterceptor: this.getCsrfInterceptor().requestInterceptor, - authorizations: { - csrf: function () { - this.headers['X-Harbor-CSRF-Token'] = _this.cookieService.get('__csrf'); - return true; - } - } - }); - }); - } - -} diff --git a/src/portal/src/app/dev-center/dev-center.component.ts b/src/portal/src/app/dev-center/dev-center.component.ts index 6e5dd50a2d..638aa83925 100644 --- a/src/portal/src/app/dev-center/dev-center.component.ts +++ b/src/portal/src/app/dev-center/dev-center.component.ts @@ -6,8 +6,10 @@ import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { CookieService } from "ngx-cookie"; import * as SwaggerUI from 'swagger-ui'; -import { mergeDeep } from "../../lib/utils/utils"; +import { mergeDeep } from "../shared/units/utils"; import { DevCenterBase } from "./dev-center-base"; +// @ts-ignore +window.Buffer = window.Buffer || require('buffer').Buffer; // this is for swagger UI enum SwaggerJsonUrls { SWAGGER1 = '/swagger.json', diff --git a/src/portal/src/app/dev-center/dev-center.module.ts b/src/portal/src/app/dev-center/dev-center.module.ts index 849b10bee5..4cbaf93725 100644 --- a/src/portal/src/app/dev-center/dev-center.module.ts +++ b/src/portal/src/app/dev-center/dev-center.module.ts @@ -1,25 +1,19 @@ import { NgModule } from "@angular/core"; -import { RouterModule } from "@angular/router"; -import { CommonModule } from "@angular/common"; -import { ClarityModule } from '@clr/angular'; -import { SharedModule } from '../shared/shared.module'; import { DevCenterComponent } from "./dev-center.component"; -import { DevCenterOtherComponent } from "./dev-center-other.component"; - +import { RouterModule, Routes } from "@angular/router"; +const routes: Routes = [ + { + path: '', + component: DevCenterComponent + } +]; @NgModule({ imports: [ - CommonModule, - SharedModule, - RouterModule.forChild([{ - path: "**", - component: DevCenterComponent, - }]), - ClarityModule, + RouterModule.forChild(routes) ], declarations: [ DevCenterComponent, - DevCenterOtherComponent, ], }) export class DeveloperCenterModule {} diff --git a/src/portal/src/app/group/group.module.ts b/src/portal/src/app/group/group.module.ts deleted file mode 100644 index 45464c1e77..0000000000 --- a/src/portal/src/app/group/group.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { SharedModule } from '../shared/shared.module'; -import { GroupComponent } from './group.component'; -import { AddGroupModalComponent } from './add-group-modal/add-group-modal.component'; -import { GroupService } from './group.service'; - - -@NgModule({ - imports: [ - CommonModule, - SharedModule, - FormsModule, - ReactiveFormsModule - ], - exports: [ - GroupComponent, - AddGroupModalComponent, - FormsModule, - ReactiveFormsModule - ], - providers: [ GroupService ], - declarations: [GroupComponent, AddGroupModalComponent] -}) -export class GroupModule { } diff --git a/src/portal/src/app/harbor-routing.module.ts b/src/portal/src/app/harbor-routing.module.ts index 8f3a47856c..d958c7b008 100644 --- a/src/portal/src/app/harbor-routing.module.ts +++ b/src/portal/src/app/harbor-routing.module.ts @@ -12,415 +12,47 @@ // See the License for the specific language governing permissions and // limitations under the License. import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { SystemAdminGuard } from './shared/route/system-admin-activate.service'; -import { AuthCheckGuard } from './shared/route/auth-user-activate.service'; -import { SignInGuard } from './shared/route/sign-in-guard-activate.service'; -import { MemberGuard } from './shared/route/member-guard-activate.service'; -import { MemberPermissionGuard } from './shared/route/member-permission-guard-activate.service'; -import { OidcGuard } from './shared/route/oidc-guard-active.service'; -import { PageNotFoundComponent } from './shared/not-found/not-found.component'; -import { HarborShellComponent } from './base/harbor-shell/harbor-shell.component'; -import { ConfigurationComponent } from './config/config.component'; -import { DevCenterComponent } from './dev-center/dev-center.component'; -import { DevCenterOtherComponent } from './dev-center/dev-center-other.component'; -import { GcPageComponent } from './gc-page/gc-page.component'; -import { UserComponent } from './user/user.component'; -import { SignInComponent } from './sign-in/sign-in.component'; -import { ResetPasswordComponent } from './account/password-setting/reset-password/reset-password.component'; -import { GroupComponent } from './group/group.component'; -import { TotalReplicationPageComponent } from './replication/total-replication/total-replication-page.component'; -import { DestinationPageComponent } from './replication/destination/destination-page.component'; -import { AuditLogComponent } from './log/audit-log.component'; -import { LogPageComponent } from './log/log-page.component'; -import { ProjectComponent } from './project/project.component'; -import { ProjectDetailComponent } from './project/project-detail/project-detail.component'; -import { MemberComponent } from './project/member/member.component'; -import { RobotAccountComponent } from './project/robot-account/robot-account.component'; -import { WebhookComponent } from './project/webhook/webhook.component'; -import { ProjectLabelComponent } from './project/project-label/project-label.component'; -import { ProjectConfigComponent } from './project/project-config/project-config.component'; -import { ProjectRoutingResolver } from './services/routing-resolvers/project-routing-resolver.service'; -import { ListChartsComponent } from './project/helm-chart/list-charts.component'; -import { ListChartVersionsComponent } from './project/helm-chart/list-chart-versions/list-chart-versions.component'; -import { HelmChartDetailComponent } from './project/helm-chart/helm-chart-detail/chart-detail.component'; -import { OidcOnboardComponent } from './oidc-onboard/oidc-onboard.component'; -import { LicenseComponent } from './license/license.component'; -import { SummaryComponent } from './project/summary/summary.component'; -import { TagFeatureIntegrationComponent } from './project/tag-feature-integration/tag-feature-integration.component'; -import { TagRetentionComponent } from './project/tag-feature-integration/tag-retention/tag-retention.component'; -import { ImmutableTagComponent } from './project/tag-feature-integration/immutable-tag/immutable-tag.component'; -import { ScannerComponent } from "./project/scanner/scanner.component"; -import { InterrogationServicesComponent } from "./interrogation-services/interrogation-services.component"; -import { ConfigurationScannerComponent } from "./config/scanner/config-scanner.component"; -import { LabelsComponent } from "./labels/labels.component"; -import { ProjectQuotasComponent } from "./project-quotas/project-quotas.component"; -import { VulnerabilityConfigComponent } from "../lib/components/config/vulnerability/vulnerability-config.component"; -import { USERSTATICPERMISSION } from "../lib/services"; -import { RepositoryGridviewComponent } from "./project/repository/repository-gridview.component"; -import { ArtifactListPageComponent } from "./project/repository/artifact-list-page/artifact-list-page.component"; -import { ArtifactSummaryComponent } from "./project/repository/artifact/artifact-summary.component"; -import { ReplicationTasksComponent } from "../lib/components/replication/replication-tasks/replication-tasks.component"; -import { ReplicationTasksRoutingResolverService } from "./services/routing-resolvers/replication-tasks-routing-resolver.service"; -import { ArtifactDetailRoutingResolverService } from "./services/routing-resolvers/artifact-detail-routing-resolver.service"; -import { DistributionInstancesComponent } from './distribution/distribution-instances/distribution-instances.component'; -import { PolicyComponent } from './project/p2p-provider/policy/policy.component'; -import { TaskListComponent } from './project/p2p-provider/task-list/task-list.component'; -import { P2pProviderComponent } from './project/p2p-provider/p2p-provider.component'; -import { SystemRobotAccountsComponent } from './system-robot-accounts/system-robot-accounts.component'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { AuthCheckGuard } from './shared/router-guard/auth-user-activate.service'; +import { SignInGuard } from './shared/router-guard/sign-in-guard-activate.service'; +import { OidcGuard } from './shared/router-guard/oidc-guard-active.service'; const harborRoutes: Routes = [ { path: '', redirectTo: 'harbor', pathMatch: 'full' }, - { path: 'reset_password', component: ResetPasswordComponent }, { - path: 'devcenter-api-2.0', - component: DevCenterComponent + path: 'account', + loadChildren: () => import('./account/account.module').then(m => m.AccountModule) }, { - path: 'devcenter-api', - component: DevCenterOtherComponent + path: 'devcenter-api-2.0', + loadChildren: () => import('./dev-center/dev-center.module').then(m => m.DeveloperCenterModule) }, { path: 'oidc-onboard', - component: OidcOnboardComponent, - canActivate: [OidcGuard, SignInGuard] + canActivate: [OidcGuard, SignInGuard], + loadChildren: () => import('./oidc-onboard/oidc-onboard.module').then(m => m.OidcOnboardModule) }, { path: 'license', - component: LicenseComponent - }, - { - path: 'harbor/sign-in', - component: SignInComponent, - canActivate: [SignInGuard] + loadChildren: () => import('./license/license.module').then(m => m.LicenseModule) }, { path: 'harbor', - component: HarborShellComponent, canActivateChild: [AuthCheckGuard], - children: [ - { path: '', redirectTo: 'projects', pathMatch: 'full' }, - { - path: 'projects', - component: ProjectComponent - }, - { - path: 'logs', - component: LogPageComponent - }, - { - path: 'users', - component: UserComponent, - canActivate: [SystemAdminGuard] - }, - { - path: 'robot-accounts', - component: SystemRobotAccountsComponent, - canActivate: [SystemAdminGuard] - }, - { - path: 'groups', - component: GroupComponent, - canActivate: [SystemAdminGuard] - }, - { - path: 'registries', - component: DestinationPageComponent, - canActivate: [SystemAdminGuard] - }, - { - path: 'replications', - component: TotalReplicationPageComponent, - canActivate: [SystemAdminGuard], - canActivateChild: [SystemAdminGuard] - }, - { - path: 'distribution/instances', - component: DistributionInstancesComponent, - canActivate: [SystemAdminGuard] - }, - { - path: 'interrogation-services', - component: InterrogationServicesComponent, - canActivate: [SystemAdminGuard], - canActivateChild: [SystemAdminGuard], - children: [ - { - path: 'scanners', - component: ConfigurationScannerComponent - }, - { - path: 'vulnerability', - component: VulnerabilityConfigComponent - }, - { - path: '', - redirectTo: 'scanners', - pathMatch: 'full' - }, - ] - }, - { - path: 'labels', - component: LabelsComponent, - canActivate: [SystemAdminGuard], - }, - { - path: 'project-quotas', - component: ProjectQuotasComponent, - canActivate: [SystemAdminGuard], - }, - { - path: 'replications/:id/tasks', - component: ReplicationTasksComponent, - resolve: { - replicationTasksRoutingResolver: ReplicationTasksRoutingResolverService - }, - canActivate: [SystemAdminGuard], - canActivateChild: [SystemAdminGuard] - }, - { - path: 'projects/:id/helm-charts/:chart/versions', - component: ListChartVersionsComponent, - canActivate: [MemberGuard], - resolve: { - projectResolver: ProjectRoutingResolver - } - }, - { - path: 'projects/:id/helm-charts/:chart/versions/:version', - component: HelmChartDetailComponent, - canActivate: [MemberGuard], - resolve: { - projectResolver: ProjectRoutingResolver - } - }, - { - path: 'projects/:id', - component: ProjectDetailComponent, - canActivate: [MemberGuard], - resolve: { - projectResolver: ProjectRoutingResolver - }, - children: [ - { - path: 'summary', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.PROJECT.KEY, - action: USERSTATICPERMISSION.PROJECT.VALUE.READ - } - }, - component: SummaryComponent - }, - { - path: 'repositories', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.REPOSITORY.KEY, - action: USERSTATICPERMISSION.REPOSITORY.VALUE.LIST - } - }, - component: RepositoryGridviewComponent - }, - { - path: 'helm-charts', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.HELM_CHART.KEY, - action: USERSTATICPERMISSION.HELM_CHART.VALUE.LIST - } - }, - component: ListChartsComponent - }, - { - path: 'members', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.MEMBER.KEY, - action: USERSTATICPERMISSION.MEMBER.VALUE.LIST - } - }, - component: MemberComponent - }, - { - path: 'logs', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.LOG.KEY, - action: USERSTATICPERMISSION.LOG.VALUE.LIST - } - }, - component: AuditLogComponent - }, - { - path: 'labels', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.LABEL.KEY, - action: USERSTATICPERMISSION.LABEL.VALUE.CREATE - } - }, - component: ProjectLabelComponent - }, - { - path: 'configs', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.CONFIGURATION.KEY, - action: USERSTATICPERMISSION.CONFIGURATION.VALUE.READ - } - }, - component: ProjectConfigComponent - }, - { - path: 'robot-account', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.ROBOT.KEY, - action: USERSTATICPERMISSION.ROBOT.VALUE.LIST - } - }, - component: RobotAccountComponent - }, - { - path: 'tag-strategy', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.TAG_RETENTION.KEY, - action: USERSTATICPERMISSION.TAG_RETENTION.VALUE.READ - } - }, - component: TagFeatureIntegrationComponent, - children: [ - { - path: 'tag-retention', - component: TagRetentionComponent - }, - { - path: 'immutable-tag', - component: ImmutableTagComponent - }, - { path: '', redirectTo: 'tag-retention', pathMatch: 'full' }, - - ] - }, - { - path: 'webhook', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.WEBHOOK.KEY, - action: USERSTATICPERMISSION.WEBHOOK.VALUE.LIST - } - }, - component: WebhookComponent - }, - { - path: 'scanner', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.SCANNER.KEY, - action: USERSTATICPERMISSION.SCANNER.VALUE.READ - } - }, - component: ScannerComponent - }, - { - path: 'p2p-provider', - canActivate: [MemberPermissionGuard], - data: { - permissionParam: { - resource: USERSTATICPERMISSION.P2P_PROVIDER.KEY, - action: USERSTATICPERMISSION.P2P_PROVIDER.VALUE.READ - } - }, - component: P2pProviderComponent, - children: [ - { - path: 'policies', - component: PolicyComponent - }, - { - path: ':preheatPolicyName/executions/:executionId/tasks', - component: TaskListComponent - }, - { path: '', redirectTo: 'policies', pathMatch: 'full' }, - ], - }, - { - path: '', - redirectTo: 'repositories', - pathMatch: 'full' - }, - ] - }, - { - path: 'projects/:id/repositories/:repo', - component: ArtifactListPageComponent, - canActivate: [MemberGuard], - resolve: { - projectResolver: ProjectRoutingResolver - } - }, - { - path: 'projects/:id/repositories/:repo/depth/:depth', - component: ArtifactListPageComponent, - canActivate: [MemberGuard], - resolve: { - projectResolver: ProjectRoutingResolver - }, - }, - { - path: 'projects/:id/repositories/:repo/artifacts/:digest', - component: ArtifactSummaryComponent, - canActivate: [MemberGuard], - resolve: { - artifactResolver: ArtifactDetailRoutingResolverService - } - }, - { - path: 'projects/:id/repositories/:repo/depth/:depth/artifacts/:digest', - component: ArtifactSummaryComponent, - canActivate: [MemberGuard], - resolve: { - artifactResolver: ArtifactDetailRoutingResolverService - } - }, - { - path: 'configs', - component: ConfigurationComponent, - canActivate: [SystemAdminGuard] - }, - { - path: 'gc', - component: GcPageComponent, - canActivate: [SystemAdminGuard] - }, - { - path: 'registry', - component: DestinationPageComponent, - canActivate: [SystemAdminGuard], - canActivateChild: [SystemAdminGuard] - } - ] + loadChildren: () => import('./base/base.module').then(m => m.BaseModule) }, - { path: '**', component: PageNotFoundComponent } + { + path: '**', + loadChildren: () => import('./not-found/not-found.module').then(m => m.NotFoundModule) + } ]; @NgModule({ imports: [ - RouterModule.forRoot(harborRoutes, { onSameUrlNavigation: 'reload' }) + RouterModule.forRoot(harborRoutes, { + onSameUrlNavigation: 'reload', + preloadingStrategy: PreloadAllModules + }) ], exports: [RouterModule] }) diff --git a/src/portal/src/app/license/license.module.ts b/src/portal/src/app/license/license.module.ts index 543dcddc4e..ac732f3863 100644 --- a/src/portal/src/app/license/license.module.ts +++ b/src/portal/src/app/license/license.module.ts @@ -1,11 +1,18 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { LicenseComponent } from './license.component'; - +import { RouterModule, Routes } from "@angular/router"; +import {CommonModule} from "@angular/common"; +const routes: Routes = [ + { + path: '', + component: LicenseComponent + } +]; @NgModule({ - declarations: [LicenseComponent], imports: [ - CommonModule - ] + CommonModule, + RouterModule.forChild(routes) + ], + declarations: [LicenseComponent], }) export class LicenseModule { } diff --git a/src/portal/src/app/log/log-page.component.html b/src/portal/src/app/log/log-page.component.html deleted file mode 100644 index e9f925ed6d..0000000000 --- a/src/portal/src/app/log/log-page.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
\ No newline at end of file diff --git a/src/portal/src/app/log/log-page.component.spec.ts b/src/portal/src/app/log/log-page.component.spec.ts deleted file mode 100644 index a54edf4244..0000000000 --- a/src/portal/src/app/log/log-page.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LogPageComponent } from './log-page.component'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; - -describe('LogPageComponent', () => { - let component: LogPageComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ], - declarations: [LogPageComponent], - providers: [ - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(LogPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/app/shared/not-found/not-found.component.html b/src/portal/src/app/not-found/not-found.component.html similarity index 100% rename from src/portal/src/app/shared/not-found/not-found.component.html rename to src/portal/src/app/not-found/not-found.component.html diff --git a/src/portal/src/app/shared/not-found/not-found.component.scss b/src/portal/src/app/not-found/not-found.component.scss similarity index 100% rename from src/portal/src/app/shared/not-found/not-found.component.scss rename to src/portal/src/app/not-found/not-found.component.scss diff --git a/src/portal/src/app/shared/not-found/not-found.component.spec.ts b/src/portal/src/app/not-found/not-found.component.spec.ts similarity index 100% rename from src/portal/src/app/shared/not-found/not-found.component.spec.ts rename to src/portal/src/app/not-found/not-found.component.spec.ts diff --git a/src/portal/src/app/shared/not-found/not-found.component.ts b/src/portal/src/app/not-found/not-found.component.ts similarity index 100% rename from src/portal/src/app/shared/not-found/not-found.component.ts rename to src/portal/src/app/not-found/not-found.component.ts diff --git a/src/portal/src/app/not-found/not-found.module.ts b/src/portal/src/app/not-found/not-found.module.ts new file mode 100644 index 0000000000..a024f9385a --- /dev/null +++ b/src/portal/src/app/not-found/not-found.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../shared/shared.module"; +import { PageNotFoundComponent } from "./not-found.component"; +const routes: Routes = [ + { + path: '', + component: PageNotFoundComponent + } +]; +@NgModule({ + imports: [ + SharedModule, + RouterModule.forChild(routes) + ], + declarations: [PageNotFoundComponent], +}) +export class NotFoundModule { } diff --git a/src/portal/src/app/oidc-onboard/oidc-onboard.component.ts b/src/portal/src/app/oidc-onboard/oidc-onboard.component.ts index 9b2fff8cb5..5da483c293 100644 --- a/src/portal/src/app/oidc-onboard/oidc-onboard.component.ts +++ b/src/portal/src/app/oidc-onboard/oidc-onboard.component.ts @@ -2,8 +2,8 @@ import { Router, ActivatedRoute } from '@angular/router'; import { Component, OnInit } from '@angular/core'; import { OidcOnboardService } from './oidc-onboard.service'; import { FormControl } from '@angular/forms'; -import { CommonRoutes } from "../../lib/entities/shared.const"; -import { errorHandler } from "../../lib/utils/shared/shared.utils"; +import { CommonRoutes } from "../shared/entities/shared.const"; +import { errorHandler } from "../shared/units/shared.utils"; @Component({ selector: 'app-oidc-onboard', diff --git a/src/portal/src/app/oidc-onboard/oidc-onboard.module.ts b/src/portal/src/app/oidc-onboard/oidc-onboard.module.ts index 773e1f2e4a..0090495ca7 100644 --- a/src/portal/src/app/oidc-onboard/oidc-onboard.module.ts +++ b/src/portal/src/app/oidc-onboard/oidc-onboard.module.ts @@ -13,11 +13,21 @@ // limitations under the License. import { NgModule } from '@angular/core'; import { OidcOnboardComponent } from './oidc-onboard.component'; -import { SharedModule } from '../shared/shared.module'; import { OidcOnboardService } from './oidc-onboard.service'; +import { RouterModule, Routes } from "@angular/router"; +import { SharedModule } from "../shared/shared.module"; +const routes: Routes = [ + { + path: '', + component: OidcOnboardComponent + } +]; @NgModule({ - imports: [SharedModule], + imports: [ + SharedModule, + RouterModule.forChild(routes) + ], declarations: [ OidcOnboardComponent, ], diff --git a/src/portal/src/app/project/helm-chart/helm-chart.module.ts b/src/portal/src/app/project/helm-chart/helm-chart.module.ts deleted file mode 100644 index 56e7514038..0000000000 --- a/src/portal/src/app/project/helm-chart/helm-chart.module.ts +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { NgModule } from '@angular/core'; -import { LabelFilterComponent } from './label-filter/label-filter.component'; -import { LabelMarkerComponent } from './label-marker/label-marker.component'; -import { ListChartVersionsComponent } from './list-chart-versions/list-chart-versions.component'; -import { ChartVersionComponent } from './list-chart-versions/helm-chart-versions-detail/helm-chart-version.component'; -import { ListChartsComponent } from './list-charts.component'; -import { HelmChartComponent } from './list-charts-detail/helm-chart.component'; -import { ChartDetailDependencyComponent } from './helm-chart-detail/chart-detail/chart-detail-dependency.component'; -import { ChartDetailSummaryComponent } from './helm-chart-detail/chart-detail/chart-detail-summary.component'; -import { ChartDetailValueComponent } from './helm-chart-detail/chart-detail/chart-detail-value.component'; -import { ChartDetailComponent } from './helm-chart-detail/chart-detail/chart-detail.component'; -import { HelmChartDetailComponent } from './helm-chart-detail/chart-detail.component'; -import { SharedModule } from '../../shared/shared.module'; -import { HelmChartDefaultService, HelmChartService } from './helm-chart.service'; - -@NgModule({ - imports: [SharedModule], - declarations: [ - LabelFilterComponent, - LabelMarkerComponent, - ListChartVersionsComponent, - ChartVersionComponent, - ListChartsComponent, - HelmChartComponent, - ChartDetailDependencyComponent, - ChartDetailSummaryComponent, - ChartDetailValueComponent, - ChartDetailComponent, - HelmChartDetailComponent, - ], - providers: [ - { provide: HelmChartService, useClass: HelmChartDefaultService }], - exports: [ - LabelFilterComponent, - LabelMarkerComponent, - ListChartVersionsComponent, - ChartVersionComponent, - ListChartsComponent, - HelmChartComponent, - ChartDetailDependencyComponent, - ChartDetailSummaryComponent, - ChartDetailValueComponent, - ChartDetailComponent, - HelmChartDetailComponent - ] -}) -export class HelmChartModule { } diff --git a/src/portal/src/app/project/p2p-provider/p2p-provider.component.html b/src/portal/src/app/project/p2p-provider/p2p-provider.component.html deleted file mode 100644 index 0680b43f9c..0000000000 --- a/src/portal/src/app/project/p2p-provider/p2p-provider.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/portal/src/app/project/p2p-provider/p2p-provider.component.scss b/src/portal/src/app/project/p2p-provider/p2p-provider.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/portal/src/app/project/p2p-provider/p2p-provider.component.spec.ts b/src/portal/src/app/project/p2p-provider/p2p-provider.component.spec.ts deleted file mode 100644 index 442f23d7df..0000000000 --- a/src/portal/src/app/project/p2p-provider/p2p-provider.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { P2pProviderComponent } from './p2p-provider.component'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; - -describe('P2pProviderComponent', () => { - let component: P2pProviderComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ P2pProviderComponent ], - schemas: [ - NO_ERRORS_SCHEMA - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(P2pProviderComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/app/project/p2p-provider/p2p-provider.component.ts b/src/portal/src/app/project/p2p-provider/p2p-provider.component.ts deleted file mode 100644 index f458f1a5c6..0000000000 --- a/src/portal/src/app/project/p2p-provider/p2p-provider.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'p2p-provider', - templateUrl: './p2p-provider.component.html', - styleUrls: ['./p2p-provider.component.scss'] -}) -export class P2pProviderComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/portal/src/app/project/project.module.ts b/src/portal/src/app/project/project.module.ts deleted file mode 100644 index 300586db2b..0000000000 --- a/src/portal/src/app/project/project.module.ts +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { SharedModule } from '../shared/shared.module'; -import { ReplicationModule } from '../replication/replication.module'; -import { SummaryModule } from './summary/summary.module'; -import { TagFeatureIntegrationModule } from './tag-feature-integration/tag-feature-integration.module'; -import { LogModule } from '../log/log.module'; -import { ProjectComponent } from './project.component'; -import { CreateProjectComponent } from './create-project/create-project.component'; -import { ListProjectComponent } from './list-project/list-project.component'; -import { ProjectDetailComponent } from './project-detail/project-detail.component'; -import { MemberComponent } from './member/member.component'; -import { AddMemberComponent } from './member/add-member/add-member.component'; -import { AddGroupComponent } from './member/add-group/add-group.component'; -import { MemberService } from './member/member.service'; -import { TargetExistsValidatorDirective } from '../shared/target-exists-directive'; -import { HelmChartModule } from './helm-chart/helm-chart.module'; -import { RobotAccountComponent } from './robot-account/robot-account.component'; -import { AddRobotComponent } from './robot-account/add-robot/add-robot.component'; -import { AddHttpAuthGroupComponent } from './member/add-http-auth-group/add-http-auth-group.component'; -import { WebhookService } from './webhook/webhook.service'; -import { WebhookComponent } from './webhook/webhook.component'; -import { AddWebhookComponent } from './webhook/add-webhook/add-webhook.component'; -import { AddWebhookFormComponent } from './webhook/add-webhook-form/add-webhook-form.component'; -import { ScannerComponent } from "./scanner/scanner.component"; -import { ConfigScannerService } from "../config/scanner/config-scanner.service"; -import { RepositoryGridviewComponent } from "./repository/repository-gridview.component"; -import { ResultTipHistogramComponent } from "./repository/vulnerability-scanning/result-tip-histogram/result-tip-histogram.component"; -import { ResultBarChartComponent } from "./repository/vulnerability-scanning/result-bar-chart.component"; -import { HistogramChartComponent } from "./repository/vulnerability-scanning/histogram-chart/histogram-chart.component"; -import { ResultTipComponent } from "./repository/vulnerability-scanning/result-tip.component"; -import { ArtifactListPageComponent } from "./repository/artifact-list-page/artifact-list-page.component"; -import { ProjectLabelComponent } from "./project-label/project-label.component"; -import { ArtifactListComponent } from "./repository/artifact-list-page/artifact-list/artifact-list.component"; -import { ArtifactTagComponent } from "./repository/artifact/artifact-tag/artifact-tag.component"; -import { ArtifactCommonPropertiesComponent } from "./repository/artifact/artifact-common-properties/artifact-common-properties.component"; -import { ArtifactAdditionsComponent } from "./repository/artifact/artifact-additions/artifact-additions.component"; -import { ArtifactSummaryComponent } from "./repository/artifact/artifact-summary.component"; -import { ArtifactListTabComponent } from "./repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component"; -import { BuildHistoryComponent } from "./repository/artifact/artifact-additions/build-history/build-history.component"; -import { DependenciesComponent } from "./repository/artifact/artifact-additions/dependencies/dependencies.component"; -import { SummaryComponent } from "./repository/artifact/artifact-additions/summary/summary.component"; -import { ValuesComponent } from "./repository/artifact/artifact-additions/values/values.component"; -import { - ArtifactVulnerabilitiesComponent -} from "./repository/artifact/artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component"; -import { ArtifactDefaultService, ArtifactService } from "./repository/artifact/artifact.service"; -import { GridViewComponent } from "./repository/gridview/grid-view.component"; -import { LastTriggerComponent } from "./webhook/last-trigger/last-trigger.component"; -import { AllPipesModule } from '../all-pipes/all-pipes.module'; -import { PolicyComponent } from './p2p-provider/policy/policy.component'; -import { P2pProviderService } from './p2p-provider/p2p-provider.service'; -import { AddP2pPolicyComponent } from './p2p-provider/add-p2p-policy/add-p2p-policy.component'; -import { TaskListComponent } from './p2p-provider/task-list/task-list.component'; -import { P2pProviderComponent } from './p2p-provider/p2p-provider.component'; - -@NgModule({ - imports: [ - SharedModule, - ReplicationModule, - LogModule, - RouterModule, - HelmChartModule, - SummaryModule, - TagFeatureIntegrationModule, - AllPipesModule, - ], - declarations: [ - ProjectComponent, - CreateProjectComponent, - ListProjectComponent, - ProjectDetailComponent, - MemberComponent, - AddMemberComponent, - TargetExistsValidatorDirective, - ProjectLabelComponent, - AddGroupComponent, - RobotAccountComponent, - AddRobotComponent, - AddHttpAuthGroupComponent, - WebhookComponent, - AddWebhookComponent, - AddWebhookFormComponent, - ScannerComponent, - RepositoryGridviewComponent, - HistogramChartComponent, - ResultTipHistogramComponent, - ResultBarChartComponent, - ResultTipComponent, - ArtifactListPageComponent, - ArtifactListComponent, - ArtifactListTabComponent, - ArtifactSummaryComponent, - ArtifactCommonPropertiesComponent, - ArtifactTagComponent, - ArtifactAdditionsComponent, - BuildHistoryComponent, - DependenciesComponent, - SummaryComponent, - ValuesComponent, - ArtifactVulnerabilitiesComponent, - GridViewComponent, - LastTriggerComponent, - PolicyComponent, - AddP2pPolicyComponent, - TaskListComponent, - P2pProviderComponent, - ], - exports: [ProjectComponent, ListProjectComponent], - providers: [ - MemberService, - WebhookService, - ConfigScannerService, - ArtifactDefaultService, - { provide: ArtifactService, useClass: ArtifactDefaultService }, - P2pProviderService - ] -}) -export class ProjectModule { - -} diff --git a/src/portal/src/app/project/summary/summary.module.ts b/src/portal/src/app/project/summary/summary.module.ts deleted file mode 100644 index 96ef04c8bc..0000000000 --- a/src/portal/src/app/project/summary/summary.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SummaryComponent } from './summary.component'; -import { TranslateModule } from '@ngx-translate/core'; - -@NgModule({ - declarations: [SummaryComponent], - imports: [ - CommonModule, - TranslateModule - ] -}) -export class SummaryModule { } diff --git a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.module.ts b/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.module.ts deleted file mode 100644 index b19d936964..0000000000 --- a/src/portal/src/app/project/tag-feature-integration/immutable-tag/immutable-tag.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SharedModule } from '../../../shared/shared.module'; -import { ImmutableTagComponent } from './immutable-tag.component'; -import { ImmutableTagService } from './immutable-tag.service'; - -import { TranslateModule } from '@ngx-translate/core'; -import { AddRuleComponent } from './add-rule/add-rule.component'; - - -@NgModule({ - declarations: [ImmutableTagComponent, AddRuleComponent], - imports: [ - CommonModule, - SharedModule, - TranslateModule - ], - exports: [ - - ], - providers: [ - ImmutableTagService - ] -}) -export class ImmutableTagModule { } diff --git a/src/portal/src/app/project/tag-feature-integration/tag-feature-integration.module.ts b/src/portal/src/app/project/tag-feature-integration/tag-feature-integration.module.ts deleted file mode 100644 index 93dc97b320..0000000000 --- a/src/portal/src/app/project/tag-feature-integration/tag-feature-integration.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { TagFeatureIntegrationComponent } from './tag-feature-integration.component'; -import { TranslateModule } from '@ngx-translate/core'; -import { TagRetentionComponent } from "./tag-retention/tag-retention.component"; -import { ImmutableTagModule } from "./immutable-tag/immutable-tag.module"; -import { ClarityModule } from '@clr/angular'; -import { SharedModule } from '../../shared/shared.module'; -import { AddRuleComponent } from "./tag-retention/add-rule/add-rule.component"; -import { RouterModule } from '@angular/router'; -import { TagRetentionService } from './tag-retention/tag-retention.service'; - - - -@NgModule({ - declarations: [TagFeatureIntegrationComponent, TagRetentionComponent, AddRuleComponent], - imports: [ - CommonModule, - TranslateModule, - ImmutableTagModule, - ClarityModule, - SharedModule, - RouterModule - ], - providers: [ - TagRetentionService - ] -}) -export class TagFeatureIntegrationModule { } diff --git a/src/portal/src/app/replication/destination/destination-page.component.html b/src/portal/src/app/replication/destination/destination-page.component.html deleted file mode 100644 index 8c16c7d2a6..0000000000 --- a/src/portal/src/app/replication/destination/destination-page.component.html +++ /dev/null @@ -1,4 +0,0 @@ -

{{'SIDE_NAV.SYSTEM_MGMT.REGISTRY' | translate}}

-
- -
\ No newline at end of file diff --git a/src/portal/src/app/replication/destination/destination-page.component.spec.ts b/src/portal/src/app/replication/destination/destination-page.component.spec.ts deleted file mode 100644 index 309d1f1e25..0000000000 --- a/src/portal/src/app/replication/destination/destination-page.component.spec.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { DestinationPageComponent } from './destination-page.component'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -describe('DestinationPageComponent', () => { - let component: DestinationPageComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ], - imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HttpClientTestingModule - ], - declarations: [DestinationPageComponent], - providers: [ - TranslateService - ] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DestinationPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/app/replication/destination/destination-page.component.ts b/src/portal/src/app/replication/destination/destination-page.component.ts deleted file mode 100644 index ce1eca0f3f..0000000000 --- a/src/portal/src/app/replication/destination/destination-page.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { Component } from '@angular/core'; - -@Component({ - selector: 'destination-page', - templateUrl: 'destination-page.component.html', - styleUrls: [ '../total-replication/total-replication.component.scss' ] -}) -export class DestinationPageComponent { -} diff --git a/src/portal/src/app/replication/replication-management/replication-management.component.html b/src/portal/src/app/replication/replication-management/replication-management.component.html deleted file mode 100644 index 3fd84365cf..0000000000 --- a/src/portal/src/app/replication/replication-management/replication-management.component.html +++ /dev/null @@ -1,12 +0,0 @@ -

{{'SIDE_NAV.SYSTEM_MGMT.REPLICATION' | translate}}

- - diff --git a/src/portal/src/app/replication/replication-management/replication-management.component.scss b/src/portal/src/app/replication/replication-management/replication-management.component.scss deleted file mode 100644 index fd8cfb74e5..0000000000 --- a/src/portal/src/app/replication/replication-management/replication-management.component.scss +++ /dev/null @@ -1,12 +0,0 @@ -.sub-header-title { - margin-top: 0; - margin-bottom: 12px; -} - -.sub-nav-bg-color { - background-color: #fafafa; -} - -.subnav .nav { - padding-left: 0; -} \ No newline at end of file diff --git a/src/portal/src/app/replication/replication-management/replication-management.component.spec.ts b/src/portal/src/app/replication/replication-management/replication-management.component.spec.ts deleted file mode 100644 index bce22935c3..0000000000 --- a/src/portal/src/app/replication/replication-management/replication-management.component.spec.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { ReplicationManagementComponent } from './replication-management.component'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -describe('ReplicationManagementComponent', () => { - let component: ReplicationManagementComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ], - imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HttpClientTestingModule - ], - declarations: [ReplicationManagementComponent], - providers: [ - TranslateService - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ReplicationManagementComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/app/replication/replication-management/replication-management.component.ts b/src/portal/src/app/replication/replication-management/replication-management.component.ts deleted file mode 100644 index fb5f343d0f..0000000000 --- a/src/portal/src/app/replication/replication-management/replication-management.component.ts +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. - -// This Module is used as Container For Endpoint and Replication Rules -// Will deprecated on Harbor 1.4.0 - -import { Component } from '@angular/core'; - -@Component({ - selector: 'replication-management', - templateUrl: 'replication-management.component.html', - styleUrls: [ './replication-management.component.scss' ] -}) -export class ReplicationManagementComponent {} diff --git a/src/portal/src/app/replication/replication-page.component.html b/src/portal/src/app/replication/replication-page.component.html deleted file mode 100644 index e7efd3ce47..0000000000 --- a/src/portal/src/app/replication/replication-page.component.html +++ /dev/null @@ -1,12 +0,0 @@ -
- -
\ No newline at end of file diff --git a/src/portal/src/app/replication/replication-page.component.spec.ts b/src/portal/src/app/replication/replication-page.component.spec.ts deleted file mode 100644 index b719757fbe..0000000000 --- a/src/portal/src/app/replication/replication-page.component.spec.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { ReplicationPageComponent } from './replication-page.component'; -import { ActivatedRoute, Router } from '@angular/router'; -import { SessionService } from "../shared/session.service"; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { of } from 'rxjs'; -import { ErrorHandler } from "../../lib/utils/error-handler"; -import { ProjectService, UserPermissionService } from "../../lib/services"; -describe('ReplicationPageComponent', () => { - let component: ReplicationPageComponent; - let fixture: ComponentFixture; - const mockSessionService = { - getCurrentUser: () => { } - }; - const mockUserPermissionService = { - getPermission() { - return of(true); - } - }; - const mockErrorHandler = { - error: () => { } - }; - const mockProjectService = { - listProjects: () => { - return of({ - body: [] - }); - } - }; - const mockActivatedRoute = { - RouterparamMap: of({ get: (key) => 'value' }), - snapshot: { - parent: { - params: { id: 1 }, - data: { - projectResolver: { - ismember: true, - name: 'library', - } - } - }, - queryParams: { - is_create: "" - } - } - }; - const mockRouter = { - navigate: () => { } - }; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ], - imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HttpClientTestingModule - ], - declarations: [ReplicationPageComponent], - providers: [ - TranslateService, - { provide: ErrorHandler, useValue: mockErrorHandler }, - { provide: SessionService, useValue: mockSessionService }, - { provide: UserPermissionService, useValue: mockUserPermissionService }, - { provide: ProjectService, useValue: mockProjectService }, - { provide: ErrorHandler, useValue: mockErrorHandler }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: Router, useValue: mockRouter }, - - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ReplicationPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/app/replication/replication-page.component.ts b/src/portal/src/app/replication/replication-page.component.ts deleted file mode 100644 index 44c4ffb303..0000000000 --- a/src/portal/src/app/replication/replication-page.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright (c) 2017 VMware, Inc. All Rights Reserved. -// -// 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. -import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { SessionService } from "../shared/session.service"; -import { Project } from "../project/project"; -import { forkJoin } from 'rxjs'; -import { ReplicationComponent } from "../../lib/components/replication/replication.component"; -import { ProjectService, UserPermissionService, USERSTATICPERMISSION } from "../../lib/services"; -import { ErrorHandler } from "../../lib/utils/error-handler"; - -@Component({ - selector: 'replication', - templateUrl: 'replication-page.component.html' -}) -export class ReplicationPageComponent implements OnInit, AfterViewInit { - projectIdentify: string | number; - @ViewChild("replicationView") replicationView: ReplicationComponent; - projectName: string; - hasCreateReplicationPermission: boolean; - hasUpdateReplicationPermission: boolean; - hasDeleteReplicationPermission: boolean; - hasExecuteReplicationPermission: boolean; - constructor(private route: ActivatedRoute, - private router: Router, - private proService: ProjectService, - private userPermissionService: UserPermissionService, - private errorHandler: ErrorHandler, - private session: SessionService) { } - - ngOnInit(): void { - this.projectIdentify = +this.route.snapshot.parent.params['id']; - this.getReplicationPermissions(this.projectIdentify); - this.proService.listProjects("", undefined) - .subscribe(response => { - let projects = response.body as Project[]; - if (projects.length) { - let project = projects.find(data => data.project_id === this.projectIdentify); - if (project) { - this.projectName = project.name; - } - } - }); - } - - public get isSystemAdmin(): boolean { - let account = this.session.getCurrentUser(); - return account != null && account.has_admin_role; - } - - ngAfterViewInit(): void { - let isCreated: boolean = this.route.snapshot.queryParams['is_create']; - if (isCreated) { - if (this.replicationView) { - this.replicationView.openModal(); - } - } - } - - goRegistry(): void { - this.router.navigate(['/harbor', 'registries']); - } - - getReplicationPermissions(projectId: number): void { - - let permissionsCreate = this.userPermissionService.getPermission(projectId, - USERSTATICPERMISSION.REPLICATION.KEY, USERSTATICPERMISSION.REPLICATION.VALUE.CREATE); - let permissionsUpdate = this.userPermissionService.getPermission(projectId, - USERSTATICPERMISSION.REPLICATION.KEY, USERSTATICPERMISSION.REPLICATION.VALUE.UPDATE); - let permissionsDelete = this.userPermissionService.getPermission(projectId, - USERSTATICPERMISSION.REPLICATION.KEY, USERSTATICPERMISSION.REPLICATION.VALUE.DELETE); - let permissionsExecute = this.userPermissionService.getPermission(projectId, - USERSTATICPERMISSION.REPLICATION_JOB.KEY, USERSTATICPERMISSION.REPLICATION_JOB.VALUE.CREATE); - forkJoin(permissionsCreate, permissionsUpdate, permissionsDelete, permissionsExecute).subscribe(permissions => { - this.hasCreateReplicationPermission = permissions[0] as boolean; - this.hasUpdateReplicationPermission = permissions[1] as boolean; - this.hasDeleteReplicationPermission = permissions[2] as boolean; - this.hasExecuteReplicationPermission = permissions[3] as boolean; - }, error => { - this.errorHandler.error(error); - }); - } -} diff --git a/src/portal/src/app/replication/replication.module.ts b/src/portal/src/app/replication/replication.module.ts deleted file mode 100644 index e8fdd99c25..0000000000 --- a/src/portal/src/app/replication/replication.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { ReplicationManagementComponent } from './replication-management/replication-management.component'; -import { ReplicationPageComponent } from './replication-page.component'; -import { TotalReplicationPageComponent } from './total-replication/total-replication-page.component'; -import { DestinationPageComponent } from './destination/destination-page.component'; -import { SharedModule } from '../shared/shared.module'; -import {ReactiveFormsModule} from "@angular/forms"; - -@NgModule({ - imports: [ - SharedModule, - RouterModule, - ReactiveFormsModule - ], - declarations: [ - ReplicationPageComponent, - ReplicationManagementComponent, - TotalReplicationPageComponent, - DestinationPageComponent, - ], - exports: [ - ReplicationPageComponent, - DestinationPageComponent, - TotalReplicationPageComponent, - ] -}) -export class ReplicationModule { } diff --git a/src/portal/src/app/services/app-config.service.spec.ts b/src/portal/src/app/services/app-config.service.spec.ts index fcbd96158b..7a9c8cbdee 100644 --- a/src/portal/src/app/services/app-config.service.spec.ts +++ b/src/portal/src/app/services/app-config.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { CookieService } from 'ngx-cookie'; import { AppConfigService } from './app-config.service'; import { AppConfig } from './app-config'; -import { CURRENT_BASE_HREF } from "../../lib/utils/utils"; +import { CURRENT_BASE_HREF } from "../shared/units/utils"; describe('AppConfigService', () => { let injector: TestBed; diff --git a/src/portal/src/app/services/app-config.service.ts b/src/portal/src/app/services/app-config.service.ts index bc9b43d726..220f501007 100644 --- a/src/portal/src/app/services/app-config.service.ts +++ b/src/portal/src/app/services/app-config.service.ts @@ -15,12 +15,11 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { CookieService } from 'ngx-cookie'; import { AppConfig } from './app-config'; -import { CookieKeyOfAdmiral, HarborQueryParamKey } from '../shared/shared.const'; -import { maintainUrlQueryParmas } from '../shared/shared.utils'; +import { maintainUrlQueryParmas } from '../shared/units/shared.utils'; import { map } from "rxjs/operators"; import { Observable } from "rxjs"; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS } from "../../lib/utils/utils"; -import { CONFIG_AUTH_MODE } from "../../lib/entities/shared.const"; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS } from "../shared/units/utils"; +import { CONFIG_AUTH_MODE, CookieKeyOfAdmiral, HarborQueryParamKey } from "../shared/entities/shared.const"; export const systemInfoEndpoint = CURRENT_BASE_HREF + "/systeminfo"; /** * Declare service to handle the bootstrap options diff --git a/src/portal/src/app/services/app-config.ts b/src/portal/src/app/services/app-config.ts index 1a1fc30217..bb6338356e 100644 --- a/src/portal/src/app/services/app-config.ts +++ b/src/portal/src/app/services/app-config.ts @@ -13,7 +13,7 @@ // limitations under the License. -import { ClairDBStatus } from "../../lib/services"; +import { ClairDBStatus } from "../shared/services"; export class AppConfig { with_notary: boolean; diff --git a/src/portal/src/app/config/config.service.spec.ts b/src/portal/src/app/services/config.service.spec.ts similarity index 100% rename from src/portal/src/app/config/config.service.spec.ts rename to src/portal/src/app/services/config.service.spec.ts diff --git a/src/portal/src/app/config/config.service.ts b/src/portal/src/app/services/config.service.ts similarity index 94% rename from src/portal/src/app/config/config.service.ts rename to src/portal/src/app/services/config.service.ts index 9082d02ef2..2c576f7959 100644 --- a/src/portal/src/app/config/config.service.ts +++ b/src/portal/src/app/services/config.service.ts @@ -15,15 +15,17 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; -import { Configuration } from "../../lib/components/config/config"; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../../lib/utils/utils"; +import { Configuration } from "../base/left-side-nav/config/config"; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../shared/units/utils"; const configEndpoint = CURRENT_BASE_HREF + "/configurations"; const emailEndpoint = CURRENT_BASE_HREF + "/email/ping"; const ldapEndpoint = CURRENT_BASE_HREF + "/ldap/ping"; const oidcEndpoint = CURRENT_BASE_HREF + "/system/oidc/ping"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class ConfigurationService { constructor(private http: HttpClient) { } diff --git a/src/portal/src/app/services/harbor-translate-loader.service.spec.ts b/src/portal/src/app/services/harbor-translate-loader.service.spec.ts new file mode 100644 index 0000000000..8a276d891d --- /dev/null +++ b/src/portal/src/app/services/harbor-translate-loader.service.spec.ts @@ -0,0 +1,18 @@ +import { TestBed, inject } from '@angular/core/testing'; +import { SharedTestingModule } from "../shared/shared.module"; +import { HarborTranslateLoaderService } from "./harbor-translate-loader.service"; + +describe('ConfigService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + SharedTestingModule + ], + providers: [HarborTranslateLoaderService] + }); + }); + + it('should be created', inject([HarborTranslateLoaderService], (service: HarborTranslateLoaderService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/portal/src/app/services/harbor-translate-loader.service.ts b/src/portal/src/app/services/harbor-translate-loader.service.ts new file mode 100644 index 0000000000..c3836f6500 --- /dev/null +++ b/src/portal/src/app/services/harbor-translate-loader.service.ts @@ -0,0 +1,23 @@ +import { Injectable } from "@angular/core"; +import { TranslateLoader } from "@ngx-translate/core"; +import { Observable } from 'rxjs'; +import { HttpClient } from "@angular/common/http"; +import { environment } from "../../environments/environment"; + +@Injectable({ + providedIn: 'root' +}) +export class HarborTranslateLoaderService extends TranslateLoader { + constructor(private http: HttpClient) { + super(); + } + getTranslation(lang: string): Observable { + const prefix: string = "i18n/lang/"; + let suffix: string = "-lang.json"; + if (environment && environment.buildTimestamp) { + suffix += `?buildTimeStamp=${environment.buildTimestamp}`; + } + return this.http.get(`${prefix}${lang}${suffix}`); + } +} + diff --git a/src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.spec.ts b/src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.spec.ts index b36b8c8eb2..41f10038b7 100644 --- a/src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.spec.ts +++ b/src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed, inject } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { ProjectService } from "../../../lib/services"; +import { ProjectService } from "../../shared/services"; import { ArtifactService } from "../../../../ng-swagger-gen/services/artifact.service"; import { ArtifactDetailRoutingResolverService } from "./artifact-detail-routing-resolver.service"; diff --git a/src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.ts b/src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.ts index 620cee9b98..fda9845427 100644 --- a/src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.ts +++ b/src/portal/src/app/services/routing-resolvers/artifact-detail-routing-resolver.service.ts @@ -17,9 +17,9 @@ import { forkJoin, Observable, of } from 'rxjs'; import { map, catchError, mergeMap } from "rxjs/operators"; import { Artifact } from "../../../../ng-swagger-gen/models/artifact"; import { ArtifactService } from "../../../../ng-swagger-gen/services/artifact.service"; -import { Project } from "../../project/project"; -import { ProjectService } from "../../../lib/services"; -import { dbEncodeURIComponent } from '../../../lib/utils/utils'; +import { Project } from "../../base/project/project"; +import { ProjectService } from "../../shared/services"; +import { dbEncodeURIComponent } from '../../shared/units/utils'; @Injectable({ providedIn: 'root' diff --git a/src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.spec.ts b/src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.spec.ts index c7f076153f..8a87bf0372 100644 --- a/src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.spec.ts +++ b/src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.spec.ts @@ -1,8 +1,8 @@ import { TestBed, inject } from '@angular/core/testing'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../../shared/services/session.service'; import { ProjectRoutingResolver } from './project-routing-resolver.service'; import { RouterTestingModule } from '@angular/router/testing'; -import { ProjectService } from "../../../lib/services"; +import { ProjectService } from "../../shared/services"; describe('ProjectRoutingResolverService', () => { beforeEach(() => { diff --git a/src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.ts b/src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.ts index 3e6ac29e59..44e2565699 100644 --- a/src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.ts +++ b/src/portal/src/app/services/routing-resolvers/project-routing-resolver.service.ts @@ -13,15 +13,12 @@ // limitations under the License. import { Injectable } from '@angular/core'; import { Router, Resolve, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router'; -import { Project } from '../../project/project'; -import { SessionService } from '../../shared/session.service'; +import { Project } from '../../base/project/project'; +import { SessionService } from '../../shared/services/session.service'; import { Observable } from 'rxjs'; import { map, catchError } from "rxjs/operators"; -import { RoleInfo } from '../../shared/shared.const'; - - -import { Roles } from '../../shared/shared.const'; -import { ProjectService } from "../../../lib/services"; +import { ProjectService } from "../../shared/services"; +import { RoleInfo, Roles } from "../../shared/entities/shared.const"; @Injectable({ providedIn: 'root' diff --git a/src/portal/src/app/services/theme.service.ts b/src/portal/src/app/services/theme.service.ts index e29f186b15..ef346a7839 100644 --- a/src/portal/src/app/services/theme.service.ts +++ b/src/portal/src/app/services/theme.service.ts @@ -1,5 +1,6 @@ import { Injectable, Inject } from '@angular/core'; import { DOCUMENT } from '@angular/common'; +import { environment } from "../../environments/environment"; @Injectable({ providedIn: 'root' @@ -23,7 +24,7 @@ loadStyle(styleName: string) { const style = this.document.createElement('link'); style.id = 'client-theme'; style.rel = 'stylesheet'; - style.href = `${styleName}`; + style.href = `${styleName}?buildTimeStamp=${environment.buildTimestamp}`; head.appendChild(style); } diff --git a/src/portal/src/lib/_animations/fade-in.animation.ts b/src/portal/src/app/shared/_animations/fade-in.animation.ts similarity index 93% rename from src/portal/src/lib/_animations/fade-in.animation.ts rename to src/portal/src/app/shared/_animations/fade-in.animation.ts index 6b15d688df..75d6a4e36a 100644 --- a/src/portal/src/lib/_animations/fade-in.animation.ts +++ b/src/portal/src/app/shared/_animations/fade-in.animation.ts @@ -5,7 +5,7 @@ export const FadeInAnimation: AnimationTriggerMetadata = // trigger name for attaching this animation to an element using the [@triggerName] syntax trigger('FadeInAnimation', [ - // route 'enter' transition + // router-guard 'enter' transition transition(':enter', [ // css styles at start of transition diff --git a/src/portal/src/lib/_animations/slide-in-out.animation.ts b/src/portal/src/app/shared/_animations/slide-in-out.animation.ts similarity index 100% rename from src/portal/src/lib/_animations/slide-in-out.animation.ts rename to src/portal/src/app/shared/_animations/slide-in-out.animation.ts diff --git a/src/portal/src/lib/_mixin.scss b/src/portal/src/app/shared/_mixin.scss similarity index 100% rename from src/portal/src/lib/_mixin.scss rename to src/portal/src/app/shared/_mixin.scss diff --git a/src/portal/src/app/shared/about-dialog/about-dialog.component.html b/src/portal/src/app/shared/components/about-dialog/about-dialog.component.html similarity index 100% rename from src/portal/src/app/shared/about-dialog/about-dialog.component.html rename to src/portal/src/app/shared/components/about-dialog/about-dialog.component.html diff --git a/src/portal/src/app/shared/about-dialog/about-dialog.component.scss b/src/portal/src/app/shared/components/about-dialog/about-dialog.component.scss similarity index 100% rename from src/portal/src/app/shared/about-dialog/about-dialog.component.scss rename to src/portal/src/app/shared/components/about-dialog/about-dialog.component.scss diff --git a/src/portal/src/app/shared/about-dialog/about-dialog.component.spec.ts b/src/portal/src/app/shared/components/about-dialog/about-dialog.component.spec.ts similarity index 90% rename from src/portal/src/app/shared/about-dialog/about-dialog.component.spec.ts rename to src/portal/src/app/shared/components/about-dialog/about-dialog.component.spec.ts index 775abc47ad..dab80aa8c8 100644 --- a/src/portal/src/app/shared/about-dialog/about-dialog.component.spec.ts +++ b/src/portal/src/app/shared/components/about-dialog/about-dialog.component.spec.ts @@ -1,7 +1,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule, TranslateService } from "@ngx-translate/core"; -import { AppConfigService } from '../../services/app-config.service'; -import { SkinableConfig } from "../../services/skinable-config.service"; +import { AppConfigService } from '../../../services/app-config.service'; +import { SkinableConfig } from "../../../services/skinable-config.service"; import { AboutDialogComponent } from './about-dialog.component'; import { ClarityModule } from "@clr/angular"; diff --git a/src/portal/src/app/shared/about-dialog/about-dialog.component.ts b/src/portal/src/app/shared/components/about-dialog/about-dialog.component.ts similarity index 92% rename from src/portal/src/app/shared/about-dialog/about-dialog.component.ts rename to src/portal/src/app/shared/components/about-dialog/about-dialog.component.ts index 5db1f9826b..2fbc77679b 100644 --- a/src/portal/src/app/shared/about-dialog/about-dialog.component.ts +++ b/src/portal/src/app/shared/components/about-dialog/about-dialog.component.ts @@ -14,8 +14,8 @@ import { Component, OnInit } from '@angular/core'; import { TranslateService } from "@ngx-translate/core"; -import { AppConfigService } from '../../services/app-config.service'; -import { SkinableConfig } from "../../services/skinable-config.service"; +import { AppConfigService } from '../../../services/app-config.service'; +import { SkinableConfig } from "../../../services/skinable-config.service"; @Component({ selector: 'about-dialog', diff --git a/src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.html b/src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.html similarity index 97% rename from src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.html rename to src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.html index 878f112688..b5cec396a2 100644 --- a/src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.html +++ b/src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.html @@ -1,5 +1,5 @@ -

{{dialogTitle}}

+

{{dialogTitle}}

diff --git a/src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.scss b/src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.scss similarity index 100% rename from src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.scss rename to src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.scss diff --git a/src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.spec.ts b/src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.spec.ts similarity index 86% rename from src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.spec.ts rename to src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.spec.ts index 20f5aede40..2336aefa8a 100644 --- a/src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.spec.ts +++ b/src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.spec.ts @@ -1,21 +1,17 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { HarborLibraryModule } from '../../harbor-library.module'; import { ConfirmationDialogComponent } from './confirmation-dialog.component'; -import { IServiceConfig, SERVICE_CONFIG } from '../../entities/service.config'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ConfirmationTargets } from '../../entities/shared.const'; -import { ConfirmationMessage } from './confirmation-message'; -import { BatchInfo } from './confirmation-batch-message'; -import { CURRENT_BASE_HREF } from "../../utils/utils"; +import { ConfirmationMessage } from '../../../base/global-confirmation-dialog/confirmation-message'; +import { BatchInfo } from '../../../base/global-confirmation-dialog/confirmation-batch-message'; +import { CURRENT_BASE_HREF } from "../../units/utils"; +import { SharedTestingModule } from "../../shared.module"; describe('ConfirmationDialogComponent', () => { let comp: ConfirmationDialogComponent; let fixture: ComponentFixture; - let config: IServiceConfig = { - configurationEndpoint: CURRENT_BASE_HREF + '/configurations/testing' - }; const deletionMessage: ConfirmationMessage = new ConfirmationMessage( "MEMBER.DELETION_TITLE", "MEMBER.DELETION_SUMMARY", @@ -27,12 +23,9 @@ describe('ConfirmationDialogComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - HarborLibraryModule, + SharedTestingModule, BrowserAnimationsModule ], - providers: [ - {provide: SERVICE_CONFIG, useValue: config} - ] }); })); diff --git a/src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.ts b/src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.ts similarity index 89% rename from src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.ts rename to src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.ts index fb183d5fa0..02db3ebb24 100644 --- a/src/portal/src/lib/components/confirmation-dialog/confirmation-dialog.component.ts +++ b/src/portal/src/app/shared/components/confirmation-dialog/confirmation-dialog.component.ts @@ -11,14 +11,12 @@ // 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. -import {Component, EventEmitter, Output} from '@angular/core'; +import { Component, EventEmitter, Output } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; - -import { ConfirmationMessage } from './confirmation-message'; -import { ConfirmationAcknowledgement } from './confirmation-state-message'; import { ConfirmationState, ConfirmationTargets, ConfirmationButtons } from '../../entities/shared.const'; - -import {BatchInfo} from './confirmation-batch-message'; +import { ConfirmationMessage } from "../../../base/global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../../base/global-confirmation-dialog/confirmation-state-message"; +import { BatchInfo } from "../../../base/global-confirmation-dialog/confirmation-batch-message"; @Component({ selector: 'confirmation-dialog', diff --git a/src/portal/src/lib/components/confirmation-dialog/index.ts b/src/portal/src/app/shared/components/confirmation-dialog/index.ts similarity index 65% rename from src/portal/src/lib/components/confirmation-dialog/index.ts rename to src/portal/src/app/shared/components/confirmation-dialog/index.ts index bf21ae1967..5ae27a243d 100644 --- a/src/portal/src/lib/components/confirmation-dialog/index.ts +++ b/src/portal/src/app/shared/components/confirmation-dialog/index.ts @@ -1,12 +1,6 @@ import { Type } from "@angular/core"; - import { ConfirmationDialogComponent } from "./confirmation-dialog.component"; - export * from "./confirmation-dialog.component"; -export * from "./confirmation-batch-message"; -export * from "./confirmation-message"; -export * from "./confirmation-state-message"; - export const CONFIRMATION_DIALOG_DIRECTIVES: Type[] = [ ConfirmationDialogComponent ]; diff --git a/src/portal/src/lib/components/cron-schedule/cron-schedule.component.html b/src/portal/src/app/shared/components/cron-schedule/cron-schedule.component.html similarity index 100% rename from src/portal/src/lib/components/cron-schedule/cron-schedule.component.html rename to src/portal/src/app/shared/components/cron-schedule/cron-schedule.component.html diff --git a/src/portal/src/lib/components/cron-schedule/cron-schedule.component.scss b/src/portal/src/app/shared/components/cron-schedule/cron-schedule.component.scss similarity index 100% rename from src/portal/src/lib/components/cron-schedule/cron-schedule.component.scss rename to src/portal/src/app/shared/components/cron-schedule/cron-schedule.component.scss diff --git a/src/portal/src/lib/components/cron-schedule/cron-schedule.component.ts b/src/portal/src/app/shared/components/cron-schedule/cron-schedule.component.ts similarity index 96% rename from src/portal/src/lib/components/cron-schedule/cron-schedule.component.ts rename to src/portal/src/app/shared/components/cron-schedule/cron-schedule.component.ts index 1630cedf19..2e2060ac53 100644 --- a/src/portal/src/lib/components/cron-schedule/cron-schedule.component.ts +++ b/src/portal/src/app/shared/components/cron-schedule/cron-schedule.component.ts @@ -8,9 +8,9 @@ import { SimpleChange } from "@angular/core"; import { OriginCron } from "../../services/interface"; -import { cronRegex } from "../../utils/utils"; +import { cronRegex } from "../../units/utils"; import { TranslateService } from "@ngx-translate/core"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; +import { ErrorHandler } from "../../units/error-handler/error-handler"; const SCHEDULE_TYPE = { NONE: "None", DAILY: "Daily", diff --git a/src/portal/src/lib/components/cron-schedule/cron-tooltip/cron-tooltip.component.html b/src/portal/src/app/shared/components/cron-schedule/cron-tooltip/cron-tooltip.component.html similarity index 100% rename from src/portal/src/lib/components/cron-schedule/cron-tooltip/cron-tooltip.component.html rename to src/portal/src/app/shared/components/cron-schedule/cron-tooltip/cron-tooltip.component.html diff --git a/src/portal/src/lib/components/cron-schedule/cron-tooltip/cron-tooltip.component.scss b/src/portal/src/app/shared/components/cron-schedule/cron-tooltip/cron-tooltip.component.scss similarity index 100% rename from src/portal/src/lib/components/cron-schedule/cron-tooltip/cron-tooltip.component.scss rename to src/portal/src/app/shared/components/cron-schedule/cron-tooltip/cron-tooltip.component.scss diff --git a/src/portal/src/lib/components/cron-schedule/cron-tooltip/cron-tooltip.component.ts b/src/portal/src/app/shared/components/cron-schedule/cron-tooltip/cron-tooltip.component.ts similarity index 100% rename from src/portal/src/lib/components/cron-schedule/cron-tooltip/cron-tooltip.component.ts rename to src/portal/src/app/shared/components/cron-schedule/cron-tooltip/cron-tooltip.component.ts diff --git a/src/portal/src/lib/components/cron-schedule/index.ts b/src/portal/src/app/shared/components/cron-schedule/index.ts similarity index 100% rename from src/portal/src/lib/components/cron-schedule/index.ts rename to src/portal/src/app/shared/components/cron-schedule/index.ts diff --git a/src/portal/src/lib/components/datetime-picker/date-validator.directive.ts b/src/portal/src/app/shared/components/datetime-picker/date-validator.directive.ts similarity index 100% rename from src/portal/src/lib/components/datetime-picker/date-validator.directive.ts rename to src/portal/src/app/shared/components/datetime-picker/date-validator.directive.ts diff --git a/src/portal/src/lib/components/datetime-picker/datetime-picker.component.html b/src/portal/src/app/shared/components/datetime-picker/datetime-picker.component.html similarity index 100% rename from src/portal/src/lib/components/datetime-picker/datetime-picker.component.html rename to src/portal/src/app/shared/components/datetime-picker/datetime-picker.component.html diff --git a/src/portal/src/lib/components/datetime-picker/datetime-picker.component.scss b/src/portal/src/app/shared/components/datetime-picker/datetime-picker.component.scss similarity index 100% rename from src/portal/src/lib/components/datetime-picker/datetime-picker.component.scss rename to src/portal/src/app/shared/components/datetime-picker/datetime-picker.component.scss diff --git a/src/portal/src/lib/components/datetime-picker/datetime-picker.component.ts b/src/portal/src/app/shared/components/datetime-picker/datetime-picker.component.ts similarity index 100% rename from src/portal/src/lib/components/datetime-picker/datetime-picker.component.ts rename to src/portal/src/app/shared/components/datetime-picker/datetime-picker.component.ts diff --git a/src/portal/src/lib/components/filter/filter.component.html b/src/portal/src/app/shared/components/filter/filter.component.html similarity index 100% rename from src/portal/src/lib/components/filter/filter.component.html rename to src/portal/src/app/shared/components/filter/filter.component.html diff --git a/src/portal/src/lib/components/filter/filter.component.scss b/src/portal/src/app/shared/components/filter/filter.component.scss similarity index 100% rename from src/portal/src/lib/components/filter/filter.component.scss rename to src/portal/src/app/shared/components/filter/filter.component.scss diff --git a/src/portal/src/lib/components/filter/filter.component.ts b/src/portal/src/app/shared/components/filter/filter.component.ts similarity index 100% rename from src/portal/src/lib/components/filter/filter.component.ts rename to src/portal/src/app/shared/components/filter/filter.component.ts diff --git a/src/portal/src/app/shared/gauge/gauge.component.html b/src/portal/src/app/shared/components/gauge/gauge.component.html similarity index 100% rename from src/portal/src/app/shared/gauge/gauge.component.html rename to src/portal/src/app/shared/components/gauge/gauge.component.html diff --git a/src/portal/src/app/shared/gauge/gauge.component.scss b/src/portal/src/app/shared/components/gauge/gauge.component.scss similarity index 100% rename from src/portal/src/app/shared/gauge/gauge.component.scss rename to src/portal/src/app/shared/components/gauge/gauge.component.scss diff --git a/src/portal/src/app/shared/gauge/gauge.component.spec.ts b/src/portal/src/app/shared/components/gauge/gauge.component.spec.ts similarity index 100% rename from src/portal/src/app/shared/gauge/gauge.component.spec.ts rename to src/portal/src/app/shared/components/gauge/gauge.component.spec.ts diff --git a/src/portal/src/app/shared/gauge/gauge.component.ts b/src/portal/src/app/shared/components/gauge/gauge.component.ts similarity index 100% rename from src/portal/src/app/shared/gauge/gauge.component.ts rename to src/portal/src/app/shared/components/gauge/gauge.component.ts diff --git a/src/portal/src/app/global-message/message.component.html b/src/portal/src/app/shared/components/global-message/message.component.html similarity index 100% rename from src/portal/src/app/global-message/message.component.html rename to src/portal/src/app/shared/components/global-message/message.component.html diff --git a/src/portal/src/app/global-message/message.component.scss b/src/portal/src/app/shared/components/global-message/message.component.scss similarity index 100% rename from src/portal/src/app/global-message/message.component.scss rename to src/portal/src/app/shared/components/global-message/message.component.scss diff --git a/src/portal/src/app/global-message/message.component.spec.ts b/src/portal/src/app/shared/components/global-message/message.component.spec.ts similarity index 97% rename from src/portal/src/app/global-message/message.component.spec.ts rename to src/portal/src/app/shared/components/global-message/message.component.spec.ts index cb18eb50b4..df7c9201af 100644 --- a/src/portal/src/app/global-message/message.component.spec.ts +++ b/src/portal/src/app/shared/components/global-message/message.component.spec.ts @@ -6,7 +6,7 @@ import { ClarityModule } from '@clr/angular'; import { Message } from './message'; import { MessageService } from './message.service'; import { MessageComponent } from './message.component'; -import { AlertType } from '../shared/shared.const'; +import { AlertType } from "../../entities/shared.const"; describe('MessageComponent', () => { let component: MessageComponent; diff --git a/src/portal/src/app/global-message/message.component.ts b/src/portal/src/app/shared/components/global-message/message.component.ts similarity index 99% rename from src/portal/src/app/global-message/message.component.ts rename to src/portal/src/app/shared/components/global-message/message.component.ts index a213b505ff..20474032f2 100644 --- a/src/portal/src/app/global-message/message.component.ts +++ b/src/portal/src/app/shared/components/global-message/message.component.ts @@ -17,7 +17,7 @@ import { Subscription } from "rxjs"; import { TranslateService } from '@ngx-translate/core'; import { Message } from './message'; import { MessageService } from './message.service'; -import { CommonRoutes, dismissInterval, httpStatusCode } from "../../lib/entities/shared.const"; +import { CommonRoutes, dismissInterval, httpStatusCode } from "../../entities/shared.const"; const YES: string = 'yes'; @Component({ diff --git a/src/portal/src/app/global-message/message.service.spec.ts b/src/portal/src/app/shared/components/global-message/message.service.spec.ts similarity index 100% rename from src/portal/src/app/global-message/message.service.spec.ts rename to src/portal/src/app/shared/components/global-message/message.service.spec.ts diff --git a/src/portal/src/app/global-message/message.service.ts b/src/portal/src/app/shared/components/global-message/message.service.ts similarity index 93% rename from src/portal/src/app/global-message/message.service.ts rename to src/portal/src/app/shared/components/global-message/message.service.ts index 794e9e8859..8f8f494e2d 100644 --- a/src/portal/src/app/global-message/message.service.ts +++ b/src/portal/src/app/shared/components/global-message/message.service.ts @@ -14,9 +14,11 @@ import { Injectable } from '@angular/core'; import { Subject } from "rxjs"; import { Message } from './message'; -import { AlertType } from '../shared/shared.const'; +import { AlertType } from "../../entities/shared.const"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class MessageService { messageAnnouncedSource = new Subject(); diff --git a/src/portal/src/app/global-message/message.ts b/src/portal/src/app/shared/components/global-message/message.ts similarity index 96% rename from src/portal/src/app/global-message/message.ts rename to src/portal/src/app/shared/components/global-message/message.ts index 5e6635e501..cc178d173a 100644 --- a/src/portal/src/app/global-message/message.ts +++ b/src/portal/src/app/shared/components/global-message/message.ts @@ -11,7 +11,8 @@ // 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. -import { AlertType } from '../shared/shared.const'; + +import { AlertType } from "../../entities/shared.const"; export class Message { statusCode: number; diff --git a/src/portal/src/app/base/global-search/global-search.component.html b/src/portal/src/app/shared/components/global-search/global-search.component.html similarity index 100% rename from src/portal/src/app/base/global-search/global-search.component.html rename to src/portal/src/app/shared/components/global-search/global-search.component.html diff --git a/src/portal/src/app/base/global-search/global-search.component.spec.ts b/src/portal/src/app/shared/components/global-search/global-search.component.spec.ts similarity index 94% rename from src/portal/src/app/base/global-search/global-search.component.spec.ts rename to src/portal/src/app/shared/components/global-search/global-search.component.spec.ts index 76c92af531..25ddde2aba 100644 --- a/src/portal/src/app/base/global-search/global-search.component.spec.ts +++ b/src/portal/src/app/shared/components/global-search/global-search.component.spec.ts @@ -3,8 +3,8 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { GlobalSearchComponent } from './global-search.component'; import { SearchTriggerService } from './search-trigger.service'; import { FormsModule } from '@angular/forms'; -import { AppConfigService } from '../../services/app-config.service'; -import { SkinableConfig } from "../../services/skinable-config.service"; +import { AppConfigService } from '../../../services/app-config.service'; +import { SkinableConfig } from "../../../services/skinable-config.service"; import { RouterTestingModule } from '@angular/router/testing'; describe('GlobalSearchComponent', () => { diff --git a/src/portal/src/app/base/global-search/global-search.component.ts b/src/portal/src/app/shared/components/global-search/global-search.component.ts similarity index 95% rename from src/portal/src/app/base/global-search/global-search.component.ts rename to src/portal/src/app/shared/components/global-search/global-search.component.ts index 7de6814868..821455205c 100644 --- a/src/portal/src/app/base/global-search/global-search.component.ts +++ b/src/portal/src/app/shared/components/global-search/global-search.component.ts @@ -19,12 +19,12 @@ import { Subject , Subscription } from "rxjs"; import { SearchTriggerService } from './search-trigger.service'; -import { AppConfigService } from '../../services/app-config.service'; +import { AppConfigService } from '../../../services/app-config.service'; import {TranslateService} from "@ngx-translate/core"; -import {SkinableConfig} from "../../services/skinable-config.service"; +import {SkinableConfig} from "../../../services/skinable-config.service"; const deBounceTime = 500; // ms diff --git a/src/portal/src/app/base/global-search/global-search.service.spec.ts b/src/portal/src/app/shared/components/global-search/global-search.service.spec.ts similarity index 95% rename from src/portal/src/app/base/global-search/global-search.service.spec.ts rename to src/portal/src/app/shared/components/global-search/global-search.service.spec.ts index 6cb314ff70..bad0d47dbc 100644 --- a/src/portal/src/app/base/global-search/global-search.service.spec.ts +++ b/src/portal/src/app/shared/components/global-search/global-search.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { GlobalSearchService } from './global-search.service'; import { Injector } from '@angular/core'; import { SearchResults } from './search-results'; -import { CURRENT_BASE_HREF } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF } from "../../units/utils"; describe('GlobalSearchService', () => { let injector: TestBed; diff --git a/src/portal/src/app/base/global-search/global-search.service.ts b/src/portal/src/app/shared/components/global-search/global-search.service.ts similarity index 95% rename from src/portal/src/app/base/global-search/global-search.service.ts rename to src/portal/src/app/shared/components/global-search/global-search.service.ts index 00a59e83f3..9dfddb5ea7 100644 --- a/src/portal/src/app/base/global-search/global-search.service.ts +++ b/src/portal/src/app/shared/components/global-search/global-search.service.ts @@ -16,7 +16,7 @@ import { HttpClient } from '@angular/common/http'; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; import { SearchResults } from './search-results'; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS } from "../../../lib/utils/utils"; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS } from "../../units/utils"; const searchEndpoint = CURRENT_BASE_HREF + "/search"; /** diff --git a/src/portal/src/app/base/global-search/search-result.component.html b/src/portal/src/app/shared/components/global-search/search-result.component.html similarity index 100% rename from src/portal/src/app/base/global-search/search-result.component.html rename to src/portal/src/app/shared/components/global-search/search-result.component.html diff --git a/src/portal/src/app/base/global-search/search-result.component.spec.ts b/src/portal/src/app/shared/components/global-search/search-result.component.spec.ts similarity index 91% rename from src/portal/src/app/base/global-search/search-result.component.spec.ts rename to src/portal/src/app/shared/components/global-search/search-result.component.spec.ts index 0ac16b542f..517007e270 100644 --- a/src/portal/src/app/base/global-search/search-result.component.spec.ts +++ b/src/portal/src/app/shared/components/global-search/search-result.component.spec.ts @@ -4,13 +4,13 @@ import { SearchResults } from './search-results'; import { SearchTriggerService } from './search-trigger.service'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { AppConfigService } from '../../services/app-config.service'; -import { ListProjectROComponent } from '../../shared/list-project-ro/list-project-ro.component'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { AppConfigService } from '../../../services/app-config.service'; +import { ListProjectROComponent } from '../list-project-ro/list-project-ro.component'; +import { MessageHandlerService } from '../../services/message-handler.service'; import { SearchResultComponent } from './search-result.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; -import { AppConfig } from '../../services/app-config'; +import { AppConfig } from '../../../services/app-config'; import { ClarityModule } from '@clr/angular'; describe('SearchResultComponent', () => { diff --git a/src/portal/src/app/base/global-search/search-result.component.ts b/src/portal/src/app/shared/components/global-search/search-result.component.ts similarity index 97% rename from src/portal/src/app/base/global-search/search-result.component.ts rename to src/portal/src/app/shared/components/global-search/search-result.component.ts index 5aee21e395..cc0102593d 100644 --- a/src/portal/src/app/base/global-search/search-result.component.ts +++ b/src/portal/src/app/shared/components/global-search/search-result.component.ts @@ -18,8 +18,8 @@ import { GlobalSearchService } from './global-search.service'; import { SearchResults } from './search-results'; import { SearchTriggerService } from './search-trigger.service'; -import { AppConfigService } from '../../services/app-config.service'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { AppConfigService } from '../../../services/app-config.service'; +import { MessageHandlerService } from '../../services/message-handler.service'; import { filter, switchMap } from "rxjs/operators"; @Component({ diff --git a/src/portal/src/app/base/global-search/search-results.ts b/src/portal/src/app/shared/components/global-search/search-results.ts similarity index 76% rename from src/portal/src/app/base/global-search/search-results.ts rename to src/portal/src/app/shared/components/global-search/search-results.ts index 396133e1e3..25eeabfd3f 100644 --- a/src/portal/src/app/base/global-search/search-results.ts +++ b/src/portal/src/app/shared/components/global-search/search-results.ts @@ -11,9 +11,9 @@ // 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. -import { Project } from "../../project/project"; -import { HelmChartSearchResultItem } from "../../project/helm-chart/helm-chart.interface.service"; -import { Repository } from "../../../../ng-swagger-gen/models/repository"; +import { Project } from "../../../base/project/project"; +import { HelmChartSearchResultItem } from "../../../base/project/helm-chart/helm-chart-detail/helm-chart.interface.service"; +import { Repository } from "../../../../../ng-swagger-gen/models/repository"; export class SearchResults { constructor() { diff --git a/src/portal/src/app/base/global-search/search-trigger.service.spec.ts b/src/portal/src/app/shared/components/global-search/search-trigger.service.spec.ts similarity index 100% rename from src/portal/src/app/base/global-search/search-trigger.service.spec.ts rename to src/portal/src/app/shared/components/global-search/search-trigger.service.spec.ts diff --git a/src/portal/src/app/base/global-search/search-trigger.service.ts b/src/portal/src/app/shared/components/global-search/search-trigger.service.ts similarity index 96% rename from src/portal/src/app/base/global-search/search-trigger.service.ts rename to src/portal/src/app/shared/components/global-search/search-trigger.service.ts index d10530f2ab..60f1faebfd 100644 --- a/src/portal/src/app/base/global-search/search-trigger.service.ts +++ b/src/portal/src/app/shared/components/global-search/search-trigger.service.ts @@ -14,7 +14,9 @@ import { Injectable } from '@angular/core'; import { Subject } from "rxjs"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class SearchTriggerService { searchTriggerSource = new Subject(); diff --git a/src/portal/src/app/base/global-search/search.component.scss b/src/portal/src/app/shared/components/global-search/search.component.scss similarity index 100% rename from src/portal/src/app/base/global-search/search.component.scss rename to src/portal/src/app/shared/components/global-search/search.component.scss diff --git a/src/portal/src/lib/components/image-name-input/image-name-input.component.html b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.html similarity index 100% rename from src/portal/src/lib/components/image-name-input/image-name-input.component.html rename to src/portal/src/app/shared/components/image-name-input/image-name-input.component.html diff --git a/src/portal/src/lib/components/image-name-input/image-name-input.component.scss b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.scss similarity index 100% rename from src/portal/src/lib/components/image-name-input/image-name-input.component.scss rename to src/portal/src/app/shared/components/image-name-input/image-name-input.component.scss diff --git a/src/portal/src/lib/components/image-name-input/image-name-input.component.spec.ts b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.spec.ts similarity index 76% rename from src/portal/src/lib/components/image-name-input/image-name-input.component.spec.ts rename to src/portal/src/app/shared/components/image-name-input/image-name-input.component.spec.ts index aeff2101fe..6a4a2e169e 100644 --- a/src/portal/src/lib/components/image-name-input/image-name-input.component.spec.ts +++ b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.spec.ts @@ -1,14 +1,13 @@ import { waitForAsync, ComponentFixture, TestBed } from "@angular/core/testing"; -import { SharedModule } from "../../utils/shared/shared.module"; import { ImageNameInputComponent } from "./image-name-input.component"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; +import { ErrorHandler } from "../../units/error-handler/error-handler"; import { ProjectDefaultService, ProjectService } from "../../services"; -import { Project } from "../project-policy-config/project"; -import { IServiceConfig, SERVICE_CONFIG } from "../../entities/service.config"; +import { Project } from "../../../base/project/project-config/project-policy-config/project"; import { of } from "rxjs"; import { HttpResponse } from "@angular/common/http"; import { ChannelService } from "../../services/channel.service"; -import { CURRENT_BASE_HREF } from "../../utils/utils"; +import { CURRENT_BASE_HREF } from "../../units/utils"; +import { SharedTestingModule } from "../../shared.module"; describe("ImageNameInputComponent (inline template)", () => { let comp: ImageNameInputComponent; @@ -27,15 +26,10 @@ describe("ImageNameInputComponent (inline template)", () => { "creation_time": "", } ]; - - let config: IServiceConfig = { - projectBaseEndpoint: CURRENT_BASE_HREF + "/projects/testing" - }; - beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule + SharedTestingModule ], declarations: [ ImageNameInputComponent @@ -43,7 +37,6 @@ describe("ImageNameInputComponent (inline template)", () => { providers: [ ErrorHandler, ChannelService, - { provide: SERVICE_CONFIG, useValue: config }, { provide: ProjectService, useClass: ProjectDefaultService } ] }); diff --git a/src/portal/src/lib/components/image-name-input/image-name-input.component.ts b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.ts similarity index 91% rename from src/portal/src/lib/components/image-name-input/image-name-input.component.ts rename to src/portal/src/app/shared/components/image-name-input/image-name-input.component.ts index 610942b123..7f544c54f3 100644 --- a/src/portal/src/lib/components/image-name-input/image-name-input.component.ts +++ b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.ts @@ -1,10 +1,10 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; -import { Project } from "../project-policy-config/project"; -import { Subject } from "rxjs/index"; -import { debounceTime, distinctUntilChanged, switchMap } from "rxjs/operators"; -import { ProjectService } from "../../services/project.service"; +import { Project } from "../../../base/project/project-config/project-policy-config/project"; +import { Subject } from "rxjs"; +import { debounceTime, switchMap } from "rxjs/operators"; +import { ProjectService } from "../../services"; import { AbstractControl, FormBuilder, FormGroup, Validators } from "@angular/forms"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; +import { ErrorHandler } from "../../units/error-handler"; @Component({ selector: "hbr-image-name-input", diff --git a/src/portal/src/app/shared/inline-alert/inline-alert.component.html b/src/portal/src/app/shared/components/inline-alert/inline-alert.component.html similarity index 100% rename from src/portal/src/app/shared/inline-alert/inline-alert.component.html rename to src/portal/src/app/shared/components/inline-alert/inline-alert.component.html diff --git a/src/portal/src/lib/components/inline-alert/inline-alert.component.scss b/src/portal/src/app/shared/components/inline-alert/inline-alert.component.scss similarity index 100% rename from src/portal/src/lib/components/inline-alert/inline-alert.component.scss rename to src/portal/src/app/shared/components/inline-alert/inline-alert.component.scss diff --git a/src/portal/src/app/shared/components/inline-alert/inline-alert.component.spec.ts b/src/portal/src/app/shared/components/inline-alert/inline-alert.component.spec.ts new file mode 100644 index 0000000000..c9c446cc81 --- /dev/null +++ b/src/portal/src/app/shared/components/inline-alert/inline-alert.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { InlineAlertComponent } from './inline-alert.component'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { SharedTestingModule } from "../../shared.module"; +describe('InlineAlertComponent', () => { + let component: InlineAlertComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ], + imports: [ + SharedTestingModule + ], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(InlineAlertComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/portal/src/lib/components/inline-alert/inline-alert.component.ts b/src/portal/src/app/shared/components/inline-alert/inline-alert.component.ts similarity index 82% rename from src/portal/src/lib/components/inline-alert/inline-alert.component.ts rename to src/portal/src/app/shared/components/inline-alert/inline-alert.component.ts index f95ab11742..7c168b864b 100644 --- a/src/portal/src/lib/components/inline-alert/inline-alert.component.ts +++ b/src/portal/src/app/shared/components/inline-alert/inline-alert.component.ts @@ -13,13 +13,12 @@ // limitations under the License. import { Component, Output, EventEmitter } from "@angular/core"; import { TranslateService } from "@ngx-translate/core"; - -import { errorHandler } from "../../utils/shared/shared.utils"; -import { Observable, Subscription } from "rxjs"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; +import { Subscription } from "rxjs"; +import { ErrorHandler } from "../../units/error-handler"; +import { errorHandler } from "../../units/shared.utils"; @Component({ - selector: "hbr-inline-alert", + selector: "inline-alert", templateUrl: "./inline-alert.component.html", styleUrls: ["./inline-alert.component.scss"] }) @@ -35,6 +34,7 @@ export class InlineAlertComponent { blinking: boolean = false; @Output() confirmEvt = new EventEmitter(); + @Output() closeEvt = new EventEmitter(); constructor(private translate: TranslateService, private errHandler: ErrorHandler, @@ -90,7 +90,18 @@ export class InlineAlertComponent { this.alertClose = false; this.useAppLevelStyle = false; } - + // Show warning + public showInlineWarning(warning: any): void { + this.displayedText = ""; + if (warning && warning.message) { + this.translate.get(warning.message).subscribe((res: string) => this.displayedText = res); + } + this.inlineAlertType = 'warning'; + this.showCancelAction = false; + this.inlineAlertClosable = true; + this.alertClose = false; + this.useAppLevelStyle = false; + } // Close alert public close(): void { this.alertClose = true; diff --git a/src/portal/src/lib/components/create-edit-label/create-edit-label.component.html b/src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.html similarity index 100% rename from src/portal/src/lib/components/create-edit-label/create-edit-label.component.html rename to src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.html diff --git a/src/portal/src/lib/components/create-edit-label/create-edit-label.component.scss b/src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.scss similarity index 100% rename from src/portal/src/lib/components/create-edit-label/create-edit-label.component.scss rename to src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.scss diff --git a/src/portal/src/lib/components/create-edit-label/create-edit-label.component.spec.ts b/src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.spec.ts similarity index 70% rename from src/portal/src/lib/components/create-edit-label/create-edit-label.component.spec.ts rename to src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.spec.ts index a7f6dd0cd6..3967d67bc7 100644 --- a/src/portal/src/lib/components/create-edit-label/create-edit-label.component.spec.ts +++ b/src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.spec.ts @@ -1,16 +1,14 @@ import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; - -import { SharedModule } from "../../utils/shared/shared.module"; -import { FilterComponent } from "../filter/filter.component"; -import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; -import { Label } from "../../services/interface"; -import { IServiceConfig, SERVICE_CONFIG } from "../../entities/service.config"; +import { FilterComponent } from "../../filter/filter.component"; +import { InlineAlertComponent } from "../../inline-alert/inline-alert.component"; +import { ErrorHandler } from "../../../units/error-handler"; +import { Label } from "../../../services"; import { CreateEditLabelComponent } from "./create-edit-label.component"; -import { LabelDefaultService, LabelService } from "../../services/label.service"; +import { LabelDefaultService, LabelService } from "../../../services"; import { of } from "rxjs"; -import { CURRENT_BASE_HREF } from "../../utils/utils"; +import { CURRENT_BASE_HREF } from "../../../units/utils"; +import { SharedTestingModule } from "../../../shared.module"; describe("CreateEditLabelComponent (inline template)", () => { let mockOneData: Label = { @@ -26,11 +24,6 @@ describe("CreateEditLabelComponent (inline template)", () => { let comp: CreateEditLabelComponent; let fixture: ComponentFixture; - - let config: IServiceConfig = { - systemInfoEndpoint: CURRENT_BASE_HREF + "/label/testing" - }; - let labelService: LabelService; let spy: jasmine.Spy; @@ -38,7 +31,7 @@ describe("CreateEditLabelComponent (inline template)", () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [SharedModule, NoopAnimationsModule], + imports: [SharedTestingModule, NoopAnimationsModule], declarations: [ FilterComponent, CreateEditLabelComponent, @@ -46,7 +39,6 @@ describe("CreateEditLabelComponent (inline template)", () => { ], providers: [ ErrorHandler, - { provide: SERVICE_CONFIG, useValue: config }, { provide: LabelService, useClass: LabelDefaultService } ] }); diff --git a/src/portal/src/lib/components/create-edit-label/create-edit-label.component.ts b/src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.ts similarity index 93% rename from src/portal/src/lib/components/create-edit-label/create-edit-label.component.ts rename to src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.ts index 05fd728926..7a1ec7d685 100644 --- a/src/portal/src/lib/components/create-edit-label/create-edit-label.component.ts +++ b/src/portal/src/app/shared/components/label/create-edit-label/create-edit-label.component.ts @@ -23,16 +23,16 @@ import { ChangeDetectorRef } from "@angular/core"; -import { Label } from "../../services/interface"; +import { Label } from "../../../services/interface"; -import { clone, compareValue } from "../../utils/utils"; +import { clone, compareValue } from "../../../units/utils"; -import { LabelService } from "../../services/label.service"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; +import { LabelService } from "../../../services/label.service"; +import { ErrorHandler } from "../../../units/error-handler/error-handler"; import { NgForm } from "@angular/forms"; import { Subject } from "rxjs"; import { debounceTime } from "rxjs/operators"; -import { LabelColor } from "../../entities/shared.const"; +import { LabelColor } from "../../../entities/shared.const"; @Component({ selector: "hbr-create-edit-label", diff --git a/src/portal/src/lib/components/label-piece/label-piece.component.html b/src/portal/src/app/shared/components/label/label-piece/label-piece.component.html similarity index 100% rename from src/portal/src/lib/components/label-piece/label-piece.component.html rename to src/portal/src/app/shared/components/label/label-piece/label-piece.component.html diff --git a/src/portal/src/lib/components/label-piece/label-piece.component.scss b/src/portal/src/app/shared/components/label/label-piece/label-piece.component.scss similarity index 100% rename from src/portal/src/lib/components/label-piece/label-piece.component.scss rename to src/portal/src/app/shared/components/label/label-piece/label-piece.component.scss diff --git a/src/portal/src/lib/components/label-piece/label-piece.component.ts b/src/portal/src/app/shared/components/label/label-piece/label-piece.component.ts similarity index 87% rename from src/portal/src/lib/components/label-piece/label-piece.component.ts rename to src/portal/src/app/shared/components/label/label-piece/label-piece.component.ts index 14404d6550..553ea87d38 100644 --- a/src/portal/src/lib/components/label-piece/label-piece.component.ts +++ b/src/portal/src/app/shared/components/label/label-piece/label-piece.component.ts @@ -11,13 +11,9 @@ // 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. -import {Component, Input, OnInit, OnChanges} from '@angular/core'; - - - - -import {Label} from "../../services/interface"; -import {LabelColor} from "../../entities/shared.const"; +import { Component, Input, OnInit, OnChanges } from '@angular/core'; +import { Label } from "../../../services"; +import { LabelColor } from "../../../entities/shared.const"; @Component({ diff --git a/src/portal/src/lib/components/label/label-signpost/label-signpost.component.html b/src/portal/src/app/shared/components/label/label-signpost/label-signpost.component.html similarity index 100% rename from src/portal/src/lib/components/label/label-signpost/label-signpost.component.html rename to src/portal/src/app/shared/components/label/label-signpost/label-signpost.component.html diff --git a/src/portal/src/lib/components/label/label-signpost/label-signpost.component.scss b/src/portal/src/app/shared/components/label/label-signpost/label-signpost.component.scss similarity index 100% rename from src/portal/src/lib/components/label/label-signpost/label-signpost.component.scss rename to src/portal/src/app/shared/components/label/label-signpost/label-signpost.component.scss diff --git a/src/portal/src/lib/components/label/label-signpost/label-signpost.component.ts b/src/portal/src/app/shared/components/label/label-signpost/label-signpost.component.ts similarity index 100% rename from src/portal/src/lib/components/label/label-signpost/label-signpost.component.ts rename to src/portal/src/app/shared/components/label/label-signpost/label-signpost.component.ts diff --git a/src/portal/src/lib/components/label/label.component.html b/src/portal/src/app/shared/components/label/label.component.html similarity index 100% rename from src/portal/src/lib/components/label/label.component.html rename to src/portal/src/app/shared/components/label/label.component.html diff --git a/src/portal/src/lib/components/label/label.component.scss b/src/portal/src/app/shared/components/label/label.component.scss similarity index 100% rename from src/portal/src/lib/components/label/label.component.scss rename to src/portal/src/app/shared/components/label/label.component.scss diff --git a/src/portal/src/lib/components/label/label.component.spec.ts b/src/portal/src/app/shared/components/label/label.component.spec.ts similarity index 83% rename from src/portal/src/lib/components/label/label.component.spec.ts rename to src/portal/src/app/shared/components/label/label.component.spec.ts index f1bbf91d34..d0808c9bf5 100644 --- a/src/portal/src/lib/components/label/label.component.spec.ts +++ b/src/portal/src/app/shared/components/label/label.component.spec.ts @@ -2,18 +2,17 @@ import { Label } from "../../services"; import { LabelComponent } from "./label.component"; import { waitForAsync, ComponentFixture, TestBed } from "@angular/core/testing"; import { LabelDefaultService, LabelService } from "../../services"; -import { SharedModule } from "../../utils/shared/shared.module"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { FilterComponent } from "../filter/filter.component"; import { ConfirmationDialogComponent } from "../confirmation-dialog"; -import { CreateEditLabelComponent } from "../create-edit-label/create-edit-label.component"; -import { LabelPieceComponent } from "../label-piece/label-piece.component"; +import { CreateEditLabelComponent } from "./create-edit-label/create-edit-label.component"; +import { LabelPieceComponent } from "./label-piece/label-piece.component"; import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; -import { ErrorHandler } from "../../utils/error-handler"; -import { IServiceConfig, SERVICE_CONFIG } from "../../entities/service.config"; +import { ErrorHandler } from "../../units/error-handler"; import { OperationService } from "../operation/operation.service"; import { of } from "rxjs"; -import { CURRENT_BASE_HREF } from "../../utils/utils"; +import { CURRENT_BASE_HREF } from "../../units/utils"; +import { SharedTestingModule } from "../../shared.module"; describe('LabelComponent (inline template)', () => { @@ -58,15 +57,10 @@ describe('LabelComponent (inline template)', () => { let labelService: LabelService; let spy: jasmine.Spy; let spyOneLabel: jasmine.Spy; - - let config: IServiceConfig = { - systemInfoEndpoint: CURRENT_BASE_HREF + '/label/testing' - }; - beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule, + SharedTestingModule, NoopAnimationsModule ], declarations: [ @@ -79,7 +73,6 @@ describe('LabelComponent (inline template)', () => { ], providers: [ ErrorHandler, - {provide: SERVICE_CONFIG, useValue: config}, {provide: LabelService, useClass: LabelDefaultService}, {provide: OperationService} ] diff --git a/src/portal/src/lib/components/label/label.component.ts b/src/portal/src/app/shared/components/label/label.component.ts similarity index 78% rename from src/portal/src/lib/components/label/label.component.ts rename to src/portal/src/app/shared/components/label/label.component.ts index a8ac7b157d..832aebce29 100644 --- a/src/portal/src/lib/components/label/label.component.ts +++ b/src/portal/src/app/shared/components/label/label.component.ts @@ -15,33 +15,30 @@ import { Component, OnInit, ViewChild, - ChangeDetectionStrategy, - ChangeDetectorRef, Input } from "@angular/core"; -import { Label } from "../../services/interface"; -import { LabelService } from "../../services/label.service"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; -import { CreateEditLabelComponent } from "../create-edit-label/create-edit-label.component"; -import { ConfirmationMessage } from "../confirmation-dialog/confirmation-message"; +import { Label } from "../../services"; +import { LabelService } from "../../services"; +import { ErrorHandler } from "../../units/error-handler"; +import { CreateEditLabelComponent } from "./create-edit-label/create-edit-label.component"; import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from "../../entities/shared.const"; -import { ConfirmationAcknowledgement } from "../confirmation-dialog/confirmation-state-message"; import { TranslateService } from "@ngx-translate/core"; -import { ConfirmationDialogComponent } from "../confirmation-dialog/confirmation-dialog.component"; +import { ConfirmationDialogComponent } from "../confirmation-dialog"; import { operateChanges, OperateInfo, OperationState } from "../operation/operate"; import { OperationService } from "../operation/operation.service"; import { map, catchError, finalize } from "rxjs/operators"; -import { errorHandler as errorHandFn } from "../../utils/shared/shared.utils"; import { Observable, throwError as observableThrowError, forkJoin } from "rxjs"; +import { errorHandler } from "../../units/shared.utils"; +import { ConfirmationMessage } from "../../../base/global-confirmation-dialog/confirmation-message"; +import { ConfirmationAcknowledgement } from "../../../base/global-confirmation-dialog/confirmation-state-message"; @Component({ selector: "hbr-label", templateUrl: "./label.component.html", styleUrls: ["./label.component.scss"], - changeDetection: ChangeDetectionStrategy.OnPush }) export class LabelComponent implements OnInit { timerHandler: any; @@ -62,10 +59,9 @@ export class LabelComponent implements OnInit { confirmationDialogComponent: ConfirmationDialogComponent; constructor(private labelService: LabelService, - private errorHandler: ErrorHandler, + private errorHandlerEntity: ErrorHandler, private translateService: TranslateService, - private operationService: OperationService, - private ref: ChangeDetectorRef) { + private operationService: OperationService) { } ngOnInit(): void { @@ -78,12 +74,11 @@ export class LabelComponent implements OnInit { this.targetName = ""; this.labelService.getLabels(scope, this.projectId, name).pipe(finalize(() => { this.loading = false; - this.forceRefreshView(2000); })) .subscribe(targets => { this.targets = targets || []; }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } @@ -142,7 +137,7 @@ export class LabelComponent implements OnInit { this.selectedRow = []; this.retrieve(this.scope); }, error => { - this.errorHandler.error(error); + this.errorHandlerEntity.error(error); }); } } @@ -166,27 +161,11 @@ export class LabelComponent implements OnInit { operateChanges(operMessage, OperationState.success); }); }), catchError(error => { - const message = errorHandFn(error); + const message = errorHandler(error); this.translateService.get(message).subscribe(res => operateChanges(operMessage, OperationState.failure, res) ); return observableThrowError(error); })); } - - // Forcely refresh the view - forceRefreshView(duration: number): void { - // Reset timer - if (this.timerHandler) { - clearInterval(this.timerHandler); - } - this.timerHandler = setInterval(() => this.ref.markForCheck(), 100); - setTimeout(() => { - if (this.timerHandler) { - clearInterval(this.timerHandler); - this.timerHandler = null; - } - }, duration); - } - } diff --git a/src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.html b/src/portal/src/app/shared/components/list-chart-version-ro/list-chart-version-ro.component.html similarity index 100% rename from src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.html rename to src/portal/src/app/shared/components/list-chart-version-ro/list-chart-version-ro.component.html diff --git a/src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.spec.ts b/src/portal/src/app/shared/components/list-chart-version-ro/list-chart-version-ro.component.spec.ts similarity index 93% rename from src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.spec.ts rename to src/portal/src/app/shared/components/list-chart-version-ro/list-chart-version-ro.component.spec.ts index fb32aeec74..9e7d001f9c 100644 --- a/src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.spec.ts +++ b/src/portal/src/app/shared/components/list-chart-version-ro/list-chart-version-ro.component.spec.ts @@ -8,8 +8,8 @@ import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; -import { ProjectService } from "../../../lib/services"; +import { SearchTriggerService } from '../global-search/search-trigger.service'; +import { ProjectService } from "../../services"; describe('ListChartVersionRoComponent', () => { diff --git a/src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.ts b/src/portal/src/app/shared/components/list-chart-version-ro/list-chart-version-ro.component.ts similarity index 89% rename from src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.ts rename to src/portal/src/app/shared/components/list-chart-version-ro/list-chart-version-ro.component.ts index b9b6985f07..2c02568099 100644 --- a/src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.ts +++ b/src/portal/src/app/shared/components/list-chart-version-ro/list-chart-version-ro.component.ts @@ -1,8 +1,8 @@ import { Router } from '@angular/router'; import { Component, OnInit, Input } from '@angular/core'; -import { HelmChartSearchResultItem, HelmChartVersion, HelmChartMaintainer } from '../../project/helm-chart/helm-chart.interface.service'; -import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; -import { ProjectService } from "../../../lib/services"; +import { HelmChartSearchResultItem, HelmChartVersion, HelmChartMaintainer } from '../../../base/project/helm-chart/helm-chart-detail/helm-chart.interface.service'; +import { SearchTriggerService } from '../global-search/search-trigger.service'; +import { ProjectService } from "../../services"; @Component({ diff --git a/src/portal/src/app/shared/list-project-ro/list-project-ro.component.html b/src/portal/src/app/shared/components/list-project-ro/list-project-ro.component.html similarity index 100% rename from src/portal/src/app/shared/list-project-ro/list-project-ro.component.html rename to src/portal/src/app/shared/components/list-project-ro/list-project-ro.component.html diff --git a/src/portal/src/app/shared/list-project-ro/list-project-ro.component.spec.ts b/src/portal/src/app/shared/components/list-project-ro/list-project-ro.component.spec.ts similarity index 95% rename from src/portal/src/app/shared/list-project-ro/list-project-ro.component.spec.ts rename to src/portal/src/app/shared/components/list-project-ro/list-project-ro.component.spec.ts index c0084e62c5..451e65e978 100644 --- a/src/portal/src/app/shared/list-project-ro/list-project-ro.component.spec.ts +++ b/src/portal/src/app/shared/components/list-project-ro/list-project-ro.component.spec.ts @@ -8,7 +8,7 @@ import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; +import { SearchTriggerService } from '../global-search/search-trigger.service'; describe('ListProjectROComponent', () => { let component: ListProjectROComponent; diff --git a/src/portal/src/app/shared/list-project-ro/list-project-ro.component.ts b/src/portal/src/app/shared/components/list-project-ro/list-project-ro.component.ts similarity index 87% rename from src/portal/src/app/shared/list-project-ro/list-project-ro.component.ts rename to src/portal/src/app/shared/components/list-project-ro/list-project-ro.component.ts index eafa7f6e8d..652eda1f54 100644 --- a/src/portal/src/app/shared/list-project-ro/list-project-ro.component.ts +++ b/src/portal/src/app/shared/components/list-project-ro/list-project-ro.component.ts @@ -13,10 +13,10 @@ // limitations under the License. import { Component, EventEmitter, Output, Input, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; import { Router } from '@angular/router'; -import { State } from '../../../lib/services/interface'; +import { State } from '../../services/interface'; -import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; -import { Project } from '../../project/project'; +import { SearchTriggerService } from '../global-search/search-trigger.service'; +import { Project } from '../../../base/project/project'; @Component({ selector: 'list-project-ro', diff --git a/src/portal/src/app/shared/list-repository-ro/list-repository-ro.component.html b/src/portal/src/app/shared/components/list-repository-ro/list-repository-ro.component.html similarity index 100% rename from src/portal/src/app/shared/list-repository-ro/list-repository-ro.component.html rename to src/portal/src/app/shared/components/list-repository-ro/list-repository-ro.component.html diff --git a/src/portal/src/app/shared/list-repository-ro/list-repository-ro.component.spec.ts b/src/portal/src/app/shared/components/list-repository-ro/list-repository-ro.component.spec.ts similarity index 92% rename from src/portal/src/app/shared/list-repository-ro/list-repository-ro.component.spec.ts rename to src/portal/src/app/shared/components/list-repository-ro/list-repository-ro.component.spec.ts index 6cf48655c5..6b49ba9505 100644 --- a/src/portal/src/app/shared/list-repository-ro/list-repository-ro.component.spec.ts +++ b/src/portal/src/app/shared/components/list-repository-ro/list-repository-ro.component.spec.ts @@ -7,8 +7,8 @@ import { ClarityModule } from '@clr/angular'; import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; -import { SessionService } from "../session.service"; +import { SearchTriggerService } from '../global-search/search-trigger.service'; +import { SessionService } from "../../services/session.service"; describe('ListRepositoryRoComponent', () => { let component: ListRepositoryROComponent; diff --git a/src/portal/src/app/shared/list-repository-ro/list-repository-ro.component.ts b/src/portal/src/app/shared/components/list-repository-ro/list-repository-ro.component.ts similarity index 91% rename from src/portal/src/app/shared/list-repository-ro/list-repository-ro.component.ts rename to src/portal/src/app/shared/components/list-repository-ro/list-repository-ro.component.ts index fd2b1c07eb..feae735735 100644 --- a/src/portal/src/app/shared/list-repository-ro/list-repository-ro.component.ts +++ b/src/portal/src/app/shared/components/list-repository-ro/list-repository-ro.component.ts @@ -15,12 +15,12 @@ import {filter} from 'rxjs/operators'; // limitations under the License. import { Component, Input, Output, OnDestroy, EventEmitter, ChangeDetectionStrategy, ChangeDetectorRef, OnInit } from '@angular/core'; import { Router, NavigationEnd } from '@angular/router'; -import { State } from '../../../lib/services/interface'; -import { Repository } from '../../../../ng-swagger-gen/models/repository'; +import { State } from '../../services/interface'; +import { Repository } from '../../../../../ng-swagger-gen/models/repository'; -import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; +import { SearchTriggerService } from '../global-search/search-trigger.service'; import {Subscription} from "rxjs"; -import { SessionService } from "../session.service"; +import { SessionService } from "../../services/session.service"; const YES: string = 'yes'; @Component({ selector: 'list-repository-ro', diff --git a/src/portal/src/app/base/navigator/navigator.component.html b/src/portal/src/app/shared/components/navigator/navigator.component.html similarity index 100% rename from src/portal/src/app/base/navigator/navigator.component.html rename to src/portal/src/app/shared/components/navigator/navigator.component.html diff --git a/src/portal/src/app/base/navigator/navigator.component.scss b/src/portal/src/app/shared/components/navigator/navigator.component.scss similarity index 100% rename from src/portal/src/app/base/navigator/navigator.component.scss rename to src/portal/src/app/shared/components/navigator/navigator.component.scss diff --git a/src/portal/src/app/base/navigator/navigator.component.spec.ts b/src/portal/src/app/shared/components/navigator/navigator.component.spec.ts similarity index 89% rename from src/portal/src/app/base/navigator/navigator.component.spec.ts rename to src/portal/src/app/shared/components/navigator/navigator.component.spec.ts index 3ecb47b95f..4806bc8da7 100644 --- a/src/portal/src/app/base/navigator/navigator.component.spec.ts +++ b/src/portal/src/app/shared/components/navigator/navigator.component.spec.ts @@ -1,15 +1,15 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../../services/session.service'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { PlatformLocation } from '@angular/common'; import { NavigatorComponent } from './navigator.component'; import { RouterTestingModule } from '@angular/router/testing'; import { CookieService } from 'ngx-cookie'; -import { AppConfigService } from '../../services/app-config.service'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; +import { AppConfigService } from '../../../services/app-config.service'; +import { MessageHandlerService } from '../../services/message-handler.service'; import { SearchTriggerService } from '../global-search/search-trigger.service'; -import { SkinableConfig } from "../../services/skinable-config.service"; +import { SkinableConfig } from "../../../services/skinable-config.service"; describe('NavigatorComponent', () => { let component: NavigatorComponent; diff --git a/src/portal/src/app/base/navigator/navigator.component.ts b/src/portal/src/app/shared/components/navigator/navigator.component.ts similarity index 77% rename from src/portal/src/app/base/navigator/navigator.component.ts rename to src/portal/src/app/shared/components/navigator/navigator.component.ts index ee993bb903..88f0454ff4 100644 --- a/src/portal/src/app/base/navigator/navigator.component.ts +++ b/src/portal/src/app/shared/components/navigator/navigator.component.ts @@ -14,18 +14,20 @@ import { Component, Output, EventEmitter, OnInit } from '@angular/core'; import { Router, NavigationExtras } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -// import { map } from 'rxjs/operators'; import { PlatformLocation } from '@angular/common'; -import { ModalEvent } from '../modal-event'; -import { modalEvents } from '../modal-events.const'; -import { SessionService } from '../../shared/session.service'; -import { CookieService, CookieOptions } from 'ngx-cookie'; -import { supportedLangs, enLang, languageNames } from '../../shared/shared.const'; -import { AppConfigService } from '../../services/app-config.service'; +import { ModalEvent } from '../../../base/modal-event'; +import { modalEvents } from '../../../base/modal-events.const'; +import { SessionService } from '../../services/session.service'; +import { AppConfigService } from '../../../services/app-config.service'; import { SearchTriggerService } from '../global-search/search-trigger.service'; -import { MessageHandlerService } from '../../shared/message-handler/message-handler.service'; -import { SkinableConfig } from "../../services/skinable-config.service"; -import { CommonRoutes } from "../../../lib/entities/shared.const"; +import { MessageHandlerService } from '../../services/message-handler.service'; +import { SkinableConfig } from "../../../services/skinable-config.service"; +import { + CommonRoutes, + DEFAULT_LANG_LOCALSTORAGE_KEY, + DeFaultLang, + languageNames, +} from "../../entities/shared.const"; @Component({ @@ -35,11 +37,10 @@ import { CommonRoutes } from "../../../lib/entities/shared.const"; }) export class NavigatorComponent implements OnInit { - // constructor(private router: Router){} @Output() showAccountSettingsModal = new EventEmitter(); @Output() showDialogModalAction = new EventEmitter(); - selectedLang: string = enLang; + selectedLang: string = DeFaultLang; appTitle: string = 'APP_TITLE.HARBOR'; customStyle: { [key: string]: any }; customProjectName: { [key: string]: any }; @@ -48,7 +49,6 @@ export class NavigatorComponent implements OnInit { private router: Router, private location: PlatformLocation, private translate: TranslateService, - private cookie: CookieService, private appConfigService: AppConfigService, private msgHandler: MessageHandlerService, private searchTrigger: SearchTriggerService, @@ -64,14 +64,7 @@ export class NavigatorComponent implements OnInit { } this.customStyle = customSkinObj; } - this.selectedLang = this.translate.currentLang; - this.translate.onLangChange.subscribe((langChange: { lang: string }) => { - this.selectedLang = langChange.lang; - // Keep in cookie for next use - let opt: CookieOptions = { path: '/', expires: new Date(Date.now() + 3600 * 1000 * 24 * 31) }; - this.cookie.put("harbor-lang", langChange.lang, opt); - }); if (this.appConfigService.isIntegrationMode()) { this.appTitle = 'APP_TITLE.VIC'; } @@ -146,7 +139,7 @@ export class NavigatorComponent implements OnInit { // Log out system logOut(): void { - // Naviagte to the sign in route + // Naviagte to the sign in router-guard // Appending 'signout' means destroy session cache let signout = true; let redirect_url = this.location.pathname; @@ -160,14 +153,9 @@ export class NavigatorComponent implements OnInit { // Switch languages switchLanguage(lang: string): void { - let selectedLang: string = enLang; // Default - if (supportedLangs.find(supportedLang => supportedLang === lang.trim())) { - selectedLang = lang; - } else { - console.error('Language ' + lang.trim() + ' is not suppoted yet'); - } - - this.translate.use(selectedLang).subscribe(() => window.location.reload()); + this.selectedLang = lang; + localStorage.setItem(DEFAULT_LANG_LOCALSTORAGE_KEY, lang); + this.translate.use(lang); } // Handle the home action diff --git a/src/portal/src/app/shared/new-user-form/new-user-form.component.html b/src/portal/src/app/shared/components/new-user-form/new-user-form.component.html similarity index 100% rename from src/portal/src/app/shared/new-user-form/new-user-form.component.html rename to src/portal/src/app/shared/components/new-user-form/new-user-form.component.html diff --git a/src/portal/src/app/shared/new-user-form/new-user-form.component.scss b/src/portal/src/app/shared/components/new-user-form/new-user-form.component.scss similarity index 100% rename from src/portal/src/app/shared/new-user-form/new-user-form.component.scss rename to src/portal/src/app/shared/components/new-user-form/new-user-form.component.scss diff --git a/src/portal/src/app/shared/new-user-form/new-user-form.component.spec.ts b/src/portal/src/app/shared/components/new-user-form/new-user-form.component.spec.ts similarity index 96% rename from src/portal/src/app/shared/new-user-form/new-user-form.component.spec.ts rename to src/portal/src/app/shared/components/new-user-form/new-user-form.component.spec.ts index 37c0ed422f..f5079f054e 100644 --- a/src/portal/src/app/shared/new-user-form/new-user-form.component.spec.ts +++ b/src/portal/src/app/shared/components/new-user-form/new-user-form.component.spec.ts @@ -8,7 +8,7 @@ import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../../services/session.service'; describe('NewUserFormComponent', () => { let component: NewUserFormComponent; diff --git a/src/portal/src/app/shared/new-user-form/new-user-form.component.ts b/src/portal/src/app/shared/components/new-user-form/new-user-form.component.ts similarity index 97% rename from src/portal/src/app/shared/new-user-form/new-user-form.component.ts rename to src/portal/src/app/shared/components/new-user-form/new-user-form.component.ts index 1405c51aa1..a43c1f352b 100644 --- a/src/portal/src/app/shared/new-user-form/new-user-form.component.ts +++ b/src/portal/src/app/shared/components/new-user-form/new-user-form.component.ts @@ -23,14 +23,14 @@ import { } from '@angular/core'; import { NgForm } from '@angular/forms'; -import { User } from '../../user/user'; -import { isEmptyForm } from '../../shared/shared.utils'; -import { SessionService } from '../../shared/session.service'; +import { User } from '../../../base/left-side-nav/user/user'; +import { isEmptyForm } from '../../units/shared.utils'; +import { SessionService } from '../../services/session.service'; @Component({ selector: 'new-user-form', templateUrl: 'new-user-form.component.html', - styleUrls: ['./new-user-form.component.scss', '../../common.scss'] + styleUrls: ['./new-user-form.component.scss', '../../../common.scss'] }) export class NewUserFormComponent implements AfterViewChecked, OnInit { diff --git a/src/portal/src/lib/components/operation/operate.ts b/src/portal/src/app/shared/components/operation/operate.ts similarity index 100% rename from src/portal/src/lib/components/operation/operate.ts rename to src/portal/src/app/shared/components/operation/operate.ts diff --git a/src/portal/src/lib/components/operation/operation.component.css b/src/portal/src/app/shared/components/operation/operation.component.css similarity index 100% rename from src/portal/src/lib/components/operation/operation.component.css rename to src/portal/src/app/shared/components/operation/operation.component.css diff --git a/src/portal/src/lib/components/operation/operation.component.html b/src/portal/src/app/shared/components/operation/operation.component.html similarity index 100% rename from src/portal/src/lib/components/operation/operation.component.html rename to src/portal/src/app/shared/components/operation/operation.component.html diff --git a/src/portal/src/lib/components/operation/operation.component.spec.ts b/src/portal/src/app/shared/components/operation/operation.component.spec.ts similarity index 88% rename from src/portal/src/lib/components/operation/operation.component.spec.ts rename to src/portal/src/app/shared/components/operation/operation.component.spec.ts index 1618a681b0..4ff8b1c835 100644 --- a/src/portal/src/lib/components/operation/operation.component.spec.ts +++ b/src/portal/src/app/shared/components/operation/operation.component.spec.ts @@ -3,29 +3,23 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateService } from "@ngx-translate/core"; import { OperationComponent } from './operation.component'; import { OperationService } from './operation.service'; -import { HarborLibraryModule } from '../../harbor-library.module'; -import { IServiceConfig, SERVICE_CONFIG } from '../../entities/service.config'; import { OperateInfo } from './operate'; -import { CURRENT_BASE_HREF } from "../../utils/utils"; +import { CURRENT_BASE_HREF } from "../../units/utils"; +import { SharedTestingModule } from "../../shared.module"; describe('OperationComponent', () => { let component: OperationComponent; let fixture: ComponentFixture; - let config: IServiceConfig = { - configurationEndpoint: CURRENT_BASE_HREF + '/configurations/testing' - }; - beforeEach(() => { TestBed.configureTestingModule({ imports: [ - HarborLibraryModule, + SharedTestingModule, BrowserAnimationsModule, ], providers: [ OperationService, TranslateService, - {provide: SERVICE_CONFIG, useValue: config} ] }); }); diff --git a/src/portal/src/lib/components/operation/operation.component.ts b/src/portal/src/app/shared/components/operation/operation.component.ts similarity index 100% rename from src/portal/src/lib/components/operation/operation.component.ts rename to src/portal/src/app/shared/components/operation/operation.component.ts diff --git a/src/portal/src/lib/components/operation/operation.service.spec.ts b/src/portal/src/app/shared/components/operation/operation.service.spec.ts similarity index 100% rename from src/portal/src/lib/components/operation/operation.service.spec.ts rename to src/portal/src/app/shared/components/operation/operation.service.spec.ts diff --git a/src/portal/src/lib/components/operation/operation.service.ts b/src/portal/src/app/shared/components/operation/operation.service.ts similarity index 90% rename from src/portal/src/lib/components/operation/operation.service.ts rename to src/portal/src/app/shared/components/operation/operation.service.ts index d7bcd5d093..24aa075bac 100644 --- a/src/portal/src/lib/components/operation/operation.service.ts +++ b/src/portal/src/app/shared/components/operation/operation.service.ts @@ -2,7 +2,9 @@ import { Injectable } from '@angular/core'; import { Observable, Subject} from "rxjs"; import { OperateInfo } from "./operate"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class OperationService { subjects: Subject = null; diff --git a/src/portal/src/lib/components/push-image/copy-input.component.ts b/src/portal/src/app/shared/components/push-image/copy-input.component.ts similarity index 100% rename from src/portal/src/lib/components/push-image/copy-input.component.ts rename to src/portal/src/app/shared/components/push-image/copy-input.component.ts diff --git a/src/portal/src/lib/components/push-image/copy-input.coponent.html b/src/portal/src/app/shared/components/push-image/copy-input.coponent.html similarity index 100% rename from src/portal/src/lib/components/push-image/copy-input.coponent.html rename to src/portal/src/app/shared/components/push-image/copy-input.coponent.html diff --git a/src/portal/src/lib/components/push-image/push-image.component.html b/src/portal/src/app/shared/components/push-image/push-image.component.html similarity index 97% rename from src/portal/src/lib/components/push-image/push-image.component.html rename to src/portal/src/app/shared/components/push-image/push-image.component.html index 5da6b3ad8c..491adb03c7 100644 --- a/src/portal/src/lib/components/push-image/push-image.component.html +++ b/src/portal/src/app/shared/components/push-image/push-image.component.html @@ -19,7 +19,7 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- +
{{ 'PUSH_IMAGE.DOCKER' | translate }} {{ 'PUSH_IMAGE.TITLE' | translate }}
diff --git a/src/portal/src/lib/components/push-image/push-image.component.spec.ts b/src/portal/src/app/shared/components/push-image/push-image.component.spec.ts similarity index 83% rename from src/portal/src/lib/components/push-image/push-image.component.spec.ts rename to src/portal/src/app/shared/components/push-image/push-image.component.spec.ts index 3dde75b566..cf1b6710c0 100644 --- a/src/portal/src/lib/components/push-image/push-image.component.spec.ts +++ b/src/portal/src/app/shared/components/push-image/push-image.component.spec.ts @@ -1,30 +1,24 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; - import { PushImageButtonComponent } from './push-image.component'; import { CopyInputComponent } from './copy-input.component'; import { InlineAlertComponent } from '../inline-alert/inline-alert.component'; - -import { SERVICE_CONFIG, IServiceConfig } from '../../entities/service.config'; -import { SharedModule } from '../../utils/shared/shared.module'; -import { ErrorHandler } from '../../../lib/utils/error-handler'; +import { ErrorHandler } from '../../units/error-handler'; +import { SharedTestingModule } from "../../shared.module"; describe('PushImageButtonComponent (inline template)', () => { let component: PushImageButtonComponent; let fixture: ComponentFixture; - let serviceConfig: IServiceConfig; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ - SharedModule + SharedTestingModule ], declarations: [InlineAlertComponent, CopyInputComponent, PushImageButtonComponent], providers: [ - { provide: SERVICE_CONFIG, useValue: {} }, ErrorHandler ] }); - })); beforeEach(() => { @@ -32,8 +26,6 @@ describe('PushImageButtonComponent (inline template)', () => { component = fixture.componentInstance; component.projectName = 'testing'; component.registryUrl = 'https://testing.harbor.com'; - serviceConfig = TestBed.get(SERVICE_CONFIG); - fixture.detectChanges(); }); diff --git a/src/portal/src/lib/components/push-image/push-image.component.ts b/src/portal/src/app/shared/components/push-image/push-image.component.ts similarity index 100% rename from src/portal/src/lib/components/push-image/push-image.component.ts rename to src/portal/src/app/shared/components/push-image/push-image.component.ts diff --git a/src/portal/src/lib/components/push-image/push-image.scss b/src/portal/src/app/shared/components/push-image/push-image.scss similarity index 100% rename from src/portal/src/lib/components/push-image/push-image.scss rename to src/portal/src/app/shared/components/push-image/push-image.scss diff --git a/src/portal/src/lib/components/third-party/ngx-clipboard/clipboard.directive.ts b/src/portal/src/app/shared/components/third-party/ngx-clipboard/clipboard.directive.ts similarity index 98% rename from src/portal/src/lib/components/third-party/ngx-clipboard/clipboard.directive.ts rename to src/portal/src/app/shared/components/third-party/ngx-clipboard/clipboard.directive.ts index 5538d0e18e..d314c98202 100644 --- a/src/portal/src/lib/components/third-party/ngx-clipboard/clipboard.directive.ts +++ b/src/portal/src/app/shared/components/third-party/ngx-clipboard/clipboard.directive.ts @@ -2,7 +2,7 @@ import { ClipboardService } from './clipboard.service'; import { Directive, EventEmitter, HostListener, Input, OnDestroy, OnInit, Output, ElementRef, Renderer2 } from '@angular/core'; @Directive({ - selector: '[ngxClipboard]' + selector: '[ngxClipboard]', }) export class ClipboardDirective implements OnInit, OnDestroy { // tslint:disable-next-line:no-input-rename diff --git a/src/portal/src/lib/components/third-party/ngx-clipboard/clipboard.service.ts b/src/portal/src/app/shared/components/third-party/ngx-clipboard/clipboard.service.ts similarity index 96% rename from src/portal/src/lib/components/third-party/ngx-clipboard/clipboard.service.ts rename to src/portal/src/app/shared/components/third-party/ngx-clipboard/clipboard.service.ts index 7ef8c2d757..c46b13a84a 100644 --- a/src/portal/src/lib/components/third-party/ngx-clipboard/clipboard.service.ts +++ b/src/portal/src/app/shared/components/third-party/ngx-clipboard/clipboard.service.ts @@ -1,6 +1,4 @@ -import { Inject, -// tslint:disable-next-line:no-unused-variable -InjectionToken, Injectable, Optional, SkipSelf, Renderer2 } from "@angular/core"; +import { Inject, Injectable, Optional, SkipSelf, Renderer2 } from "@angular/core"; import { DOCUMENT } from "@angular/common"; import { WINDOW } from "../ngx-window-token/window-token"; diff --git a/src/portal/src/lib/components/third-party/ngx-clipboard/index.ts b/src/portal/src/app/shared/components/third-party/ngx-clipboard/index.ts similarity index 87% rename from src/portal/src/lib/components/third-party/ngx-clipboard/index.ts rename to src/portal/src/app/shared/components/third-party/ngx-clipboard/index.ts index c75916d227..7e224db945 100644 --- a/src/portal/src/lib/components/third-party/ngx-clipboard/index.ts +++ b/src/portal/src/app/shared/components/third-party/ngx-clipboard/index.ts @@ -9,7 +9,10 @@ export * from './clipboard.service'; @NgModule({ imports: [CommonModule, WindowTokenModule], declarations: [ClipboardDirective], - exports: [ClipboardDirective], + exports: [ + ClipboardDirective, + WindowTokenModule + ], providers: [CLIPBOARD_SERVICE_PROVIDER] }) export class ClipboardModule { } diff --git a/src/portal/src/lib/components/third-party/ngx-window-token/window-token.ts b/src/portal/src/app/shared/components/third-party/ngx-window-token/window-token.ts similarity index 100% rename from src/portal/src/lib/components/third-party/ngx-window-token/window-token.ts rename to src/portal/src/app/shared/components/third-party/ngx-window-token/window-token.ts diff --git a/src/portal/src/app/system-robot-accounts/view-token/view-token.component.html b/src/portal/src/app/shared/components/view-token/view-token.component.html similarity index 100% rename from src/portal/src/app/system-robot-accounts/view-token/view-token.component.html rename to src/portal/src/app/shared/components/view-token/view-token.component.html diff --git a/src/portal/src/app/system-robot-accounts/view-token/view-token.component.scss b/src/portal/src/app/shared/components/view-token/view-token.component.scss similarity index 100% rename from src/portal/src/app/system-robot-accounts/view-token/view-token.component.scss rename to src/portal/src/app/shared/components/view-token/view-token.component.scss diff --git a/src/portal/src/app/system-robot-accounts/view-token/view-token.component.spec.ts b/src/portal/src/app/shared/components/view-token/view-token.component.spec.ts similarity index 86% rename from src/portal/src/app/system-robot-accounts/view-token/view-token.component.spec.ts rename to src/portal/src/app/shared/components/view-token/view-token.component.spec.ts index c6f21e4804..2a3fc6e032 100644 --- a/src/portal/src/app/system-robot-accounts/view-token/view-token.component.spec.ts +++ b/src/portal/src/app/shared/components/view-token/view-token.component.spec.ts @@ -1,19 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ViewTokenComponent } from './view-token.component'; -import { RobotService } from "../../../../ng-swagger-gen/services/robot.service"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; +import { RobotService } from "../../../../../ng-swagger-gen/services/robot.service"; +import { OperationService } from "../operation/operation.service"; +import { MessageHandlerService } from "../../services/message-handler.service"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ClarityModule } from "@clr/angular"; import { TranslateModule } from "@ngx-translate/core"; -import { Robot } from "../../../../ng-swagger-gen/models/robot"; -import { Action, PermissionsKinds, Resource } from "../system-robot-util"; -import { HttpHeaders, HttpResponse } from "@angular/common/http"; +import { Robot } from "../../../../../ng-swagger-gen/models/robot"; +import { Action, PermissionsKinds, Resource } from "../../../base/left-side-nav/system-robot-accounts/system-robot-util"; import { of } from "rxjs"; import { delay } from "rxjs/operators"; import { NO_ERRORS_SCHEMA } from "@angular/core"; import { FormsModule } from "@angular/forms"; -import { SharedModule } from "../../shared/shared.module"; +import { SharedTestingModule } from "../../shared.module"; describe('ViewTokenComponent', () => { let component: ViewTokenComponent; @@ -57,7 +56,7 @@ describe('ViewTokenComponent', () => { ClarityModule, TranslateModule.forRoot(), FormsModule, - SharedModule + SharedTestingModule ], declarations: [ ViewTokenComponent ], providers: [ diff --git a/src/portal/src/app/system-robot-accounts/view-token/view-token.component.ts b/src/portal/src/app/shared/components/view-token/view-token.component.ts similarity index 87% rename from src/portal/src/app/system-robot-accounts/view-token/view-token.component.ts rename to src/portal/src/app/shared/components/view-token/view-token.component.ts index de0e8c7f63..ce5016d3cc 100644 --- a/src/portal/src/app/system-robot-accounts/view-token/view-token.component.ts +++ b/src/portal/src/app/shared/components/view-token/view-token.component.ts @@ -1,17 +1,16 @@ import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; -import { RobotService } from "../../../../ng-swagger-gen/services/robot.service"; +import { RobotService } from "../../../../../ng-swagger-gen/services/robot.service"; import { ClrLoadingState } from "@clr/angular"; -import { InlineAlertComponent } from "../../shared/inline-alert/inline-alert.component"; -import { Robot } from "../../../../ng-swagger-gen/models/robot"; -import { clone } from "../../../lib/utils/utils"; +import { Robot } from "../../../../../ng-swagger-gen/models/robot"; +import { clone } from "../../units/utils"; import { NgForm } from "@angular/forms"; -import { operateChanges, OperateInfo, OperationState } from "../../../lib/components/operation/operate"; -import { OperationService } from "../../../lib/components/operation/operation.service"; -import { errorHandler } from "../../../lib/utils/shared/shared.utils"; -import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; -import { Observable } from "rxjs"; +import { operateChanges, OperateInfo, OperationState } from "../operation/operate"; +import { OperationService } from "../operation/operation.service"; +import { MessageHandlerService } from "../../services/message-handler.service"; import { DomSanitizer, SafeUrl } from "@angular/platform-browser"; import { TranslateService } from "@ngx-translate/core"; +import { InlineAlertComponent } from "../inline-alert/inline-alert.component"; +import { errorHandler } from "../../units/shared.utils"; @Component({ selector: 'view-token', diff --git a/src/portal/src/app/shared/confirmation-dialog/confirmation-message.ts b/src/portal/src/app/shared/confirmation-dialog/confirmation-message.ts deleted file mode 100644 index 1c75d1e622..0000000000 --- a/src/portal/src/app/shared/confirmation-dialog/confirmation-message.ts +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { ConfirmationTargets, ConfirmationButtons } from '../shared.const'; - -export class ConfirmationMessage { - public constructor(title: string, - message: string, - param: string, - data: any, - targetId: ConfirmationTargets, - buttons?: ConfirmationButtons) { - this.title = title; - this.message = message; - this.data = data; - this.targetId = targetId; - this.param = param; - this.buttons = buttons ? buttons : ConfirmationButtons.CONFIRM_CANCEL; - } - title: string; - message: string; - data: any = {}; // default is empty - targetId: ConfirmationTargets = ConfirmationTargets.EMPTY; - param: string; - buttons: ConfirmationButtons; -} diff --git a/src/portal/src/app/shared/date-validator.directive.spec.ts b/src/portal/src/app/shared/directives/date-validator.directive.spec.ts similarity index 100% rename from src/portal/src/app/shared/date-validator.directive.spec.ts rename to src/portal/src/app/shared/directives/date-validator.directive.spec.ts diff --git a/src/portal/src/app/shared/date-validator.directive.ts b/src/portal/src/app/shared/directives/date-validator.directive.ts similarity index 100% rename from src/portal/src/app/shared/date-validator.directive.ts rename to src/portal/src/app/shared/directives/date-validator.directive.ts diff --git a/src/portal/src/app/shared/max-length-ext.directive.spec.ts b/src/portal/src/app/shared/directives/max-length-ext.directive.spec.ts similarity index 100% rename from src/portal/src/app/shared/max-length-ext.directive.spec.ts rename to src/portal/src/app/shared/directives/max-length-ext.directive.spec.ts diff --git a/src/portal/src/app/shared/max-length-ext.directive.ts b/src/portal/src/app/shared/directives/max-length-ext.directive.ts similarity index 100% rename from src/portal/src/app/shared/max-length-ext.directive.ts rename to src/portal/src/app/shared/directives/max-length-ext.directive.ts diff --git a/src/portal/src/app/shared/port.directive.spec.ts b/src/portal/src/app/shared/directives/port.directive.spec.ts similarity index 100% rename from src/portal/src/app/shared/port.directive.spec.ts rename to src/portal/src/app/shared/directives/port.directive.spec.ts diff --git a/src/portal/src/app/shared/port.directive.ts b/src/portal/src/app/shared/directives/port.directive.ts similarity index 100% rename from src/portal/src/app/shared/port.directive.ts rename to src/portal/src/app/shared/directives/port.directive.ts diff --git a/src/portal/src/app/shared/target-exists-directive.spec.ts b/src/portal/src/app/shared/directives/target-exists-directive.spec.ts similarity index 100% rename from src/portal/src/app/shared/target-exists-directive.spec.ts rename to src/portal/src/app/shared/directives/target-exists-directive.spec.ts diff --git a/src/portal/src/app/shared/target-exists-directive.ts b/src/portal/src/app/shared/directives/target-exists-directive.ts similarity index 93% rename from src/portal/src/app/shared/target-exists-directive.ts rename to src/portal/src/app/shared/directives/target-exists-directive.ts index f2b90e6080..f88ef2fc6b 100644 --- a/src/portal/src/app/shared/target-exists-directive.ts +++ b/src/portal/src/app/shared/directives/target-exists-directive.ts @@ -13,10 +13,10 @@ // limitations under the License. import { Directive, OnChanges, Input, SimpleChanges } from '@angular/core'; import { NG_ASYNC_VALIDATORS, Validator, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; -import { MemberService } from '../project/member/member.service'; -import { Member } from '../project/member/member'; +import { MemberService } from '../../base/project/member/member.service'; +import { Member } from '../../base/project/member/member'; import { Observable } from 'rxjs'; -import { ProjectDefaultService, ProjectService } from "../../lib/services"; +import { ProjectDefaultService, ProjectService } from "../services"; @Directive({ selector: '[targetExists]', diff --git a/src/portal/src/app/shared/session-user.ts b/src/portal/src/app/shared/entities/session-user.ts similarity index 100% rename from src/portal/src/app/shared/session-user.ts rename to src/portal/src/app/shared/entities/session-user.ts diff --git a/src/portal/src/lib/entities/shared.const.ts b/src/portal/src/app/shared/entities/shared.const.ts similarity index 68% rename from src/portal/src/lib/entities/shared.const.ts rename to src/portal/src/app/shared/entities/shared.const.ts index a50f8beb1d..e78b5a4061 100644 --- a/src/portal/src/lib/entities/shared.const.ts +++ b/src/portal/src/app/shared/entities/shared.const.ts @@ -38,7 +38,17 @@ export const enum ConfirmationTargets { HELM_CHART, HELM_CHART_VERSION, STOP_EXECUTIONS, - REPLICATION + SCANNER, + REPLICATION, + ROBOT_ACCOUNT_ENABLE_OR_DISABLE, + INSTANCE, + P2P_PROVIDER, + P2P_PROVIDER_STOP, + P2P_PROVIDER_EXECUTE, + P2P_PROVIDER_DELETE, + PROJECT_ROBOT_ACCOUNT, + PROJECT_ROBOT_ACCOUNT_ENABLE_OR_DISABLE, + WEBHOOK } export const enum ActionType { @@ -52,9 +62,9 @@ export const ListMode = { export const CommonRoutes = { SIGN_IN: "/sign-in", - EMBEDDED_SIGN_IN: "/harbor/sign-in", + EMBEDDED_SIGN_IN: "/account/sign-in", SIGN_UP: "/sign-in?sign_up=true", - EMBEDDED_SIGN_UP: "/harbor/sign-in?sign_up=true", + EMBEDDED_SIGN_UP: "/account/sign-in?sign_up=true", HARBOR_ROOT: "/harbor", HARBOR_DEFAULT: "/harbor/projects" }; @@ -161,3 +171,72 @@ export enum GroupType { OIDC_TYPE = 3 } export const REFRESH_TIME_DIFFERENCE = 10000; + + +// + + +export const supportedLangs = ['en-us', 'zh-cn', 'zh-tw', 'es-es', 'fr-fr', 'pt-br', 'tr-tr', 'de-de']; +export const DeFaultLang = "en-us"; +export const languageNames = { + "en-us": "English", + "zh-cn": "中文简体", + "zh-tw": "中文繁體", + "es-es": "Español", + "fr-fr": "Français", + "pt-br": "Português do Brasil", + "tr-tr": "Türkçe", + "de-de": "Deutsch" +}; +/** + * The default cookie key used to store current used language preference. + */ +export const DEFAULT_LANG_LOCALSTORAGE_KEY = 'harbor-lang'; + +export const AdmiralQueryParamKey = "admiral_redirect_url"; + +export const HarborQueryParamKey = "harbor_redirect_url"; + +export const CookieKeyOfAdmiral = "admiral.endpoint.latest"; + +export const ProjectTypes = { 0: 'PROJECT.ALL_PROJECTS', 1: 'PROJECT.PRIVATE_PROJECTS', 2: 'PROJECT.PUBLIC_PROJECTS' }; + +export const RoleInfo = { + 1: "MEMBER.PROJECT_ADMIN", + 2: "MEMBER.DEVELOPER", + 3: "MEMBER.GUEST", + 4: "MEMBER.PROJECT_MAINTAINER", + 5: "MEMBER.LIMITED_GUEST", +}; + +export const RoleMapping = { + "projectAdmin": "MEMBER.PROJECT_ADMIN", + "maintainer": "MEMBER.PROJECT_MAINTAINER", + "developer": "MEMBER.DEVELOPER", + "guest": "MEMBER.GUEST", + "limitedGuest": "MEMBER.LIMITED_GUEST", +}; + +export const ProjectRoles = [ + { id: 1, value: "MEMBER.PROJECT_ADMIN" }, + { id: 2, value: "MEMBER.DEVELOPER" }, + { id: 3, value: "MEMBER.GUEST" }, + { id: 4, value: "MEMBER.PROJECT_MAINTAINER" }, + { id: 5, value: "MEMBER.LIMITED_GUEST" }, +]; + +export enum Roles { + PROJECT_ADMIN = 1, + PROJECT_MAINTAINER = 4, + DEVELOPER = 2, + GUEST = 3, + LIMITED_GUEST = 5, + OTHER = 0, +} +export const DefaultHelmIcon = '/images/helm-gray.svg'; + +export enum ResourceType { + REPOSITORY = 1, + CHART_VERSION = 2, + REPOSITORY_TAG = 3, +} diff --git a/src/portal/src/app/shared/inline-alert/inline-alert.component.scss b/src/portal/src/app/shared/inline-alert/inline-alert.component.scss deleted file mode 100644 index 0d96e37ca6..0000000000 --- a/src/portal/src/app/shared/inline-alert/inline-alert.component.scss +++ /dev/null @@ -1,9 +0,0 @@ -.alert-text-blink { - color: red; - font-weight: bolder; -} - -.alert-btn-link { - padding: 0px !important; - min-width: 30px !important; -} \ No newline at end of file diff --git a/src/portal/src/app/shared/inline-alert/inline-alert.component.spec.ts b/src/portal/src/app/shared/inline-alert/inline-alert.component.spec.ts deleted file mode 100644 index fedc663bf5..0000000000 --- a/src/portal/src/app/shared/inline-alert/inline-alert.component.spec.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { InlineAlertComponent } from './inline-alert.component'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ClarityModule } from '@clr/angular'; -import { FormsModule } from '@angular/forms'; -import { RouterTestingModule } from '@angular/router/testing'; -import { of } from 'rxjs'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { MessageHandlerService } from '../message-handler/message-handler.service'; -import { ErrorHandler } from '../../../lib/utils/error-handler'; - -describe('InlineAlertComponent', () => { - let component: InlineAlertComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ], - imports: [ - BrowserAnimationsModule, - ClarityModule, - TranslateModule.forRoot(), - FormsModule, - RouterTestingModule, - NoopAnimationsModule, - HttpClientTestingModule - ], - declarations: [InlineAlertComponent], - providers: [ - TranslateService, - ErrorHandler - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(InlineAlertComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/app/shared/inline-alert/inline-alert.component.ts b/src/portal/src/app/shared/inline-alert/inline-alert.component.ts deleted file mode 100644 index f441fb8660..0000000000 --- a/src/portal/src/app/shared/inline-alert/inline-alert.component.ts +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { Component, Output, EventEmitter } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { Subscription } from "rxjs"; -import { errorHandler } from "../../../lib/utils/shared/shared.utils"; -import { MessageHandlerService } from '../message-handler/message-handler.service'; -import { ErrorHandler } from '../../../lib/utils/error-handler'; - -@Component({ - selector: 'inline-alert', - templateUrl: "inline-alert.component.html", - styleUrls: ['inline-alert.component.scss'] -}) -export class InlineAlertComponent { - inlineAlertType: string = 'danger'; - inlineAlertClosable: boolean = false; - alertClose: boolean = true; - displayedText: string = ""; - showCancelAction: boolean = false; - useAppLevelStyle: boolean = false; - timer: Subscription = null; - count: number = 0; - blinking: boolean = false; - - @Output() confirmEvt = new EventEmitter(); - @Output() closeEvt = new EventEmitter(); - - constructor(private translate: TranslateService, - private errHandler: ErrorHandler, - ) { } - - public get errorMessage(): string { - return this.displayedText; - } - - // Show error message inline - public showInlineError(error: any): void { - this.displayedText = errorHandler(error); - if (this.displayedText) { - this.translate.get(this.displayedText).subscribe((res: string) => this.displayedText = res); - } - this.errHandler.handleErrorPopupUnauthorized(error); - this.inlineAlertType = 'danger'; - this.showCancelAction = false; - this.inlineAlertClosable = true; - this.alertClose = false; - this.useAppLevelStyle = false; - } - - // Show confirmation info with action button - public showInlineConfirmation(warning: any): void { - this.displayedText = ""; - if (warning && warning.message) { - this.translate.get(warning.message).subscribe((res: string) => this.displayedText = res); - } - this.inlineAlertType = 'warning'; - this.showCancelAction = true; - this.inlineAlertClosable = false; - this.alertClose = false; - this.useAppLevelStyle = false; - } - - // Show warning - public showInlineWarning(warning: any): void { - this.displayedText = ""; - if (warning && warning.message) { - this.translate.get(warning.message).subscribe((res: string) => this.displayedText = res); - } - this.inlineAlertType = 'warning'; - this.showCancelAction = false; - this.inlineAlertClosable = true; - this.alertClose = false; - this.useAppLevelStyle = false; - } - - // Show inline sccess info - public showInlineSuccess(info: any): void { - this.displayedText = ""; - if (info && info.message) { - this.translate.get(info.message).subscribe((res: string) => this.displayedText = res); - } - this.inlineAlertType = 'success'; - this.showCancelAction = false; - this.inlineAlertClosable = true; - this.alertClose = false; - this.useAppLevelStyle = false; - } - - // Close alert - public close(): void { - this.alertClose = true; - this.closeEvt.emit(true); - } - - public blink() { - } - - confirmCancel(): void { - this.confirmEvt.emit(true); - } -} diff --git a/src/portal/src/app/shared/route/auth-user-activate.service.spec.ts b/src/portal/src/app/shared/router-guard/auth-user-activate.service.spec.ts similarity index 81% rename from src/portal/src/app/shared/route/auth-user-activate.service.spec.ts rename to src/portal/src/app/shared/router-guard/auth-user-activate.service.spec.ts index 2542e267c0..a2736f3d9a 100644 --- a/src/portal/src/app/shared/route/auth-user-activate.service.spec.ts +++ b/src/portal/src/app/shared/router-guard/auth-user-activate.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed, inject } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../services/session.service'; import { AppConfigService } from '../../services/app-config.service'; -import { MessageHandlerService } from '../message-handler/message-handler.service'; -import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; +import { MessageHandlerService } from '../services/message-handler.service'; +import { SearchTriggerService } from '../components/global-search/search-trigger.service'; import { AuthCheckGuard } from './auth-user-activate.service'; describe('AuthCheckGuard', () => { diff --git a/src/portal/src/app/shared/route/auth-user-activate.service.ts b/src/portal/src/app/shared/router-guard/auth-user-activate.service.ts similarity index 86% rename from src/portal/src/app/shared/route/auth-user-activate.service.ts rename to src/portal/src/app/shared/router-guard/auth-user-activate.service.ts index 291a49cf47..dfe5d1d4cf 100644 --- a/src/portal/src/app/shared/route/auth-user-activate.service.ts +++ b/src/portal/src/app/shared/router-guard/auth-user-activate.service.ts @@ -19,15 +19,17 @@ import { CanActivateChild, NavigationExtras } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; -import { AdmiralQueryParamKey } from '../../shared/shared.const'; +import { SessionService } from '../services/session.service'; import { AppConfigService } from '../../services/app-config.service'; -import { maintainUrlQueryParmas } from '../../shared/shared.utils'; -import { MessageHandlerService } from '../message-handler/message-handler.service'; -import { SearchTriggerService } from '../../base/global-search/search-trigger.service'; +import { maintainUrlQueryParmas } from '../units/shared.utils'; +import { MessageHandlerService } from '../services/message-handler.service'; +import { SearchTriggerService } from '../components/global-search/search-trigger.service'; import { Observable } from "rxjs"; -import { CommonRoutes } from "../../../lib/entities/shared.const"; -@Injectable() +import { AdmiralQueryParamKey, CommonRoutes } from "../entities/shared.const"; + +@Injectable({ + providedIn: 'root', +}) export class AuthCheckGuard implements CanActivate, CanActivateChild { constructor( private authService: SessionService, @@ -82,7 +84,7 @@ export class AuthCheckGuard implements CanActivate, CanActivateChild { } // Session retrieving failed then redirect to sign-in // no matter what status code is. - // Please pay attention that route 'HARBOR_ROOT' and 'EMBEDDED_SIGN_IN' support anonymous user + // Please pay attention that router-guard 'HARBOR_ROOT' and 'EMBEDDED_SIGN_IN' support anonymous user if (!state.url.startsWith(CommonRoutes.EMBEDDED_SIGN_IN)) { let navigatorExtra: NavigationExtras = { queryParams: { "redirect_url": state.url } diff --git a/src/portal/src/app/shared/route/member-guard-activate.service.spec.ts b/src/portal/src/app/shared/router-guard/member-guard-activate.service.spec.ts similarity index 85% rename from src/portal/src/app/shared/route/member-guard-activate.service.spec.ts rename to src/portal/src/app/shared/router-guard/member-guard-activate.service.spec.ts index 57d2c151a2..920f7f6a7b 100644 --- a/src/portal/src/app/shared/route/member-guard-activate.service.spec.ts +++ b/src/portal/src/app/shared/router-guard/member-guard-activate.service.spec.ts @@ -1,8 +1,8 @@ import { TestBed, inject } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../services/session.service'; import { MemberGuard } from './member-guard-activate.service'; -import { ProjectService } from "../../../lib/services"; +import { ProjectService } from "../services"; describe('MemberGuard', () => { const fakeSessionService = null; diff --git a/src/portal/src/app/shared/route/member-guard-activate.service.ts b/src/portal/src/app/shared/router-guard/member-guard-activate.service.ts similarity index 91% rename from src/portal/src/app/shared/route/member-guard-activate.service.ts rename to src/portal/src/app/shared/router-guard/member-guard-activate.service.ts index 95d0ad2d96..c22cb2c964 100644 --- a/src/portal/src/app/shared/route/member-guard-activate.service.ts +++ b/src/portal/src/app/shared/router-guard/member-guard-activate.service.ts @@ -18,13 +18,15 @@ import { RouterStateSnapshot, CanActivateChild } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../services/session.service'; import { Observable, of } from 'rxjs'; import { map, catchError } from 'rxjs/operators'; -import { ProjectService } from "../../../lib/services"; -import { CommonRoutes } from "../../../lib/entities/shared.const"; +import { ProjectService } from "../services"; +import { CommonRoutes } from "../entities/shared.const"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class MemberGuard implements CanActivate, CanActivateChild { constructor( private sessionService: SessionService, diff --git a/src/portal/src/app/shared/route/member-permission-guard-activate.service.spec.ts b/src/portal/src/app/shared/router-guard/member-permission-guard-activate.service.spec.ts similarity index 86% rename from src/portal/src/app/shared/route/member-permission-guard-activate.service.spec.ts rename to src/portal/src/app/shared/router-guard/member-permission-guard-activate.service.spec.ts index 3bcbd95112..ccffeb6dbb 100644 --- a/src/portal/src/app/shared/route/member-permission-guard-activate.service.spec.ts +++ b/src/portal/src/app/shared/router-guard/member-permission-guard-activate.service.spec.ts @@ -2,8 +2,8 @@ import { TestBed, inject } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { MemberPermissionGuard } from './member-permission-guard-activate.service'; import { of } from 'rxjs'; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { UserPermissionService } from "../../../lib/services"; +import { ErrorHandler } from "../units/error-handler"; +import { UserPermissionService } from "../services"; describe('MemberPermissionGuardActivateServiceGuard', () => { const fakeUserPermissionService = { diff --git a/src/portal/src/app/shared/route/member-permission-guard-activate.service.ts b/src/portal/src/app/shared/router-guard/member-permission-guard-activate.service.ts similarity index 89% rename from src/portal/src/app/shared/route/member-permission-guard-activate.service.ts rename to src/portal/src/app/shared/router-guard/member-permission-guard-activate.service.ts index 0471fd36ec..547b9a8a75 100644 --- a/src/portal/src/app/shared/route/member-permission-guard-activate.service.ts +++ b/src/portal/src/app/shared/router-guard/member-permission-guard-activate.service.ts @@ -7,11 +7,13 @@ import { CanActivateChild, } from "@angular/router"; import { Observable } from "rxjs"; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { UserPermissionService, UserPrivilegeServeItem } from "../../../lib/services"; -import { CommonRoutes } from "../../../lib/entities/shared.const"; +import { ErrorHandler } from "../units/error-handler"; +import { UserPermissionService, UserPrivilegeServeItem } from "../services"; +import { CommonRoutes } from "../entities/shared.const"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class MemberPermissionGuard implements CanActivate, CanActivateChild { constructor( private router: Router, diff --git a/src/portal/src/app/shared/route/mode-guard-activate.service.spec.ts b/src/portal/src/app/shared/router-guard/mode-guard-activate.service.spec.ts similarity index 100% rename from src/portal/src/app/shared/route/mode-guard-activate.service.spec.ts rename to src/portal/src/app/shared/router-guard/mode-guard-activate.service.spec.ts diff --git a/src/portal/src/app/shared/route/mode-guard-activate.service.ts b/src/portal/src/app/shared/router-guard/mode-guard-activate.service.ts similarity index 95% rename from src/portal/src/app/shared/route/mode-guard-activate.service.ts rename to src/portal/src/app/shared/router-guard/mode-guard-activate.service.ts index 93d2693b99..681ab48a50 100644 --- a/src/portal/src/app/shared/route/mode-guard-activate.service.ts +++ b/src/portal/src/app/shared/router-guard/mode-guard-activate.service.ts @@ -20,9 +20,11 @@ import { } from '@angular/router'; import { AppConfigService } from '../../services/app-config.service'; import { Observable } from 'rxjs'; -import { CommonRoutes } from "../../../lib/entities/shared.const"; +import { CommonRoutes } from "../entities/shared.const"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class ModeGuard implements CanActivate, CanActivateChild { constructor( private router: Router, diff --git a/src/portal/src/app/shared/route/oidc-guard-active.service.spec.ts b/src/portal/src/app/shared/router-guard/oidc-guard-active.service.spec.ts similarity index 93% rename from src/portal/src/app/shared/route/oidc-guard-active.service.spec.ts rename to src/portal/src/app/shared/router-guard/oidc-guard-active.service.spec.ts index 905d3ab4df..f5422fb023 100644 --- a/src/portal/src/app/shared/route/oidc-guard-active.service.spec.ts +++ b/src/portal/src/app/shared/router-guard/oidc-guard-active.service.spec.ts @@ -3,7 +3,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { OidcGuard } from './oidc-guard-active.service'; import { AppConfigService } from '../../services/app-config.service'; import { of } from 'rxjs'; -import { UserPermissionService } from "../../../lib/services"; +import { UserPermissionService } from "../services"; describe('OidcGuard', () => { const fakeAppConfigService = null; diff --git a/src/portal/src/app/shared/route/oidc-guard-active.service.ts b/src/portal/src/app/shared/router-guard/oidc-guard-active.service.ts similarity index 90% rename from src/portal/src/app/shared/route/oidc-guard-active.service.ts rename to src/portal/src/app/shared/router-guard/oidc-guard-active.service.ts index 86fcfe2498..4223f13f8b 100644 --- a/src/portal/src/app/shared/route/oidc-guard-active.service.ts +++ b/src/portal/src/app/shared/router-guard/oidc-guard-active.service.ts @@ -21,12 +21,13 @@ import { } from '@angular/router'; import { AppConfigService } from '../../services/app-config.service'; import { Observable } from 'rxjs'; -import { CommonRoutes } from "../../../lib/entities/shared.const"; -import { UserPermissionService } from "../../../lib/services"; +import { CommonRoutes } from "../entities/shared.const"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class OidcGuard implements CanActivate, CanActivateChild { - constructor(private appConfigService: AppConfigService, private router: Router, private userPermission: UserPermissionService) { } + constructor(private appConfigService: AppConfigService, private router: Router) { } canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | boolean { // If user has logged in, should not login again diff --git a/src/portal/src/app/shared/route/sign-in-guard-activate.service.spec.ts b/src/portal/src/app/shared/router-guard/sign-in-guard-activate.service.spec.ts similarity index 86% rename from src/portal/src/app/shared/route/sign-in-guard-activate.service.spec.ts rename to src/portal/src/app/shared/router-guard/sign-in-guard-activate.service.spec.ts index d548689571..27f9506f60 100644 --- a/src/portal/src/app/shared/route/sign-in-guard-activate.service.spec.ts +++ b/src/portal/src/app/shared/router-guard/sign-in-guard-activate.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed, inject } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { SignInGuard } from './sign-in-guard-activate.service'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../services/session.service'; import { of } from 'rxjs'; -import { UserPermissionService } from "../../../lib/services"; +import { UserPermissionService } from "../services"; describe('SignInGuard', () => { const fakeUserPermissionService = { diff --git a/src/portal/src/app/shared/route/sign-in-guard-activate.service.ts b/src/portal/src/app/shared/router-guard/sign-in-guard-activate.service.ts similarity index 93% rename from src/portal/src/app/shared/route/sign-in-guard-activate.service.ts rename to src/portal/src/app/shared/router-guard/sign-in-guard-activate.service.ts index 225c9b3dd9..3d297ae6ce 100644 --- a/src/portal/src/app/shared/route/sign-in-guard-activate.service.ts +++ b/src/portal/src/app/shared/router-guard/sign-in-guard-activate.service.ts @@ -18,11 +18,13 @@ import { RouterStateSnapshot, CanActivateChild } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../services/session.service'; import { Observable } from 'rxjs'; -import { CommonRoutes } from "../../../lib/entities/shared.const"; +import { CommonRoutes } from "../entities/shared.const"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class SignInGuard implements CanActivate, CanActivateChild { constructor(private authService: SessionService, private router: Router) { } diff --git a/src/portal/src/app/shared/route/system-admin-activate.service.spec.ts b/src/portal/src/app/shared/router-guard/system-admin-activate.service.spec.ts similarity index 92% rename from src/portal/src/app/shared/route/system-admin-activate.service.spec.ts rename to src/portal/src/app/shared/router-guard/system-admin-activate.service.spec.ts index 53bc9eaf87..4458669708 100644 --- a/src/portal/src/app/shared/route/system-admin-activate.service.spec.ts +++ b/src/portal/src/app/shared/router-guard/system-admin-activate.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed, inject } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { SystemAdminGuard } from './system-admin-activate.service'; import { AppConfigService } from '../../services/app-config.service'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../services/session.service'; describe('SystemAdminGuard', () => { const fakeAppConfigService = null; diff --git a/src/portal/src/app/shared/route/system-admin-activate.service.ts b/src/portal/src/app/shared/router-guard/system-admin-activate.service.ts similarity index 91% rename from src/portal/src/app/shared/route/system-admin-activate.service.ts rename to src/portal/src/app/shared/router-guard/system-admin-activate.service.ts index fdcdb9483a..8a535a5064 100644 --- a/src/portal/src/app/shared/route/system-admin-activate.service.ts +++ b/src/portal/src/app/shared/router-guard/system-admin-activate.service.ts @@ -19,12 +19,14 @@ import { CanActivateChild, NavigationExtras } from '@angular/router'; -import { SessionService } from '../../shared/session.service'; +import { SessionService } from '../services/session.service'; import { AppConfigService } from '../../services/app-config.service'; import { Observable } from 'rxjs'; -import { CommonRoutes } from "../../../lib/entities/shared.const"; +import { CommonRoutes } from "../entities/shared.const"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class SystemAdminGuard implements CanActivate, CanActivateChild { constructor( private authService: SessionService, @@ -48,7 +50,7 @@ export class SystemAdminGuard implements CanActivate, CanActivateChild { }, error => { // Session retrieving failed.pipe(map redirect to sign-in // no matter what status code is. - // Please pay attention that route 'harborRootRoute' support anonymous user + // Please pay attention that router-guard 'harborRootRoute' support anonymous user if (state.url !== CommonRoutes.HARBOR_ROOT && !state.url.startsWith(CommonRoutes.EMBEDDED_SIGN_IN)) { let navigatorExtra: NavigationExtras = { queryParams: { "redirect_url": state.url } diff --git a/src/portal/src/lib/services/RequestQueryParams.ts b/src/portal/src/app/shared/services/RequestQueryParams.ts similarity index 100% rename from src/portal/src/lib/services/RequestQueryParams.ts rename to src/portal/src/app/shared/services/RequestQueryParams.ts diff --git a/src/portal/src/lib/services/channel.service.ts b/src/portal/src/app/shared/services/channel.service.ts similarity index 88% rename from src/portal/src/lib/services/channel.service.ts rename to src/portal/src/app/shared/services/channel.service.ts index 78d4c61aca..9fb3f7aa6c 100644 --- a/src/portal/src/lib/services/channel.service.ts +++ b/src/portal/src/app/shared/services/channel.service.ts @@ -13,9 +13,11 @@ // limitations under the License. import { Injectable } from '@angular/core'; import { Subject } from "rxjs"; -import { ArtifactFront as Artifact } from "../../app/project/repository/artifact/artifact"; +import { ArtifactFront as Artifact } from "../../base/project/repository/artifact/artifact"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class ChannelService { // Declare for publishing scan event diff --git a/src/portal/src/app/shared/services/endpoint.service.spec.ts b/src/portal/src/app/shared/services/endpoint.service.spec.ts new file mode 100644 index 0000000000..3f0a12e5f6 --- /dev/null +++ b/src/portal/src/app/shared/services/endpoint.service.spec.ts @@ -0,0 +1,24 @@ +import { TestBed, inject } from '@angular/core/testing'; +import { SharedTestingModule } from "../shared.module"; +import { EndpointDefaultService, EndpointService } from "./endpoint.service"; + + +describe('EndpointService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + SharedTestingModule, + ], + providers: [ + EndpointDefaultService, + { + provide: EndpointService, + useClass: EndpointDefaultService + }] + }); + }); + + it('should be initialized', inject([EndpointDefaultService], (service: EndpointService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/portal/src/lib/services/endpoint.service.ts b/src/portal/src/app/shared/services/endpoint.service.ts similarity index 93% rename from src/portal/src/lib/services/endpoint.service.ts rename to src/portal/src/app/shared/services/endpoint.service.ts index 54401211bd..7c95e4972b 100644 --- a/src/portal/src/lib/services/endpoint.service.ts +++ b/src/portal/src/app/shared/services/endpoint.service.ts @@ -1,15 +1,13 @@ -import { Injectable, Inject } from "@angular/core"; +import { Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; import { Observable, throwError as observableThrowError } from "rxjs"; - -import { IServiceConfig, SERVICE_CONFIG } from "../entities/service.config"; import { buildHttpRequestOptions, HTTP_JSON_OPTIONS, HTTP_GET_OPTIONS, CURRENT_BASE_HREF -} from "../utils/utils"; -import { RequestQueryParams } from "./RequestQueryParams"; -import { Endpoint, ReplicationRule, PingEndpoint } from "./interface"; +} from "../units/utils"; +import { RequestQueryParams } from "./index"; +import { Endpoint, ReplicationRule, PingEndpoint } from "./index"; import { catchError, map } from "rxjs/operators"; const ADAPTERS_MAP = { @@ -163,13 +161,10 @@ export class EndpointDefaultService extends EndpointService { _endpointUrl: string; constructor( - @Inject(SERVICE_CONFIG) config: IServiceConfig, private http: HttpClient ) { super(); - this._endpointUrl = config.targetBaseEndpoint - ? config.targetBaseEndpoint - : CURRENT_BASE_HREF + "/registries"; + this._endpointUrl = CURRENT_BASE_HREF + "/registries"; } public getEndpoints( diff --git a/src/portal/src/lib/services/index.ts b/src/portal/src/app/shared/services/index.ts similarity index 77% rename from src/portal/src/lib/services/index.ts rename to src/portal/src/app/shared/services/index.ts index c58a06d7e4..af5e94cfc0 100644 --- a/src/portal/src/lib/services/index.ts +++ b/src/portal/src/app/shared/services/index.ts @@ -1,11 +1,8 @@ export * from "./interface"; export * from "./system-info.service"; -export * from "./access-log.service"; -export * from "./endpoint.service"; export * from "./replication.service"; export * from "./RequestQueryParams"; export * from "./scanning.service"; -export * from "./configuration.service"; export * from "./job-log.service"; export * from "./project.service"; export * from "./label.service"; diff --git a/src/portal/src/lib/services/interface.ts b/src/portal/src/app/shared/services/interface.ts similarity index 99% rename from src/portal/src/lib/services/interface.ts rename to src/portal/src/app/shared/services/interface.ts index 0044817406..fde191c512 100644 --- a/src/portal/src/lib/services/interface.ts +++ b/src/portal/src/app/shared/services/interface.ts @@ -1,4 +1,3 @@ -import { Project } from "../components/project-policy-config/project"; import { Observable } from 'rxjs'; import { ClrModal } from '@clr/angular'; import { HttpHeaders, HttpParams } from '@angular/common/http'; diff --git a/src/portal/src/app/shared/services/job-log.service.spec.ts b/src/portal/src/app/shared/services/job-log.service.spec.ts new file mode 100644 index 0000000000..dfb3826325 --- /dev/null +++ b/src/portal/src/app/shared/services/job-log.service.spec.ts @@ -0,0 +1,25 @@ +import { TestBed, inject } from '@angular/core/testing'; +import { JobLogService, JobLogDefaultService } from './job-log.service'; +import { SharedTestingModule } from "../shared.module"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; + +describe('JobLogService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + SharedTestingModule, + HttpClientTestingModule + ], + providers: [ + JobLogDefaultService, + { + provide: JobLogService, + useClass: JobLogDefaultService + }] + }); + }); + + it('should be initialized', inject([JobLogDefaultService], (service: JobLogService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/portal/src/lib/services/job-log.service.ts b/src/portal/src/app/shared/services/job-log.service.ts similarity index 79% rename from src/portal/src/lib/services/job-log.service.ts rename to src/portal/src/app/shared/services/job-log.service.ts index aa372e0a54..0ddd39a64c 100644 --- a/src/portal/src/lib/services/job-log.service.ts +++ b/src/portal/src/app/shared/services/job-log.service.ts @@ -1,7 +1,6 @@ -import { Injectable, Inject } from "@angular/core"; +import { Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; -import { SERVICE_CONFIG, IServiceConfig } from "../entities/service.config"; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_GET_OPTIONS_TEXT } from "../utils/utils"; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS_TEXT } from "../units/utils"; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; /** @@ -44,15 +43,10 @@ export class JobLogDefaultService extends JobLogService { constructor( private http: HttpClient, - @Inject(SERVICE_CONFIG) config: IServiceConfig ) { super(); - this._replicationJobBaseUrl = config.replicationBaseEndpoint - ? config.replicationBaseEndpoint - : CURRENT_BASE_HREF + "/replication"; - this._scanningJobBaseUrl = config.scanJobEndpoint - ? config.scanJobEndpoint - : CURRENT_BASE_HREF + "/jobs/scan"; + this._replicationJobBaseUrl = CURRENT_BASE_HREF + "/replication"; + this._scanningJobBaseUrl = CURRENT_BASE_HREF + "/jobs/scan"; this._supportedJobTypes = ["replication", "scan"]; } diff --git a/src/portal/src/lib/services/label.service.ts b/src/portal/src/app/shared/services/label.service.ts similarity index 90% rename from src/portal/src/lib/services/label.service.ts rename to src/portal/src/app/shared/services/label.service.ts index be363f39e6..e000504595 100644 --- a/src/portal/src/lib/services/label.service.ts +++ b/src/portal/src/app/shared/services/label.service.ts @@ -1,12 +1,9 @@ -import { Inject, Injectable } from "@angular/core"; +import { Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; -import { map, catchError} from "rxjs/operators"; - +import { catchError} from "rxjs/operators"; import { RequestQueryParams } from "./RequestQueryParams"; import { Label } from "./interface"; - -import { IServiceConfig, SERVICE_CONFIG } from "../entities/service.config"; -import { buildHttpRequestOptions, CURRENT_BASE_HREF, V1_BASE_HREF, HTTP_JSON_OPTIONS } from "../utils/utils"; +import { buildHttpRequestOptions, CURRENT_BASE_HREF, V1_BASE_HREF, HTTP_JSON_OPTIONS } from "../units/utils"; import { Observable, throwError as observableThrowError } from "rxjs"; export abstract class LabelService { @@ -75,13 +72,12 @@ export class LabelDefaultService extends LabelService { chartLabelUrl: string; constructor( - @Inject(SERVICE_CONFIG) config: IServiceConfig, private http: HttpClient ) { super(); - this.labelUrl = config.labelEndpoint ? config.labelEndpoint : CURRENT_BASE_HREF + "/labels"; - this.chartUrl = config.helmChartEndpoint ? config.helmChartEndpoint : V1_BASE_HREF + "/chartrepo"; - this.chartLabelUrl = config.helmChartLabelEndpoint ? config.helmChartLabelEndpoint : CURRENT_BASE_HREF + "/chartrepo"; + this.labelUrl = CURRENT_BASE_HREF + "/labels"; + this.chartUrl = V1_BASE_HREF + "/chartrepo"; + this.chartLabelUrl = CURRENT_BASE_HREF + "/chartrepo"; } diff --git a/src/portal/src/app/shared/message-handler/message-handler.service.spec.ts b/src/portal/src/app/shared/services/message-handler.service.spec.ts similarity index 79% rename from src/portal/src/app/shared/message-handler/message-handler.service.spec.ts rename to src/portal/src/app/shared/services/message-handler.service.spec.ts index 8d5ea64abd..e58da45923 100644 --- a/src/portal/src/app/shared/message-handler/message-handler.service.spec.ts +++ b/src/portal/src/app/shared/services/message-handler.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed, inject } from '@angular/core/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { MessageHandlerService } from './message-handler.service'; -import { MessageService } from '../../global-message/message.service'; -import { SessionService } from '../../shared/session.service'; -import { UserPermissionService } from "../../../lib/services"; +import { MessageService } from '../components/global-message/message.service'; +import { SessionService } from './session.service'; +import { UserPermissionService } from "./index"; describe('MessageHandlerService', () => { beforeEach(() => { diff --git a/src/portal/src/app/shared/message-handler/message-handler.service.ts b/src/portal/src/app/shared/services/message-handler.service.ts similarity index 90% rename from src/portal/src/app/shared/message-handler/message-handler.service.ts rename to src/portal/src/app/shared/services/message-handler.service.ts index ed72c71029..0b00b5dfc7 100644 --- a/src/portal/src/app/shared/message-handler/message-handler.service.ts +++ b/src/portal/src/app/shared/services/message-handler.service.ts @@ -13,15 +13,16 @@ // limitations under the License. import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { AlertType } from '../../shared/shared.const'; -import { MessageService } from '../../global-message/message.service'; -import { SessionService } from '../../shared/session.service'; -import { ErrorHandler } from "../../../lib/utils/error-handler"; -import { errorHandler } from "../../../lib/utils/shared/shared.utils"; -import { httpStatusCode } from "../../../lib/entities/shared.const"; +import { MessageService } from '../components/global-message/message.service'; +import { SessionService } from './session.service'; +import { ErrorHandler } from "../units/error-handler"; +import { AlertType, httpStatusCode } from "../entities/shared.const"; +import { errorHandler } from "../units/shared.utils"; -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class MessageHandlerService implements ErrorHandler { constructor( diff --git a/src/portal/src/lib/services/permission-static.ts b/src/portal/src/app/shared/services/permission-static.ts similarity index 100% rename from src/portal/src/lib/services/permission-static.ts rename to src/portal/src/app/shared/services/permission-static.ts diff --git a/src/portal/src/lib/services/permission.service.ts b/src/portal/src/app/shared/services/permission.service.ts similarity index 97% rename from src/portal/src/lib/services/permission.service.ts rename to src/portal/src/app/shared/services/permission.service.ts index 05ddb7d2bf..1cb0eaf457 100644 --- a/src/portal/src/lib/services/permission.service.ts +++ b/src/portal/src/app/shared/services/permission.service.ts @@ -16,8 +16,8 @@ import { Injectable } from '@angular/core'; import { Observable, forkJoin} from "rxjs"; import { map, share } from "rxjs/operators"; import { HttpClient } from '@angular/common/http'; -import { CacheObservable } from "../utils/cache-util"; -import { CURRENT_BASE_HREF } from "../utils/utils"; +import { CacheObservable } from "../units/cache-util"; +import { CURRENT_BASE_HREF } from "../units/utils"; interface Permission { diff --git a/src/portal/src/lib/services/project.service.ts b/src/portal/src/app/shared/services/project.service.ts similarity index 89% rename from src/portal/src/lib/services/project.service.ts rename to src/portal/src/app/shared/services/project.service.ts index 40f86ec17a..b21889ed65 100644 --- a/src/portal/src/lib/services/project.service.ts +++ b/src/portal/src/app/shared/services/project.service.ts @@ -1,17 +1,14 @@ - import { throwError as observableThrowError, Observable, of } from "rxjs"; -import {Injectable, Inject} from "@angular/core"; +import {Injectable} from "@angular/core"; import { HttpClient, HttpParams, HttpResponse } from "@angular/common/http"; import { catchError } from "rxjs/operators"; - -import { SERVICE_CONFIG, IServiceConfig } from "../entities/service.config"; -import { Project } from "../components/project-policy-config/project"; -import { ProjectPolicy } from "../components/project-policy-config/project-policy-config.component"; +import { Project } from "../../base/project/project-config/project-policy-config/project"; +import { ProjectPolicy } from "../../base/project/project-config/project-policy-config/project-policy-config.component"; import { HTTP_JSON_OPTIONS, HTTP_GET_OPTIONS, buildHttpRequestOptionsWithObserveResponse, CURRENT_BASE_HREF -} from "../utils/utils"; +} from "../units/utils"; /** * Define the service methods to handle the Project related things. @@ -87,7 +84,6 @@ export abstract class ProjectService { export class ProjectDefaultService extends ProjectService { constructor( private http: HttpClient, - @Inject(SERVICE_CONFIG) private config: IServiceConfig ) { super(); } @@ -98,9 +94,7 @@ export class ProjectDefaultService extends ProjectService { if (!projectId) { return observableThrowError("Bad argument"); } - let baseUrl: string = this.config.projectBaseEndpoint - ? this.config.projectBaseEndpoint - : CURRENT_BASE_HREF + "/projects"; + let baseUrl: string = CURRENT_BASE_HREF + "/projects"; return this.http .get(`${baseUrl}/${projectId}`, HTTP_GET_OPTIONS) .pipe(catchError(error => observableThrowError(error))); @@ -112,9 +106,7 @@ export class ProjectDefaultService extends ProjectService { reuseSysCVEVAllowlist: string, projectAllowlist: object ): any { - let baseUrl: string = this.config.projectBaseEndpoint - ? this.config.projectBaseEndpoint - : CURRENT_BASE_HREF + "/projects"; + let baseUrl: string = CURRENT_BASE_HREF + "/projects"; return this.http .put( `${baseUrl}/${projectId}`, diff --git a/src/portal/src/lib/services/quota.service.ts b/src/portal/src/app/shared/services/quota.service.ts similarity index 84% rename from src/portal/src/lib/services/quota.service.ts rename to src/portal/src/app/shared/services/quota.service.ts index 8ce26abb59..0c9f6f5e08 100644 --- a/src/portal/src/lib/services/quota.service.ts +++ b/src/portal/src/app/shared/services/quota.service.ts @@ -1,16 +1,16 @@ import { HttpClient, HttpResponse, HttpParams } from "@angular/common/http"; -import { Injectable, Inject } from "@angular/core"; +import { Injectable } from "@angular/core"; import { HTTP_JSON_OPTIONS, - buildHttpRequestOptionsWithObserveResponse, -} from "../utils/utils"; + buildHttpRequestOptionsWithObserveResponse, CURRENT_BASE_HREF, +} from "../units/utils"; import { QuotaHard } from "./interface"; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; import { Quota } from "./interface"; -import { SERVICE_CONFIG, IServiceConfig } from "../entities/service.config"; + /** * Define the service methods to handle the replication (rule and job) related things. * @@ -47,12 +47,9 @@ export class QuotaDefaultService extends QuotaService { quotaUrl: string; constructor( private http: HttpClient, - @Inject(SERVICE_CONFIG) private config: IServiceConfig ) { super(); - if (this.config && this.config.quotaUrl) { - this.quotaUrl = this.config.quotaUrl; - } + this.quotaUrl = CURRENT_BASE_HREF + "/quotas"; } public getQuotaList(quotaType: string, page?, pageSize?, sortBy?: any): diff --git a/src/portal/src/app/shared/services/replication.service.spec.ts b/src/portal/src/app/shared/services/replication.service.spec.ts new file mode 100644 index 0000000000..ed48aeb7b1 --- /dev/null +++ b/src/portal/src/app/shared/services/replication.service.spec.ts @@ -0,0 +1,25 @@ +import { TestBed, inject } from '@angular/core/testing'; +import { ReplicationService, ReplicationDefaultService } from './replication.service'; +import { SharedTestingModule } from "../shared.module"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; + +describe('ReplicationService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + SharedTestingModule, + HttpClientTestingModule + ], + providers: [ + ReplicationDefaultService, + { + provide: ReplicationService, + useClass: ReplicationDefaultService + }] + }); + }); + + it('should be initialized', inject([ReplicationDefaultService], (service: ReplicationService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/portal/src/lib/services/replication.service.ts b/src/portal/src/app/shared/services/replication.service.ts similarity index 95% rename from src/portal/src/lib/services/replication.service.ts rename to src/portal/src/app/shared/services/replication.service.ts index f188375ce0..87c9e56082 100644 --- a/src/portal/src/lib/services/replication.service.ts +++ b/src/portal/src/app/shared/services/replication.service.ts @@ -1,13 +1,12 @@ import { HttpClient, HttpResponse } from "@angular/common/http"; -import { Injectable, Inject } from "@angular/core"; -import { SERVICE_CONFIG, IServiceConfig } from "../entities/service.config"; +import { Injectable } from "@angular/core"; import { buildHttpRequestOptions, HTTP_JSON_OPTIONS, HTTP_GET_OPTIONS, buildHttpRequestOptionsWithObserveResponse, HTTP_GET_OPTIONS_OBSERVE_RESPONSE, CURRENT_BASE_HREF -} from "../utils/utils"; +} from "../units/utils"; import { ReplicationJob, ReplicationRule, @@ -17,7 +16,7 @@ import { import { RequestQueryParams } from "./RequestQueryParams"; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; -import { Project } from '../components/project-policy-config/project'; + /** * Define the service methods to handle the replication (rule and job) related things. * @@ -221,16 +220,11 @@ export class ReplicationDefaultService extends ReplicationService { constructor( private http: HttpClient, - @Inject(SERVICE_CONFIG) config: IServiceConfig ) { super(); - this._ruleBaseUrl = config.replicationRuleEndpoint - ? config.replicationRuleEndpoint - : CURRENT_BASE_HREF + "/replication/policies"; - this._replicateUrl = config.replicationBaseEndpoint - ? config.replicationBaseEndpoint - : CURRENT_BASE_HREF + "/replication"; - this._baseUrl = config.baseEndpoint ? config.baseEndpoint : CURRENT_BASE_HREF + ""; + this._ruleBaseUrl = CURRENT_BASE_HREF + "/replication/policies"; + this._replicateUrl = CURRENT_BASE_HREF + "/replication"; + this._baseUrl = CURRENT_BASE_HREF + ""; } // Private methods diff --git a/src/portal/src/app/shared/services/scanning.service.spec.ts b/src/portal/src/app/shared/services/scanning.service.spec.ts new file mode 100644 index 0000000000..34ba00ccc0 --- /dev/null +++ b/src/portal/src/app/shared/services/scanning.service.spec.ts @@ -0,0 +1,25 @@ +import { TestBed, inject } from '@angular/core/testing'; +import { ScanningResultService, ScanningResultDefaultService } from './scanning.service'; +import { SharedTestingModule } from "../shared.module"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; + +describe('ScanningResultService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + SharedTestingModule, + HttpClientTestingModule + ], + providers: [ + ScanningResultDefaultService, + { + provide: ScanningResultService, + useClass: ScanningResultDefaultService + }] + }); + }); + + it('should be initialized', inject([ScanningResultDefaultService], (service: ScanningResultService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/portal/src/lib/services/scanning.service.ts b/src/portal/src/app/shared/services/scanning.service.ts similarity index 90% rename from src/portal/src/lib/services/scanning.service.ts rename to src/portal/src/app/shared/services/scanning.service.ts index f902b3684d..e4a31d8a9a 100644 --- a/src/portal/src/lib/services/scanning.service.ts +++ b/src/portal/src/app/shared/services/scanning.service.ts @@ -1,11 +1,9 @@ -import { HttpClient, HttpHeaders } from "@angular/common/http"; +import { HttpClient } from "@angular/common/http"; import { Injectable, Inject } from "@angular/core"; - -import { SERVICE_CONFIG, IServiceConfig } from "../entities/service.config"; import { CURRENT_BASE_HREF, HTTP_JSON_OPTIONS -} from "../utils/utils"; +} from "../units/utils"; import { RequestQueryParams } from "./RequestQueryParams"; import { VulnerabilitySummary } from "./interface"; import { map, catchError } from "rxjs/operators"; @@ -81,12 +79,9 @@ export class ScanningResultDefaultService extends ScanningResultService { constructor( private http: HttpClient, - @Inject(SERVICE_CONFIG) private config: IServiceConfig ) { super(); - if (this.config && this.config.vulnerabilityScanningBaseEndpoint) { - this._baseUrl = this.config.vulnerabilityScanningBaseEndpoint; - } + this._baseUrl = CURRENT_BASE_HREF + "/repositories"; } getVulnerabilityScanningSummary( diff --git a/src/portal/src/app/shared/session.service.spec.ts b/src/portal/src/app/shared/services/session.service.spec.ts similarity index 100% rename from src/portal/src/app/shared/session.service.spec.ts rename to src/portal/src/app/shared/services/session.service.spec.ts diff --git a/src/portal/src/app/shared/session.service.ts b/src/portal/src/app/shared/services/session.service.ts similarity index 92% rename from src/portal/src/app/shared/session.service.ts rename to src/portal/src/app/shared/services/session.service.ts index 2762f093e7..260605e6c0 100644 --- a/src/portal/src/app/shared/session.service.ts +++ b/src/portal/src/app/shared/services/session.service.ts @@ -15,19 +15,19 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; -import { SessionUser, SessionUserBackend } from './session-user'; -import { Member } from '../project/member/member'; -import { SignInCredential } from './sign-in-credential'; -import { enLang } from './shared.const'; +import { SessionUser, SessionUserBackend } from '../entities/session-user'; +import { Member } from '../../base/project/member/member'; import { SessionViewmodelFactory } from './session.viewmodel.factory'; import { HTTP_FORM_OPTIONS, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS, - clone, CURRENT_BASE_HREF -} from "../../lib/utils/utils"; -import { FlushAll } from "../../lib/utils/cache-util"; +} from "../units/utils"; +import { FlushAll } from "../units/cache-util"; +import { SignInCredential } from "../../account/sign-in/sign-in-credential"; +import { DeFaultLang } from "../entities/shared.const"; + const signInUrl = '/c/login'; const currentUserEndpoint = CURRENT_BASE_HREF + "/users/current"; @@ -47,16 +47,12 @@ const langMap = { ** * class SessionService */ -@Injectable() +@Injectable({ + providedIn: 'root', +}) export class SessionService { currentUser: SessionUser = null; - projectMembers: Member[]; - - /*formHeaders = new Headers({ - "Content-Type": 'application/x-www-form-urlencoded' - });*/ - constructor(private http: HttpClient, public sessionViewmodel: SessionViewmodelFactory) { } // Handle the related exceptions @@ -164,7 +160,7 @@ export class SessionService { let backendLang = langMap[lang]; if (!backendLang) { - backendLang = langMap[enLang]; + backendLang = langMap[DeFaultLang]; } let getUrl = langEndpoint + "?lang=" + backendLang; diff --git a/src/portal/src/app/shared/session.viewmodel.factory.spec.ts b/src/portal/src/app/shared/services/session.viewmodel.factory.spec.ts similarity index 100% rename from src/portal/src/app/shared/session.viewmodel.factory.spec.ts rename to src/portal/src/app/shared/services/session.viewmodel.factory.spec.ts diff --git a/src/portal/src/app/shared/session.viewmodel.factory.ts b/src/portal/src/app/shared/services/session.viewmodel.factory.ts similarity index 84% rename from src/portal/src/app/shared/session.viewmodel.factory.ts rename to src/portal/src/app/shared/services/session.viewmodel.factory.ts index 46f647005a..b8e582abf4 100644 --- a/src/portal/src/app/shared/session.viewmodel.factory.ts +++ b/src/portal/src/app/shared/services/session.viewmodel.factory.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { SessionUser, SessionUserBackend } from './session-user'; -import { clone } from "../../lib/utils/utils"; +import { SessionUser, SessionUserBackend } from '../entities/session-user'; +import { clone } from "../units/utils"; @Injectable({ providedIn: 'root' diff --git a/src/portal/src/app/shared/services/system-info.service.spec.ts b/src/portal/src/app/shared/services/system-info.service.spec.ts new file mode 100644 index 0000000000..b17df4cf72 --- /dev/null +++ b/src/portal/src/app/shared/services/system-info.service.spec.ts @@ -0,0 +1,23 @@ +import { TestBed, inject } from '@angular/core/testing'; +import { SystemInfoService, SystemInfoDefaultService } from './system-info.service'; +import { SharedTestingModule } from "../shared.module"; + +describe('SystemInfoService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + SharedTestingModule + ], + providers: [ + SystemInfoDefaultService, + { + provide: SystemInfoService, + useClass: SystemInfoDefaultService + }] + }); + }); + + it('should be initialized', inject([SystemInfoDefaultService], (service: SystemInfoService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/portal/src/lib/services/system-info.service.ts b/src/portal/src/app/shared/services/system-info.service.ts similarity index 83% rename from src/portal/src/lib/services/system-info.service.ts rename to src/portal/src/app/shared/services/system-info.service.ts index 7cc9c2325e..27f25d8098 100644 --- a/src/portal/src/lib/services/system-info.service.ts +++ b/src/portal/src/app/shared/services/system-info.service.ts @@ -1,10 +1,9 @@ -import {ElementRef, Inject, Injectable} from '@angular/core'; +import { ElementRef, Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; -import {SystemCVEAllowlist, SystemInfo} from './interface'; -import { SERVICE_CONFIG, IServiceConfig } from '../entities/service.config'; -import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../utils/utils"; +import { SystemCVEAllowlist, SystemInfo} from './interface'; +import { CURRENT_BASE_HREF, HTTP_GET_OPTIONS, HTTP_JSON_OPTIONS } from "../units/utils"; /** * Get System information about current backend server. @@ -37,12 +36,11 @@ export abstract class SystemInfoService { @Injectable() export class SystemInfoDefaultService extends SystemInfoService { constructor( - @Inject(SERVICE_CONFIG) private config: IServiceConfig, private http: HttpClient) { super(); } getSystemInfo(): Observable { - let url = this.config.systemInfoEndpoint ? this.config.systemInfoEndpoint : CURRENT_BASE_HREF + '/systeminfo'; + let url = CURRENT_BASE_HREF + '/systeminfo'; return this.http.get(url, HTTP_GET_OPTIONS) .pipe(map(systemInfo => systemInfo as SystemInfo) , catchError(error => observableThrowError(error))); diff --git a/src/portal/src/lib/services/tempCodeRunnerFile.ts b/src/portal/src/app/shared/services/tempCodeRunnerFile.ts similarity index 100% rename from src/portal/src/lib/services/tempCodeRunnerFile.ts rename to src/portal/src/app/shared/services/tempCodeRunnerFile.ts diff --git a/src/portal/src/app/shared/shared.const.ts b/src/portal/src/app/shared/shared.const.ts deleted file mode 100644 index 7509a4a898..0000000000 --- a/src/portal/src/app/shared/shared.const.ts +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -export const supportedLangs = ['en-us', 'zh-cn', 'zh-tw', 'es-es', 'fr-fr', 'pt-br', 'tr-tr', 'de-de']; -export const enLang = "en-us"; -export const languageNames = { - "en-us": "English", - "zh-cn": "中文简体", - "zh-tw": "中文繁體", - "es-es": "Español", - "fr-fr": "Français", - "pt-br": "Português do Brasil", - "tr-tr": "Türkçe", - "de-de": "Deutsch" -}; -export const enum AlertType { - DANGER, WARNING, INFO, SUCCESS -} - -export const enum ConfirmationTargets { - EMPTY, - PROJECT, - PROJECT_MEMBER, - ROBOT_ACCOUNT, - USER, - POLICY, - TOGGLE_CONFIRM, - TARGET, - REPOSITORY, - TAG, - CONFIG, - CONFIG_ROUTE, - CONFIG_TAB, - HELM_CHART, - HELM_CHART_VERSION, - WEBHOOK, - SCANNER, - INSTANCE, - P2P_PROVIDER, - P2P_PROVIDER_EXECUTE, - P2P_PROVIDER_STOP, - P2P_PROVIDER_DELETE, - ROBOT_ACCOUNT_ENABLE_OR_DISABLE, - PROJECT_ROBOT_ACCOUNT, - PROJECT_ROBOT_ACCOUNT_ENABLE_OR_DISABLE -} - -export const enum ActionType { - ADD_NEW, EDIT -} - -export const AdmiralQueryParamKey = "admiral_redirect_url"; -export const HarborQueryParamKey = "harbor_redirect_url"; -export const CookieKeyOfAdmiral = "admiral.endpoint.latest"; -export const enum ConfirmationState { - NA, CONFIRMED, CANCEL -} -export const enum ConfirmationButtons { - CONFIRM_CANCEL, YES_NO, DELETE_CANCEL, CLOSE, ENABLE_CANCEL, DISABLE_CANCEL, SWITCH_CANCEL -} - -export const ProjectTypes = { 0: 'PROJECT.ALL_PROJECTS', 1: 'PROJECT.PRIVATE_PROJECTS', 2: 'PROJECT.PUBLIC_PROJECTS' }; - -export const RoleInfo = { - 1: "MEMBER.PROJECT_ADMIN", - 2: "MEMBER.DEVELOPER", - 3: "MEMBER.GUEST", - 4: "MEMBER.PROJECT_MAINTAINER", - 5: "MEMBER.LIMITED_GUEST", -}; - -export const RoleMapping = { - "projectAdmin": "MEMBER.PROJECT_ADMIN", - "maintainer": "MEMBER.PROJECT_MAINTAINER", - "developer": "MEMBER.DEVELOPER", - "guest": "MEMBER.GUEST", - "limitedGuest": "MEMBER.LIMITED_GUEST", -}; - -export const ProjectRoles = [ - { id: 1, value: "MEMBER.PROJECT_ADMIN" }, - { id: 2, value: "MEMBER.DEVELOPER" }, - { id: 3, value: "MEMBER.GUEST" }, - { id: 4, value: "MEMBER.PROJECT_MAINTAINER" }, - { id: 5, value: "MEMBER.LIMITED_GUEST" }, -]; - -export enum Roles { - PROJECT_ADMIN = 1, - PROJECT_MAINTAINER = 4, - DEVELOPER = 2, - GUEST = 3, - LIMITED_GUEST = 5, - OTHER = 0, -} -export const DefaultHelmIcon = '/images/helm-gray.svg'; - -export enum ResourceType { - REPOSITORY = 1, - CHART_VERSION = 2, - REPOSITORY_TAG = 3, -} diff --git a/src/portal/src/app/shared/shared.module.ts b/src/portal/src/app/shared/shared.module.ts index 5d505b6417..0febb0afa6 100644 --- a/src/portal/src/app/shared/shared.module.ts +++ b/src/portal/src/app/shared/shared.module.ts @@ -13,135 +13,202 @@ // limitations under the License. import { NgModule } from "@angular/core"; import { RouterModule } from "@angular/router"; -import { TranslateModule } from "@ngx-translate/core"; +import { + TranslateModule, TranslateStore, +} from "@ngx-translate/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { CookieService } from "ngx-cookie"; -import { SessionService } from "../shared/session.service"; -import { MessageService } from "../global-message/message.service"; -import { MessageComponent } from "../global-message/message.component"; -import { DateValidatorDirective } from "./date-validator.directive"; -import { CoreModule } from "../core/core.module"; -import { AuthCheckGuard } from "./route/auth-user-activate.service"; -import { SignInGuard } from "./route/sign-in-guard-activate.service"; -import { SystemAdminGuard } from "./route/system-admin-activate.service"; -import { MemberGuard } from "./route/member-guard-activate.service"; -import { MemberPermissionGuard } from "./route/member-permission-guard-activate.service"; -import { OidcGuard } from "./route/oidc-guard-active.service"; -import { PortValidatorDirective } from "./port.directive"; -import { MaxLengthExtValidatorDirective } from "./max-length-ext.directive"; -import { StatisticHandler } from "./statictics/statistic-handler.service"; -import { StatisticsComponent } from "./statictics/statistics.component"; -import { StatisticsPanelComponent } from "./statictics/statistics-panel.component"; -import { ListProjectROComponent } from "./list-project-ro/list-project-ro.component"; -import { ListRepositoryROComponent } from "./list-repository-ro/list-repository-ro.component"; -import { NewUserFormComponent } from "./new-user-form/new-user-form.component"; -import { InlineAlertComponent } from "./inline-alert/inline-alert.component"; -import { PageNotFoundComponent } from "./not-found/not-found.component"; -import { AboutDialogComponent } from "./about-dialog/about-dialog.component"; -import { GaugeComponent } from "./gauge/gauge.component"; -import { ConfirmationDialogComponent } from "./confirmation-dialog/confirmation-dialog.component"; -import { ConfirmationDialogService } from "./confirmation-dialog/confirmation-dialog.service"; -import { MessageHandlerService } from "./message-handler/message-handler.service"; -import { ListChartVersionRoComponent } from "./list-chart-version-ro/list-chart-version-ro.component"; -import { IServiceConfig, SERVICE_CONFIG } from "../../lib/entities/service.config"; -import { ErrorHandler } from "../../lib/utils/error-handler"; -import { HarborLibraryModule } from "../../lib/harbor-library.module"; -import { CURRENT_BASE_HREF, V1_BASE_HREF } from "../../lib/utils/utils"; -import { ViewTokenComponent } from "../system-robot-accounts/view-token/view-token.component"; +import { DateValidatorDirective } from "./directives/date-validator.directive"; +import { PortValidatorDirective } from "./directives/port.directive"; +import { MaxLengthExtValidatorDirective } from "./directives/max-length-ext.directive"; +import { ErrorHandler } from "./units/error-handler"; +import { ClarityIconsApi } from "@clr/icons/clr-icons-api"; +import { ClarityModule } from "@clr/angular"; +import { MarkdownModule } from "ngx-markdown"; +import { CommonModule } from "@angular/common"; +import { ClipboardModule } from "./components/third-party/ngx-clipboard"; +import { InlineAlertComponent } from "./components/inline-alert/inline-alert.component"; +import { NewUserFormComponent } from "./components/new-user-form/new-user-form.component"; +import { MessageComponent } from "./components/global-message/message.component"; +import { NavigatorComponent } from "./components/navigator/navigator.component"; +import { SearchResultComponent } from "./components/global-search/search-result.component"; +import { GlobalSearchComponent } from "./components/global-search/global-search.component"; +import { AboutDialogComponent } from "./components/about-dialog/about-dialog.component"; +import { + LabelDefaultService, + LabelService, ProjectDefaultService, ProjectService, + QuotaDefaultService, + QuotaService, + ReplicationDefaultService, + ReplicationService, ScanningResultDefaultService, + ScanningResultService, + SystemInfoDefaultService, + SystemInfoService, UserPermissionDefaultService, UserPermissionService, +} from "./services"; +import { FilterComponent } from "./components/filter/filter.component"; +import { GaugeComponent } from "./components/gauge/gauge.component"; +import { ConfirmationDialogComponent } from "./components/confirmation-dialog"; +import { ListRepositoryROComponent } from "./components/list-repository-ro/list-repository-ro.component"; +import { OperationComponent } from "./components/operation/operation.component"; +import { ViewTokenComponent } from "./components/view-token/view-token.component"; +import { PushImageButtonComponent } from "./components/push-image/push-image.component"; +import { CopyInputComponent } from "./components/push-image/copy-input.component"; +import { ListProjectROComponent } from "./components/list-project-ro/list-project-ro.component"; +import { CronScheduleComponent, CronTooltipComponent } from "./components/cron-schedule"; +import { LabelComponent } from "./components/label/label.component"; +import { LabelSignPostComponent } from "./components/label/label-signpost/label-signpost.component"; +import { LabelPieceComponent } from "./components/label/label-piece/label-piece.component"; +import { CreateEditLabelComponent } from "./components/label/create-edit-label/create-edit-label.component"; +import { ListChartVersionRoComponent } from "./components/list-chart-version-ro/list-chart-version-ro.component"; +import { DatePickerComponent } from "./components/datetime-picker/datetime-picker.component"; +import { EndpointDefaultService, EndpointService } from "./services/endpoint.service"; +import { ImageNameInputComponent } from "./components/image-name-input/image-name-input.component"; +import { + HelmChartDefaultService, + HelmChartService +} from "../base/project/helm-chart/helm-chart-detail/helm-chart.service"; +import { MessageHandlerService } from "./services/message-handler.service"; +import { HttpClientTestingModule } from "@angular/common/http/testing"; +import { RouterTestingModule } from "@angular/router/testing"; +import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; + +// ClarityIcons is publicly accessible from the browser's window object. +declare const ClarityIcons: ClarityIconsApi; + +// Add custom icons to ClarityIcons +// Add robot head icon +ClarityIcons.add({"robot-head": ` + + + + + + + + +`}); + -const uiLibConfig: IServiceConfig = { - enablei18Support: true, - langCookieKey: "harbor-lang", - langMessageLoader: "http", - langMessagePathForHttpLoader: "i18n/lang/", - langMessageFileSuffixForHttpLoader: "-lang.json", - systemInfoEndpoint: CURRENT_BASE_HREF + "/systeminfo", - repositoryBaseEndpoint: CURRENT_BASE_HREF + "/repositories", - logBaseEndpoint: CURRENT_BASE_HREF + "/logs", - targetBaseEndpoint: CURRENT_BASE_HREF + "/registries", - replicationBaseEndpoint: CURRENT_BASE_HREF + "/replication", - replicationRuleEndpoint: CURRENT_BASE_HREF + "/replication/policies", - vulnerabilityScanningBaseEndpoint: CURRENT_BASE_HREF + "/repositories", - projectPolicyEndpoint: CURRENT_BASE_HREF + "/projects/configs", - projectBaseEndpoint: CURRENT_BASE_HREF + "/projects", - localI18nMessageVariableMap: {}, - configurationEndpoint: CURRENT_BASE_HREF + "/configurations", - scanJobEndpoint: CURRENT_BASE_HREF + "/jobs/scan", - labelEndpoint: CURRENT_BASE_HREF + "/labels", - helmChartEndpoint: V1_BASE_HREF + "/chartrepo", - downloadChartEndpoint: "/chartrepo", - helmChartLabelEndpoint: CURRENT_BASE_HREF + "/chartrepo", - gcEndpoint: CURRENT_BASE_HREF + "/system/gc", - ScanAllEndpoint: CURRENT_BASE_HREF + "/system/scanAll", - quotaUrl: CURRENT_BASE_HREF + "/quotas" -}; @NgModule({ imports: [ - CoreModule, - TranslateModule, - RouterModule, + TranslateModule.forChild({ + extend: true + }), FormsModule, + CommonModule, + ClarityModule, + MarkdownModule.forRoot(), + RouterModule, ReactiveFormsModule, - HarborLibraryModule.forRoot({ - config: { provide: SERVICE_CONFIG, useValue: uiLibConfig }, - errorHandler: { provide: ErrorHandler, useClass: MessageHandlerService } - }) + ClipboardModule, ], declarations: [ - MessageComponent, MaxLengthExtValidatorDirective, - ConfirmationDialogComponent, - NewUserFormComponent, - InlineAlertComponent, PortValidatorDirective, - PageNotFoundComponent, - AboutDialogComponent, - StatisticsComponent, - StatisticsPanelComponent, - ListProjectROComponent, - ListRepositoryROComponent, - GaugeComponent, DateValidatorDirective, - ListChartVersionRoComponent, + InlineAlertComponent, + NewUserFormComponent, + MessageComponent, + NavigatorComponent, + SearchResultComponent, + GlobalSearchComponent, + AboutDialogComponent, + FilterComponent, + GaugeComponent, + ConfirmationDialogComponent, + ListRepositoryROComponent, + OperationComponent, ViewTokenComponent, + PushImageButtonComponent, + CopyInputComponent, + ListProjectROComponent, + CronTooltipComponent, + LabelComponent, + LabelSignPostComponent, + LabelPieceComponent, + CreateEditLabelComponent, + CronScheduleComponent, + ListChartVersionRoComponent, + DatePickerComponent, + ImageNameInputComponent ], exports: [ - CoreModule, - HarborLibraryModule, - MessageComponent, - MaxLengthExtValidatorDirective, TranslateModule, - ConfirmationDialogComponent, - NewUserFormComponent, - InlineAlertComponent, - PortValidatorDirective, - PageNotFoundComponent, - AboutDialogComponent, - StatisticsComponent, - StatisticsPanelComponent, - ListProjectROComponent, - ListRepositoryROComponent, - GaugeComponent, - DateValidatorDirective, FormsModule, ReactiveFormsModule, - ListChartVersionRoComponent, + ClarityModule, + CommonModule, + ClipboardModule, + MarkdownModule, + MaxLengthExtValidatorDirective, + PortValidatorDirective, + DateValidatorDirective, + InlineAlertComponent, + NewUserFormComponent, + MessageComponent, + NavigatorComponent, + SearchResultComponent, + GlobalSearchComponent, + AboutDialogComponent, + FilterComponent, + GaugeComponent, + ConfirmationDialogComponent, + ListRepositoryROComponent, + OperationComponent, ViewTokenComponent, + PushImageButtonComponent, + CopyInputComponent, + ListProjectROComponent, + CronTooltipComponent, + LabelComponent, + LabelSignPostComponent, + LabelPieceComponent, + CreateEditLabelComponent, + CronScheduleComponent, + ListChartVersionRoComponent, + DatePickerComponent, + ImageNameInputComponent ], providers: [ - SessionService, - MessageService, - CookieService, - ConfirmationDialogService, - SystemAdminGuard, - AuthCheckGuard, - SignInGuard, - MemberGuard, - MemberPermissionGuard, - OidcGuard, - MessageHandlerService, - StatisticHandler + {provide: EndpointService, useClass: EndpointDefaultService }, + {provide: ReplicationService, useClass: ReplicationDefaultService }, + {provide: LabelService, useClass: LabelDefaultService }, + {provide: QuotaService, useClass: QuotaDefaultService }, + {provide: SystemInfoService, useClass: SystemInfoDefaultService }, + {provide: ScanningResultService, useClass: ScanningResultDefaultService }, + {provide: HelmChartService, useClass: HelmChartDefaultService }, ] }) export class SharedModule {} + + + + + + +// this module is only for testing, you should only import this module in *.spec.ts files +@NgModule({ + imports: [ + BrowserAnimationsModule, + SharedModule, + HttpClientTestingModule, + RouterTestingModule, + ], + exports: [ + BrowserAnimationsModule, + SharedModule, + HttpClientTestingModule, + RouterTestingModule, + ], + providers: [ + TranslateStore, + { provide: ProjectService, useClass: ProjectDefaultService }, + { provide: ErrorHandler, useClass: MessageHandlerService }, + { provide: UserPermissionService, useClass: UserPermissionDefaultService }, + ] +}) +export class SharedTestingModule {} diff --git a/src/portal/src/app/shared/shared.utils.ts b/src/portal/src/app/shared/shared.utils.ts deleted file mode 100644 index 067342218e..0000000000 --- a/src/portal/src/app/shared/shared.utils.ts +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright (c) 2017 VMware, Inc. All Rights Reserved. -// -// 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. -import { NgForm } from '@angular/forms'; -import { MessageService } from '../global-message/message.service'; -import { AlertType } from '../shared/shared.const'; -import { httpStatusCode } from "../../lib/entities/shared.const"; - -/** - * To check if form is empty - */ -export const isEmptyForm = function (ngForm: NgForm): boolean { - if (ngForm && ngForm.form) { - let values = ngForm.form.value; - if (values) { - for (let key in values) { - if (values[key]) { - return false; - } - } - } - - } - - return true; -}; - -/** - * Hanlde the 401 and 403 code - * - * If handled the 401 or 403, then return true otherwise false - */ -export const accessErrorHandler = function (error: any, msgService: MessageService): boolean { - if (error && error.status && msgService) { - if (error.status === httpStatusCode.Unauthorized) { - msgService.announceAppLevelMessage(error.status, "UNAUTHORIZED_ERROR", AlertType.DANGER); - return true; - } - } - - return false; -}; - -// Provide capability of reconstructing the query paramter -export const maintainUrlQueryParmas = function (uri: string, key: string, value: string): string { - let re: RegExp = new RegExp("([?&])" + key + "=.*?(&|#|$)", "i"); - if (value === undefined) { - if (uri.match(re)) { - return uri.replace(re, '$1$2'); - } else { - return uri; - } - } else { - if (uri.match(re)) { - return uri.replace(re, '$1' + key + "=" + value + '$2'); - } else { - let hash = ''; - if (uri.indexOf('#') !== -1) { - hash = uri.replace(/.*#/, '#'); - uri = uri.replace(/#.*/, ''); - } - let separator = uri.indexOf('?') !== -1 ? "&" : "?"; - return uri + separator + key + "=" + value + hash; - } - } -}; -/** - * the password or secret must longer than 8 chars with at least 1 uppercase letter, 1 lowercase letter and 1 number - * @param randomFlag - * @param min - * @param max - * @returns {string} - */ - - export function randomWord(max) { - let str = ""; - - let contentArray = [['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'], - ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l' - , 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x' - , 'y', 'z'], - ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J' - , 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']]; - for (let i = 0; i < max; i++) { - let randomNumber = getRandomInt(contentArray.length); - str += contentArray[randomNumber][getRandomInt(contentArray[randomNumber].length)]; - } - if (!str.match(/\d+/g)) { - str += contentArray[0][getRandomInt(contentArray[0].length)]; - } - if (!str.match(/[a-z]+/g)) { - str += contentArray[1][getRandomInt(contentArray[1].length)]; - } - if (!str.match(/[A-Z]+/g)) { - str += contentArray[2][getRandomInt(contentArray[2].length)]; - } - return str; - } - function getRandomInt(max) { - return Math.floor(Math.random() * Math.floor(max)); - } - diff --git a/src/portal/src/lib/utils/cache-util.ts b/src/portal/src/app/shared/units/cache-util.ts similarity index 100% rename from src/portal/src/lib/utils/cache-util.ts rename to src/portal/src/app/shared/units/cache-util.ts diff --git a/src/portal/src/lib/utils/error-handler/error-handler.ts b/src/portal/src/app/shared/units/error-handler/error-handler.ts similarity index 57% rename from src/portal/src/lib/utils/error-handler/error-handler.ts rename to src/portal/src/app/shared/units/error-handler/error-handler.ts index 41c0343c9d..51b63470b4 100644 --- a/src/portal/src/lib/utils/error-handler/error-handler.ts +++ b/src/portal/src/app/shared/units/error-handler/error-handler.ts @@ -1,5 +1,3 @@ -import { Injectable } from "@angular/core"; - /** * Declare interface for error handling * @@ -49,27 +47,4 @@ export abstract class ErrorHandler { abstract log(log: any): void; abstract handleErrorPopupUnauthorized(error: any): void; -} - -@Injectable() -export class DefaultErrorHandler extends ErrorHandler { - public error(error: any): void { - console.error("[Default error handler]: ", error); - } - - public warning(warning: any): void { - console.warn("[Default warning handler]: ", warning); - } - - public info(info: any): void { - // tslint:disable-next-line:no-console - console.info("[Default info handler]: ", info); - } - - public log(log: any): void { - console.log("[Default log handler]: ", log); - } - public handleErrorPopupUnauthorized(error: any): void { - console.log("[Default log handler]: ", error); - } -} +} \ No newline at end of file diff --git a/src/portal/src/lib/utils/error-handler/index.ts b/src/portal/src/app/shared/units/error-handler/index.ts similarity index 100% rename from src/portal/src/lib/utils/error-handler/index.ts rename to src/portal/src/app/shared/units/error-handler/index.ts diff --git a/src/portal/src/lib/utils/shared/shared.utils.ts b/src/portal/src/app/shared/units/shared.utils.ts similarity index 53% rename from src/portal/src/lib/utils/shared/shared.utils.ts rename to src/portal/src/app/shared/units/shared.utils.ts index e31633b394..eea30898fa 100644 --- a/src/portal/src/lib/utils/shared/shared.utils.ts +++ b/src/portal/src/app/shared/units/shared.utils.ts @@ -1,5 +1,3 @@ -import { errorSrcWithoutHttpClient } from "ngx-markdown"; - // Copyright (c) 2017 VMware, Inc. All Rights Reserved. // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,6 +11,103 @@ import { errorSrcWithoutHttpClient } from "ngx-markdown"; // 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. +import { NgForm } from '@angular/forms'; +import { MessageService } from '../components/global-message/message.service'; +import { AlertType, httpStatusCode } from "../entities/shared.const"; + +/** + * To check if form is empty + */ +export const isEmptyForm = function (ngForm: NgForm): boolean { + if (ngForm && ngForm.form) { + let values = ngForm.form.value; + if (values) { + for (let key in values) { + if (values[key]) { + return false; + } + } + } + + } + + return true; +}; + +/** + * Hanlde the 401 and 403 code + * + * If handled the 401 or 403, then return true otherwise false + */ +export const accessErrorHandler = function (error: any, msgService: MessageService): boolean { + if (error && error.status && msgService) { + if (error.status === httpStatusCode.Unauthorized) { + msgService.announceAppLevelMessage(error.status, "UNAUTHORIZED_ERROR", AlertType.DANGER); + return true; + } + } + + return false; +}; + +// Provide capability of reconstructing the query paramter +export const maintainUrlQueryParmas = function (uri: string, key: string, value: string): string { + let re: RegExp = new RegExp("([?&])" + key + "=.*?(&|#|$)", "i"); + if (value === undefined) { + if (uri.match(re)) { + return uri.replace(re, '$1$2'); + } else { + return uri; + } + } else { + if (uri.match(re)) { + return uri.replace(re, '$1' + key + "=" + value + '$2'); + } else { + let hash = ''; + if (uri.indexOf('#') !== -1) { + hash = uri.replace(/.*#/, '#'); + uri = uri.replace(/#.*/, ''); + } + let separator = uri.indexOf('?') !== -1 ? "&" : "?"; + return uri + separator + key + "=" + value + hash; + } + } +}; +/** + * the password or secret must longer than 8 chars with at least 1 uppercase letter, 1 lowercase letter and 1 number + * @param randomFlag + * @param min + * @param max + * @returns {string} + */ + + export function randomWord(max) { + let str = ""; + + let contentArray = [['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'], + ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l' + , 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x' + , 'y', 'z'], + ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J' + , 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']]; + for (let i = 0; i < max; i++) { + let randomNumber = getRandomInt(contentArray.length); + str += contentArray[randomNumber][getRandomInt(contentArray[randomNumber].length)]; + } + if (!str.match(/\d+/g)) { + str += contentArray[0][getRandomInt(contentArray[0].length)]; + } + if (!str.match(/[a-z]+/g)) { + str += contentArray[1][getRandomInt(contentArray[1].length)]; + } + if (!str.match(/[A-Z]+/g)) { + str += contentArray[2][getRandomInt(contentArray[2].length)]; + } + return str; + } + function getRandomInt(max) { + return Math.floor(Math.random() * Math.floor(max)); + } /** * handle docker client response error @@ -46,7 +141,7 @@ export const errorHandler = function (error: any): string { if (error.errors && error.errors instanceof Array && error.errors.length) { return error.errors.reduce((preError, currentError, index) => { return preError ? `${preError},${currentError.message}` : currentError.message; - }, ''); + }, ''); } // Not a standard error return Basically not used cover unknown error try { @@ -60,7 +155,7 @@ export const errorHandler = function (error: any): string { if (error.error && error.error.errors && error.error.errors instanceof Array && error.error.errors.length) { return error.error.errors.reduce((preError, currentError, index) => { return preError ? `${preError},${currentError.message}` : currentError.message; - }, ''); + }, ''); } if (error.error && error.error.message) { if (typeof error.error.message === "string") { diff --git a/src/portal/src/lib/utils/utils.ts b/src/portal/src/app/shared/units/utils.ts similarity index 97% rename from src/portal/src/lib/utils/utils.ts rename to src/portal/src/app/shared/units/utils.ts index c0cc30eda0..d175fe66ed 100644 --- a/src/portal/src/lib/utils/utils.ts +++ b/src/portal/src/app/shared/units/utils.ts @@ -1,9 +1,8 @@ import { Observable } from "rxjs"; - import { HttpHeaders } from '@angular/common/http'; -import { RequestQueryParams } from '../services/RequestQueryParams'; +import { RequestQueryParams } from '../services'; import { DebugElement } from '@angular/core'; -import { Comparator, State, HttpOptionInterface, HttpOptionTextInterface, QuotaUnitInterface } from '../services/interface'; +import { Comparator, State, HttpOptionInterface, HttpOptionTextInterface, QuotaUnitInterface } from '../services'; import { QuotaUnits, StorageMultipleConstant, LimitCount } from '../entities/shared.const'; import { AbstractControl } from "@angular/forms"; /** @@ -45,22 +44,6 @@ export function toPromise(async: Observable | Promise | T): Promise } } -/** - * The default cookie key used to store current used language preference. - */ -export const DEFAULT_LANG_COOKIE_KEY = 'harbor-lang'; - -/** - * Declare what languages are supported now. - */ -export const DEFAULT_SUPPORTING_LANGS = ['en-us', 'zh-cn', 'zh-tw', 'es-es', 'fr-fr', 'pt-br', 'tr-tr', 'de-de']; - -/** - * The default language. - */ -export const DEFAULT_LANG = 'en-us'; - - export const HTTP_JSON_OPTIONS: HttpOptionInterface = { headers: new HttpHeaders({ "Content-Type": 'application/json', diff --git a/src/portal/src/app/sign-in/sign-in.module.ts b/src/portal/src/app/sign-in/sign-in.module.ts deleted file mode 100644 index 02f98cfd4f..0000000000 --- a/src/portal/src/app/sign-in/sign-in.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SignInComponent } from './sign-in.component'; -import { AccountModule } from '../account/account.module'; -import { BaseModule } from '../base/base.module'; -import { SharedModule } from '../shared/shared.module'; -import { TopRepoComponent } from "./top-repo/top-repo.component"; -import { TopRepoService } from "./top-repo/top-repository.service"; - -@NgModule({ - declarations: [ - SignInComponent, - TopRepoComponent - ], - imports: [ - CommonModule, - AccountModule, - SharedModule, - BaseModule - ], - providers: [ - TopRepoService - ] -}) -export class SignInModule { } diff --git a/src/portal/src/app/vulnerability-page/vulnerability-page.component.html b/src/portal/src/app/vulnerability-page/vulnerability-page.component.html deleted file mode 100644 index d3ef290a45..0000000000 --- a/src/portal/src/app/vulnerability-page/vulnerability-page.component.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
-

{{'VULNERABILITY.SINGULAR' | translate }}

- - - - - - - - - -
-
\ No newline at end of file diff --git a/src/portal/src/app/vulnerability-page/vulnerability-page.component.scss b/src/portal/src/app/vulnerability-page/vulnerability-page.component.scss deleted file mode 100644 index 59ff8ee95b..0000000000 --- a/src/portal/src/app/vulnerability-page/vulnerability-page.component.scss +++ /dev/null @@ -1,9 +0,0 @@ -.vul-title { - display: inline-block; -} -.first-letter-upcase { - text-transform: capitalize; -} -.first-letter-upcase.nav-link.btn { - text-transform: capitalize; -} \ No newline at end of file diff --git a/src/portal/src/app/vulnerability-page/vulnerability-page.component.spec.ts b/src/portal/src/app/vulnerability-page/vulnerability-page.component.spec.ts deleted file mode 100644 index 4acc3fbc19..0000000000 --- a/src/portal/src/app/vulnerability-page/vulnerability-page.component.spec.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ClarityModule } from '@clr/angular'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { AppConfigService } from "../services/app-config.service"; -import { VulnerabilityPageComponent } from './vulnerability-page.component'; - -describe('VulnerabilityPageComponent', () => { - let component: VulnerabilityPageComponent; - let fixture: ComponentFixture; - let fakeAppConfigService = null; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ], - imports: [ - ClarityModule, - TranslateModule.forRoot() - ], - providers: [ - TranslateService, - { provide: AppConfigService, useValue: fakeAppConfigService } - ], - declarations: [VulnerabilityPageComponent] - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(VulnerabilityPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/app/vulnerability-page/vulnerability-page.component.ts b/src/portal/src/app/vulnerability-page/vulnerability-page.component.ts deleted file mode 100644 index 5379600377..0000000000 --- a/src/portal/src/app/vulnerability-page/vulnerability-page.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Component, OnInit } from "@angular/core"; -import { AppConfigService } from "../services/app-config.service"; - -@Component({ - selector: "vulnerability-page", - templateUrl: "./vulnerability-page.component.html", - styleUrls: ["./vulnerability-page.component.scss"] -}) -export class VulnerabilityPageComponent implements OnInit { - inProgress: boolean = true; - constructor(private appConfigService: AppConfigService) {} - - ngOnInit() {} - - getStatus(status: boolean) { - this.inProgress = false; - } -} diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index f362be5a01..115a9ff6c5 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -690,7 +690,8 @@ "TAGS_NO_DELETE": "在只讀模式下刪除是被禁止的", "FILTER_FOR_REPOSITORIES": "過濾鏡像倉庫", "TAG":"標籤", - "ARTIFACT":"Aarifact", + "ARTIFACT": "Aarifact", + "ARTIFACTS": "Artifacts", "工件":"工件", "SIZE": "大小", "VULNERABILITY": "漏洞", diff --git a/src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.spec.ts b/src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.spec.ts deleted file mode 100644 index fbadb6d37e..0000000000 --- a/src/portal/src/lib/components/config/project-quotas/edit-project-quotas/edit-project-quotas.component.spec.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { EditProjectQuotasComponent } from './edit-project-quotas.component'; -import { SERVICE_CONFIG, IServiceConfig } from '../../../../entities/service.config'; -import { EditQuotaQuotaInterface } from '../../../../services'; -import { HarborLibraryModule } from '../../../../harbor-library.module'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CURRENT_BASE_HREF } from "../../../../utils/utils"; -import { ErrorHandler } from '../../../../utils/error-handler'; - -describe('EditProjectQuotasComponent', () => { - let component: EditProjectQuotasComponent; - let fixture: ComponentFixture; - let config: IServiceConfig = { - quotaUrl: CURRENT_BASE_HREF + "/quotas/testing" - }; - const mockedEditQuota: EditQuotaQuotaInterface = { - editQuota: "Edit Default Project Quotas", - setQuota: "Set the default project quotas when creating new projects", - storageQuota: "Default storage consumption", - quotaHardLimitValue: {storageLimit: -1, storageUnit: "Byte"}, - isSystemDefaultQuota: true - }; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - HarborLibraryModule, - BrowserAnimationsModule - ], - providers: [ - { provide: SERVICE_CONFIG, useValue: config }, - ErrorHandler - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EditProjectQuotasComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - it('should create', () => { - expect(component).toBeTruthy(); - }); - // ToDo update it with storage edit? - // it('should open', async () => { - // component.openEditQuota = true; - // fixture.detectChanges(); - // await fixture.whenStable(); - // component.openEditQuotaModal(mockedEditQuota); - // fixture.detectChanges(); - // await fixture.whenStable(); - // let countInput: HTMLInputElement = fixture.nativeElement.querySelector('#count'); - // countInput.value = "100"; - // countInput.dispatchEvent(new Event("input")); - // fixture.detectChanges(); - // await fixture.whenStable(); - // expect(component.isValid).toBeTruthy(); - // }); -}); diff --git a/src/portal/src/lib/components/config/registry-config.component.html b/src/portal/src/lib/components/config/registry-config.component.html deleted file mode 100644 index 6716e85002..0000000000 --- a/src/portal/src/lib/components/config/registry-config.component.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/portal/src/lib/components/config/registry-config.component.scss b/src/portal/src/lib/components/config/registry-config.component.scss deleted file mode 100644 index 84f2aa105b..0000000000 --- a/src/portal/src/lib/components/config/registry-config.component.scss +++ /dev/null @@ -1,24 +0,0 @@ -.info-tips-icon { - color: grey; -} - -.info-tips-icon:hover { - color: #007CBB; -} - -.replication-config { - margin-top: 0; - margin-bottom: 0; -} - -.replication-text { - font-size: 14px; - font-weight: 600; -} - -.replication-tooltip { - top: -8px; -} -.margin-top-3px { - margin-top: 3px; -} diff --git a/src/portal/src/lib/components/config/registry-config.component.spec.ts b/src/portal/src/lib/components/config/registry-config.component.spec.ts deleted file mode 100644 index 48761c3942..0000000000 --- a/src/portal/src/lib/components/config/registry-config.component.spec.ts +++ /dev/null @@ -1,121 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; - -import { SharedModule } from '../../utils/shared/shared.module'; -import { ErrorHandler } from '../../utils/error-handler/error-handler'; -import { SERVICE_CONFIG, IServiceConfig } from '../../entities/service.config'; - -import { SystemSettingsComponent } from './system/system-settings.component'; -import { VulnerabilityConfigComponent } from './vulnerability/vulnerability-config.component'; -import { RegistryConfigComponent } from './registry-config.component'; -import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; -import { GcComponent } from './gc/gc.component'; -import { GcHistoryComponent } from './gc/gc-history/gc-history.component'; -import { CronScheduleComponent } from '../cron-schedule/cron-schedule.component'; -import { CronTooltipComponent } from "../cron-schedule/cron-tooltip/cron-tooltip.component"; -import { - ConfigurationService, - ConfigurationDefaultService, - ScanningResultService, - ScanningResultDefaultService, - SystemInfoService, - SystemInfoDefaultService, - SystemInfo, SystemCVEAllowlist -} from '../../services'; -import { Configuration } from './config'; -import { of } from 'rxjs'; -import { CURRENT_BASE_HREF } from "../../utils/utils"; - -describe('RegistryConfigComponent (inline template)', () => { - - let comp: RegistryConfigComponent; - let fixture: ComponentFixture; - let cfgService: ConfigurationService; - let systemInfoService: SystemInfoService; - let spy: jasmine.Spy; - let spySystemInfo: jasmine.Spy; - let mockConfig: Configuration = new Configuration(); - mockConfig.token_expiration.value = 90; - mockConfig.scan_all_policy.value = { - type: "daily", - parameter: { - daily_time: 0 - } - }; - let config: IServiceConfig = { - configurationEndpoint: CURRENT_BASE_HREF + '/configurations/testing' - }; - let mockSystemInfo: SystemInfo = { - "with_notary": true, - "with_admiral": false, - "with_trivy": true, - "admiral_endpoint": "NA", - "auth_mode": "db_auth", - "registry_url": "10.112.122.56", - "project_creation_restriction": "everyone", - "self_registration": true, - "has_ca_root": true, - "harbor_version": "v1.1.1-rc1-160-g565110d", - "next_scan_all": 0 - }; - let mockSystemAllowlist: SystemCVEAllowlist = { - "expires_at": 1561996800, - "id": 1, - "items": [], - "project_id": 0 - }; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - SharedModule - ], - declarations: [ - SystemSettingsComponent, - VulnerabilityConfigComponent, - RegistryConfigComponent, - ConfirmationDialogComponent, - GcComponent, - GcHistoryComponent, - CronScheduleComponent, - CronTooltipComponent - ], - providers: [ - ErrorHandler, - { provide: SERVICE_CONFIG, useValue: config }, - { provide: ConfigurationService, useClass: ConfigurationDefaultService }, - { provide: ScanningResultService, useClass: ScanningResultDefaultService }, - { provide: SystemInfoService, useClass: SystemInfoDefaultService } - ] - }); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(RegistryConfigComponent); - comp = fixture.componentInstance; - - cfgService = fixture.debugElement.injector.get(ConfigurationService); - systemInfoService = fixture.debugElement.injector.get(SystemInfoService); - spy = spyOn(cfgService, 'getConfigurations').and.returnValue(of(mockConfig)); - spySystemInfo = spyOn(systemInfoService, 'getSystemInfo').and.returnValue(of(mockSystemInfo)); - spySystemInfo = spyOn(systemInfoService, 'getSystemAllowlist').and.returnValue(of(mockSystemAllowlist)); - fixture.detectChanges(); - }); - - it('should render configurations to the view', waitForAsync(() => { - expect(spy.calls.count()).toEqual(1); - expect(spySystemInfo.calls.count()).toEqual(1); - fixture.detectChanges(); - - fixture.whenStable().then(() => { - fixture.detectChanges(); - - let el: HTMLInputElement = fixture.nativeElement.querySelector('input[type="text"]'); - expect(el).not.toBeFalsy(); - expect(el.value).toEqual('90'); - - - fixture.detectChanges(); - let el3: HTMLElement = fixture.nativeElement.querySelector('#config-vulnerability'); - expect(el3).toBeTruthy(); - }); - })); -}); diff --git a/src/portal/src/lib/components/config/registry-config.component.ts b/src/portal/src/lib/components/config/registry-config.component.ts deleted file mode 100644 index 0894835092..0000000000 --- a/src/portal/src/lib/components/config/registry-config.component.ts +++ /dev/null @@ -1,175 +0,0 @@ -import { Component, OnInit, ViewChild, Input } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; - -import { ConfirmationState, ConfirmationTargets } from '../../entities/shared.const'; -import { ConfirmationDialogComponent } from '../confirmation-dialog'; -import { ConfirmationMessage } from '../confirmation-dialog'; -import { ConfirmationAcknowledgement } from '../confirmation-dialog'; -import { ConfigurationService, SystemInfoService, SystemInfo } from '../../services'; -import { - compareValue, - isEmptyObject, - clone -} from '../../utils/utils'; -import { ErrorHandler } from '../../utils/error-handler'; -import { Configuration } from './config'; -import { VulnerabilityConfigComponent } from "./vulnerability/vulnerability-config.component"; -import { SystemSettingsComponent } from "./system/system-settings.component"; -import { GcComponent } from "./gc/gc.component"; - -@Component({ - selector: 'hbr-registry-config', - templateUrl: './registry-config.component.html' -}) -export class RegistryConfigComponent implements OnInit { - config: Configuration = new Configuration(); - configCopy: Configuration; - onGoing: boolean = false; - systemInfo: SystemInfo; - - @Input() hasAdminRole: boolean = false; - - @ViewChild("systemSettings") systemSettings: SystemSettingsComponent; - @ViewChild("vulnerabilityConfig") vulnerabilityCfg: VulnerabilityConfigComponent; - @ViewChild("gc") gc: GcComponent; - @ViewChild("cfgConfirmationDialog") confirmationDlg: ConfirmationDialogComponent; - - constructor( - private configService: ConfigurationService, - private errorHandler: ErrorHandler, - private translate: TranslateService, - private systemInfoService: SystemInfoService - ) { } - - get shouldDisable(): boolean { - return !this.isValid() || !this.hasChanges() || this.onGoing; - } - - get hasCAFile(): boolean { - return this.systemInfo && this.systemInfo.has_ca_root; - } - get withAdmiral(): boolean { - return this.systemInfo && this.systemInfo.with_admiral; - } - - ngOnInit(): void { - this.loadSystemInfo(); - // Initialize - this.load(); - } - - isValid(): boolean { - return !!(this.systemSettings && - this.systemSettings.isValid && - this.vulnerabilityCfg); - } - - hasChanges(): boolean { - return !isEmptyObject(this.getChanges()); - } - - // Get system info - loadSystemInfo(): void { - this.systemInfoService.getSystemInfo() - .subscribe((info: SystemInfo) => { - this.systemInfo = info; - }, error => this.errorHandler.error(error)); - } - - // Load configurations - load(): void { - this.onGoing = true; - this.configService.getConfigurations() - .subscribe((config: Configuration) => { - this.configCopy = clone(config); - this.config = config; - this.onGoing = false; - }, error => { - this.errorHandler.error(error); - this.onGoing = false; - }); - } - - // Save configuration changes - save(): void { - let changes: { [key: string]: any | any[] } = this.getChanges(); - - if (isEmptyObject(changes)) { - // Guard code, do nothing - return; - } - - this.onGoing = true; - this.configService.saveConfigurations(changes) - .subscribe(() => { - this.onGoing = false; - - this.translate.get("CONFIG.SAVE_SUCCESS").subscribe((res: string) => { - this.errorHandler.info(res); - }); - // Reload to fetch all the updates - this.load(); - // Reload all system info - // this.loadSystemInfo(); - } - , error => { - this.onGoing = false; - this.errorHandler.error(error); - }); - } - - // Cancel the changes if have - cancel(): void { - let msg = new ConfirmationMessage( - "CONFIG.CONFIRM_TITLE", - "CONFIG.CONFIRM_SUMMARY", - "", - {}, - ConfirmationTargets.CONFIG - ); - this.confirmationDlg.open(msg); - } - - // Confirm cancel - confirmCancel(ack: ConfirmationAcknowledgement): void { - if (ack && ack.source === ConfirmationTargets.CONFIG && - ack.state === ConfirmationState.CONFIRMED) { - this.reset(); - } - } - - reset(): void { - // Reset to the values of copy - let changes: { [key: string]: any | any[] } = this.getChanges(); - for (let prop of Object.keys(changes)) { - this.config[prop] = clone(this.configCopy[prop]); - } - } - - getChanges(): { [key: string]: any | any[] } { - let changes: { [key: string]: any | any[] } = {}; - if (!this.config || !this.configCopy) { - return changes; - } - - for (let prop of Object.keys(this.config)) { - let field = this.configCopy[prop]; - if (field && field.editable) { - if (!compareValue(field.value, this.config[prop].value)) { - changes[prop] = this.config[prop].value; - // Number - if (typeof field.value === "number") { - changes[prop] = +changes[prop]; - } - - // Trim string value - if (typeof field.value === "string") { - changes[prop] = ('' + changes[prop]).trim(); - } - } - } - } - - return changes; - } -} diff --git a/src/portal/src/lib/components/config/replication/replication-config.component.html b/src/portal/src/lib/components/config/replication/replication-config.component.html deleted file mode 100644 index 3859f78d3f..0000000000 --- a/src/portal/src/lib/components/config/replication/replication-config.component.html +++ /dev/null @@ -1,20 +0,0 @@ - -
- -
-
- - - - - -
-
-
- \ No newline at end of file diff --git a/src/portal/src/lib/components/config/replication/replication-config.component.scss b/src/portal/src/lib/components/config/replication/replication-config.component.scss deleted file mode 100644 index f68fb69a45..0000000000 --- a/src/portal/src/lib/components/config/replication/replication-config.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.top-7{ - top:-7px; -} \ No newline at end of file diff --git a/src/portal/src/lib/components/config/replication/replication-config.component.spec.ts b/src/portal/src/lib/components/config/replication/replication-config.component.spec.ts deleted file mode 100644 index 8b7d1792ca..0000000000 --- a/src/portal/src/lib/components/config/replication/replication-config.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ReplicationConfigComponent } from "./replication-config.component"; -import { HarborLibraryModule } from "../../../harbor-library.module"; -import { IServiceConfig, SERVICE_CONFIG } from "../../../entities/service.config"; -import { Configuration } from "../config"; -import { CURRENT_BASE_HREF } from "../../../utils/utils"; -describe('ReplicationConfigComponent', () => { - let component: ReplicationConfigComponent; - let fixture: ComponentFixture; - const config: IServiceConfig = { - baseEndpoint: CURRENT_BASE_HREF + "/testing" - }; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ - HarborLibraryModule - ], - providers: [ - { provide: SERVICE_CONFIG, useValue: config } - ] - }); - }); - beforeEach(() => { - fixture = TestBed.createComponent(ReplicationConfigComponent); - component = fixture.componentInstance; - component.config = new Configuration(); - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/portal/src/lib/components/config/replication/replication-config.component.ts b/src/portal/src/lib/components/config/replication/replication-config.component.ts deleted file mode 100644 index de66e3fadc..0000000000 --- a/src/portal/src/lib/components/config/replication/replication-config.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Component, Input, Output, EventEmitter, ViewChild } from '@angular/core'; -import { NgForm } from '@angular/forms'; -import { Configuration } from '../config'; - -@Component({ - selector: 'replication-config', - templateUrl: './replication-config.component.html', - styles: ['./replication-config.component.scss', '../registry-config.component.scss'] -}) -export class ReplicationConfigComponent { - config: Configuration; - @Output() configChange: EventEmitter = new EventEmitter(); - - @Input() - get replicationConfig(): Configuration { - return this.config; - } - set replicationConfig(cfg: Configuration) { - this.config = cfg; - this.configChange.emit(this.config); - } - - @Input() showSubTitle: boolean = false; - - @ViewChild("replicationConfigFrom") replicationConfigForm: NgForm; - - get editable(): boolean { - return this.replicationConfig && - this.replicationConfig.verify_remote_cert && - this.replicationConfig.verify_remote_cert.editable; - } - - get isValid(): boolean { - return this.replicationConfigForm && this.replicationConfigForm.valid; - } -} diff --git a/src/portal/src/lib/components/confirmation-dialog/confirmation-state-message.ts b/src/portal/src/lib/components/confirmation-dialog/confirmation-state-message.ts deleted file mode 100644 index b00f7148a5..0000000000 --- a/src/portal/src/lib/components/confirmation-dialog/confirmation-state-message.ts +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { ConfirmationState, ConfirmationTargets } from '../../entities/shared.const'; - -export class ConfirmationAcknowledgement { - constructor(state: ConfirmationState, data: any, source: ConfirmationTargets) { - this.state = state; - this.data = data; - this.source = source; - } - - state: ConfirmationState = ConfirmationState.NA; - data: any = {}; - source: ConfirmationTargets = ConfirmationTargets.EMPTY; -} diff --git a/src/portal/src/lib/components/create-edit-rule/filter-label.component.html b/src/portal/src/lib/components/create-edit-rule/filter-label.component.html deleted file mode 100644 index dbf25f2421..0000000000 --- a/src/portal/src/lib/components/create-edit-rule/filter-label.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
- × - -
-
{{'LABEL.NO_LABELS' | translate }}
- -
- -
-
\ No newline at end of file diff --git a/src/portal/src/lib/components/create-edit-rule/filter-label.component.scss b/src/portal/src/lib/components/create-edit-rule/filter-label.component.scss deleted file mode 100644 index f32493a17a..0000000000 --- a/src/portal/src/lib/components/create-edit-rule/filter-label.component.scss +++ /dev/null @@ -1,137 +0,0 @@ -.filterLabelPanel { - display: flex; - position: absolute; - left:135px; - -ms-flex-direction: column; - flex-direction: column; - background: #fff; - padding: .5rem 0; - border: 1px solid #ccc; - box-shadow: 0 1px 0.125rem hsla(0, 0%, 45%, .25); - min-width: 5rem; - max-width: 15rem; - border-radius: .125rem; - z-index: 100; - .filterClose { - position: absolute; - right: 8px; - top: 5px; - cursor: pointer; - font-size: 20px; - } - .filterLabelHeader { - font-size: .5rem; - font-weight: 600; - letter-spacing: normal; - padding: 0 .5rem; - line-height: .75rem; - margin: 0; - color: #313131; - } - .no-labels { - padding-left: 10px; - } - .label-list { - max-height: 300px; - overflow-y: auto; - } -} - -.filterLabelPanel .filterInput{margin-left: .5rem; margin-right: .5rem;} - -.filterLabelPanel .form-group input { - position: relative; - margin-left: .5rem; - margin-right: .5rem; -} - -.pull-left { - display: inline-block; - float: left; -} - -.pull-right { - display: inline-block; - float: right; -} - -.btn-link { - display: inline-flex; - width: 15px; - min-width: 15px; - color: black; - vertical-align: super; -} - -.trigger-item, -.signpost-item { - display: inline; -} - -.signpost-content-body .label { - margin: .3rem; -} - -.labelDiv { - position: absolute; - left: 28px; - top: 5px; -} - -.datagrid-action-bar { - z-index: 10; -} - -.trigger-item hbr-label-piece { - display: flex !important; - margin: 6px 0; -} - -:host>>>.signpost-content { - min-width: 4rem; -} - -:host>>>.signpost-content-body { - padding: 0 .4rem; -} - -:host>>>.signpost-content-header { - display: none; -} - -.filterLabelPiece { - position: absolute; - top: 4px; - z-index: 1; -} - -.dropdown .dropdown-toggle.btn { - margin: .25rem .5rem .25rem 0; -} - -.labelBtn { - position: relative; - overflow: hidden; - font-size: .58333rem; - letter-spacing: normal; - font-weight: 400; - background: transparent; - border: 0; - color: #565656; - cursor: pointer; - display: block; - margin: 0; - width: 100%; - height: 30px; - text-transform: none; -} - -.labelBtn:hover { - background-color: #eee; -} - -.labelBtn:focus { - outline: none; -} - -.labelDiv label{margin: 0;} diff --git a/src/portal/src/lib/components/create-edit-rule/filter-label.component.spec.ts b/src/portal/src/lib/components/create-edit-rule/filter-label.component.spec.ts deleted file mode 100644 index c0869d4021..0000000000 --- a/src/portal/src/lib/components/create-edit-rule/filter-label.component.spec.ts +++ /dev/null @@ -1,109 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync, fakeAsync, tick } from '@angular/core/testing'; -import { NoopAnimationsModule } from "@angular/platform-browser/animations"; -import { SharedModule } from "../../utils/shared/shared.module"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; -import { IServiceConfig, SERVICE_CONFIG } from '../../entities/service.config'; -import {FilterLabelComponent} from "./filter-label.component"; -import {LabelService} from "../../services/label.service"; -import { RouterTestingModule } from '@angular/router/testing'; -import { CURRENT_BASE_HREF } from '../../utils/utils'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { Label } from '../../services'; -import { of } from 'rxjs'; -import { delay } from 'rxjs/operators'; - - -describe("FilterLabelComponent", () => { - let fixture: ComponentFixture; - let comp: FilterLabelComponent; - const fakedLabel1: Label = { - id: 1, - name: "dd", - description: "fff", - color: "#CD3517", - scope: "g", - project_id: 0, - creation_time: "2020-04-20T08:08:39.540765Z", - update_time: "2020-04-20T08:08:39.540765Z", - deleted: false - }; - const fakedLabel2: Label = { - id: 2, - name: "ff", - description: "fff", - color: "#CD3518", - scope: "p", - project_id: 1, - creation_time: "2020-04-20T08:08:39.540765Z", - update_time: "2020-04-20T08:08:39.540765Z", - deleted: false - }; - - const config: IServiceConfig = { - replicationBaseEndpoint: CURRENT_BASE_HREF + "/replication/testing", - targetBaseEndpoint: CURRENT_BASE_HREF + "/registries/testing" - }; - const fakedLabelService = { - getGLabels() { - return of([fakedLabel1]).pipe(delay(0)); - }, - getPLabels() { - return of([fakedLabel2]).pipe(delay(0)); - } - }; - const fakedErrorHandler = { - error() { - return null; - } - }; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [SharedModule, NoopAnimationsModule, RouterTestingModule], - declarations: [ - FilterLabelComponent, - ], - providers: [ - { provide: ErrorHandler, useValue: fakedErrorHandler }, - { provide: SERVICE_CONFIG, useValue: config }, - { provide: LabelService, useValue: fakedLabelService} - ], - schemas: [ - NO_ERRORS_SCHEMA - ] - }); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FilterLabelComponent); - comp = fixture.componentInstance; - fixture.detectChanges(); - comp.openFilterLabelPanel = true; - }); - - it("Should create", () => { - expect(comp).toBeTruthy(); - }); - it("Should render and filter", fakeAsync( async () => { - comp.labelLists = [{ - iconsShow: true, - label: fakedLabel1, - show: true, - }, - { - iconsShow: true, - label: fakedLabel2, - show: true, - }]; - fixture.detectChanges(); - let buttons: HTMLCollection = fixture.nativeElement.getElementsByClassName('labelBtn'); - expect(buttons.length).toEqual(2); - const input: HTMLInputElement = fixture.nativeElement.querySelector('.filterInput'); - input.value = 'dd'; - input.dispatchEvent(new Event('input')); - input.dispatchEvent(new Event('keyup')); - tick(600); - fixture.detectChanges(); - await fixture.whenStable(); - expect(comp.labelLists[1].show).toBeFalsy(); - })); -}); diff --git a/src/portal/src/lib/components/create-edit-rule/filter-label.component.ts b/src/portal/src/lib/components/create-edit-rule/filter-label.component.ts deleted file mode 100644 index fecff21084..0000000000 --- a/src/portal/src/lib/components/create-edit-rule/filter-label.component.ts +++ /dev/null @@ -1,162 +0,0 @@ -import { Component, Input, OnInit, OnChanges, Output, EventEmitter, ChangeDetectorRef, SimpleChanges } from "@angular/core"; -import { LabelService } from "../../services/label.service"; -import { Label } from "../../services/interface"; -import { ErrorHandler } from "../../utils/error-handler/error-handler"; -import { Subject, forkJoin, Observable, throwError as observableThrowError } from "rxjs"; -import { debounceTime, distinctUntilChanged } from "rxjs/operators"; -import { map, catchError } from "rxjs/operators"; - -export interface LabelState { - iconsShow: boolean; - label: Label; - show: boolean; -} - -@Component({ - selector: "hbr-filter-label", - templateUrl: "./filter-label.component.html", - styleUrls: ["./filter-label.component.scss"] -}) -export class FilterLabelComponent implements OnInit, OnChanges { - - openFilterLabelPanel: boolean; - labelLists: LabelState[] = []; - filterLabelName = ''; - labelNameFilter: Subject = new Subject(); - @Input() isOpen: boolean; - @Input() projectId: number; - @Input() selectedLabelInfo: Label[]; - @Output() selectedLabels = new EventEmitter(); - @Output() closePanelEvent = new EventEmitter(); - - constructor(private labelService: LabelService, - private errorHandler: ErrorHandler) { } - - ngOnInit(): void { - forkJoin(this.getGLabels(), this.getPLabels()).subscribe(() => { - this.selectedLabelInfo.forEach(info => { - if (this.labelLists.length) { - let lab = this.labelLists.find(data => data.label.id === info.id); - if (lab) { this.selectOper(lab); } - } - }); - }, error => { - this.errorHandler.error(error); - }); - - this.labelNameFilter - .pipe(debounceTime(500)) - .pipe(distinctUntilChanged()) - .subscribe((name: string) => { - if (this.filterLabelName.length) { - this.labelLists.forEach(data => { - data.show = data.label.name.indexOf(this.filterLabelName) !== -1; - }); - } - }); - } - - ngOnChanges(changes: SimpleChanges) { - if (changes['isOpen']) { this.openFilterLabelPanel = changes['isOpen'].currentValue; } - } - - getGLabels() { - return this.labelService.getGLabels().pipe(map((res: Label[]) => { - if (res.length) { - res.forEach(data => { - this.labelLists.push({ 'iconsShow': false, 'label': data, 'show': true }); - }); - } - }) - , catchError(error => observableThrowError(error))); - } - - getPLabels() { - if (this.projectId && this.projectId > 0) { - return this.labelService.getPLabels(this.projectId).pipe(map((res1: Label[]) => { - if (res1.length) { - res1.forEach(data => { - this.labelLists.push({ 'iconsShow': false, 'label': data, 'show': true }); - }); - } - }) - , catchError(error => observableThrowError(error))); - } - } - - handleInputFilter(): void { - if (this.filterLabelName.length) { - this.labelNameFilter.next(this.filterLabelName); - } else { - this.labelLists.every(data => data.show = true); - } - } - - selectLabel(labelInfo: LabelState): void { - if (labelInfo) { - let isClick = true; - if (!labelInfo.iconsShow) { - this.selectOper(labelInfo, isClick); - } else { - this.unSelectOper(labelInfo, isClick); - } - } - } - - selectOper(labelInfo: LabelState, isClick?: boolean): void { - // set the selected label in front - this.labelLists.splice(this.labelLists.indexOf(labelInfo), 1); - this.labelLists.some((data, i) => { - if (!data.iconsShow) { - this.labelLists.splice(i, 0, labelInfo); - return true; - } - }); - // when is the last one - if (this.labelLists.every(data => data.iconsShow === true)) { - this.labelLists.push(labelInfo); - } - - labelInfo.iconsShow = true; - if (isClick) { - this.selectedLabels.emit(this.labelLists); - } - - } - - unSelectOper(labelInfo: LabelState, isClick?: boolean): void { - this.sortOperation(this.labelLists, labelInfo); - - labelInfo.iconsShow = false; - if (isClick) { - this.selectedLabels.emit(this.labelLists); - } - } - - // insert the unselected label to groups with the same icons - sortOperation(labelList: LabelState[], labelInfo: LabelState): void { - labelList.some((data, i) => { - if (!data.iconsShow) { - if (data.label.scope === labelInfo.label.scope) { - labelList.splice(i, 0, labelInfo); - labelList.splice(labelList.indexOf(labelInfo, 0), 1); - return true; - } - if (data.label.scope !== labelInfo.label.scope && i === labelList.length - 1) { - labelList.push(labelInfo); - labelList.splice(labelList.indexOf(labelInfo), 1); - return true; - } - } - if (data.iconsShow && i === labelList.length - 1) { - labelList.push(labelInfo); - labelList.splice(labelList.indexOf(labelInfo), 1); - return true; - } - }); - } - - closeFilter(): void { - this.closePanelEvent.emit(); - } -} diff --git a/src/portal/src/lib/components/inline-alert/inline-alert.component.html b/src/portal/src/lib/components/inline-alert/inline-alert.component.html deleted file mode 100644 index 487f69d2fa..0000000000 --- a/src/portal/src/lib/components/inline-alert/inline-alert.component.html +++ /dev/null @@ -1,11 +0,0 @@ - -
- - {{errorMessage}} - -
- - -
-
- diff --git a/src/portal/src/lib/entities/service.config.ts b/src/portal/src/lib/entities/service.config.ts deleted file mode 100644 index f90dcbcab5..0000000000 --- a/src/portal/src/lib/entities/service.config.ts +++ /dev/null @@ -1,239 +0,0 @@ -import { InjectionToken } from '@angular/core'; - -export let SERVICE_CONFIG = new InjectionToken("service.config"); -export interface IServiceConfig { - baseEndpoint?: string; - /** - * The base endpoint of service used to retrieve the system configuration information. - * The configurations may include but not limit: - * Notary configurations - * Registry configuration - * Volume information - * - * * {string} - * @memberOf IServiceConfig - */ - systemInfoEndpoint?: string; - - /** - * The base endpoint of the service used to handle the repositories of registry and/or tags of repository. - * The endpoints of repository or tag(s) will be built based on this endpoint. - * E.g: - * If the base endpoint is CURRENT_BASE_HREF + '/repositories', - * the repository endpoint will be CURRENT_BASE_HREF + '/repositories/:repo_id', - * the tag(s) endpoint will be CURRENT_BASE_HREF + '/repositories/:repo_id/tags[/:tag_id]'. - * - * - * * {string} - * @memberOf IServiceConfig - */ - repositoryBaseEndpoint?: string; - - /** - * The base endpoint of the service used to handle the recent access logs. - * - * * {string} - * @memberOf IServiceConfig - */ - logBaseEndpoint?: string; - - /** - * The base endpoint of the service used to handle the registry targets. - * Registry target related endpoints will be built based on this endpoint. - * E.g: - * If the base endpoint is CURRENT_BASE_HREF + '/endpoints', - * the endpoint for registry target will be CURRENT_BASE_HREF + '/endpoints/:endpoint_id', - * the endpoint for pinging registry target will be CURRENT_BASE_HREF + '/endpoints/:endpoint_id/ping'. - * - * * {string} - * @memberOf IServiceConfig - */ - targetBaseEndpoint?: string; - - /** - * The base endpoint of the service used to handle the replications. - */ - replicationBaseEndpoint?: string; - - /** - * The base endpoint of the service used to handle the replication rules. - * Replication rule related endpoints will be built based on this endpoint. - * E.g: - * If the base endpoint is CURRENT_BASE_HREF + '/replication/rules', - * the endpoint for rule will be CURRENT_BASE_HREF + '/replication/rules/:rule_id'. - * - * * {string} - * @memberOf IServiceConfig - */ - replicationRuleEndpoint?: string; - - /** - * The base endpoint of the service used to handle vulnerability scanning. - * - * * {string} - * @memberOf IServiceConfig - */ - vulnerabilityScanningBaseEndpoint?: string; - - /** - * The base endpoint of the service used to handle project policy. - * - * * {string} - * @memberOf IServiceConfig - */ - projectPolicyEndpoint?: string; - - /** - * The base endpoint of service used to handle projects - * * {string} - * @memberOf IServiceConfig - */ - projectBaseEndpoint?: string; - - /** - * To determine whether or not to enable the i18 multiple languages supporting. - * - * * {boolean} - * @memberOf IServiceConfig - */ - enablei18Support?: boolean; - - /** - * The cookie key used to store the current used language preference. - * - * * {string} - * @memberOf IServiceConfig - */ - langCookieKey?: string; - - /** - * Declare what languages are supported. - * - * * {string[]} - * @memberOf IServiceConfig - */ - supportedLangs?: string[]; - - /** - * Define the default language the translate service uses. - * - * * {string} - * @memberOf I18nConfig - */ - defaultLang?: string; - - /** - * To determine which loader will be used to load the required lang messages. - * Support two loaders: - * One is 'http', use async http to load json files with the specified url/path. - * Another is 'local', use local json variable to store the lang message. - * - * * {string} - * @memberOf IServiceConfig - */ - langMessageLoader?: string; - - /** - * Define the basic url/path prefix for the loader to find the json files if the 'langMessageLoader' is 'http'. - * For example, 'src/i18n/langs'. - * - * * {string} - * @memberOf IServiceConfig - */ - langMessagePathForHttpLoader?: string; - - /** - * Define the suffix of the json file names without lang name if 'langMessageLoader' is 'http'. - * For example, '-lang.json' is suffix of message file 'en-us-lang.json'. - * - * * {string} - * @memberOf IServiceConfig - */ - langMessageFileSuffixForHttpLoader?: string; - - /** - * If set 'local' loader in configuration property 'langMessageLoader' to load the i18n messages, - * this property must be defined to tell local JSON loader where to get the related messages. - * E.g: - * If declare the following messages storage variables, - * - * export const EN_US_LANG: any = { - * "APP_TITLE": { - * "VMW_HARBOR": "VMware Harbor", - * "HARBOR": "Harbor" - * } - * } - * - * export const ZH_CN_LANG: any = { - * "APP_TITLE": { - * "VMW_HARBOR": "VMware Harbor中文版", - * "HARBOR": "Harbor" - * } - * } - * - * then this property should be set to: - * { - * "en-us": EN_US_LANG, - * "zh-cn": ZH_CN_LANG - * }; - * - * - * * {{ [key: string]: any }} - * @memberOf IServiceConfig - */ - localI18nMessageVariableMap?: { [key: string]: any }; - - /** - * The base endpoint of configuration service. - * - * * {string} - * @memberOf IServiceConfig - */ - configurationEndpoint?: string; - - /** - * The base endpoint of scan job service. - * - * * {string} - * @memberof IServiceConfig - */ - scanJobEndpoint?: string; - - /** - * The base endpoint of the service used to handle the labels. - * labels related endpoints will be built based on this endpoint. - * E.g: - * If the base endpoint is CURRENT_BASE_HREF + '/labels', - * the label endpoint will be CURRENT_BASE_HREF + '/labels/:id'. - * - * * {string} - * @memberOf IServiceConfig - */ - labelEndpoint?: string; - - /** - * The base endpoint of the service used to handle the helm chart. - * helm charts related endpoints will be built based on this endpoint. - * E.g: - * If the base endpoint is CURRENT_BASE_HREF + '/helmcharts', - * the helm chart endpoint will be CURRENT_BASE_HREF + '/helmcharts/:id'. - * - * * {string} - * @memberOf IServiceConfig - */ - helmChartEndpoint?: string; - - /** - * The base endpoint of the chart download url - * * {string} - */ - downloadChartEndpoint?: string; - - helmChartLabelEndpoint?: string; - - gcEndpoint?: string; - - ScanAllEndpoint?: string; - - quotaUrl?: string; -} diff --git a/src/portal/src/lib/harbor-library.module.ts b/src/portal/src/lib/harbor-library.module.ts deleted file mode 100644 index 374e36a01f..0000000000 --- a/src/portal/src/lib/harbor-library.module.ts +++ /dev/null @@ -1,325 +0,0 @@ -import { NgModule, ModuleWithProviders, Provider, APP_INITIALIZER } from '@angular/core'; -import { SERVICE_CONFIG, IServiceConfig } from './entities/service.config'; - -import { - SystemInfoService, - SystemInfoDefaultService, - AccessLogService, - AccessLogDefaultService, - EndpointService, - EndpointDefaultService, - ReplicationService, - ReplicationDefaultService, - QuotaService, - QuotaDefaultService, - ScanningResultService, - ScanningResultDefaultService, - ConfigurationService, - ConfigurationDefaultService, - JobLogService, - JobLogDefaultService, - ProjectService, - ProjectDefaultService, - LabelService, - LabelDefaultService, - UserPermissionService, - UserPermissionDefaultService, -} from './services'; -import { GcRepoService } from './components/config/gc/gc.service'; -import { ScanAllRepoService } from './components/config/vulnerability/scanAll.service'; -import {GcViewModelFactory} from './components/config/gc/gc.viewmodel.factory'; -import {GcApiRepository, GcApiDefaultRepository} from './components/config/gc/gc.api.repository'; -import {ScanApiRepository, ScanApiDefaultRepository} from './components/config/vulnerability/scanAll.api.repository'; -import { - ErrorHandler, - DefaultErrorHandler -} from './utils/error-handler'; -import { DEFAULT_LANG_COOKIE_KEY, DEFAULT_SUPPORTING_LANGS, DEFAULT_LANG, CURRENT_BASE_HREF, V1_BASE_HREF } from './utils/utils'; -import { OperationService } from './components/operation/operation.service'; -import { GcHistoryComponent } from "./components/config/gc/gc-history/gc-history.component"; -import { GcComponent } from "./components/config/gc/gc.component"; -import { EditProjectQuotasComponent } from "./components/config/project-quotas/edit-project-quotas/edit-project-quotas.component"; -import { ProjectQuotasComponent } from "./components/config/project-quotas/project-quotas.component"; -import { ReplicationConfigComponent } from "./components/config/replication/replication-config.component"; -import { SystemSettingsComponent } from "./components/config/system/system-settings.component"; -import { VulnerabilityConfigComponent } from "./components/config/vulnerability/vulnerability-config.component"; -import { RegistryConfigComponent } from "./components/config/registry-config.component"; -import { ConfirmationDialogComponent } from "./components/confirmation-dialog"; -import { CreateEditEndpointComponent } from "./components/create-edit-endpoint/create-edit-endpoint.component"; -import { CreateEditLabelComponent } from "./components/create-edit-label/create-edit-label.component"; -import { CreateEditRuleComponent } from "./components/create-edit-rule/create-edit-rule.component"; -import { FilterLabelComponent } from "./components/create-edit-rule/filter-label.component"; -import { CronScheduleComponent, CronTooltipComponent } from "./components/cron-schedule"; -import { DateValidatorDirective } from "./components/datetime-picker/date-validator.directive"; -import { DatePickerComponent } from "./components/datetime-picker/datetime-picker.component"; -import { EndpointComponent } from "./components/endpoint/endpoint.component"; -import { ImageNameInputComponent } from "./components/image-name-input/image-name-input.component"; -import { InlineAlertComponent } from "./components/inline-alert/inline-alert.component"; -import { LabelSignPostComponent } from "./components/label/label-signpost/label-signpost.component"; -import { LabelComponent } from "./components/label/label.component"; -import { LabelPieceComponent } from "./components/label-piece/label-piece.component"; -import { RecentLogComponent } from "./components/log/recent-log.component"; -import { OperationComponent } from "./components/operation/operation.component"; -import { ProjectPolicyConfigComponent } from "./components/project-policy-config/project-policy-config.component"; -import { CopyInputComponent } from "./components/push-image/copy-input.component"; -import { PushImageButtonComponent } from "./components/push-image/push-image.component"; -import { ReplicationTasksComponent } from "./components/replication/replication-tasks/replication-tasks.component"; -import { ReplicationComponent } from "./components/replication/replication.component"; -import { FilterComponent } from "./components/filter/filter.component"; -import { ListReplicationRuleComponent } from "./components/list-replication-rule/list-replication-rule.component"; -import { ChannelService } from "./services/channel.service"; -import { SharedModule } from "./utils/shared/shared.module"; -import { TranslateServiceInitializer } from "./i18n"; - -/** - * Declare default service configuration; all the endpoints will be defined in - * this default configuration. - */ -export const DefaultServiceConfig: IServiceConfig = { - baseEndpoint: CURRENT_BASE_HREF, - systemInfoEndpoint: CURRENT_BASE_HREF + "/systeminfo", - repositoryBaseEndpoint: CURRENT_BASE_HREF + "/repositories", - logBaseEndpoint: CURRENT_BASE_HREF + "/logs", - targetBaseEndpoint: CURRENT_BASE_HREF + "/registries", - replicationBaseEndpoint: CURRENT_BASE_HREF + "/replication", - replicationRuleEndpoint: CURRENT_BASE_HREF + "/replication/policies", - vulnerabilityScanningBaseEndpoint: CURRENT_BASE_HREF + "/repositories", - projectPolicyEndpoint: CURRENT_BASE_HREF + "/projects/configs", - projectBaseEndpoint: CURRENT_BASE_HREF + "/projects", - enablei18Support: false, - langCookieKey: DEFAULT_LANG_COOKIE_KEY, - supportedLangs: DEFAULT_SUPPORTING_LANGS, - defaultLang: DEFAULT_LANG, - langMessageLoader: "local", - langMessagePathForHttpLoader: "i18n/langs/", - langMessageFileSuffixForHttpLoader: "-lang.json", - localI18nMessageVariableMap: {}, - configurationEndpoint: CURRENT_BASE_HREF + "/configurations", - scanJobEndpoint: CURRENT_BASE_HREF + "/jobs/scan", - labelEndpoint: CURRENT_BASE_HREF + "/labels", - helmChartEndpoint: V1_BASE_HREF + "/chartrepo", - helmChartLabelEndpoint: CURRENT_BASE_HREF + "/chartrepo", - downloadChartEndpoint: "/chartrepo", - gcEndpoint: CURRENT_BASE_HREF + "/system/gc", - ScanAllEndpoint: CURRENT_BASE_HREF + "/system/scanAll" -}; - -/** - ** - * ** deprecated param {AppConfigService} configService - * returns - */ -export function initConfig(translateInitializer: TranslateServiceInitializer, config: IServiceConfig) { - return (init); - function init() { - translateInitializer.init({ - enablei18Support: config.enablei18Support, - supportedLangs: config.supportedLangs, - defaultLang: config.defaultLang, - langCookieKey: config.langCookieKey - }); - } -} - -/** - * Define the configuration for harbor shareable module - * - ** - * interface HarborModuleConfig - */ -export interface HarborModuleConfig { - // Service endpoints - config?: Provider; - - // Handling error messages - errorHandler?: Provider; - - // Service implementation for system info - systemInfoService?: Provider; - - // Service implementation for log - logService?: Provider; - - // Service implementation for endpoint - endpointService?: Provider; - - // Service implementation for replication - replicationService?: Provider; - - // Service implementation for replication - QuotaService?: Provider; - - // Service implementation for repository - repositoryService?: Provider; - - // Service implementation for vulnerability scanning - scanningService?: Provider; - - // Service implementation for configuration - configService?: Provider; - - // Service implementation for job log - jobLogService?: Provider; - - // Service implementation for project policy - projectPolicyService?: Provider; - - // Service implementation for label - labelService?: Provider; - - // Service implementation for helmchart - helmChartService?: Provider; - // Service implementation for userPermission - userPermissionService?: Provider; - artifactService?: Provider; - - // Service implementation for gc - gcApiRepository?: Provider; - - // Service implementation for scanAll - ScanApiRepository?: Provider; - -} - - -@NgModule({ - imports: [ - SharedModule, - ], - declarations: [ - GcHistoryComponent, - GcComponent, - EditProjectQuotasComponent, - ProjectQuotasComponent, - ReplicationConfigComponent, - SystemSettingsComponent, - VulnerabilityConfigComponent, - RegistryConfigComponent, - ConfirmationDialogComponent, - CreateEditEndpointComponent, - CreateEditLabelComponent, - CreateEditRuleComponent, - FilterLabelComponent, - CronScheduleComponent, - CronTooltipComponent, - DateValidatorDirective, - DatePickerComponent, - EndpointComponent, - FilterComponent, - ImageNameInputComponent, - InlineAlertComponent, - LabelSignPostComponent, - LabelComponent, - LabelPieceComponent, - ListReplicationRuleComponent, - RecentLogComponent, - OperationComponent, - ProjectPolicyConfigComponent, - CopyInputComponent, - PushImageButtonComponent, - ReplicationTasksComponent, - ReplicationComponent, - ], - exports: [ - SharedModule, - GcHistoryComponent, - GcComponent, - EditProjectQuotasComponent, - ProjectQuotasComponent, - ReplicationConfigComponent, - SystemSettingsComponent, - VulnerabilityConfigComponent, - RegistryConfigComponent, - ConfirmationDialogComponent, - CreateEditEndpointComponent, - CreateEditLabelComponent, - CreateEditRuleComponent, - FilterLabelComponent, - CronScheduleComponent, - CronTooltipComponent, - DateValidatorDirective, - DatePickerComponent, - EndpointComponent, - FilterComponent, - ImageNameInputComponent, - InlineAlertComponent, - LabelSignPostComponent, - LabelComponent, - LabelPieceComponent, - ListReplicationRuleComponent, - RecentLogComponent, - OperationComponent, - ProjectPolicyConfigComponent, - CopyInputComponent, - PushImageButtonComponent, - ReplicationTasksComponent, - ReplicationComponent, - ], - providers: [] -}) - -export class HarborLibraryModule { - static forRoot(config: HarborModuleConfig = {}): ModuleWithProviders { - return { - ngModule: HarborLibraryModule, - providers: [ - config.config || { provide: SERVICE_CONFIG, useValue: DefaultServiceConfig }, - config.errorHandler || { provide: ErrorHandler, useClass: DefaultErrorHandler }, - config.systemInfoService || { provide: SystemInfoService, useClass: SystemInfoDefaultService }, - config.logService || { provide: AccessLogService, useClass: AccessLogDefaultService }, - config.endpointService || { provide: EndpointService, useClass: EndpointDefaultService }, - config.replicationService || { provide: ReplicationService, useClass: ReplicationDefaultService }, - config.QuotaService || { provide: QuotaService, useClass: QuotaDefaultService }, - config.scanningService || { provide: ScanningResultService, useClass: ScanningResultDefaultService }, - config.configService || { provide: ConfigurationService, useClass: ConfigurationDefaultService }, - config.jobLogService || { provide: JobLogService, useClass: JobLogDefaultService }, - config.projectPolicyService || { provide: ProjectService, useClass: ProjectDefaultService }, - config.labelService || { provide: LabelService, useClass: LabelDefaultService }, - config.userPermissionService || { provide: UserPermissionService, useClass: UserPermissionDefaultService }, - config.gcApiRepository || {provide: GcApiRepository, useClass: GcApiDefaultRepository}, - config.ScanApiRepository || {provide: ScanApiRepository, useClass: ScanApiDefaultRepository}, - // Do initializing - TranslateServiceInitializer, - { - provide: APP_INITIALIZER, - useFactory: initConfig, - deps: [TranslateServiceInitializer, SERVICE_CONFIG], - multi: true - }, - ChannelService, - OperationService, - GcRepoService, - ScanAllRepoService, - GcViewModelFactory - ] - }; - } - - static forChild(config: HarborModuleConfig = {}): ModuleWithProviders { - return { - ngModule: HarborLibraryModule, - providers: [ - config.config || { provide: SERVICE_CONFIG, useValue: DefaultServiceConfig }, - config.errorHandler || { provide: ErrorHandler, useClass: DefaultErrorHandler }, - config.systemInfoService || { provide: SystemInfoService, useClass: SystemInfoDefaultService }, - config.logService || { provide: AccessLogService, useClass: AccessLogDefaultService }, - config.endpointService || { provide: EndpointService, useClass: EndpointDefaultService }, - config.replicationService || { provide: ReplicationService, useClass: ReplicationDefaultService }, - config.QuotaService || { provide: QuotaService, useClass: QuotaDefaultService }, - config.scanningService || { provide: ScanningResultService, useClass: ScanningResultDefaultService }, - config.configService || { provide: ConfigurationService, useClass: ConfigurationDefaultService }, - config.jobLogService || { provide: JobLogService, useClass: JobLogDefaultService }, - config.projectPolicyService || { provide: ProjectService, useClass: ProjectDefaultService }, - config.labelService || { provide: LabelService, useClass: LabelDefaultService }, - config.userPermissionService || { provide: UserPermissionService, useClass: UserPermissionDefaultService }, - config.gcApiRepository || {provide: GcApiRepository, useClass: GcApiDefaultRepository}, - config.ScanApiRepository || {provide: ScanApiRepository, useClass: ScanApiDefaultRepository}, - ChannelService, - OperationService, - GcRepoService, - ScanAllRepoService, - GcViewModelFactory - ] - }; - } -} diff --git a/src/portal/src/lib/i18n/i18n-config.ts b/src/portal/src/lib/i18n/i18n-config.ts deleted file mode 100644 index f21c59a33f..0000000000 --- a/src/portal/src/lib/i18n/i18n-config.ts +++ /dev/null @@ -1,33 +0,0 @@ -export interface I18nConfig { - /** - * The cookie key used to store the current used language preference. - * - * * {string} - * @memberOf IServiceConfig - */ - langCookieKey?: string; - - /** - * Declare what languages are supported. - * - * * {string[]} - * @memberOf IServiceConfig - */ - supportedLangs?: string[]; - - /** - * Define the default language the translate service uses. - * - * * {string} - * @memberOf I18nConfig - */ - defaultLang?: string; - - /** - * To determine whether or not to enable the i18 multiple languages supporting. - * - * * {boolean} - * @memberOf IServiceConfig - */ - enablei18Support?: boolean; -} diff --git a/src/portal/src/lib/i18n/index.ts b/src/portal/src/lib/i18n/index.ts deleted file mode 100644 index 4af6ecc987..0000000000 --- a/src/portal/src/lib/i18n/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from "./translate-init.service"; -export * from "./i18n-config"; diff --git a/src/portal/src/lib/i18n/local-json.loader.ts b/src/portal/src/lib/i18n/local-json.loader.ts deleted file mode 100644 index 774730a1d2..0000000000 --- a/src/portal/src/lib/i18n/local-json.loader.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { TranslateLoader } from "@ngx-translate/core"; -import { of , Observable} from "rxjs"; -import { IServiceConfig } from "../entities/service.config"; - - -/** - * Declare a translation loader with local json object - * - ** - * class TranslatorJsonLoader - * extends {TranslateLoader} - */ -export class TranslatorJsonLoader extends TranslateLoader { - constructor(private config: IServiceConfig) { - super(); - } - - getTranslation(lang: string): Observable { - let dict: any = - this.config && - this.config.localI18nMessageVariableMap && - this.config.localI18nMessageVariableMap[lang] - ? this.config.localI18nMessageVariableMap[lang] - : {}; - return of(dict); - } -} diff --git a/src/portal/src/lib/i18n/missing-trans.handler.ts b/src/portal/src/lib/i18n/missing-trans.handler.ts deleted file mode 100644 index d4f7895693..0000000000 --- a/src/portal/src/lib/i18n/missing-trans.handler.ts +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright Project Harbor Authors -// -// 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. -import { - MissingTranslationHandler, - MissingTranslationHandlerParams -} from "@ngx-translate/core"; - -export class MyMissingTranslationHandler implements MissingTranslationHandler { - handle(params: MissingTranslationHandlerParams) { - const missingText: string = "{Harbor}"; - return params.key || missingText; - } -} diff --git a/src/portal/src/lib/i18n/translate-init.service.ts b/src/portal/src/lib/i18n/translate-init.service.ts deleted file mode 100644 index 301e7df7f9..0000000000 --- a/src/portal/src/lib/i18n/translate-init.service.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { Injectable } from "@angular/core"; -import { I18nConfig } from "./i18n-config"; -import { TranslateService } from "@ngx-translate/core"; -import { CookieService } from "ngx-cookie"; -import { DEFAULT_LANG, DEFAULT_LANG_COOKIE_KEY, DEFAULT_SUPPORTING_LANGS } from "../utils/utils"; - -@Injectable() -export class TranslateServiceInitializer { - constructor( - private translateService: TranslateService, - private cookie: CookieService - ) {} - - public init(config: I18nConfig = {}): void { - let selectedLang: string = config.defaultLang - ? config.defaultLang - : DEFAULT_LANG; - let supportedLangs: string[] = config.supportedLangs - ? config.supportedLangs - : DEFAULT_SUPPORTING_LANGS; - - this.translateService.addLangs(supportedLangs); - this.translateService.setDefaultLang(selectedLang); - - if (config.enablei18Support) { - // If user has selected lang, then directly use it - let langSetting: string = this.cookie.get( - config.langCookieKey ? config.langCookieKey : DEFAULT_LANG_COOKIE_KEY - ); - if (!langSetting || langSetting.trim() === "") { - // Use browser lang - langSetting = this.translateService - .getBrowserCultureLang() - .toLowerCase(); - } - - if (langSetting && langSetting.trim() !== "") { - if (supportedLangs && supportedLangs.length > 0) { - if (supportedLangs.find(lang => lang === langSetting)) { - selectedLang = langSetting; - } - } - } - } - - this.translateService.use(selectedLang); - } -} diff --git a/src/portal/src/lib/i18n/translate.spec.ts b/src/portal/src/lib/i18n/translate.spec.ts deleted file mode 100644 index baac2d4f25..0000000000 --- a/src/portal/src/lib/i18n/translate.spec.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { TestBed, inject } from "@angular/core/testing"; -import { TranslateService } from "@ngx-translate/core"; -import { IServiceConfig, SERVICE_CONFIG } from "../entities/service.config"; -import { SharedModule } from "../utils/shared/shared.module"; -import { DEFAULT_LANG } from "../utils/utils"; - -const EN_US_LANG: any = { - SIGN_UP: { - TITLE: "Sign Up" - } -}; - -const ZH_CN_LANG: any = { - SIGN_UP: { - TITLE: "注册" - } -}; - -describe("TranslateService", () => { - let testConfig: IServiceConfig = { - langMessageLoader: "local", - localI18nMessageVariableMap: { - "en-us": EN_US_LANG, - "zh-cn": ZH_CN_LANG - } - }; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [SharedModule], - providers: [ - { - provide: SERVICE_CONFIG, - useValue: testConfig - } - ] - }); - }); - - it( - "should be initialized", - inject([TranslateService], (service: TranslateService) => { - expect(service).toBeTruthy(); - }) - ); - - it( - "should use the specified lang", - inject([TranslateService], (service: TranslateService) => { - service.use(DEFAULT_LANG).subscribe(() => { - expect(service.currentLang).toEqual(DEFAULT_LANG); - }); - }) - ); - - it( - "should translate key to text [en-us]", - inject([TranslateService], (service: TranslateService) => { - service.use(DEFAULT_LANG); - service.get("SIGN_UP.TITLE").subscribe(text => { - expect(text).toEqual("Sign Up"); - }); - }) - ); - - it( - "should translate key to text [zh-cn]", - inject([TranslateService], (service: TranslateService) => { - service.use("zh-cn"); - service.get("SIGN_UP.TITLE").subscribe(text => { - expect(text).toEqual("注册"); - }); - }) - ); -}); diff --git a/src/portal/src/lib/services/access-log.service.spec.ts b/src/portal/src/lib/services/access-log.service.spec.ts deleted file mode 100644 index d575528f0d..0000000000 --- a/src/portal/src/lib/services/access-log.service.spec.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { AccessLogService, AccessLogDefaultService } from './access-log.service'; -import { SharedModule } from '../utils/shared/shared.module'; -import { SERVICE_CONFIG, IServiceConfig } from '../entities/service.config'; -import { CURRENT_BASE_HREF } from "../utils/utils"; - -describe('AccessLogService', () => { - const mockConfig: IServiceConfig = { - logBaseEndpoint: CURRENT_BASE_HREF + "/logs/testing" - }; - - let config: IServiceConfig; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ - SharedModule - ], - providers: [ - AccessLogDefaultService, - { - provide: AccessLogService, - useClass: AccessLogDefaultService - }, { - provide: SERVICE_CONFIG, - useValue: mockConfig - }] - }); - - config = TestBed.get(SERVICE_CONFIG); - }); - - it('should be initialized', inject([AccessLogDefaultService], (service: AccessLogService) => { - expect(service).toBeTruthy(); - })); - - it('should inject the right config', () => { - expect(config).toBeTruthy(); - expect(config.logBaseEndpoint).toEqual(CURRENT_BASE_HREF + "/logs/testing"); - }); - -}); diff --git a/src/portal/src/lib/services/access-log.service.ts b/src/portal/src/lib/services/access-log.service.ts deleted file mode 100644 index 9602529706..0000000000 --- a/src/portal/src/lib/services/access-log.service.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { Observable, of, throwError as observableThrowError } from "rxjs"; -import { RequestQueryParams } from "./RequestQueryParams"; -import { AccessLog, AccessLogItem } from "./interface"; -import { Injectable, Inject } from "@angular/core"; -import { SERVICE_CONFIG, IServiceConfig } from "../entities/service.config"; -import { HttpClient, HttpResponse } from "@angular/common/http"; -import { - buildHttpRequestOptionsWithObserveResponse, - CURRENT_BASE_HREF, - HTTP_GET_OPTIONS_OBSERVE_RESPONSE -} from "../utils/utils"; -import { map, catchError } from "rxjs/operators"; - -/** - * Define service methods to handle the access log related things. - * - ** - * @abstract - * class AccessLogService - */ -export abstract class AccessLogService { - /** - * Get the audit logs for the specified project. - * Set query parameters through 'queryParams', support: - * - page - * - pageSize - * - * @abstract - * ** deprecated param {(number | string)} projectId - * ** deprecated param {RequestQueryParams} [queryParams] - * returns {(Observable | AccessLog)} - * - * @memberOf AccessLogService - */ - abstract getAuditLogs( - projectId: number | string, - queryParams?: RequestQueryParams - ): Observable; - - /** - * Get the recent logs. - * - * @abstract - * ** deprecated param {RequestQueryParams} [queryParams] - * returns {(Observable | AccessLog)} - * - * @memberOf AccessLogService - */ - abstract getRecentLogs( - queryParams?: RequestQueryParams - ): Observable; -} - -/** - * Implement a default service for access log. - * - ** - * class AccessLogDefaultService - * extends {AccessLogService} - */ -@Injectable() -export class AccessLogDefaultService extends AccessLogService { - constructor( - private http: HttpClient, - @Inject(SERVICE_CONFIG) private config: IServiceConfig - ) { - super(); - } - - public getAuditLogs( - projectId: number | string, - queryParams?: RequestQueryParams - ): Observable { - return of({} as AccessLog); - } - - public getRecentLogs( - queryParams?: RequestQueryParams - ): Observable { - let url: string = this.config.logBaseEndpoint - ? this.config.logBaseEndpoint - : ""; - if (url === "") { - url = CURRENT_BASE_HREF + "/logs"; - } - - return this.http - .get>( - url, - queryParams ? buildHttpRequestOptionsWithObserveResponse(queryParams) : HTTP_GET_OPTIONS_OBSERVE_RESPONSE - ) - .pipe(map(response => { - let result: AccessLog = { - metadata: { - xTotalCount: 0 - }, - data: [] - }; - let xHeader: string | null = "0"; - if (response && response.headers) { - xHeader = response.headers.get("X-Total-Count"); - } - - if (result && result.metadata) { - result.metadata.xTotalCount = parseInt(xHeader ? xHeader : "0", 0); - if (result.metadata.xTotalCount > 0) { - result.data = response.body as AccessLogItem[]; - } - } - - return result; - }) - , catchError(error => observableThrowError(error))); - } -} diff --git a/src/portal/src/lib/services/configuration.service.spec.ts b/src/portal/src/lib/services/configuration.service.spec.ts deleted file mode 100644 index 0a2aae54f7..0000000000 --- a/src/portal/src/lib/services/configuration.service.spec.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { ConfigurationService, ConfigurationDefaultService } from './configuration.service'; -import { SharedModule } from '../utils/shared/shared.module'; -import { SERVICE_CONFIG, IServiceConfig } from '../entities/service.config'; -import { CURRENT_BASE_HREF } from "../utils/utils"; - -describe('ConfigurationService', () => { - const mockConfig: IServiceConfig = { - configurationEndpoint: CURRENT_BASE_HREF + "/configurations/testing" - }; - - let config: IServiceConfig; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ - SharedModule - ], - providers: [ - ConfigurationDefaultService, - { - provide: ConfigurationService, - useClass: ConfigurationDefaultService - }, { - provide: SERVICE_CONFIG, - useValue: mockConfig - }] - }); - - config = TestBed.get(SERVICE_CONFIG); - }); - - it('should be initialized', inject([ConfigurationDefaultService], (service: ConfigurationService) => { - expect(service).toBeTruthy(); - })); - - it('should inject the right config', () => { - expect(config).toBeTruthy(); - expect(config.configurationEndpoint).toEqual(CURRENT_BASE_HREF + "/configurations/testing"); - }); - -}); diff --git a/src/portal/src/lib/services/configuration.service.ts b/src/portal/src/lib/services/configuration.service.ts deleted file mode 100644 index 194e9a4a48..0000000000 --- a/src/portal/src/lib/services/configuration.service.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { Injectable, Inject } from "@angular/core"; -import { HttpClient } from "@angular/common/http"; -import { map, catchError } from "rxjs/operators"; -import { Observable, throwError as observableThrowError } from "rxjs"; - -import { SERVICE_CONFIG, IServiceConfig } from "../entities/service.config"; -import { HTTP_JSON_OPTIONS, HTTP_GET_OPTIONS, CURRENT_BASE_HREF } from "../utils/utils"; -import { Configuration } from "../components/config/config"; - -/** - * Service used to get and save registry-related configurations. - * - ** - * @abstract - * class ConfigurationService - */ -export abstract class ConfigurationService { - /** - * Get configurations. - * - * @abstract - * returns {(Observable)} - * - * @memberOf ConfigurationService - */ - abstract getConfigurations(): - | Observable; - - /** - * Save configurations. - * - * @abstract - * returns {(Observable)} - * - * @memberOf ConfigurationService - */ - abstract saveConfigurations( - changedConfigs: any | { [key: string]: any | any[] } - ): Observable; -} - -@Injectable() -export class ConfigurationDefaultService extends ConfigurationService { - _baseUrl: string; - - constructor( - private http: HttpClient, - @Inject(SERVICE_CONFIG) private config: IServiceConfig - ) { - super(); - - this._baseUrl = - this.config && this.config.configurationEndpoint - ? this.config.configurationEndpoint - : CURRENT_BASE_HREF + "/configurations"; - } - - getConfigurations(): - | Observable { - return this.http - .get(this._baseUrl, HTTP_GET_OPTIONS) - .pipe(map(response => response as Configuration) - , catchError(error => observableThrowError(error))); - } - - saveConfigurations( - changedConfigs: any | { [key: string]: any | any[] } - ): Observable { - if (!changedConfigs) { - return observableThrowError("Bad argument!"); - } - - return this.http - .put(this._baseUrl, JSON.stringify(changedConfigs), HTTP_JSON_OPTIONS) - .pipe(map(() => { }) - , catchError(error => observableThrowError(error))); - } -} diff --git a/src/portal/src/lib/services/endpoint.service.spec.ts b/src/portal/src/lib/services/endpoint.service.spec.ts deleted file mode 100644 index f06c4ef3a5..0000000000 --- a/src/portal/src/lib/services/endpoint.service.spec.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; -import { SharedModule } from '../utils/shared/shared.module'; -import { IServiceConfig, SERVICE_CONFIG } from '../entities/service.config'; -import { EndpointService, EndpointDefaultService } from './endpoint.service'; -import { CURRENT_BASE_HREF } from "../utils/utils"; - - - -describe('EndpointService', () => { - - let mockEndpoint: IServiceConfig = { - targetBaseEndpoint: CURRENT_BASE_HREF + '/endpoint/testing' - }; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ - SharedModule - ], - providers: [ - EndpointDefaultService, - { - provide: SERVICE_CONFIG, - useValue: mockEndpoint - }, - { - provide: EndpointService, - useClass: EndpointDefaultService - }] - }); - }); - - it('should be initialized', inject([EndpointDefaultService], (service: EndpointService) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/src/portal/src/lib/services/job-log.service.spec.ts b/src/portal/src/lib/services/job-log.service.spec.ts deleted file mode 100644 index bd5da77b6c..0000000000 --- a/src/portal/src/lib/services/job-log.service.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { JobLogService, JobLogDefaultService } from './job-log.service'; -import { SharedModule } from '../utils/shared/shared.module'; -import { SERVICE_CONFIG, IServiceConfig } from '../entities/service.config'; -import { CURRENT_BASE_HREF } from "../utils/utils"; - -describe('JobLogService', () => { - const mockConfig: IServiceConfig = { - replicationBaseEndpoint: CURRENT_BASE_HREF + "/replication/testing", - scanJobEndpoint: CURRENT_BASE_HREF + "/jobs/scan/testing" - }; - - let config: IServiceConfig; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ - SharedModule - ], - providers: [ - JobLogDefaultService, - { - provide: JobLogService, - useClass: JobLogDefaultService - }, { - provide: SERVICE_CONFIG, - useValue: mockConfig - }] - }); - - config = TestBed.get(SERVICE_CONFIG); - }); - - it('should be initialized', inject([JobLogDefaultService], (service: JobLogService) => { - expect(service).toBeTruthy(); - expect(config.replicationBaseEndpoint).toEqual(CURRENT_BASE_HREF + "/replication/testing"); - expect(config.scanJobEndpoint).toEqual(CURRENT_BASE_HREF + "/jobs/scan/testing"); - })); -}); diff --git a/src/portal/src/lib/services/replication.service.spec.ts b/src/portal/src/lib/services/replication.service.spec.ts deleted file mode 100644 index d36273a133..0000000000 --- a/src/portal/src/lib/services/replication.service.spec.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { ReplicationService, ReplicationDefaultService } from './replication.service'; -import { SharedModule } from '../utils/shared/shared.module'; -import { SERVICE_CONFIG, IServiceConfig } from '../entities/service.config'; -import { CURRENT_BASE_HREF } from "../utils/utils"; - -describe('ReplicationService', () => { - const mockConfig: IServiceConfig = { - replicationRuleEndpoint: CURRENT_BASE_HREF + "/policies/replication/testing", - replicationBaseEndpoint: CURRENT_BASE_HREF + "/replication/testing" - }; - - let config: IServiceConfig; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ - SharedModule - ], - providers: [ - ReplicationDefaultService, - { - provide: ReplicationService, - useClass: ReplicationDefaultService - }, { - provide: SERVICE_CONFIG, - useValue: mockConfig - }] - }); - - config = TestBed.get(SERVICE_CONFIG); - }); - - it('should be initialized', inject([ReplicationDefaultService], (service: ReplicationService) => { - expect(service).toBeTruthy(); - })); - - it('should inject the right config', () => { - expect(config).toBeTruthy(); - expect(config.replicationRuleEndpoint).toEqual(CURRENT_BASE_HREF + "/policies/replication/testing"); - expect(config.replicationBaseEndpoint).toEqual(CURRENT_BASE_HREF + "/replication/testing"); - }); -}); diff --git a/src/portal/src/lib/services/resource-label.service.ts b/src/portal/src/lib/services/resource-label.service.ts deleted file mode 100644 index da4962bb22..0000000000 --- a/src/portal/src/lib/services/resource-label.service.ts +++ /dev/null @@ -1,146 +0,0 @@ -import { Label } from "./interface"; -import { Inject, Injectable } from "@angular/core"; -import { HttpClient } from "@angular/common/http"; -import { IServiceConfig, SERVICE_CONFIG } from "../entities/service.config"; -import { buildHttpRequestOptions, CURRENT_BASE_HREF, HTTP_JSON_OPTIONS } from "../utils/utils"; -import { RequestQueryParams } from "./RequestQueryParams"; -import { map, catchError } from "rxjs/operators"; -import { Observable, throwError as observableThrowError } from "rxjs"; - -export abstract class LabelService { - abstract getLabels( - scope: string, - projectId?: number, - name?: string, - queryParams?: RequestQueryParams - ): Observable; - - abstract createLabel( - label: Label - ): Observable