From 2f7f3118fd783fe986d31bf448e5a14748416032 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Tue, 27 Feb 2024 20:33:32 +0600
Subject: [PATCH] Fix settins roles check (#4789)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 plugins/setting-resources/src/components/Settings.svelte      | 4 ++--
 .../setting-resources/src/components/WorkspaceSettings.svelte | 4 ++--
 .../workbench-resources/src/components/AccountPopup.svelte    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte
index ead007f8b1..e5e4049082 100644
--- a/plugins/setting-resources/src/components/Settings.svelte
+++ b/plugins/setting-resources/src/components/Settings.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { PersonAccount } from '@hcengineering/contact'
-  import { AccountRole, getCurrentAccount } from '@hcengineering/core'
+  import { AccountRole, getCurrentAccount, roleOrder } from '@hcengineering/core'
   import login, { loginId } from '@hcengineering/login'
   import { setMetadata } from '@hcengineering/platform'
   import presentation, { closeClient, createQuery } from '@hcengineering/presentation'
@@ -57,7 +57,7 @@
     setting.class.SettingsCategory,
     {},
     (res) => {
-      categories = account.role > AccountRole.User ? res : res.filter((p) => !p.secured)
+      categories = roleOrder[account.role] > roleOrder[AccountRole.User] ? res : res.filter((p) => !p.secured)
       category = findCategory(categoryId)
     },
     { sort: { order: 1 } }
diff --git a/plugins/setting-resources/src/components/WorkspaceSettings.svelte b/plugins/setting-resources/src/components/WorkspaceSettings.svelte
index 15f6b0859a..10f89a4067 100644
--- a/plugins/setting-resources/src/components/WorkspaceSettings.svelte
+++ b/plugins/setting-resources/src/components/WorkspaceSettings.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { PersonAccount } from '@hcengineering/contact'
-  import { AccountRole, getCurrentAccount } from '@hcengineering/core'
+  import { AccountRole, getCurrentAccount, roleOrder } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
   import setting, { SettingsCategory } from '@hcengineering/setting'
   import {
@@ -43,7 +43,7 @@
     setting.class.WorkspaceSettingCategory,
     {},
     (res) => {
-      categories = account.role > AccountRole.User ? res : res.filter((p) => !p.secured)
+      categories = roleOrder[account.role] > roleOrder[AccountRole.User] ? res : res.filter((p) => !p.secured)
       category = findCategory(categoryId)
     },
     { sort: { order: 1 } }
diff --git a/plugins/workbench-resources/src/components/AccountPopup.svelte b/plugins/workbench-resources/src/components/AccountPopup.svelte
index 7ead2b23ae..cb5db5e4c0 100644
--- a/plugins/workbench-resources/src/components/AccountPopup.svelte
+++ b/plugins/workbench-resources/src/components/AccountPopup.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import contact, { Employee, PersonAccount, formatName } from '@hcengineering/contact'
-  import { AccountRole, Ref, getCurrentAccount } from '@hcengineering/core'
+  import { AccountRole, Ref, getCurrentAccount, roleOrder } from '@hcengineering/core'
   import login from '@hcengineering/login'
   import { createQuery } from '@hcengineering/presentation'
   import setting, { SettingsCategory, settingId } from '@hcengineering/setting'
@@ -41,7 +41,7 @@
     setting.class.SettingsCategory,
     {},
     (res) => {
-      items = account.role > AccountRole.User ? res : res.filter((p) => !p.secured)
+      items = roleOrder[account.role] > roleOrder[AccountRole.User] ? res : res.filter((p) => !p.secured)
     },
     { sort: { order: 1 } }
   )