Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-23 17:17:46 +01:00
Code Issues Projects Releases Wiki Activity

Update UI package to latest version

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
AllForNothing 2020-09-22 17:42:01 +08:00
parent 18f41bad88
commit 8d9a18b539
240 changed files with 9171 additions and 7873 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/portal/angular.json
View File

@ -40,9 +40,10 @@
}
],
"scripts": [
"node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js",
"node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js",
"node_modules/core-js/client/shim.min.js",
"node_modules/mutationobserver-shim/dist/mutationobserver.min.js",
"node_modules/@webcomponents/custom-elements/custom-elements.min.js",
"node_modules/@clr/icons/clr-icons.min.js",
"node_modules/web-animations-js/web-animations.min.js",
"node_modules/marked/lib/marked.js",
@ -150,5 +151,8 @@
"@schematics/angular:directive": {
"prefix": "app"
}
},
"cli": {
"analytics": false
}
}

2
src/portal/karma.conf.js
View File

@ -18,7 +18,7 @@ module.exports = function (config) {
},
coverageIstanbulReporter: {
// reports can be any that are listed here: https://github.com/istanbuljs/istanbuljs/tree/aae256fb8b9a3d19414dcf069c592e88712c32c6/packages/istanbul-reports/lib
reports: ['html', 'lcovonly', 'text-summary'],
reports: ['json', 'lcovonly', 'text-summary'],
// base output directory. If you include %browser% in the path it will be replaced with the karma browser name
dir: path.join(__dirname, 'coverage'),

15851
src/portal/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

69
src/portal/package.json
View File

@ -1,6 +1,6 @@
{
"name": "harbor",
"version": "1.10.0",
"version": "2.2.0",
"description": "Harbor UI with Clarity",
"angular-cli": {},
"scripts": {
@ -8,7 +8,7 @@
"start": "ng serve --ssl true --ssl-key ssl/server.key --ssl-cert ssl/server.crt --host 0.0.0.0 --proxy-config proxy.config.json",
"lint": "tslint \"src/**/*.ts\"",
"lint_fix": "tslint --fix \"src/**/*.ts\"",
"test": "ng test --code-coverage",
"test": "node --max_old_space_size=2048 ./node_modules/@angular/cli/bin/ng test --code-coverage",
"test:watch": "ng test --code-coverage --watch",
"test:debug": "ng test --code-coverage --source-map false",
"test:chrome": "ng test --code-coverage --browsers Chrome",
@ -24,77 +24,80 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^8.2.0",
"@angular/common": "^8.2.0",
"@angular/compiler": "^8.2.0",
"@angular/core": "^8.2.0",
"@angular/forms": "^8.2.0",
"@angular/platform-browser": "^8.2.0",
"@angular/platform-browser-dynamic": "^8.2.0",
"@angular/router": "^8.2.0",
"@clr/angular": "^2.3.8",
"@clr/icons": "^2.3.8",
"@clr/ui": "^2.3.8",
"@angular/animations": "^10.1.2",
"@angular/common": "^10.1.2",
"@angular/compiler": "^10.1.2",
"@angular/core": "^10.1.2",
"@angular/forms": "^10.1.2",
"@angular/localize": "^10.1.2",
"@angular/platform-browser": "^10.1.2",
"@angular/platform-browser-dynamic": "^10.1.2",
"@angular/router": "^10.1.2",
"@clr/angular": "^4.0.2",
"@clr/core": "^4.0.2",
"@clr/icons": "^4.0.2",
"@clr/ui": "^4.0.2",
"@fortawesome/fontawesome-free": "^5.1.0-4",
"@ng-bootstrap/ng-bootstrap": "^5.1.1",
"@ng-bootstrap/ng-bootstrap": "^7.0.0",
"@ngx-translate/core": "^10.0.2",
"@ngx-translate/http-loader": "^3.0.1",
"@types/jquery": "^2.0.41",
"@webcomponents/custom-elements": "^1.2.4",
"@webcomponents/custom-elements": "^1.0.0",
"@webcomponents/webcomponentsjs": "^2.0.0",
"buffer": "^5.2.1",
"core-js": "^2.5.4",
"intl": "^1.2.5",
"jasmine-core": "^3.3.0",
"mutationobserver-shim": "^0.3.2",
"ng-packagr": "^5.3.0",
"ng-packagr": "^10.1.0",
"ngx-clipboard": "^12.0.0",
"ngx-cookie": "^1.0.0",
"ngx-markdown": "^8.1.0",
"ngx-markdown": "^10.1.1",
"popper.js": "^1.14.3",
"rxjs": "^6.5.2",
"rxjs": "^6.6.3",
"stream": "^0.0.2",
"swagger-ui": "^3.24.0",
"ts-helpers": "^1.1.1",
"tslib": "^1.9.0",
"tslib": "^2.0.1",
"types": "^0.1.1",
"web-animations-js": "^2.3.2",
"zone.js": "^0.9.1"
"zone.js": "^0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.802.0",
"@angular-devkit/build-ng-packagr": "~0.802.0",
"@angular/cli": "^8.2.0",
"@angular/compiler-cli": "^8.2.0",
"@angular/language-service": "^8.2.0",
"@angular-devkit/build-angular": "^0.1001.2",
"@angular-devkit/build-ng-packagr": "~0.1001.2",
"@angular/cli": "^10.1.2",
"@angular/compiler-cli": "^10.1.2",
"@angular/language-service": "^10.1.2",
"@types/core-js": "^0.9.41",
"@types/express": "^4.17.2",
"@types/jasmine": "^3.3.1",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~5.0.0",
"@types/node": "^14.11.2",
"codelyzer": "^6.0.0",
"enhanced-resolve": "^3.0.0",
"express": "^4.17.1",
"jasmine-spec-reporter": "~4.2.1",
"js-yaml": "^3.13.1",
"karma": "^4.4.1",
"karma": "^5.2.2",
"karma-chrome-launcher": "~2.2.0",
"karma-cli": "^1.0.1",
"karma-coverage": "^2.0.1",
"karma-coverage": "^2.0.3",
"karma-coverage-istanbul-reporter": "~2.0.0",
"karma-jasmine": "^2.0.0",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-mocha-reporter": "^2.2.4",
"karma-remap-istanbul": "^0.6.0",
"ng-swagger-gen": "^1.8.1",
"protractor": "^5.4.2",
"rollup": "^0.41.6",
"protractor": "^7.0.0",
"rollup": "^2.22.0",
"rollup-plugin-commonjs": "^8.0.2",
"rollup-plugin-node-resolve": "^3.0.0",
"rollup-plugin-uglify": "^1.0.1",
"ts-node": "~5.0.1",
"tsickle": "^0.36.0",
"tsickle": "^0.39.1",
"tslint": "~5.9.1",
"typescript": "^3.5.3",
"typescript": "^3.9.7",
"typings": "^2.1.1",
"uglify-js": "3.3.18",
"webdriver-manager": "10.2.5"

6
src/portal/src/app/account/account-settings/account-settings-modal.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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";
@ -66,7 +66,7 @@ describe('AccountSettingsModalComponent', () => {
navigate: () => { }
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [AccountSettingsModalComponent, InlineAlertComponent, ConfirmationDialogComponent],
imports: [
@ -108,7 +108,7 @@ describe('AccountSettingsModalComponent', () => {
it('should create', () => {
expect(component).toBeTruthy();
});
it('should input right email', async(async () => {
it('should input right email', waitForAsync(async () => {
await fixture.whenStable();
// Update the title input
userExisting = true;

6
src/portal/src/app/account/account-settings/account-settings-modal.component.ts
View File

@ -55,14 +55,14 @@ export class AccountSettingsModalComponent implements OnInit, AfterViewChecked {
showSecretDetail = false;
resetForms = new ResetSecret();
showGenerateCli: boolean = false;
@ViewChild("confirmationDialog", {static: false})
@ViewChild("confirmationDialog")
confirmationDialogComponent: ConfirmationDialogComponent;
accountFormRef: NgForm;
@ViewChild("accountSettingsFrom", {static: true}) accountForm: NgForm;
@ViewChild("resetSecretFrom", {static: true}) resetSecretFrom: NgForm;
@ViewChild(InlineAlertComponent, {static: false}) inlineAlert: InlineAlertComponent;
@ViewChild("copyInput", {static: false}) copyInput: CopyInputComponent;
@ViewChild(InlineAlertComponent) inlineAlert: InlineAlertComponent;
@ViewChild("copyInput") copyInput: CopyInputComponent;
constructor(
private session: SessionService,

4
src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule } from '@angular/forms';
import { ForgotPasswordComponent } from './forgot-password.component';
import { ClarityModule } from "@clr/angular";
@ -17,7 +17,7 @@ describe('ForgotPasswordComponent', () => {
sendResetPasswordMail: () => of(null)
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ForgotPasswordComponent, InlineAlertComponent],
imports: [

2
src/portal/src/app/account/password-setting/forgot-password/forgot-password.component.ts
View File

@ -30,7 +30,7 @@ export class ForgotPasswordComponent {
isSuccess: boolean = false;
@ViewChild("forgotPasswordFrom", {static: true}) forgotPwdForm: NgForm;
@ViewChild(InlineAlertComponent, {static: false})
@ViewChild(InlineAlertComponent)
inlineAlert: InlineAlertComponent;
constructor(private pwdService: PasswordSettingService) { }

4
src/portal/src/app/account/password-setting/password-setting.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed, flush } from '@angular/core/testing';
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';
@ -25,7 +25,7 @@ describe('PasswordSettingComponent', () => {
showSuccess: () => { }
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
ClarityModule,

4
src/portal/src/app/account/password-setting/reset-password/reset-password.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -17,7 +17,7 @@ describe('ResetPasswordComponent', () => {
let fakePasswordSettingService = null;
let fakeMessageHandlerService = null;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),

2
src/portal/src/app/account/password-setting/reset-password/reset-password.component.ts
View File

@ -38,7 +38,7 @@ export class ResetPasswordComponent implements OnInit {
confirmPwd: string = "";
@ViewChild("resetPwdForm", {static: true}) resetPwdForm: NgForm;
@ViewChild(InlineAlertComponent, {static: false})
@ViewChild(InlineAlertComponent)
inlineAlert: InlineAlertComponent;
constructor(

4
src/portal/src/app/account/sign-up/sign-up-page.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { UserService } from '../../user/user.service';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
@ -15,7 +15,7 @@ describe('SignUpPageComponent', () => {
let fakeUserService = null;
let fakeSessionService = null;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [SignUpPageComponent, NewUserFormComponent],
imports: [

2
src/portal/src/app/account/sign-up/sign-up-page.component.ts
View File

@ -35,7 +35,7 @@ export class SignUpPageComponent implements OnInit {
private msgService: MessageService,
private router: Router) { }
@ViewChild(NewUserFormComponent, {static: false})
@ViewChild(NewUserFormComponent)
newUserForm: NewUserFormComponent;
getNewUser(): User {

4
src/portal/src/app/account/sign-up/sign-up.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -36,7 +36,7 @@ describe('SignUpComponent', () => {
creation_time: 'string',
update_time: 'string',
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [SignUpComponent, NewUserFormComponent, InlineAlertComponent],
imports: [

4
src/portal/src/app/account/sign-up/sign-up.component.ts
View File

@ -42,10 +42,10 @@ export class SignUpComponent {
@ViewChild(NewUserFormComponent, {static: true})
newUserForm: NewUserFormComponent;
@ViewChild(InlineAlertComponent, {static: false})
@ViewChild(InlineAlertComponent)
inlineAlert: InlineAlertComponent;
@ViewChild(Modal, {static: false})
@ViewChild(Modal)
modal: Modal;
getNewUser(): User {

4
src/portal/src/app/app.component.spec.ts
View File

@ -13,7 +13,7 @@
// limitations under the License.
/* tslint:disable:no-unused-variable */
import { TestBed, async, ComponentFixture } from '@angular/core/testing';
import { TestBed, waitForAsync, ComponentFixture } from '@angular/core/testing';
import { Title } from '@angular/platform-browser';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { CookieService } from 'ngx-cookie';
@ -74,7 +74,7 @@ describe('AppComponent', () => {
fixture.destroy();
});
it('should create the app', async(() => {
it('should create the app', waitForAsync(() => {
expect(compiled).toBeTruthy();
}));

4
src/portal/src/app/base/footer/footer.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { FooterComponent } from './footer.component';
@ -6,7 +6,7 @@ describe('FooterComponent', () => {
let component: FooterComponent;
let fixture: ComponentFixture<FooterComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [FooterComponent]
})

5
src/portal/src/app/base/global-search/global-search.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, fakeAsync, getTestBed, TestBed, tick } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, fakeAsync, getTestBed, TestBed, tick } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { GlobalSearchComponent } from './global-search.component';
import { SearchTriggerService } from './search-trigger.service';
@ -6,7 +6,6 @@ import { FormsModule } from '@angular/forms';
import { AppConfigService } from '../../services/app-config.service';
import { SkinableConfig } from "../../services/skinable-config.service";
import { RouterTestingModule } from '@angular/router/testing';
import { of } from 'rxjs';
describe('GlobalSearchComponent', () => {
let component: GlobalSearchComponent;
@ -33,7 +32,7 @@ describe('GlobalSearchComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),

4
src/portal/src/app/base/global-search/search-result.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { GlobalSearchService } from './global-search.service';
import { SearchResults } from './search-results';
import { SearchTriggerService } from './search-trigger.service';
@ -59,7 +59,7 @@ describe('SearchResultComponent', () => {
searchCloseChan$: of(null),
clear: () => null
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),

4
src/portal/src/app/base/harbor-shell/harbor-shell.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -66,7 +66,7 @@ describe('HarborShellComponent', () => {
return of(true);
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule,

8
src/portal/src/app/base/harbor-shell/harbor-shell.component.ts
View File

@ -43,16 +43,16 @@ const HAS_STYLE_MODE: string = 'styleModeLocal';
export class HarborShellComponent implements OnInit, OnDestroy {
@ViewChild(AccountSettingsModalComponent, { static: false })
@ViewChild(AccountSettingsModalComponent)
accountSettingsModal: AccountSettingsModalComponent;
@ViewChild(PasswordSettingComponent, { static: false })
@ViewChild(PasswordSettingComponent)
pwdSetting: PasswordSettingComponent;
@ViewChild(NavigatorComponent, { static: false })
@ViewChild(NavigatorComponent)
navigator: NavigatorComponent;
@ViewChild(AboutDialogComponent, { static: false })
@ViewChild(AboutDialogComponent)
aboutDialog: AboutDialogComponent;
// To indicator whwther or not the search results page is displayed

4
src/portal/src/app/base/navigator/navigator.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { SessionService } from '../../shared/session.service';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
@ -46,7 +46,7 @@ describe('NavigatorComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),

5
src/portal/src/app/config/auth/config-auth.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { MessageHandlerService } from '../../shared/message-handler/message-handler.service';
import { ConfirmMessageHandler } from '../config.msg.utils';
import { AppConfigService } from '../../services/app-config.service';
@ -10,7 +10,6 @@ import { FormsModule } from '@angular/forms';
import { of } from 'rxjs';
import { ErrorHandler } from "../../../lib/utils/error-handler";
import { SystemInfoService } from "../../../lib/services";
import { Configuration } from '../../../lib/components/config/config';
import { clone } from '../../../lib/utils/utils';
import { CONFIG_AUTH_MODE } from '../../../lib/entities/shared.const';
@ -37,7 +36,7 @@ describe('ConfigurationAuthComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),

2
src/portal/src/app/config/auth/config-auth.component.ts
View File

@ -40,7 +40,7 @@ export class ConfigurationAuthComponent implements OnChanges, OnInit {
// tslint:disable-next-line:no-input-rename
@Input('allConfig') currentConfig: Configuration = new Configuration();
private originalConfig: Configuration;
@ViewChild('authConfigFrom', {static: false}) authForm: NgForm;
@ViewChild('authConfigFrom') authForm: NgForm;
@Output() refreshAllconfig = new EventEmitter<any>();
constructor(

4
src/portal/src/app/config/config.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -45,7 +45,7 @@ describe('ConfigurationComponent', () => {
updateAccountSettings: () => of(null),
renameAdmin: () => of(null),
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),

6
src/portal/src/app/config/config.component.ts
View File

@ -46,9 +46,9 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
originalCopy: Configuration = new Configuration();
confirmSub: Subscription;
@ViewChild(SystemSettingsComponent, {static: false}) systemSettingsConfig: SystemSettingsComponent;
@ViewChild(ConfigurationEmailComponent, {static: false}) mailConfig: ConfigurationEmailComponent;
@ViewChild(ConfigurationAuthComponent, {static: false}) authConfig: ConfigurationAuthComponent;
@ViewChild(SystemSettingsComponent) systemSettingsConfig: SystemSettingsComponent;
@ViewChild(ConfigurationEmailComponent) mailConfig: ConfigurationEmailComponent;
@ViewChild(ConfigurationAuthComponent) authConfig: ConfigurationAuthComponent;
constructor(
private msgHandler: MessageHandlerService,

4
src/portal/src/app/config/email/config-email.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { MessageHandlerService } from '../../shared/message-handler/message-handler.service';
import { ConfirmMessageHandler } from '../config.msg.utils';
import { ConfigurationService } from '../config.service';
@ -19,7 +19,7 @@ describe('ConfigurationEmailComponent', () => {
let fakeMessageHandlerService = {
showSuccess: () => null
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),

2
src/portal/src/app/config/scanner/config-scanner.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, ComponentFixtureAutoDetect, TestBed } from '@angular/core/testing';
import { ComponentFixture, ComponentFixtureAutoDetect, TestBed } from '@angular/core/testing';
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { ClarityModule } from "@clr/angular";
import { of } from "rxjs";

2
src/portal/src/app/config/scanner/config-scanner.component.ts
View File

@ -19,7 +19,7 @@ export class ConfigurationScannerComponent implements OnInit, OnDestroy {
scanners: Scanner[] = [];
selectedRow: Scanner;
onGoing: boolean = false;
@ViewChild(NewScannerModalComponent, {static: false})
@ViewChild(NewScannerModalComponent)
newScannerDialog: NewScannerModalComponent;
deletionSubscription: any;
scannerDocUrl: string = SCANNERS_DOC;

2
src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, ComponentFixtureAutoDetect, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { ComponentFixture, ComponentFixtureAutoDetect, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { NewScannerFormComponent } from "./new-scanner-form.component";
import { FormBuilder } from "@angular/forms";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";

4
src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.ts
View File

@ -46,8 +46,8 @@ export class NewScannerFormComponent implements OnInit, AfterViewInit, OnDestro
showEndpointError: boolean = false;
originValue: any;
isEdit: boolean;
@ViewChild('name', {static: false}) scannerName: ElementRef;
@ViewChild('endpointUrl', {static: false}) scannerEndpointUrl: ElementRef;
@ViewChild('name') scannerName: ElementRef;
@ViewChild('endpointUrl') scannerEndpointUrl: ElementRef;
constructor(private fb: FormBuilder, private scannerService: ConfigScannerService) {
}
ngAfterViewInit(): void {

2
src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, ComponentFixtureAutoDetect, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { ComponentFixture, ComponentFixtureAutoDetect, fakeAsync, TestBed, tick } from '@angular/core/testing';
import { ClrLoadingState } from "@clr/angular";
import { ConfigScannerService } from "../config-scanner.service";
import { NewScannerModalComponent } from "./new-scanner-modal.component";

2
src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.ts
View File

@ -27,7 +27,7 @@ export class NewScannerModalComponent {
originValue: any;
uid: string;
editScanner: Scanner;
@ViewChild(InlineAlertComponent, { static: false }) inlineAlert: InlineAlertComponent;
@ViewChild(InlineAlertComponent) inlineAlert: InlineAlertComponent;
constructor(
private configScannerService: ConfigScannerService,
private msgHandler: MessageHandlerService,

2
src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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";

3
src/portal/src/app/dev-center/dev-center-base.ts
View File

@ -1,8 +1,9 @@
import { AfterViewInit, OnInit } from '@angular/core';
import { AfterViewInit, OnInit, Directive } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { CookieService } from "ngx-cookie";
@Directive()
export abstract class DevCenterBase implements OnInit, AfterViewInit {
constructor(
public translate: TranslateService,

4
src/portal/src/app/dev-center/dev-center-other.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed, getTestBed } from '@angular/core/testing';
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';
@ -14,7 +14,7 @@ describe('DevCenterOtherComponent', () => {
};
let injector: TestBed;
let httpMock: HttpTestingController;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [DevCenterOtherComponent],
imports: [

4
src/portal/src/app/dev-center/dev-center.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed, getTestBed } from '@angular/core/testing';
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 { DevCenterComponent } from './dev-center.component';
@ -15,7 +15,7 @@ describe('DevCenterComponent', () => {
let cookie = "fdsa|ds";
let injector: TestBed;
let httpMock: HttpTestingController;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [DevCenterComponent],
imports: [

4
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.html
View File

@ -110,8 +110,8 @@
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize" [clrDgTotalItems]="totalCount" [(clrDgPage)]="currentPage">
<span *ngIf="pagination.totalItems">{{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} {{ 'HELM_CHART.OF' | translate }} </span>
<span>{{ pagination.totalItems }} {{ 'HELM_CHART.ITEMS' | translate }}</span>
<span *ngIf="totalCount">{{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} {{ 'HELM_CHART.OF' | translate }} </span>
<span>{{ totalCount }} {{ 'HELM_CHART.ITEMS' | translate }}</span>
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

4
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -96,7 +96,7 @@ describe('DistributionInstanceComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
ClarityModule,

2
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.ts
View File

@ -59,7 +59,7 @@ export class DistributionInstancesComponent implements OnInit, OnDestroy {
private loading: boolean = true;
private operationSubscription: Subscription;
@ViewChild('setupModal', { static: false })
@ViewChild('setupModal')
setupModal: DistributionSetupModalComponent;
providerMap: {[key: string]: Metadata} = {};
providers: Metadata[] = [];

4
src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -32,7 +32,7 @@ describe('DistributionSetupModalComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
ClarityModule,

2
src/portal/src/app/distribution/distribution-setup-modal/distribution-setup-modal.component.ts
View File

@ -39,7 +39,7 @@ export class DistributionSetupModalComponent implements OnInit, OnDestroy {
editingMode: boolean = false;
authData: {[key: string]: any} = {};
@ViewChild('instanceForm', { static: true }) instanceForm: NgForm;
@ViewChild(InlineAlertComponent, { static: false }) inlineAlert: InlineAlertComponent;
@ViewChild(InlineAlertComponent) inlineAlert: InlineAlertComponent;
saveBtnState: ClrLoadingState = ClrLoadingState.DEFAULT;
@Output()

2
src/portal/src/app/gc-page/gc-page.component.html
View File

@ -1,6 +1,6 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<h2 class="custom-h2 gc-title">{{'CONFIG.GC' | translate }}<span class="spinner spinner-inline ml-1 v-mid" [hidden]="!inProgress"></span></h2>
<h2 class="custom-h2 gc-title">{{'CONFIG.GC' | translate }}<span *ngIf="inProgress" class="spinner spinner-inline ml-1 v-mid"></span></h2>
<clr-tabs>
<clr-tab *ngIf="hasAdminRole">
<button id="config-gc" clrTabLink>{{'CONFIG.GC' | translate }}</button>

4
src/portal/src/app/gc-page/gc-page.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -13,7 +13,7 @@ describe('GcPageComponent', () => {
return { has_admin_role: true };
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [GcPageComponent],
schemas: [

2
src/portal/src/app/gc-page/gc-page.component.ts
View File

@ -7,7 +7,7 @@ import { SessionService } from "../shared/session.service";
styleUrls: ["./gc-page.component.scss"]
})
export class GcPageComponent implements OnInit {
inProgress: boolean;
inProgress: boolean = true;
constructor(private session: SessionService) {}
ngOnInit() {}

3
src/portal/src/app/global-message/message.component.scss
View File

@ -6,4 +6,7 @@
width: 100%;
height: 100%;
z-index: 1000;
}
.alert-text {
flex: 0 1 auto !important;
}

4
src/portal/src/app/global-message/message.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { ElementRef } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
@ -13,7 +13,7 @@ describe('MessageComponent', () => {
let fixture: ComponentFixture<MessageComponent>;
let fakeElementRef = null;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
ClarityModule,

4
src/portal/src/app/group/add-group-modal/add-group-modal.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -33,7 +33,7 @@ describe('AddGroupModalComponent', () => {
};
let fakeMessageHandlerService = null;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [AddGroupModalComponent],
imports: [

4
src/portal/src/app/group/group.component.html
View File

@ -30,10 +30,10 @@
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="15">
<span *ngIf="pagination.totalItems">
<span *ngIf="groups?.length">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'GROUP.OF' | translate}}
</span>
{{pagination.totalItems}} {{'GROUP.ITEMS' | translate}}
{{groups?.length}} {{'GROUP.ITEMS' | translate}}
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

4
src/portal/src/app/group/group.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { GroupComponent } from './group.component';
import { ClarityModule } from '@clr/angular';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
@ -43,7 +43,7 @@ describe('GroupComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [GroupComponent],
imports: [

2
src/portal/src/app/group/group.component.ts
View File

@ -40,7 +40,7 @@ export class GroupComponent implements OnInit, OnDestroy {
batchInfos = new Map();
isLdapMode: boolean;
@ViewChild(AddGroupModalComponent, {static: false}) newGroupModal: AddGroupModalComponent;
@ViewChild(AddGroupModalComponent) newGroupModal: AddGroupModalComponent;
constructor(
private operationService: OperationService,

4
src/portal/src/app/interrogation-services/interrogation-services.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { InterrogationServicesComponent } from './interrogation-services.component';
import { SharedModule } from "../shared/shared.module";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
@ -9,7 +9,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
describe('InterrogationServicesComponent', () => {
let component: InterrogationServicesComponent;
let fixture: ComponentFixture<InterrogationServicesComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
SharedModule,

4
src/portal/src/app/labels/labels.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { LabelsComponent } from './labels.component';
import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
@ -11,7 +11,7 @@ describe('LabelsComponent', () => {
let component: LabelsComponent;
let fixture: ComponentFixture<LabelsComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
SharedModule,

4
src/portal/src/app/license/license.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { LicenseComponent } from './license.component';
@ -6,7 +6,7 @@ describe('LicenseComponent', () => {
let component: LicenseComponent;
let fixture: ComponentFixture<LicenseComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [LicenseComponent],
imports: [

2
src/portal/src/app/log/audit-log.component.html
View File

@ -44,7 +44,7 @@
<clr-dg-cell>{{l.op_time | date: 'short'}}</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>
<span *ngIf="showPaginationIndex">{{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'AUDIT_LOG.OF' | translate}} </span> {{pagination.totalItems }} {{'AUDIT_LOG.ITEMS' | translate}}
<span *ngIf="showPaginationIndex">{{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'AUDIT_LOG.OF' | translate}} </span> {{totalRecordCount }} {{'AUDIT_LOG.ITEMS' | translate}}
<clr-dg-pagination #pagination [clrDgPageSize]="15" [(clrDgPage)]="currentPage" [clrDgTotalItems]="totalRecordCount"></clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

10
src/portal/src/app/log/audit-log.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -76,7 +76,7 @@ describe('AuditLogComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA
@ -111,7 +111,7 @@ describe('AuditLogComponent', () => {
it('should create', () => {
expect(component).toBeTruthy();
});
it('should get data from AccessLogService', async(() => {
it('should get data from AccessLogService', waitForAsync(() => {
fixture.detectChanges();
fixture.whenStable().then(() => { // wait for async getRecentLogs
fixture.detectChanges();
@ -120,7 +120,7 @@ describe('AuditLogComponent', () => {
});
}));
it('should render data to view', async(() => {
it('should render data to view', waitForAsync(() => {
fixture.detectChanges();
fixture.whenStable().then(() => {
fixture.detectChanges();
@ -144,7 +144,7 @@ describe('AuditLogComponent', () => {
expect(component.auditLogs.length).toEqual(3);
});
it('should support filtering list by keywords', async(() => {
it('should support filtering list by keywords', waitForAsync(() => {
fixture.detectChanges();
let el: HTMLElement = fixture.nativeElement.querySelector('.search-btn');
expect(el).toBeTruthy("Not found search icon");

4
src/portal/src/app/log/log-page.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { LogPageComponent } from './log-page.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@ -6,7 +6,7 @@ describe('LogPageComponent', () => {
let component: LogPageComponent;
let fixture: ComponentFixture<LogPageComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
],

4
src/portal/src/app/oidc-onboard/oidc-onboard.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { ClarityModule } from '@clr/angular';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { OidcOnboardService } from './oidc-onboard.service';
@ -14,7 +14,7 @@ describe('OidcOnboardComponent', () => {
let fakeOidcOnboardService = null;
let fakeRouter = null;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [OidcOnboardComponent],
schemas: [

4
src/portal/src/app/project-quotas/project-quotas.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { ProjectQuotasComponent } from './project-quotas.component';
import { TranslateModule } from "@ngx-translate/core";
import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
@ -38,7 +38,7 @@ describe('ProjectQuotasComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot()

4
src/portal/src/app/project/create-project/create-project.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -38,7 +38,7 @@ describe('CreateProjectComponent', () => {
systemInfoEndpoint: CURRENT_BASE_HREF + "/endpoints/testing"
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
HttpClientTestingModule,

2
src/portal/src/app/project/create-project/create-project.component.ts
View File

@ -71,7 +71,7 @@ export class CreateProjectComponent implements OnInit, AfterViewInit, OnChanges
@Input() isSystemAdmin: boolean;
@ViewChild(InlineAlertComponent, {static: true})
inlineAlert: InlineAlertComponent;
@ViewChild('projectName', {static: false}) projectNameInput: ElementRef;
@ViewChild('projectName') projectNameInput: ElementRef;
checkNameSubscribe: Subscription;
registries: Endpoint[] = [];

4
src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -17,7 +17,7 @@ describe('ChartDetailComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [HelmChartDetailComponent],
schemas: [

4
src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-dependency.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { ChartDetailDependencyComponent } from './chart-detail-dependency.component';
@ -6,7 +6,7 @@ describe('ChartDetailDependencyComponent', () => {
let component: ChartDetailDependencyComponent;
let fixture: ComponentFixture<ChartDetailDependencyComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot()

12
src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-summary.component.spec.ts
View File

@ -1,10 +1,10 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { ChartDetailSummaryComponent } from './chart-detail-summary.component';
import { ClarityModule } from '@clr/angular';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { CUSTOM_ELEMENTS_SCHEMA, SecurityContext } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { MarkedOptions, MarkdownModule, MarkdownService } from 'ngx-markdown';
import { MarkedOptions, MarkdownModule } from 'ngx-markdown';
import { HelmChartService } from '../../helm-chart.service';
import { DefaultErrorHandler, ErrorHandler } from "../../../../../lib/utils/error-handler";
describe('ChartDetailSummaryComponent', () => {
@ -15,13 +15,13 @@ describe('ChartDetailSummaryComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),
ClarityModule,
FormsModule,
MarkdownModule,
MarkdownModule.forRoot({ sanitize: SecurityContext.HTML }),
],
schemas: [
CUSTOM_ELEMENTS_SCHEMA
@ -29,7 +29,6 @@ describe('ChartDetailSummaryComponent', () => {
declarations: [ChartDetailSummaryComponent],
providers: [
TranslateService,
MarkdownService,
{ provide: MarkedOptions, useValue: {} },
{ provide: ErrorHandler, useValue: DefaultErrorHandler },
{ provide: HelmChartService, useValue: mockHelmChartService },
@ -39,7 +38,6 @@ describe('ChartDetailSummaryComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(ChartDetailSummaryComponent);
// markdownService = TestBed.get(MarkdownService);
component = fixture.componentInstance;
component.summary = {
name: "string",

13
src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail-value.component.spec.ts
View File

@ -1,24 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { ChartDetailValueComponent } from './chart-detail-value.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { CUSTOM_ELEMENTS_SCHEMA, SecurityContext } from '@angular/core';
import { ClarityModule } from '@clr/angular';
import { FormsModule } from '@angular/forms';
import { MarkdownModule, MarkdownService, MarkedOptions } from 'ngx-markdown';
import { MarkdownModule, MarkedOptions } from 'ngx-markdown';
import { BrowserModule } from '@angular/platform-browser';
describe('ChartDetailValueComponent', () => {
let component: ChartDetailValueComponent;
let fixture: ComponentFixture<ChartDetailValueComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),
MarkdownModule,
ClarityModule,
FormsModule,
BrowserModule
BrowserModule,
MarkdownModule.forRoot({ sanitize: SecurityContext.HTML }),
],
declarations: [ChartDetailValueComponent],
schemas: [
@ -26,7 +26,6 @@ describe('ChartDetailValueComponent', () => {
],
providers: [
TranslateService,
MarkdownService,
{ provide: MarkedOptions, useValue: {} },
]
}).compileComponents();

4
src/portal/src/app/project/helm-chart/helm-chart-detail/chart-detail/chart-detail.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { ChartDetailComponent } from './chart-detail.component';
import { ClarityModule } from '@clr/angular';
@ -99,7 +99,7 @@ describe('ChartDetailComponent', () => {
},
downloadChart: function () { }
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),

4
src/portal/src/app/project/helm-chart/label-filter/label-filter.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { LabelFilterComponent } from './label-filter.component';
import { ClarityModule } from '@clr/angular';
@ -9,7 +9,7 @@ describe('LabelFilterComponent', () => {
let component: LabelFilterComponent;
let fixture: ComponentFixture<LabelFilterComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

4
src/portal/src/app/project/helm-chart/label-marker/label-marker.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { LabelMarkerComponent } from './label-marker.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@ -33,7 +33,7 @@ describe('LabelMarkerComponent', () => {
let component: LabelMarkerComponent;
let fixture: ComponentFixture<LabelMarkerComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

4
src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.html
View File

@ -100,10 +100,10 @@
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize" [clrDgTotalItems]="totalCount">
<span *ngIf="pagination.totalItems">
<span *ngIf="totalCount">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'HELM_CHART.OF' | translate}}
</span>
{{pagination.totalItems}} {{'HELM_CHART.ITEMS'| translate}}
{{totalCount}} {{'HELM_CHART.ITEMS'| translate}}
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

4
src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { ChartVersionComponent } from './helm-chart-version.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@ -79,7 +79,7 @@ describe('ChartVersionComponent', () => {
).pipe(delay(0));
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

2
src/portal/src/app/project/helm-chart/list-chart-versions/helm-chart-versions-detail/helm-chart-version.component.ts
View File

@ -76,7 +76,7 @@ export class ChartVersionComponent implements OnInit {
addLabelHeaders = 'HELM_CHART.ADD_LABEL_TO_CHART_VERSION';
@ViewChild("confirmationDialog", {static: false})
@ViewChild("confirmationDialog")
confirmationDialog: ConfirmationDialogComponent;
hasAddRemoveHelmChartVersionPermission: boolean;
hasDownloadHelmChartVersionPermission: boolean;

4
src/portal/src/app/project/helm-chart/list-chart-versions/list-chart-versions.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -17,7 +17,7 @@ describe('ListChartVersionsComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ListChartVersionsComponent],
imports: [

4
src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.html
View File

@ -54,10 +54,10 @@
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize" [clrDgTotalItems]="totalCount">
<span *ngIf="pagination.totalItems">
<span *ngIf="totalCount">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'HELM_CHART.OF' | translate}}
</span>
{{pagination.totalItems}} {{'HELM_CHART.ITEMS'| translate}}
{{totalCount}} {{'HELM_CHART.ITEMS'| translate}}
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

4
src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { HelmChartComponent } from './helm-chart.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@ -72,7 +72,7 @@ describe('HelmChartComponent', () => {
return of([]);
},
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

4
src/portal/src/app/project/helm-chart/list-charts-detail/helm-chart.component.ts
View File

@ -74,9 +74,9 @@ export class HelmChartComponent implements OnInit {
totalCount = 0;
currentState: State;
@ViewChild('chartUploadForm', {static: false}) uploadForm: NgForm;
@ViewChild('chartUploadForm') uploadForm: NgForm;
@ViewChild("confirmationDialog", {static: false}) confirmationDialog: ConfirmationDialogComponent;
@ViewChild("confirmationDialog") confirmationDialog: ConfirmationDialogComponent;
hasUploadHelmChartsPermission: boolean;
hasDownloadHelmChartsPermission: boolean;
hasDeleteHelmChartsPermission: boolean;

4
src/portal/src/app/project/helm-chart/list-charts.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -15,7 +15,7 @@ describe('ListChartsComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ListChartsComponent],
imports: [

2
src/portal/src/app/project/list-project/list-project.component.html
View File

@ -25,7 +25,7 @@
<clr-dg-cell>{{p.creation_time | date: 'short'}}</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>
<span *ngIf="totalCount">{{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'PROJECT.OF' | translate}} </span> {{pagination.totalItems
<span *ngIf="totalCount">{{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'PROJECT.OF' | translate}} </span> {{totalCount
}} {{'PROJECT.ITEMS' | translate}}
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize" [(clrDgPage)]="currentPage" [clrDgTotalItems]="totalCount"></clr-dg-pagination>
</clr-dg-footer>

4
src/portal/src/app/project/list-project/list-project.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed, ComponentFixtureAutoDetect } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed, ComponentFixtureAutoDetect } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { ListProjectComponent } from './list-project.component';
import { CUSTOM_ELEMENTS_SCHEMA, ChangeDetectorRef } from '@angular/core';
@ -62,7 +62,7 @@ describe('ListProjectComponent', () => {
const mockOperationService = {
publishInfo$: () => {}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

4
src/portal/src/app/project/member/add-group/add-group.component.html
View File

@ -79,10 +79,10 @@
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="5" [clrDgTotalItems]="totalCount">
<span *ngIf="pagination.totalItems">
<span *ngIf="groups?.length">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'MEMBER.OF' | translate}}
</span>
{{pagination.totalItems}} {{'MEMBER.ITEMS' | translate}}
{{groups?.length}} {{'MEMBER.ITEMS' | translate}}
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

4
src/portal/src/app/project/member/add-group/add-group.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { ClarityModule } from '@clr/angular';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { FormsModule } from '@angular/forms';
@ -17,7 +17,7 @@ describe('AddGroupComponent', () => {
let fakeGroupService = null;
let fakeMemberService = null;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [AddGroupComponent],
imports: [

2
src/portal/src/app/project/member/add-group/add-group.component.ts
View File

@ -39,7 +39,7 @@ export class AddGroupComponent implements OnInit {
@Input() memberList: Member[] = [];
@Output() added = new EventEmitter<boolean>();
@ViewChild('groupForm', { static: false })
@ViewChild('groupForm')
groupForm: NgForm;
constructor(

4
src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { of } from "rxjs";
import { MemberService } from '../member.service';
import { AppConfigService } from "../../../services/app-config.service";
@ -21,7 +21,7 @@ describe('AddHttpAuthGroupComponent', () => {
return of(null);
}};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [AddHttpAuthGroupComponent],
schemas: [

2
src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.ts
View File

@ -53,7 +53,7 @@ export class AddHttpAuthGroupComponent implements OnInit {
@ViewChild('memberForm', {static: true})
currentForm: NgForm;
@ViewChild(InlineAlertComponent, {static: false})
@ViewChild(InlineAlertComponent)
inlineAlert: InlineAlertComponent;
@Input() projectId: number;

4
src/portal/src/app/project/member/add-member/add-member.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -35,7 +35,7 @@ describe('AddMemberComponent', () => {
handleError: () => { },
isAppLevel: () => { },
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

2
src/portal/src/app/project/member/add-member/add-member.component.ts
View File

@ -64,7 +64,7 @@ export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy {
hasChanged: boolean;
@ViewChild(InlineAlertComponent, {static: false})
@ViewChild(InlineAlertComponent)
inlineAlert: InlineAlertComponent;
@Input() projectId: number;

4
src/portal/src/app/project/member/member.component.html
View File

@ -46,8 +46,8 @@
</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>
<span *ngIf="pagination.totalItems">{{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'MEMBER.OF' | translate}} </span>
{{pagination.totalItems }} {{'MEMBER.ITEMS' | translate}}
<span *ngIf="members?.length">{{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'MEMBER.OF' | translate}} </span>
{{members?.length }} {{'MEMBER.ITEMS' | translate}}
<clr-dg-pagination #pagination [clrDgPageSize]="15"></clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

4
src/portal/src/app/project/member/member.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -79,7 +79,7 @@ describe('MemberComponent', () => {
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

6
src/portal/src/app/project/member/member.component.ts
View File

@ -63,12 +63,12 @@ export class MemberComponent implements OnInit, OnDestroy {
isLdapMode: boolean;
isHttpAuthMode: boolean;
isOidcMode: boolean;
@ViewChild(AddMemberComponent, {static: false})
@ViewChild(AddMemberComponent)
addMemberComponent: AddMemberComponent;
@ViewChild(AddGroupComponent, {static: false})
@ViewChild(AddGroupComponent)
addGroupComponent: AddGroupComponent;
@ViewChild(AddHttpAuthGroupComponent, {static: false})
@ViewChild(AddHttpAuthGroupComponent)
addHttpAuthGroupComponent: AddHttpAuthGroupComponent;
hasCreateMemberPermission: boolean;
hasUpdateMemberPermission: boolean;

4
src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core';
import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
@ -76,7 +76,7 @@ describe('AddP2pPolicyComponent', () => {
});
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA,

4
src/portal/src/app/project/p2p-provider/add-p2p-policy/add-p2p-policy.component.ts
View File

@ -45,7 +45,7 @@ export class AddP2pPolicyComponent implements OnInit, OnDestroy {
projectId: number;
@Output() notify = new EventEmitter<boolean>();
@ViewChild(InlineAlertComponent, { static: false } )
@ViewChild(InlineAlertComponent)
inlineAlert: InlineAlertComponent;
policy: PreheatPolicy = {};
repos: string;
@ -57,7 +57,7 @@ export class AddP2pPolicyComponent implements OnInit, OnDestroy {
cron: string ;
@ViewChild("policyForm", { static: true }) currentForm: NgForm;
loading: boolean = false;
@ViewChild('cronScheduleComponent', {static: false})
@ViewChild('cronScheduleComponent')
cronScheduleComponent: CronScheduleComponent;
buttonStatus: ClrLoadingState = ClrLoadingState.DEFAULT;
originPolicyForEdit: PreheatPolicy;

4
src/portal/src/app/project/p2p-provider/p2p-provider.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { P2pProviderComponent } from './p2p-provider.component';
import { NO_ERRORS_SCHEMA } from '@angular/core';
@ -6,7 +6,7 @@ describe('P2pProviderComponent', () => {
let component: P2pProviderComponent;
let fixture: ComponentFixture<P2pProviderComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ P2pProviderComponent ],
schemas: [

4
src/portal/src/app/project/p2p-provider/policy/policy.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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";
@ -125,7 +125,7 @@ describe('PolicyComponent', () => {
});
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

4
src/portal/src/app/project/p2p-provider/policy/policy.component.ts
View File

@ -49,9 +49,9 @@ import { ProviderUnderProject } from '../../../../../ng-swagger-gen/models/provi
styleUrls: ['./policy.component.scss']
})
export class PolicyComponent implements OnInit, OnDestroy {
@ViewChild(AddP2pPolicyComponent, { static: false } )
@ViewChild(AddP2pPolicyComponent)
addP2pPolicyComponent: AddP2pPolicyComponent;
@ViewChild("confirmationDialogComponent", { static: false })
@ViewChild("confirmationDialogComponent")
confirmationDialogComponent: ConfirmationDialogComponent;
projectId: number;
projectName: string;

4
src/portal/src/app/project/p2p-provider/task-list/task-list.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
@ -86,7 +86,7 @@ describe('TaskListComponent', () => {
return of(true).pipe(delay(0));
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA,

4
src/portal/src/app/project/project-config/project-config.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -17,7 +17,7 @@ describe('ProjectConfigComponent', () => {
};
let fakeRouter = null;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ProjectConfigComponent],
schemas: [

4
src/portal/src/app/project/project-detail/project-detail.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { ProjectDetailComponent } from './project-detail.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@ -61,7 +61,7 @@ describe('ProjectDetailComponent', () => {
}
})
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

4
src/portal/src/app/project/project-label/project-label.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { Router, ActivatedRoute } from '@angular/router';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { of } from 'rxjs';
@ -22,7 +22,7 @@ describe('ProjectLabelComponent', () => {
}
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ProjectLabelComponent],
schemas: [

4
src/portal/src/app/project/project.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
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';
@ -227,7 +227,7 @@ describe('ProjectComponent', () => {
showSuccess() {
},
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

4
src/portal/src/app/project/project.component.ts
View File

@ -33,10 +33,10 @@ import { MessageHandlerService } from '../shared/message-handler/message-handler
export class ProjectComponent implements OnInit, OnDestroy {
projectTypes = ProjectTypes;
quotaObj: QuotaHardInterface;
@ViewChild(CreateProjectComponent, {static: false})
@ViewChild(CreateProjectComponent)
creationProject: CreateProjectComponent;
@ViewChild(ListProjectComponent, {static: false})
@ViewChild(ListProjectComponent)
listProject: ListProjectComponent;
currentFilteredType: number = 0; // all projects

4
src/portal/src/app/project/repository/artifact-list-page/artifact-list-page.component.spec.ts
View File

@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { ArtifactListPageComponent } from './artifact-list-page.component';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@ -73,7 +73,7 @@ describe('ArtifactListPageComponent', () => {
const config: IServiceConfig = {
repositoryBaseEndpoint: CURRENT_BASE_HREF + "/repositories/testing"
};
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
schemas: [
CUSTOM_ELEMENTS_SCHEMA

Some files were not shown because too many files have changed in this diff Show More