TSK-678: Update First/Last names

packages/ui/src/utils.ts

@@ -16,7 +16,7 @@
 import { generateId } from '@hcengineering/core'
 import type { Metadata } from '@hcengineering/platform'
 import { setMetadata } from '@hcengineering/platform'
-import { Notification, notificationsStore, NotificationPosition, NotificationSeverity } from '.'
+import { Notification, NotificationPosition, NotificationSeverity, notificationsStore } from '.'
 import { AnyComponent, AnySvelteComponent } from './types'
 
 export function setMetadataLocalStorage<T> (id: Metadata<T>, value: T | null): void {
@@ -64,7 +64,7 @@ export function addNotification (
     severity: NotificationSeverity.Success,
     position: NotificationPosition.BottomRight,
     component,
-    closeTimeout: 10000,
+    closeTimeout: parseInt(localStorage.getItem('#platform.notification.timeout') ?? '10000'),
     params
   }
 

plugins/contact-assets/lang/en.json

@@ -7,10 +7,10 @@
     "CreatePerson": "Create person",
     "CreatePersons": "Create persons folder",
     "CreateOrganization": "Create organization",
-    "OrganizationNamePlaceholder": "Apple",
+    "OrganizationNamePlaceholder": "Organization name",
     "OrganizationsNamePlaceholder": "Organizations",
-    "PersonFirstNamePlaceholder": "John",
-    "PersonLastNamePlaceholder": "Appleseed",
+    "PersonFirstNamePlaceholder": "First name",
+    "PersonLastNamePlaceholder": "Last name",
     "PersonLocationPlaceholder": "Location",
     "PersonsNamePlaceholder": "Folder",
     "CreateOrganizations": "Create organizations folder",

plugins/contact-assets/lang/ru.json

@@ -7,10 +7,10 @@
     "CreatePerson": "Создать персону",
     "CreatePersons": "Создать папку для людей",
     "CreateOrganization": "Создать организацию",
-    "OrganizationNamePlaceholder": "Apple",
+    "OrganizationNamePlaceholder": "Имя организации",
     "OrganizationsNamePlaceholder": "Организации",
-    "PersonFirstNamePlaceholder": "John",
-    "PersonLastNamePlaceholder": "Appleseed",
+    "PersonFirstNamePlaceholder": "Имя",
+    "PersonLastNamePlaceholder": "Фамилия",
     "PersonLocationPlaceholder": "Местоположение",
     "PersonsNamePlaceholder": "Папка",
     "CreateOrganizations": "Создать папку для организаций",

plugins/contact-resources/src/components/ChannelEditor.svelte

@@ -146,6 +146,7 @@
   </div>
 {:else}
   <div class="buttons-group xsmall-gap">
+    <!-- svelte-ignore a11y-click-events-have-key-events -->
     <span
       class="select-text cover-channel"
       class:show

plugins/contact-resources/src/components/ChannelsDropdown.svelte

@@ -168,7 +168,6 @@
   }
   const saveItems = (): void => {
     value = filterUndefined(displayItems)
-    dispatch('change', value)
     updateMenu(displayItems)
   }
 
@@ -206,6 +205,9 @@
               displayItems = dropItem(n)
             } else {
               item.value = result
+              if (displayItems.find((it) => item.value === it.value) === undefined) {
+                displayItems = [...displayItems, item]
+              }
             }
             saveItems()
             focusManager?.setFocusPos(focusIndex + 1 + n)

plugins/devmodel-resources/src/index.ts

@@ -23,7 +23,6 @@ import core, {
   Hierarchy,
   ModelDb,
   Ref,
-  toFindResult,
   Tx,
   TxResult,
   WithLookup
@@ -51,17 +50,16 @@ export interface QueryWithResult {
 }
 
 export const transactions: TxWitHResult[] = []
-export const notifications: Tx[] = []
-export const queries: QueryWithResult[] = []
 
 class ModelClient implements Client {
+  notifyEnabled = true
   constructor (readonly client: Client) {
+    this.notifyEnabled = (localStorage.getItem('#platform.notification.logging') ?? 'true') === 'true'
+
     client.notify = (tx) => {
       this.notify?.(tx)
-      console.info('devmodel# notify=>', tx, this.client.getModel(), getMetadata(devmodel.metadata.DevModel))
-      notifications.push(tx)
-      if (notifications.length > 500) {
-        notifications.shift()
+      if (this.notifyEnabled) {
+        console.info('devmodel# notify=>', tx, this.client.getModel(), getMetadata(devmodel.metadata.DevModel))
       }
     }
   }
@@ -82,26 +80,18 @@ class ModelClient implements Client {
     options?: FindOptions<T>
   ): Promise<WithLookup<T> | undefined> {
     const result = await this.client.findOne(_class, query, options)
-    console.info(
-      'devmodel# findOne=>',
-      _class,
-      query,
-      options,
-      'result => ',
-      result,
-      ' =>model',
-      this.client.getModel(),
-      getMetadata(devmodel.metadata.DevModel)
-    )
-    queries.push({
-      _class,
-      query,
-      options: options as FindOptions<Doc>,
-      result: toFindResult(result !== undefined ? [result] : []),
-      findOne: true
-    })
-    if (queries.length > 100) {
-      queries.shift()
+    if (this.notifyEnabled) {
+      console.info(
+        'devmodel# findOne=>',
+        _class,
+        query,
+        options,
+        'result => ',
+        result,
+        ' =>model',
+        this.client.getModel(),
+        getMetadata(devmodel.metadata.DevModel)
+      )
     }
     return result
   }
@@ -112,27 +102,27 @@ class ModelClient implements Client {
     options?: FindOptions<T>
   ): Promise<FindResult<T>> {
     const result = await this.client.findAll(_class, query, options)
-    console.info(
-      'devmodel# findAll=>',
-      _class,
-      query,
-      options,
-      'result => ',
-      result,
-      ' =>model',
-      this.client.getModel(),
-      getMetadata(devmodel.metadata.DevModel)
-    )
-    queries.push({ _class, query, options: options as FindOptions<Doc>, result, findOne: false })
-    if (queries.length > 100) {
-      queries.shift()
+    if (this.notifyEnabled) {
+      console.info(
+        'devmodel# findAll=>',
+        _class,
+        query,
+        options,
+        'result => ',
+        result,
+        ' =>model',
+        this.client.getModel(),
+        getMetadata(devmodel.metadata.DevModel)
+      )
     }
     return result
   }
 
   async tx (tx: Tx): Promise<TxResult> {
     const result = await this.client.tx(tx)
-    console.info('devmodel# tx=>', tx, result, getMetadata(devmodel.metadata.DevModel))
+    if (this.notifyEnabled) {
+      console.info('devmodel# tx=>', tx, result, getMetadata(devmodel.metadata.DevModel))
+    }
     transactions.push({ tx, result })
     if (transactions.length > 100) {
       transactions.shift()
@@ -166,12 +156,6 @@ export async function Hook (client: Client): Promise<Client> {
             icon: view.icon.Table,
             id: 'transactions',
             component: devmodel.component.ModelView
-          },
-          {
-            label: 'Queries' as IntlString,
-            icon: view.icon.Table,
-            id: 'queries',
-            component: devmodel.component.QueryView
           }
         ]
       }

plugins/recruit-assets/lang/en.json

@@ -54,8 +54,8 @@
     "Location": "Location",
     "Title": "Title",
     "Source": "Source",
-    "PersonFirstNamePlaceholder": "John",
-    "PersonLastNamePlaceholder": "Appleseed",
+    "PersonFirstNamePlaceholder": "First name",
+    "PersonLastNamePlaceholder": "Last name",
     "PersonLocationPlaceholder": "Location",
     "ManageVacancyStatuses": "Manage vacancy templates",
     "EditVacancy": "Edit",

plugins/recruit-assets/lang/ru.json

@@ -54,8 +54,8 @@
     "Location": "Местоположение",
     "Title": "Заголовок",
     "Source": "Источник",
-    "PersonFirstNamePlaceholder": "John",
-    "PersonLastNamePlaceholder": "Appleseed",
+    "PersonFirstNamePlaceholder": "First name",
+    "PersonLastNamePlaceholder": "Last name",
     "PersonLocationPlaceholder": "Местоположение",
     "ManageVacancyStatuses": "Управление шаблонами вакансии",
     "EditVacancy": "Редактировать",

tests/sanity/storage-dev.json

@@ -15,6 +15,14 @@
         {
           "name": "login:metadata:LoginEndpoint",
           "value": "ws://localhost:3333"
+        },
+        {
+          "name": "#platform.notification.timeout",
+          "value": "1"
+        },
+        {
+          "name": "#platform.notification.logging",
+          "value": "false"
         }
       ]
     }

tests/sanity/storage.json

@@ -15,6 +15,10 @@
         {
           "name": "login:metadata:LoginEndpoint",
           "value": "ws://localhost:3334"
+        },
+        {
+          "name": "#platform.notification.logging",
+          "value": "false"
         }
       ]
     }

tests/sanity/tests/contact.duplicate.spec.ts

@@ -8,7 +8,7 @@ test.use({
 test.describe('duplicate-org-test', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
+    await (await page.goto(`${PlatformURI}/workbench/sanity-ws`))?.finished()
   })
   test('check-contact-exists', async ({ page }) => {
     await page.click('[id="app-lead\\:string\\:LeadApplication"]')
@@ -26,11 +26,11 @@ test.describe('duplicate-org-test', () => {
     await page.click('button:has-text("Organization")')
 
     // Click [placeholder="Apple"]
-    await page.click('[placeholder="Apple"]')
+    await page.click('[placeholder="Organization name"]')
 
     const genId = 'Asoft-' + generateId(4)
     // Fill [placeholder="Apple"]
-    await page.fill('[placeholder="Apple"]', genId)
+    await page.fill('[placeholder="Organization name"]', genId)
 
     // Click button:has-text("Create")
     await page.click('button:has-text("Create")')
@@ -47,10 +47,10 @@ test.describe('duplicate-org-test', () => {
     await page.click('button:has-text("Organization")')
 
     // Click [placeholder="Apple"]
-    await page.click('[placeholder="Apple"]')
+    await page.click('[placeholder="Organization name"]')
 
     // Fill [placeholder="Apple"]
-    await page.fill('[placeholder="Apple"]', genId)
+    await page.fill('[placeholder="Organization name"]', genId)
 
     // Click text=Person already exists...
     await page.click('text=Contact already exists...')