Merge pull request #549 from MauroDataMapper/gh-545

Set the access when configuring the code set table
MauroDataMapper · May 27, 2022 · fddb2ec · fddb2ec
2 parents e66c07a + e2b0ede
commit fddb2ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/app/code-set/code-set/code-set.component.html b/src/app/code-set/code-set/code-set.component.html
@@ -16,7 +16,7 @@
 
 SPDX-License-Identifier: Apache-2.0
 -->
-<div
+<div *ngIf="codeSetModel"
   class="full-width"
   data-cy="catalogue-item-container"
   [attr.data-catalogue-item-id]="codeSetModel.id"

diff --git a/src/app/shared/code-set-terms-table/code-set-terms-table.component.ts b/src/app/shared/code-set-terms-table/code-set-terms-table.component.ts
@@ -71,11 +71,6 @@ export class CodeSetTermsTableComponent implements OnInit, AfterViewInit {
   }
 
   ngOnInit() {
-    if (this.access && this.access.showEdit) {
-      this.displayedColumns = ['terminology', 'term', 'definition', 'btns'];
-    } else {
-      this.displayedColumns = ['terminology', 'term', 'definition'];
-    }
     this.isLoadingResults = false;
   }
 
@@ -108,6 +103,12 @@ export class CodeSetTermsTableComponent implements OnInit, AfterViewInit {
 
       this.records = data;
       this.access = this.securityHandler.elementAccess(this.codeSet);
+      if (this.codeSet.availableActions.includes('update') && !this.codeSet.finalised) {
+        this.displayedColumns = ['terminology', 'term', 'definition', 'btns'];
+      } else {
+        this.displayedColumns = ['terminology', 'term', 'definition'];
+      }
+
     });
     this.changeRef.detectChanges();
   }