Merge pull request #2518 from ProgrammeVitam/fix-14357

Fix #14357: show schema delete button only on external schema on same tenant

Author: marob

api/api-referential/referential/src/main/java/fr/gouv/vitamui/referential/server/service/schema/SchemaModelToSchemaElementDtoConverter.java

@@ -47,6 +47,7 @@ public class SchemaModelToSchemaElementDtoConverter extends StdConverter<SchemaR
     public SchemaElementDto convert(SchemaResponse schemaModel) {
         final SchemaStringSizeType stringTypeSize = schemaModel.getStringSize();
         final SchemaElementDto schemaElementDto = (SchemaElementDto) new SchemaElementDto()
+            .setTenant(schemaModel.getTenant())
             .setPath(schemaModel.getPath())
             .setStringSize(Optional.ofNullable(stringTypeSize).map(SchemaStringSizeType::value).orElse(null))
             .setCardinality(Cardinality.of(schemaModel.getCardinality().value()))

ui/ui-frontend/projects/referential/src/app/ontology/ontology-group/schema-list/schema-list.component.html

@@ -57,7 +57,7 @@
       <th mat-header-cell *matHeaderCellDef class="w-0"></th>
       <td mat-cell *matCellDef="let data">
         <button
-          *ngIf="data.item.Origin === 'EXTERNAL'"
+          *ngIf="canDelete(data.item)"
           class="btn btn-circle primary"
           (click)="delete(data)"
           (mouseover)="previewDelete(data.item)"

ui/ui-frontend/projects/referential/src/app/ontology/ontology-group/schema-list/schema-list.component.spec.ts

@@ -39,7 +39,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { of } from 'rxjs';
-import { AuthService, BASE_URL, SchemaService } from 'vitamui-library';
+import { AuthService, BASE_URL, SchemaService, TenantSelectionService } from 'vitamui-library';
 import { SchemaListComponent } from './schema-list.component';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -51,6 +51,12 @@ describe('SchemaListComponent', () => {
     getSchemaTreeByCategory: () => of(null),
   };
 
+  const tenantSelectionServiceMock = {
+    getSelectedTenant: () => ({
+      identifier: 1,
+    }),
+  };
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [],
@@ -59,6 +65,7 @@ describe('SchemaListComponent', () => {
         { provide: BASE_URL, useValue: '' },
         { provide: MatDialog, useValue: {} },
         { provide: SchemaService, useValue: schemaServiceMock },
+        { provide: TenantSelectionService, useValue: tenantSelectionServiceMock },
         { provide: AuthService, useValue: { user: { proofTenantIdentifier: '1' } } },
       ],
       schemas: [NO_ERRORS_SCHEMA],

ui/ui-frontend/projects/referential/src/app/ontology/ontology-group/schema-list/schema-list.component.ts

@@ -45,6 +45,7 @@ import {
   SchemaElement,
   SchemaService,
   TableFilterModule,
+  TenantSelectionService,
 } from 'vitamui-library';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { FlatTreeControl } from '@angular/cdk/tree';
@@ -89,6 +90,7 @@ export class SchemaListComponent implements OnInit, OnDestroy {
     public schemaService: SchemaService,
     private translateService: TranslateService,
     public dialog: MatDialog,
+    private tenantSelectionService: TenantSelectionService,
   ) {
     this.treeFlattener = new MatTreeFlattener(
       this.transformer,
@@ -202,6 +204,10 @@ export class SchemaListComponent implements OnInit, OnDestroy {
     return flatNode;
   };
 
+  canDelete(schemaElement: SchemaElement) {
+    return schemaElement.Origin === 'EXTERNAL' && schemaElement.Tenant === this.tenantSelectionService.getSelectedTenant().identifier;
+  }
+
   delete(itemNode: ItemFlatNode<SchemaElement>) {
     const paths = [itemNode, ...this.treeControl.getDescendants(itemNode)].map((node) => node.item.Path);
     this.dialog

ui/ui-frontend/projects/vitamui-library/src/app/modules/models/schema/schema-element.model.ts

@@ -51,7 +51,7 @@ export interface SchemaElement extends WithPath {
   readonly Description?: string;
   readonly CreationDate?: string;
   readonly LastUpdate?: string;
-  readonly TenantIds?: string[];
+  readonly Tenant?: number;
   readonly StringSize?: 'SHORT' | 'MEDIUM' | 'LARGE';
   readonly Cardinality: Cardinality;
   readonly SedaVersions: SedaVersion[];