From 69dc46cac9cef62eb1fe7bc5a20b602cff3fab5f Mon Sep 17 00:00:00 2001
From: Katrin Yordanova <katrin.yordanova@crust.tech>
Date: Wed, 6 Dec 2023 13:30:08 +0200
Subject: [PATCH] Make content field required in comment pb

---
 .../src/components/PageBlocks/CommentBase.vue | 160 ++++++++++--------
 locale/en/corteza-webapp-compose/block.yaml   |  30 ++--
 2 files changed, 103 insertions(+), 87 deletions(-)

diff --git a/client/web/compose/src/components/PageBlocks/CommentBase.vue b/client/web/compose/src/components/PageBlocks/CommentBase.vue
index b5e2dee6a..30eccfdd9 100644
--- a/client/web/compose/src/components/PageBlocks/CommentBase.vue
+++ b/client/web/compose/src/components/PageBlocks/CommentBase.vue
@@ -5,84 +5,94 @@
     @refreshBlock="refresh"
   >
     <div
-      v-if="processing"
-      class="d-flex align-items-center justify-content-center h-100"
+      v-if="!isBlockConfigured"
+      class="d-flex h-100 align-items-center justify-content-center"
     >
-      <b-spinner />
+      <p class="mb-0">
+        {{ $t('noConfiguration') }}
+      </p>
     </div>
-    <template v-else-if="roModule && contentField">
-      <section
-        v-if="canAddRecord"
-        class="d-flex flex-column px-3 py-2"
-      >
-        <b-form-input
-          v-if="titleField"
-          v-model="newRecord.title"
-          class="mb-2"
-          :placeholder="$t('comment.titleInput')"
-        />
-        <b-form-textarea
-          v-model.trim="newRecord.content"
-          :value="true"
-          :placeholder="$t('comment.contentInput')"
-        />
-        <b-button
-          variant="primary"
-          class="ml-auto mt-2 mb-2"
-          :disabled="!isValid"
-          @click="createNewRecord()"
-        >
-          {{ $t('comment.submit') }}
-        </b-button>
-      </section>
+    <template v-else>
       <div
-        v-if="sortableRecords.length && canAddRecord"
-        class="border w-100 mb-3"
-      />
-      <section v-if="sortableRecords.length">
-        <b-list-group class="px-3 py-2">
-          <b-list-group-item
-            v-for="record in sortableRecords"
-            :key="record.recordID"
-            class="p-0 pb-3 border-0"
+        v-if="processing"
+        class="d-flex align-items-center justify-content-center h-100"
+      >
+        <b-spinner />
+      </div>
+      <template v-else-if="roModule">
+        <section
+          v-if="canAddRecord"
+          class="d-flex flex-column px-3 py-2"
+        >
+          <b-form-input
+            v-if="titleField"
+            v-model="newRecord.title"
+            class="mb-2"
+            :placeholder="$t('comment.titleInput')"
+          />
+          <b-form-textarea
+            v-model.trim="newRecord.content"
+            :value="true"
+            :placeholder="$t('comment.contentInput')"
+          />
+          <b-button
+            variant="primary"
+            class="ml-auto mt-2 mb-2"
+            :disabled="!isValid"
+            @click="createNewRecord()"
           >
-            <div class="d-flex flex-wrap border p-2">
-              <div class="text-primary">
-                {{ getAuthor(record.ownedBy) }}
+            {{ $t('comment.submit') }}
+          </b-button>
+        </section>
+        <div
+          v-if="sortableRecords.length && canAddRecord"
+          class="border w-100 mb-3"
+        />
+        <section v-if="sortableRecords.length">
+          <b-list-group class="px-3 py-2">
+            <b-list-group-item
+              v-for="record in sortableRecords"
+              :key="record.recordID"
+              class="p-0 pb-3 border-0"
+            >
+              <div class="d-flex flex-wrap border p-2">
+                <div class="text-primary">
+                  {{ getAuthor(record.ownedBy) }}
+                </div>
+                <span class="ml-auto text-muted">
+                  {{ getFormattedDate((record || {}).updatedAt || (record || {}).createdAt) }}
+                </span>
               </div>
-              <span class="ml-auto text-muted">
-                {{ getFormattedDate((record || {}).updatedAt || (record || {}).createdAt) }}
-              </span>
-            </div>
-            <div class="border p-3 d-flex flex-column">
-              <field-viewer
-                v-if="titleField && titleField.canReadRecordValue"
-                class="mb-3 text-muted font-weight-bold"
-                :field="titleField"
-                :record="record"
-                :namespace="namespace"
-                value-only
-              />
-              <template v-else-if="!options.titleField" />
-              <i
-                v-else
-                class="text-secondary h6"
-              >{{ $t('field.noPermission') }}</i>
-              <field-viewer
-                v-if="contentField.canReadRecordValue"
-                :field="contentField"
-                :record="record"
-                :namespace="namespace"
-                value-only
-              />
-              <i
-                v-else
-                class="text-secondary h6"
-              >{{ $t('field.noPermission') }}</i>
-            </div>
-          </b-list-group-item>
-        </b-list-group>
-      </section>
+              <div class="border p-3 d-flex flex-column">
+                <field-viewer
+                  v-if="titleField && titleField.canReadRecordValue"
+                  class="mb-3 text-muted font-weight-bold"
+                  :field="titleField"
+                  :record="record"
+                  :namespace="namespace"
+                  value-only
+                />
+                <template v-else-if="!options.titleField" />
+                <i
+                  v-else
+                  class="text-secondary h6"
+                >{{ $t('field.noPermission') }}</i>
+                <field-viewer
+                  v-if="contentField.canReadRecordValue"
+                  :field="contentField"
+                  :record="record"
+                  :namespace="namespace"
+                  value-only
+                />
+                <i
+                  v-else
+                  class="text-secondary h6"
+                >{{ $t('field.noPermission') }}</i>
+              </div>
+            </b-list-group-item>
+          </b-list-group>
+        </section>
+      </template>
     </template>
   </wrap>
 </template>
@@ -202,6 +212,10 @@ export default {
       }
       return NoID
     },
+
+    isBlockConfigured () {
+      return !!this.contentField
+    },
   },
 
   watch: {
diff --git a/locale/en/corteza-webapp-compose/block.yaml b/locale/en/corteza-webapp-compose/block.yaml
index e86183271..81b0a9084 100644
--- a/locale/en/corteza-webapp-compose/block.yaml
+++ b/locale/en/corteza-webapp-compose/block.yaml
@@ -601,24 +601,24 @@ field:
     modal:
       title: Update record values
 comment:
-  label: 'Comments'
+  label: Comments
   titleField:
-    label: 'Title field'
-    footnote: 'Field value will be used as record title'
+    label: Title field
+    footnote: Field value will be used as record title
   contentField:
-    label: 'Content field'
-    footnote: 'Field value will be used as record content'
-  titleInput: 'Enter comment title'
-  contentInput: 'Enter comment content'
-  submit: 'Submit'
+    label: Content field *
+    footnote: Field value will be used as record content
+  titleInput: Enter comment title
+  contentInput: Enter comment content
+  submit: Submit
   sortDirection:
-    label: 'Sort direction'
-    footnote: 'Field value will be used as sorting direction reference'
-    asc: 'ASC'
-    desc: 'DESC'
+    label: Sort direction
+    footnote: Field value will be used as sorting direction reference
+    asc: ASC
+    desc: DESC
   referenceField:
-    label: 'Reference field'
-    footnote: 'Field value will be used as reference'
+    label: Reference field
+    footnote: Field value will be used as reference
 navigation:
   chart: Charts
   colorPicker: Choose a color
@@ -845,3 +845,5 @@ tabs:
     delete: Delete tab
     editDisabled: Editing tabbed blocks is disabled until you save this block
     addBlock: Add new block
+
+noConfiguration: Block not configured correctly
\ No newline at end of file