Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CSAN
Csan
Commits
8d9a18b5
Commit
8d9a18b5
authored
Sep 22, 2020
by
AllForNothing
Browse files
Update UI package to latest version
Signed-off-by:
AllForNothing
<
sshijun@vmware.com
>
parent
18f41bad
Changes
240
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
35 additions
and
35 deletions
+35
-35
src/portal/src/app/base/harbor-shell/harbor-shell.component.ts
...ortal/src/app/base/harbor-shell/harbor-shell.component.ts
+4
-4
src/portal/src/app/base/navigator/navigator.component.spec.ts
...portal/src/app/base/navigator/navigator.component.spec.ts
+2
-2
src/portal/src/app/config/auth/config-auth.component.spec.ts
src/portal/src/app/config/auth/config-auth.component.spec.ts
+2
-3
src/portal/src/app/config/auth/config-auth.component.ts
src/portal/src/app/config/auth/config-auth.component.ts
+1
-1
src/portal/src/app/config/config.component.spec.ts
src/portal/src/app/config/config.component.spec.ts
+2
-2
src/portal/src/app/config/config.component.ts
src/portal/src/app/config/config.component.ts
+3
-3
src/portal/src/app/config/email/config-email.component.spec.ts
...ortal/src/app/config/email/config-email.component.spec.ts
+2
-2
src/portal/src/app/config/scanner/config-scanner.component.spec.ts
...l/src/app/config/scanner/config-scanner.component.spec.ts
+1
-1
src/portal/src/app/config/scanner/config-scanner.component.ts
...portal/src/app/config/scanner/config-scanner.component.ts
+1
-1
src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.spec.ts
...anner/new-scanner-form/new-scanner-form.component.spec.ts
+1
-1
src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.ts
...ig/scanner/new-scanner-form/new-scanner-form.component.ts
+2
-2
src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts
...ner/new-scanner-modal/new-scanner-modal.component.spec.ts
+1
-1
src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.ts
.../scanner/new-scanner-modal/new-scanner-modal.component.ts
+1
-1
src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.spec.ts
...anner/scanner-metadata/scanner-metadata.component.spec.ts
+1
-1
src/portal/src/app/dev-center/dev-center-base.ts
src/portal/src/app/dev-center/dev-center-base.ts
+2
-1
src/portal/src/app/dev-center/dev-center-other.component.spec.ts
...tal/src/app/dev-center/dev-center-other.component.spec.ts
+2
-2
src/portal/src/app/dev-center/dev-center.component.spec.ts
src/portal/src/app/dev-center/dev-center.component.spec.ts
+2
-2
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.html
...tribution-instances/distribution-instances.component.html
+2
-2
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.spec.ts
...bution-instances/distribution-instances.component.spec.ts
+2
-2
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.ts
...istribution-instances/distribution-instances.component.ts
+1
-1
No files found.
src/portal/src/app/base/harbor-shell/harbor-shell.component.ts
View file @
8d9a18b5
...
...
@@ -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
...
...
src/portal/src/app/base/navigator/navigator.component.spec.ts
View file @
8d9a18b5
import
{
a
sync
,
ComponentFixture
,
TestBed
}
from
'
@angular/core/testing
'
;
import
{
waitForA
sync
,
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
(
a
sync
(()
=>
{
beforeEach
(
waitForA
sync
(()
=>
{
TestBed
.
configureTestingModule
({
imports
:
[
TranslateModule
.
forRoot
(),
...
...
src/portal/src/app/config/auth/config-auth.component.spec.ts
View file @
8d9a18b5
import
{
a
sync
,
ComponentFixture
,
TestBed
}
from
'
@angular/core/testing
'
;
import
{
waitForA
sync
,
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
(
a
sync
(()
=>
{
beforeEach
(
waitForA
sync
(()
=>
{
TestBed
.
configureTestingModule
({
imports
:
[
TranslateModule
.
forRoot
(),
...
...
src/portal/src/app/config/auth/config-auth.component.ts
View file @
8d9a18b5
...
...
@@ -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
(
...
...
src/portal/src/app/config/config.component.spec.ts
View file @
8d9a18b5
import
{
a
sync
,
ComponentFixture
,
TestBed
}
from
'
@angular/core/testing
'
;
import
{
waitForA
sync
,
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
(
a
sync
(()
=>
{
beforeEach
(
waitForA
sync
(()
=>
{
TestBed
.
configureTestingModule
({
imports
:
[
TranslateModule
.
forRoot
(),
...
...
src/portal/src/app/config/config.component.ts
View file @
8d9a18b5
...
...
@@ -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
,
...
...
src/portal/src/app/config/email/config-email.component.spec.ts
View file @
8d9a18b5
import
{
a
sync
,
ComponentFixture
,
TestBed
}
from
'
@angular/core/testing
'
;
import
{
waitForA
sync
,
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
(
a
sync
(()
=>
{
beforeEach
(
waitForA
sync
(()
=>
{
TestBed
.
configureTestingModule
({
imports
:
[
TranslateModule
.
forRoot
(),
...
...
src/portal/src/app/config/scanner/config-scanner.component.spec.ts
View file @
8d9a18b5
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
"
;
...
...
src/portal/src/app/config/scanner/config-scanner.component.ts
View file @
8d9a18b5
...
...
@@ -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
;
...
...
src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.spec.ts
View file @
8d9a18b5
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
"
;
...
...
src/portal/src/app/config/scanner/new-scanner-form/new-scanner-form.component.ts
View file @
8d9a18b5
...
...
@@ -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
{
...
...
src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.spec.ts
View file @
8d9a18b5
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
"
;
...
...
src/portal/src/app/config/scanner/new-scanner-modal/new-scanner-modal.component.ts
View file @
8d9a18b5
...
...
@@ -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
,
...
...
src/portal/src/app/config/scanner/scanner-metadata/scanner-metadata.component.spec.ts
View file @
8d9a18b5
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
"
;
...
...
src/portal/src/app/dev-center/dev-center-base.ts
View file @
8d9a18b5
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
,
...
...
src/portal/src/app/dev-center/dev-center-other.component.spec.ts
View file @
8d9a18b5
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
(
a
sync
(()
=>
{
beforeEach
(
waitForA
sync
(()
=>
{
TestBed
.
configureTestingModule
({
declarations
:
[
DevCenterOtherComponent
],
imports
:
[
...
...
src/portal/src/app/dev-center/dev-center.component.spec.ts
View file @
8d9a18b5
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
(
a
sync
(()
=>
{
beforeEach
(
waitForA
sync
(()
=>
{
TestBed
.
configureTestingModule
({
declarations
:
[
DevCenterComponent
],
imports
:
[
...
...
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.html
View file @
8d9a18b5
...
...
@@ -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>
...
...
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.spec.ts
View file @
8d9a18b5
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
(
a
sync
(()
=>
{
beforeEach
(
waitForA
sync
(()
=>
{
TestBed
.
configureTestingModule
({
imports
:
[
ClarityModule
,
...
...
src/portal/src/app/distribution/distribution-instances/distribution-instances.component.ts
View file @
8d9a18b5
...
...
@@ -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
[]
=
[];
...
...
Prev
1
2
3
4
5
6
…
12
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment