fix: property info edit permission (#DEV-3601), property form control…

…s ux improvement (#DEV-3595) (#1575)
dasch-swiss · May 15, 2024 · 595a958 · 595a958
1 parent 0f46425
commit 595a958
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/apps/dsp-app/src/app/project/ontology/property-info/property-info.component.html b/apps/dsp-app/src/app/project/ontology/property-info/property-info.component.html
@@ -60,7 +60,7 @@
   </div>
   <div
     class="action-bubble"
-    *ngIf="lastModificationDate && projectStatus && showActionBubble"
+    *ngIf="userCanEdit && lastModificationDate && projectStatus && showActionBubble"
     [@simpleFadeAnimation]="'in'">
     <div class="button-container">
       <span

diff --git a/libs/vre/shared/app-property-form/src/lib/components/property-form.component.ts b/libs/vre/shared/app-property-form/src/lib/components/property-form.component.ts
@@ -8,6 +8,7 @@ import { PropertyForm } from '../property-form.type';
 
 @Component({
   selector: 'app-property-form',
+  styles: ['.toggles { display: flex; justify-content: center; gap: 16px; margin-bottom: 16px;}'],
   template: ` <form [formGroup]="form">
     <mat-form-field style="width: 100%">
       <span matPrefix>
@@ -37,10 +38,6 @@ import { PropertyForm } from '../property-form.type';
       [formArray]="form.controls.labels"
       data-cy="label-input"
       placeholder="Property label*"></dasch-swiss-multi-language-input>
-    <dasch-swiss-multi-language-textarea
-      [formArray]="form.controls.comments"
-      data-cy="comment-textarea"
-      placeholder="Comment"></dasch-swiss-multi-language-textarea>
 
     <app-gui-attr-list
       *ngIf="formData.property.propType.objectType === Constants.ListValue"
@@ -50,7 +47,7 @@ import { PropertyForm } from '../property-form.type';
       *ngIf="formData.property.propType.objectType === Constants.LinkValue"
       [control]="form.controls.guiAttr"></app-gui-attr-link>
 
-    <div style="display: flex; justify-content: center; gap: 16px">
+    <div class="toggles">
       <app-multiple-slide-toggle
         [control]="form.controls.cardinality"
         data-cy="multiple-toggle"
@@ -63,6 +60,11 @@ import { PropertyForm } from '../property-form.type';
         [label]="'Required value ?'"
         (afterCardinalityChange)="form.controls.cardinality.patchValue($event)"></app-required-slide-toggle>
     </div>
+
+    <dasch-swiss-multi-language-textarea
+      [formArray]="form.controls.comments"
+      data-cy="comment-textarea"
+      placeholder="Comment"></dasch-swiss-multi-language-textarea>
   </form>`,
 })
 export class PropertyFormComponent implements OnInit {