diff --git a/src/portal/src/app/base/left-side-nav/registries/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 index b83aed9f4..da0527be2 100644 --- a/src/portal/src/app/base/left-side-nav/registries/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 @@ -214,7 +214,10 @@ export class CreateEditEndpointComponent this.endpointService.getEndpoint(targetId).subscribe( target => { this.target = target; - this.urlDisabled = this.target.type === 'docker-hub'; + this.urlDisabled = this.adapterInfo && + this.adapterInfo[this.target.type] && + this.adapterInfo[this.target.type].endpoint_pattern && + this.adapterInfo[this.target.type].endpoint_pattern.endpoint_type === FIXED_PATTERN_TYPE; // Keep data cache this.initVal = clone(target); this.initVal.credential.access_secret = this.target.type === 'google-gcr' ? FAKE_JSON_KEY : FAKE_PASSWORD; diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/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 index 14459e5aa..94cfdff7b 100644 --- a/src/portal/src/app/base/left-side-nav/replication/replication/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 @@ -207,7 +207,7 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy { get isValid() { if (this.ruleForm.controls["dest_namespace"].value) { - if (this.ruleForm.controls["dest_namespace"].invalid) { + if (this.ruleForm.controls["dest_namespace"].invalid) {this.ruleForm.get('trigger').get('trigger_settings').get('cron').value return false; } } @@ -567,6 +567,7 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy { && this.ruleForm.get('trigger').get('trigger_settings').get('cron') && (this.ruleForm.get('trigger').get('trigger_settings').get('cron').touched || this.ruleForm.get('trigger').get('trigger_settings').get('cron').dirty) + && this.ruleForm.get('trigger').get('trigger_settings').get('cron').value && !cronRegex(this.ruleForm.get('trigger').get('trigger_settings').get('cron').value); } stickLabel(value, index) { diff --git a/src/portal/src/app/base/project/summary/summary.component.html b/src/portal/src/app/base/project/summary/summary.component.html index 2170a3fc1..3e85e1255 100644 --- a/src/portal/src/app/base/project/summary/summary.component.html +++ b/src/portal/src/app/base/project/summary/summary.component.html @@ -77,7 +77,7 @@ -
+
{{"PROJECT_DETAIL.HELMCHART" | translate}}
{{summaryInformation?.chart_count ? summaryInformation?.chart_count : 0}}
diff --git a/src/portal/src/app/base/project/summary/summary.component.spec.ts b/src/portal/src/app/base/project/summary/summary.component.spec.ts index 588653995..80a752bb0 100644 --- a/src/portal/src/app/base/project/summary/summary.component.spec.ts +++ b/src/portal/src/app/base/project/summary/summary.component.spec.ts @@ -132,13 +132,13 @@ describe('SummaryComponent', () => { expect(container).toBeTruthy(); }); - it('should show three cards', async () => { + it('should show two cards', async () => { component.summaryInformation = mockedSummaryInformation; component.isCardView = true; component.hasReadChartPermission = true; fixture.detectChanges(); await fixture.whenStable(); const cards = fixture.nativeElement.querySelectorAll(".card"); - expect(cards.length).toEqual(3); + expect(cards.length).toEqual(2); }); });