Only show chat if authorised to use

gramps-project · Sep 15, 2024 · cebf839 · cebf839
1 parent ea19f64
commit cebf839
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 30 deletions.
diff --git a/src/GrampsJs.js b/src/GrampsJs.js
@@ -524,6 +524,7 @@ export class GrampsJs extends LitElement {
           <grampsjs-main-menu
             .strings="${this._strings}"
             ?canViewPrivate="${this.canViewPrivate}"
+            ?canUseChat="${this.canUseChat}"
           ></grampsjs-main-menu>
         </div>
         <div slot="appContent">
@@ -547,6 +548,7 @@ export class GrampsJs extends LitElement {
               .canEdit="${this.canEdit}"
               .canViewPrivate="${this.canViewPrivate}"
               .canManageUsers="${this.canManageUsers}"
+              .canUseChat="${this.canUseChat}"
             >
             </grampsjs-pages>
           </main>
@@ -994,18 +996,12 @@ export class GrampsJs extends LitElement {
   setPermissions() {
     const permissions = getPermissions()
     // If permissions is null, authorization is disabled and anything goes
-    if (permissions === null) {
-      this.canAdd = true
-      this.canEdit = true
-      this.canViewPrivate = true
-      // managing users not meaningful in this case
-      this.canManageUsers = false
-    } else {
-      this.canAdd = permissions.includes('AddObject')
-      this.canEdit = permissions.includes('EditObject')
-      this.canViewPrivate = permissions.includes('ViewPrivate')
-      this.canManageUsers = permissions.includes('EditOtherUser')
-    }
+    this.canAdd = permissions.includes('AddObject')
+    this.canEdit = permissions.includes('EditObject')
+    this.canViewPrivate = permissions.includes('ViewPrivate')
+    this.canManageUsers = permissions.includes('EditOtherUser')
+    this.canUseChat =
+      permissions.includes('UseChat') && this._dbInfo?.server?.chat
   }
 
   _(s) {

diff --git a/src/components/GrampsjsChat.js b/src/components/GrampsjsChat.js
@@ -117,7 +117,7 @@ class GrampsjsChat extends GrampsjsTranslateMixin(LitElement) {
     <div class="clear-btn">
         <mwc-button
           raised
-          label="${this._('Clear')}"
+          label="${this._('New')}"
           icon="clear_all"
           @click="${this._handleClear}"
           ?disabled=${this.messages.length === 0}

diff --git a/src/components/GrampsjsMainMenu.js b/src/components/GrampsjsMainMenu.js
@@ -34,6 +34,7 @@ class GrampsjsAppBar extends GrampsjsTranslateMixin(LitElement) {
       editDialogContent: {type: String},
       saveButton: {type: Boolean},
       canViewPrivate: {type: Boolean},
+      canUseChat: {type: Boolean},
     }
   }
 
@@ -45,6 +46,7 @@ class GrampsjsAppBar extends GrampsjsTranslateMixin(LitElement) {
     this.editDialogContent = ''
     this.saveButton = false
     this.canViewPrivate = false
+    this.canUseChat = false
   }
 
   render() {
@@ -69,8 +71,15 @@ class GrampsjsAppBar extends GrampsjsTranslateMixin(LitElement) {
         <span>${this._('Family Tree')}</span>
         <mwc-icon slot="graphic">${renderIcon(mdiFamilyTree)}</mwc-icon>
       </grampsjs-list-item>
-      <grampsjs-list-item href="${BASE_DIR}/chat" graphic="icon">
-        <span>${this._('Chat')}</span>
+      ${
+        this.canUseChat
+          ? html`
+              <grampsjs-list-item href="${BASE_DIR}/chat" graphic="icon">
+                <span>${this._('Chat')}</span>
+              </grampsjs-list-item>
+            `
+          : ''
+      }
         <mwc-icon slot="graphic">${renderIcon(mdiChat)}</mwc-icon>
       </grampsjs-list-item>
       <li divider padded role="separator"></li>
@@ -94,14 +103,16 @@ class GrampsjsAppBar extends GrampsjsTranslateMixin(LitElement) {
         <span>${this._('_Reports').replace('_', '')}</span>
         <mwc-icon slot="graphic">menu_book</mwc-icon>
       </grampsjs-list-item>
-      ${this.canViewPrivate
-        ? html`
-            <grampsjs-list-item href="${BASE_DIR}/revisions" graphic="icon">
-              <span>${this._('Revisions')}</span>
-              <mwc-icon slot="graphic">commit</mwc-icon>
-            </grampsjs-list-item>
-          `
-        : ''}
+      ${
+        this.canViewPrivate
+          ? html`
+              <grampsjs-list-item href="${BASE_DIR}/revisions" graphic="icon">
+                <span>${this._('Revisions')}</span>
+                <mwc-icon slot="graphic">commit</mwc-icon>
+              </grampsjs-list-item>
+            `
+          : ''
+      }
     </mwc-list>`
   }
 }

diff --git a/src/components/GrampsjsPages.js b/src/components/GrampsjsPages.js
@@ -75,6 +75,7 @@ class GrampsjsPages extends GrampsjsTranslateMixin(LitElement) {
       canEdit: {type: Boolean},
       canManageUsers: {type: Boolean},
       canViewPrivate: {type: Boolean},
+      canUseChat: {type: Boolean},
       homePersonDetails: {type: Object},
       strings: {type: Object},
       dbInfo: {type: Object},
@@ -89,6 +90,7 @@ class GrampsjsPages extends GrampsjsTranslateMixin(LitElement) {
     this.canAdd = false
     this.canEdit = false
     this.canManageUsers = false
+    this.canUseChat = false
     this.homePersonDetails = {}
     this.strings = {}
     this.dbInfo = {}
@@ -250,13 +252,15 @@ class GrampsjsPages extends GrampsjsTranslateMixin(LitElement) {
         ?canEdit="${this.canEdit}"
         .dbInfo="${this.dbInfo}"
       ></grampsjs-view-media>
-
-      <grampsjs-view-chat
-        class="page"
-        ?active=${this.page === 'chat'}
-        .strings="${this.strings}"
-      ></grampsjs-view-chat>
-
+      ${this.canUseChat
+        ? html`
+            <grampsjs-view-chat
+              class="page"
+              ?active=${this.page === 'chat'}
+              .strings="${this.strings}"
+            ></grampsjs-view-chat>
+          `
+        : ''}
       <grampsjs-view-export
         class="page"
         ?active=${this.page === 'export'}