diff --git a/src/portal/src/app/base/project/project-config/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 index 7453f2b778a..4daac1a7940 100644 --- a/src/portal/src/app/base/project/project-config/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 @@ -32,6 +32,18 @@ 'ACCESSORY.CO_SIGN' | translate }} + + + + {{ 'PROJECT_CONFIG.CONTENT_TRUST_POLCIY' | translate }} diff --git a/src/portal/src/app/base/project/project-config/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 index c46c4e9986f..60d30e2515e 100644 --- a/src/portal/src/app/base/project/project-config/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 @@ -44,6 +44,7 @@ export class ProjectPolicy { initByProject(pro: Project) { this.Public = pro.metadata.public === 'true'; + this.ContentTrust = pro.metadata.enable_content_trust === 'true'; this.ContentTrustCosign = pro.metadata.enable_content_trust_cosign === 'true'; this.PreventVulImg = pro.metadata.prevent_vul === 'true'; diff --git a/src/portal/src/app/base/project/project-config/project-policy-config/project.ts b/src/portal/src/app/base/project/project-config/project-policy-config/project.ts index b26f353f77c..e94749945e1 100644 --- a/src/portal/src/app/base/project/project-config/project-policy-config/project.ts +++ b/src/portal/src/app/base/project/project-config/project-policy-config/project.ts @@ -14,6 +14,7 @@ export class Project { role_name?: string; metadata?: { public: string | boolean; + enable_content_trust?: string | boolean; enable_content_trust_cosign?: string | boolean; prevent_vul: string | boolean; severity: string; diff --git a/src/portal/src/app/base/project/repository/artifact/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 index deef6fdbe31..9114cb4ca62 100644 --- a/src/portal/src/app/base/project/repository/artifact/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 @@ -160,7 +160,7 @@ - {{ 'ACCESSORY.CO_SIGNED' | translate }} + {{ 'REPOSITORY.SIGNED' | translate }} diff --git a/src/portal/src/app/base/project/repository/artifact/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 index b9fb2f5cdea..9eef1097e61 100644 --- a/src/portal/src/app/base/project/repository/artifact/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 @@ -25,7 +25,7 @@ import { ClrLoadingState } from '@clr/angular'; import { Accessory } from 'ng-swagger-gen/models/accessory'; import { ArtifactModule } from '../../../artifact.module'; -describe('ArtifactListTabComponent (inline template)', () => { +describe('ArtifactListTabComponent', () => { let comp: ArtifactListTabComponent; let fixture: ComponentFixture; const mockActivatedRoute = { diff --git a/src/portal/src/app/base/project/repository/artifact/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 index 2ffa0291f8b..13502df52b2 100644 --- a/src/portal/src/app/base/project/repository/artifact/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 @@ -932,33 +932,45 @@ export class ArtifactListTabComponent implements OnInit, OnDestroy { } } checkCosignAsync(artifacts: ArtifactFront[]) { - if (artifacts && artifacts.length) { - artifacts.forEach(item => { - item.coSigned = CHECKING; - const listTagParams: NewArtifactService.ListAccessoriesParams = - { - projectName: this.projectName, - repositoryName: dbEncodeURIComponent(this.repoName), - reference: item.digest, - q: encodeURIComponent(`type=${AccessoryType.COSIGN}`), - page: 1, - pageSize: ACCESSORY_PAGE_SIZE, - }; - this.newArtifactService - .listAccessories(listTagParams) - .subscribe( - res => { - if (res?.length) { + if (artifacts) { + if (artifacts.length) { + artifacts.forEach(item => { + item.coSigned = CHECKING; + const listTagParams: NewArtifactService.ListAccessoriesParams = + { + projectName: this.projectName, + repositoryName: dbEncodeURIComponent(this.repoName), + reference: item.digest, + page: 1, + pageSize: ACCESSORY_PAGE_SIZE, + }; + listTagParams.q = encodeURIComponent( + `type=${AccessoryType.COSIGN}` + ); + const cosignParam = listTagParams; + listTagParams.q = encodeURIComponent( + `type=${AccessoryType.NOTATION}` + ); + forkJoin([ + this.newArtifactService.listAccessories(cosignParam), + this.newArtifactService.listAccessories(listTagParams), + ]).subscribe({ + next: res => { + if ( + res?.length && + (res[0]?.length || res[1]?.length) + ) { item.coSigned = TRUE; } else { item.coSigned = FALSE; } }, - err => { + error: err => { item.coSigned = FALSE; - } - ); - }); + }, + }); + }); + } } } // return true if all selected rows are in "running" state diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/pull-command/pull-command.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/pull-command/pull-command.component.ts index b0e34e2deec..8bbe4eca4d8 100644 --- a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/pull-command/pull-command.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/pull-command/pull-command.component.ts @@ -102,6 +102,7 @@ export class PullCommandComponent { artifact?.type === ArtifactType.CHART || artifact?.type === ArtifactType.CNAB) && this.accessoryType !== AccessoryType.COSIGN && + this.accessoryType !== AccessoryType.NOTATION && this.accessoryType !== AccessoryType.NYDUS ); } diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/sub-accessories/sub-accessories.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/sub-accessories/sub-accessories.component.ts index 434ebf344ef..b49d4bc0ab4 100644 --- a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/sub-accessories/sub-accessories.component.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/sub-accessories/sub-accessories.component.ts @@ -4,6 +4,7 @@ import { ChangeDetectorRef, Component, Input, + OnDestroy, OnInit, } from '@angular/core'; import { @@ -31,6 +32,7 @@ import { EventService, HarborEvent, } from '../../../../../../../../services/event-service/event.service'; +import { Subscription } from 'rxjs'; export const ACCESSORY_PAGE_SIZE: number = 5; @@ -40,7 +42,9 @@ export const ACCESSORY_PAGE_SIZE: number = 5; styleUrls: ['./sub-accessories.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, // use OnPush Strategy to avoid ExpressionChangedAfterItHasBeenCheckedError }) -export class SubAccessoriesComponent implements OnInit, AfterViewInit { +export class SubAccessoriesComponent + implements OnInit, AfterViewInit, OnDestroy +{ @Input() projectName: string; @Input() @@ -56,6 +60,7 @@ export class SubAccessoriesComponent implements OnInit, AfterViewInit { page: number = 1; displayedAccessories: AccessoryFront[] = []; loading: boolean = false; + iconSub: Subscription; constructor( private activatedRoute: ActivatedRoute, private router: Router, @@ -71,8 +76,24 @@ export class SubAccessoriesComponent implements OnInit, AfterViewInit { } ngOnInit(): void { + if (!this.iconSub) { + this.iconSub = this.event.subscribe( + HarborEvent.RETRIEVED_ICON, + () => { + this.cdf.detectChanges(); + } + ); + } this.displayedAccessories = clone(this.accessories); } + + ngOnDestroy() { + if (this.iconSub) { + this.iconSub.unsubscribe(); + this.iconSub = null; + } + } + size(size: number) { return formatSize(size.toString()); } diff --git a/src/portal/src/app/base/project/repository/artifact/artifact.service.ts b/src/portal/src/app/base/project/repository/artifact/artifact.service.ts index 896418b30ca..b835fbc58e1 100644 --- a/src/portal/src/app/base/project/repository/artifact/artifact.service.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact.service.ts @@ -6,6 +6,10 @@ import { IconService } from '../../../../../../ng-swagger-gen/services/icon.serv import { share } from 'rxjs/operators'; import { Icon } from 'ng-swagger-gen/models/icon'; import { Accessory } from '../../../../../../ng-swagger-gen/models/accessory'; +import { + EventService, + HarborEvent, +} from '../../../../services/event-service/event.service'; /** * Define the service methods to handle the repository tag related things. @@ -28,7 +32,8 @@ export class ArtifactDefaultService extends ArtifactService { private _sharedIconObservableMap: { [key: string]: Observable } = {}; constructor( private iconService: IconService, - private domSanitizer: DomSanitizer + private domSanitizer: DomSanitizer, + private event: EventService ) { super(); } @@ -57,6 +62,7 @@ export class ArtifactDefaultService extends ArtifactService { `data:${res['content-type']};charset=utf-8;base64,${res.content}` ) ); + this.event.publish(HarborEvent.RETRIEVED_ICON); }); } }); diff --git a/src/portal/src/app/base/project/repository/artifact/artifact.ts b/src/portal/src/app/base/project/repository/artifact/artifact.ts index 003cc3be42e..3b262789d4a 100644 --- a/src/portal/src/app/base/project/repository/artifact/artifact.ts +++ b/src/portal/src/app/base/project/repository/artifact/artifact.ts @@ -73,6 +73,7 @@ export const multipleFilter: Array<{ export enum AccessoryType { COSIGN = 'signature.cosign', + NOTATION = 'signature.notation', NYDUS = 'accelerator.nydus', } diff --git a/src/portal/src/app/services/event-service/event.service.ts b/src/portal/src/app/services/event-service/event.service.ts index c920edc5937..bb97e7d9722 100644 --- a/src/portal/src/app/services/event-service/event.service.ts +++ b/src/portal/src/app/services/event-service/event.service.ts @@ -82,4 +82,5 @@ export enum HarborEvent { DELETE_ACCESSORY = 'deleteAccessory', COPY_DIGEST = 'copyDigest', REFRESH_BANNER_MESSAGE = 'refreshBannerMessage', + RETRIEVED_ICON = 'retrievedIcon', } diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json index a55ee0b90cb..8591d9eaf39 100644 --- a/src/portal/src/i18n/lang/de-de-lang.json +++ b/src/portal/src/i18n/lang/de-de-lang.json @@ -1688,7 +1688,7 @@ "ACCESSORIES": "Anhänge", "SUBJECT_ARTIFACT": "Subjekt Artefakt", "CO_SIGN": "Cosign", - "NOTARY": "Notary", + "NOTARY": "Notation", "PLACEHOLDER": "Es konnten keine Anhänge gefunden werden!" }, "CLEARANCES": { diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index 2aa6a5217e2..6f517dc5206 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -1689,7 +1689,7 @@ "ACCESSORIES": "Accessories", "SUBJECT_ARTIFACT": "Subject Artifact", "CO_SIGN": "Cosign", - "NOTARY": "Notary", + "NOTARY": "Notation", "PLACEHOLDER": "We couldn't find any accessories!" }, "CLEARANCES": { diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index 22fb70c0f43..bd435d538ca 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -1685,7 +1685,7 @@ "ACCESSORIES": "Accessories", "SUBJECT_ARTIFACT": "Subject Artifact", "CO_SIGN": "Cosign", - "NOTARY": "Notary", + "NOTARY": "Notation", "PLACEHOLDER": "We couldn't find any accessories!" }, "CLEARANCES": { diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 6e02fc0f705..bfa43f30f6d 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -1655,7 +1655,7 @@ "ACCESSORIES": "Accessoires", "SUBJECT_ARTIFACT": "Sujet de l'artefact", "CO_SIGN": "Cosign", - "NOTARY": "Notary", + "NOTARY": "Notation", "PLACEHOLDER": "Nous n'avons trouvé aucun accessoire !" }, "CLEARANCES": { diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 997bcaa381a..f8a0117fe29 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -1685,7 +1685,7 @@ "ACCESSORIES": "Accessories", "SUBJECT_ARTIFACT": "Subject Artifact", "CO_SIGN": "Cosign", - "NOTARY": "Notary", + "NOTARY": "Notation", "PLACEHOLDER": "We couldn't find any accessories!" }, "CLEARANCES": { diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index cd5f5681388..974b3048184 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -1688,7 +1688,7 @@ "ACCESSORIES": "Accessories", "SUBJECT_ARTIFACT": "Subject Artifact", "CO_SIGN": "Cosign", - "NOTARY": "Notary", + "NOTARY": "Notation", "PLACEHOLDER": "We couldn't find any accessories!" }, "CLEARANCES": { diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 15b97d35a04..06ded4bea77 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -1685,7 +1685,7 @@ "ACCESSORIES": "附件", "SUBJECT_ARTIFACT": "主体 Artifact", "CO_SIGN": "Cosign", - "NOTARY": "Notary", + "NOTARY": "Notation", "PLACEHOLDER": "未发现任何附件！" }, "CLEARANCES": { diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index 0a3af0cd62c..f0eed910a0f 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -1677,7 +1677,7 @@ "ACCESSORIES": "附件", "SUBJECT_ARTIFACT": "Subject Artifact", "CO_SIGN": "Cosign", - "NOTARY": "Notary", + "NOTARY": "Notation", "PLACEHOLDER": "找不到任何附件！" }, "CLEARANCES": {