{#if employee}
diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte
index 48902a0cc7..3ab27a72b3 100644
--- a/plugins/setting-resources/src/components/Settings.svelte
+++ b/plugins/setting-resources/src/components/Settings.svelte
@@ -30,11 +30,13 @@
navigate,
resolvedLocationStore,
setMetadataLocalStorage,
- showPopup
+ showPopup,
+ Label
} from '@hcengineering/ui'
- import { NavFooter, NavHeader } from '@hcengineering/workbench-resources'
+ import { NavFooter } from '@hcengineering/workbench-resources'
import { onDestroy } from 'svelte'
- import CategoryElement from './CategoryElement.svelte'
+ import NavItem from './NavItem.svelte'
+ import NavGroup from './NavGroup.svelte'
export let visibleNav: boolean = true
export let navFloat: boolean = false
@@ -106,62 +108,53 @@
{#if visibleNav}
-
-
+
+
-
- {#each categories as _category, i}
- {#if i > 0 && categories[i - 1].group !== _category.group}
-
- {/if}
- {
- selectCategory(_category.name)
- }}
- >
-
- {#if _category.extraComponents?.tools}
-
- {/if}
-
-
- {#if _category.extraComponents?.navigation}
-
+ {#each categories as _category}
+ {#if _category.extraComponents?.navigation && (_category.expandable ?? _category._id === setting.ids.Setting)}
+
+
+
+ {:else}
+ {
+ selectCategory(_category.name)
}}
/>
{/if}
{/each}
-
-
-
-
+
+
+
diff --git a/plugins/setting-resources/src/components/WorkspaceSettings.svelte b/plugins/setting-resources/src/components/WorkspaceSettings.svelte
index f4ae694a80..1ffbc34e97 100644
--- a/plugins/setting-resources/src/components/WorkspaceSettings.svelte
+++ b/plugins/setting-resources/src/components/WorkspaceSettings.svelte
@@ -19,18 +19,17 @@
import setting, { SettingsCategory } from '@hcengineering/setting'
import { Component, Location, getCurrentResolvedLocation, navigate, resolvedLocationStore } from '@hcengineering/ui'
import { onDestroy } from 'svelte'
- import CategoryElement from './CategoryElement.svelte'
+ import NavItem from './NavItem.svelte'
export let kind: 'navigation' | undefined
export let categoryName: string
+
let category: SettingsCategory | undefined
let categoryId: string = ''
let categories: SettingsCategory[] = []
const account = getCurrentAccount() as PersonAccount
- export let visibleNav = true
-
const settingsQuery = createQuery()
settingsQuery.query(
setting.class.WorkspaceSettingCategory,
@@ -69,26 +68,19 @@
{#if kind === 'navigation'}
-
-
- {#each categories as category}
- {
- selectCategory(category.name)
- }}
- />
- {#if category.name === categoryId && category.extraComponents?.navigation}
-
- {/if}
- {/each}
-
-
+ {#each categories as category}
+
{
+ selectCategory(category.name)
+ }}
+ />
+ {#if category.name === categoryId && category.extraComponents?.navigation}
+
+ {/if}
+ {/each}
{:else if category}
{/if}
diff --git a/plugins/setting/src/index.ts b/plugins/setting/src/index.ts
index 9349094b6c..c4dc71c95a 100644
--- a/plugins/setting/src/index.ts
+++ b/plugins/setting/src/index.ts
@@ -143,7 +143,7 @@ export default plugin(settingId, {
string: {
Settings: '' as IntlString,
Setting: '' as IntlString,
- WorkspaceSetting: '' as IntlString,
+ WorkspaceSettings: '' as IntlString,
Integrations: '' as IntlString,
Support: '' as IntlString,
Privacy: '' as IntlString,
@@ -152,7 +152,7 @@ export default plugin(settingId, {
Delete: '' as IntlString,
Disconnect: '' as IntlString,
Add: '' as IntlString,
- EditProfile: '' as IntlString,
+ AccountSettings: '' as IntlString,
ChangePassword: '' as IntlString,
CurrentPassword: '' as IntlString,
NewPassword: '' as IntlString,
@@ -166,11 +166,13 @@ export default plugin(settingId, {
SelectWorkspace: '' as IntlString,
Reconnect: '' as IntlString,
ClassSetting: '' as IntlString,
+ Classes: '' as IntlString,
Owners: '' as IntlString,
Configure: '' as IntlString
},
icon: {
- EditProfile: '' as Asset,
+ AccountSettings: '' as Asset,
+ Owners: '' as Asset,
Password: '' as Asset,
Setting: '' as Asset,
Integrations: '' as Asset,
@@ -180,7 +182,8 @@ export default plugin(settingId, {
Signout: '' as Asset,
SelectWorkspace: '' as Asset,
Clazz: '' as Asset,
- Enums: '' as Asset
+ Enums: '' as Asset,
+ InviteSettings: '' as Asset
},
templateFieldCategory: {
Integration: '' as Ref
diff --git a/plugins/task-resources/src/components/TemplatesIcon.svelte b/plugins/task-resources/src/components/TemplatesIcon.svelte
index c8a379a449..b87c62968d 100644
--- a/plugins/task-resources/src/components/TemplatesIcon.svelte
+++ b/plugins/task-resources/src/components/TemplatesIcon.svelte
@@ -1,11 +1,13 @@
-
+
diff --git a/tests/sanity/tests/settings.spec.ts b/tests/sanity/tests/settings.spec.ts
index 757f6083c5..b557c23187 100644
--- a/tests/sanity/tests/settings.spec.ts
+++ b/tests/sanity/tests/settings.spec.ts
@@ -48,7 +48,8 @@ test.describe('contact tests', () => {
// await page.hover('button:has-text("Settings")')
await page.click('button:has-text("Settings")')
// Click text=Workspace Notifications >> button
- await page.click('.box > div:nth-child(4)')
+ // await page.click('.box > div:nth-child(4)')
+ await page.getByRole('button', { name: 'Notifications' }).click()
await page.click('text="Text Templates"')
// Click .flex-center.icon-button
await page.click('#create-template')
@@ -81,11 +82,12 @@ test.describe('contact tests', () => {
// await page.hover('button:has-text("Settings")')
await page.click('button:has-text("Settings")')
// Click text=Workspace Notifications >> button
- await page.click('.box > div:nth-child(4)')
+ // await page.click('.box > div:nth-child(4)')
+ await page.getByRole('button', { name: 'Notifications' }).click()
// Click text=Vacancies
await page.locator('#new-project-type').click()
- await page.getByRole('button', { name: 'Recruiting' }).click()
- await page.locator('#templates').getByText('New Recruiting project type').first().click()
+ await page.getByRole('button', { name: 'Recruiting', exact: true }).click()
+ await page.locator('#navGroup-statuses').getByText('New Recruiting project type').first().click()
// TODO: Need rework.
// // Click #create-template div