From 4d35cd26152313f79399ff280cc59619d0d2372e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Kilchenmann?= <github@milchkannen.ch>
Date: Wed, 20 Oct 2021 17:28:08 +0200
Subject: [PATCH] fix(value): fix boolean value issue (#557)

* fix(value): fix issue if boolean value does not exist

* chore(value): boolean value cannot be deleted

* test(value): fix tests

* fix(search): reactivate "exists" comparison operator for boolean value

* test(value): set correct comment
---
 .../operations/display-edit/display-edit.component.html   | 4 ++--
 .../resource/properties/properties.component.html         | 6 +-----
 .../resource/properties/properties.component.spec.ts      | 8 +-------
 .../specify-property-value.component.ts                   | 2 +-
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/app/workspace/resource/operations/display-edit/display-edit.component.html b/src/app/workspace/resource/operations/display-edit/display-edit.component.html
index 72e4a0e53c..22744526ed 100644
--- a/src/app/workspace/resource/operations/display-edit/display-edit.component.html
+++ b/src/app/workspace/resource/operations/display-edit/display-edit.component.html
@@ -47,11 +47,11 @@
                         (click)="toggleComment()">
                     <mat-icon>comment</mat-icon>
                 </button>
-                <span [matTooltip]="(canDelete ? 'delete' : 'This value cannot be deleted because at least one value is required')">
+                <span [matTooltip]="((canDelete && valueTypeOrClass != constants.BooleanValue ) ? 'delete' : 'This value cannot be deleted because at least one value is required')">
                     <button mat-button
                         class="delete"
                         *ngIf="!readOnlyValue && canModify && !editModeActive && projectStatus"
-                        [disabled]="!canDelete"
+                        [disabled]="!canDelete || valueTypeOrClass === constants.BooleanValue"
                         (click)="openDialog()">
                         <mat-icon>delete</mat-icon>
                     </button>
diff --git a/src/app/workspace/resource/properties/properties.component.html b/src/app/workspace/resource/properties/properties.component.html
index 6ce887d0ba..d4ef61e983 100644
--- a/src/app/workspace/resource/properties/properties.component.html
+++ b/src/app/workspace/resource/properties/properties.component.html
@@ -137,11 +137,7 @@ <h3 class="label mat-title">
                     </div>
                     <!-- Add button -->
                     <div *ngIf="addValueIsAllowed(prop) && project?.status">
-                        <!-- boolen value will always be displayed even if value is not defined (value = false) -->
-                        <span *ngIf="prop.propDef.objectType === booleanValueTypeIri">
-                            <app-boolean-value [mode]="'read'" class="boolean-value"></app-boolean-value>
-                        </span>
-                        <button *ngIf="prop.propDef.objectType !== booleanValueTypeIri" mat-icon-button type="button" class="value-action create"
+                        <button mat-icon-button type="button" class="value-action create"
                             (click)="showAddValueForm(prop, $event)"
                             title="Add a new value">
                             <mat-icon>add_box</mat-icon>
diff --git a/src/app/workspace/resource/properties/properties.component.spec.ts b/src/app/workspace/resource/properties/properties.component.spec.ts
index edd381613e..077e464707 100644
--- a/src/app/workspace/resource/properties/properties.component.spec.ts
+++ b/src/app/workspace/resource/properties/properties.component.spec.ts
@@ -389,7 +389,6 @@ describe('PropertiesComponent', () => {
             let addButtons = propertyViewComponentDe.queryAll(By.css('button.create'));
 
             // current amount of buttons should equal 17
-            // because the boolean property shouldn't have an add button if it has a value
             // standoff links value and has incoming link value are system props and cannot be added: -2
             expect(addButtons.length).toEqual(17);
 
@@ -399,14 +398,9 @@ describe('PropertiesComponent', () => {
             testHostFixture.detectChanges();
 
             // now the boolean property should have an add button
-            // so the amount of add buttons on the page should increase by 1
             // standoff links value and has incoming link value are system props and cannot be added: -2
             addButtons = propertyViewComponentDe.queryAll(By.css('button.create'));
-            expect(addButtons.length).toEqual(17);
-
-            // in case of boolean value, we do not display the add button, but the boolean value itself
-            const booleanValue = propertyViewComponentDe.queryAll(By.css('.boolean-value'));
-            expect(booleanValue.length).toEqual(1);
+            expect(addButtons.length).toEqual(18);
 
         });
 
diff --git a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.ts b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.ts
index 75dc8d5261..60ed4cc4ce 100644
--- a/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.ts
+++ b/src/app/workspace/search/advanced-search/resource-and-property-selection/search-select-property/specify-property-value/specify-property-value.component.ts
@@ -122,7 +122,7 @@ export class SpecifyPropertyValueComponent implements OnChanges, OnDestroy {
                 break;
 
             case Constants.BooleanValue:
-                this.comparisonOperators = [new Equals()];
+                this.comparisonOperators = [new Equals(), new Exists()];
                 break;
 
             case Constants.UriValue: