Merge branch 'develop' of https://github.com/hcengineering/platform into staging-new

Author: ArtyomSavchenko

desktop/src/ui/platform.ts

@@ -58,7 +58,7 @@ import { recruitId } from '@hcengineering/recruit'
 import rekoni from '@hcengineering/rekoni'
 import { requestId } from '@hcengineering/request'
 import setting, { settingId } from '@hcengineering/setting'
-import { supportId } from '@hcengineering/support'
+import support, { supportId, supportLink, reportBugLink, docsLink, privacyPolicyLink } from '@hcengineering/support'
 import { surveyId } from '@hcengineering/survey'
 import { tagsId } from '@hcengineering/tags'
 import { taskId } from '@hcengineering/task'
@@ -401,6 +401,12 @@ export async function configurePlatform (onWorkbenchConnect?: () => Promise<void
 
   setMetadata(billingPlugin.metadata.BillingURL, config.BILLING_URL ?? '')
   setMetadata(presentation.metadata.PaymentUrl, config.PAYMENT_URL ?? '')
+  setMetadata(presentation.metadata.SignupUrl, config.SIGNUP_URL ?? 'https://huly.io/signup')
+
+  setMetadata(support.metadata.SupportLink, myBranding.support?.supportLink ?? supportLink)
+  setMetadata(support.metadata.ReportBugLink, myBranding.support?.reportBugLink ?? reportBugLink)
+  setMetadata(support.metadata.DocsLink, myBranding.support?.docsLink ?? docsLink)
+  setMetadata(support.metadata.PrivacyPolicyLink, myBranding.support?.privacyPolicyLink ?? privacyPolicyLink)
 
   const languages =
     myBranding.languages !== undefined && myBranding.languages !== ''

desktop/src/ui/types.ts

@@ -70,6 +70,7 @@ export interface Config {
   EXCLUDED_APPLICATIONS_FOR_ANONYMOUS?: string
   HULYLAKE_URL?: string
   DISABLED_FEATURES?: string
+  SIGNUP_URL?: string
 }
 
 export interface Branding {
@@ -80,6 +81,12 @@ export interface Branding {
     type?: string
     sizes?: string
   }[]
+  support?: {
+    supportLink?: string
+    reportBugLink?: string
+    docsLink?: string
+    privacyPolicyLink?: string
+  }
   languages?: string
   lastNameFirst?: string
   defaultLanguage?: string

dev/prod/src/platform.ts

@@ -52,7 +52,7 @@ import rekoni from '@hcengineering/rekoni'
 import { requestId } from '@hcengineering/request'
 import setting, { settingId } from '@hcengineering/setting'
 import sign from '@hcengineering/sign'
-import { supportId } from '@hcengineering/support'
+import support, { supportId, supportLink, reportBugLink, docsLink, privacyPolicyLink } from '@hcengineering/support'
 import { surveyId } from '@hcengineering/survey'
 import { tagsId } from '@hcengineering/tags'
 import { taskId } from '@hcengineering/task'
@@ -202,6 +202,7 @@ export interface Config {
   PULSE_URL?: string
   HULYLAKE_URL?: string
   DISABLED_FEATURES?: string
+  SIGNUP_URL?: string
 }
 
 export interface Branding {
@@ -212,6 +213,12 @@ export interface Branding {
     type?: string
     sizes?: string
   }>
+  support?: {
+    supportLink?: string
+    reportBugLink?: string
+    docsLink?: string
+    privacyPolicyLink?: string
+  }
   languages?: string
   lastNameFirst?: string
   defaultLanguage?: string
@@ -480,6 +487,7 @@ export async function configurePlatform() {
   setMetadata(presentation.metadata.StatsUrl, config.STATS_URL)
   setMetadata(presentation.metadata.LinkPreviewUrl, config.LINK_PREVIEW_URL)
   setMetadata(presentation.metadata.MailUrl, config.MAIL_URL)
+  setMetadata(presentation.metadata.SignupUrl, config.SIGNUP_URL ?? 'https://huly.io/signup')
 
   const disabledFeatures = (config.DISABLED_FEATURES ??'').split(',').map(it => it.trim()).filter(it => it.length > 0)
   setMetadata(presentation.metadata.DisabledFeatures, new Set(disabledFeatures))
@@ -527,6 +535,11 @@ export async function configurePlatform() {
   setMetadata(presentation.metadata.PulseUrl, config.PULSE_URL)
   setMetadata(presentation.metadata.HulylakeUrl, config.HULYLAKE_URL ?? '')
 
+  setMetadata(support.metadata.SupportLink, myBranding.support?.supportLink ?? supportLink)
+  setMetadata(support.metadata.ReportBugLink, myBranding.support?.reportBugLink ?? reportBugLink)
+  setMetadata(support.metadata.DocsLink, myBranding.support?.docsLink ?? docsLink)
+  setMetadata(support.metadata.PrivacyPolicyLink, myBranding.support?.privacyPolicyLink ?? privacyPolicyLink)
+
   const languages = myBranding.languages
     ? myBranding.languages.split(',').map((l) => l.trim())
     : ['en', 'ru', 'es', 'pt', 'zh', 'fr', 'cs', 'it', 'de', 'ja', 'tr']

packages/presentation/src/plugin.ts

@@ -187,7 +187,8 @@ export default plugin(presentationId, {
     PreviewUrl: '' as Metadata<string>,
     PulseUrl: '' as Metadata<string>,
     HulylakeUrl: '' as Metadata<string>,
-    PaymentUrl: '' as Metadata<string>
+    PaymentUrl: '' as Metadata<string>,
+    SignupUrl: '' as Metadata<string>
   },
   status: {
     FileTooLarge: '' as StatusCode

plugins/card-resources/src/components/settings/view/ViewSetting.svelte

@@ -15,8 +15,8 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte'
 
-  import core, { AnyAttribute, Class, Doc, Ref, Type } from '@hcengineering/core'
-  import { Asset, IntlString } from '@hcengineering/platform'
+  import core, { AnyAttribute, Association, AssociationQuery, Class, Doc, Ref, Type } from '@hcengineering/core'
+  import { Asset, getEmbeddedLabel, IntlString } from '@hcengineering/platform'
   import { getAttributePresenterClass, getClient, hasResource } from '@hcengineering/presentation'
   import { resizeObserver } from '@hcengineering/ui'
   import view, { BuildModelKey, Viewlet, ViewletPreference } from '@hcengineering/view'
@@ -203,8 +203,25 @@
         })
       })
 
-      const ancestors = new Set(hierarchy.getAncestors(viewlet.attachTo))
-      const parent = hierarchy.getParentClass(viewlet.attachTo)
+      const desc = hierarchy.getDescendants(viewlet.attachTo)
+      for (const d of desc) {
+        if (!hierarchy.isMixin(d)) continue
+        hierarchy.getOwnAttributes(d).forEach((attr) => {
+          processAttribute(attr, result, true)
+        })
+      }
+
+      addAssociations(result, viewlet.attachTo, preference)
+    }
+
+    function addAssociations (
+      result: Config[],
+      _class: Ref<Class<Doc>>,
+      preference: ViewletPreference | undefined,
+      parents: AssociationQuery[] = []
+    ): void {
+      const ancestors = new Set(hierarchy.getAncestors(_class))
+      const parent = hierarchy.getParentClass(_class)
       const parentMixins = hierarchy
         .getDescendants(parent)
         .map((p) => hierarchy.getClass(p))
@@ -215,6 +232,72 @@
           processAttribute(attr, result, true)
         })
       })
+
+      const allClasses = [...ancestors, ...parentMixins.map((it) => it._id)]
+
+      const associationsB = client.getModel().findAllSync(core.class.Association, { classA: { $in: allClasses } })
+      const associationsA = client.getModel().findAllSync(core.class.Association, { classB: { $in: allClasses } })
+
+      associationsB.forEach((a) => {
+        processAssociation(a, 'b', result, preference, parents)
+      })
+      associationsA.forEach((a) => {
+        processAssociation(a, 'a', result, preference, parents)
+      })
+    }
+
+    function getParentsString (parents: AssociationQuery[]): string {
+      return parents.map(([assocId, direction]) => `$associations.${assocId}_${direction === 1 ? 'a' : 'b'}`).join('.')
+    }
+
+    function processAssociation (
+      association: Association,
+      direction: 'a' | 'b',
+      result: Config[],
+      preference: ViewletPreference | undefined,
+      parents: AssociationQuery[]
+    ): void {
+      const associationName = `$associations.${association._id}_${direction}`
+      const resultName = parents.length > 0 ? `${getParentsString(parents)}.${associationName}` : associationName
+
+      const name = direction === 'a' ? association.nameA : association.nameB
+      const targetClass = direction === 'a' ? association.classA : association.classB
+
+      if (name.trim().length === 0) return
+      const model = client.getModel()
+
+      const resultLabels = parents
+        .map((r) => {
+          const assoc = model.findObject(r[0])
+          if (assoc === undefined) return ''
+          return r[1] === 1 ? assoc.nameA : assoc.nameB
+        })
+        .filter((it) => it.length > 0)
+      resultLabels.push(name)
+      const fullLabel = resultLabels.join(' › ')
+
+      const clazz = hierarchy.getClass(targetClass)
+      const newValue: AttributeConfig = {
+        type: 'attribute',
+        value: resultName,
+        label: getEmbeddedLabel(fullLabel),
+        enabled: false,
+        _class: targetClass,
+        icon: clazz.icon
+      }
+
+      if (!isExist(result, newValue)) {
+        result.push(newValue)
+      }
+
+      if (preference === undefined) return
+      const exists = preference.config.find((p) => {
+        const key = typeof p === 'string' ? p : p.key
+        return key === resultName
+      })
+      if (exists) {
+        addAssociations(result, targetClass, preference, [...parents, [association._id, direction === 'a' ? 1 : -1]])
+      }
     }
 
     return preference === undefined ? result : []

plugins/card-resources/src/exporter.ts

@@ -159,7 +159,7 @@ async function exportType (
     required.push(...at.required)
   }
 
-  if (!withoutDesc || _id === card.class.Card) {
+  if (!withoutDesc && _id !== card.class.Card) {
     const descendants = h.getDescendants(_id)
     for (const desc of descendants) {
       if (h.getClass(desc).extends !== _id) continue

plugins/support/src/index.ts

@@ -15,7 +15,7 @@
 
 import { Class, Ref } from '@hcengineering/core'
 import type { Asset, IntlString, Plugin, Resource } from '@hcengineering/platform'
-import { plugin } from '@hcengineering/platform'
+import { plugin, Metadata } from '@hcengineering/platform'
 import { SupportClientFactory, SupportConversation, SupportSystem } from './types'
 
 export * from './types'
@@ -42,6 +42,12 @@ export default plugin(supportId, {
   icon: {
     Support: '' as Asset
   },
+  metadata: {
+    SupportLink: '' as Metadata<string>,
+    ReportBugLink: '' as Metadata<string>,
+    DocsLink: '' as Metadata<string>,
+    PrivacyPolicyLink: '' as Metadata<string>
+  },
   string: {
     ContactUs: '' as IntlString,
     ReportBug: '' as IntlString,

plugins/view-resources/src/components/ReadOnlyNotification.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
+  import { getMetadata } from '@hcengineering/platform'
   import { Button, navigate, Notification, NotificationToast } from '@hcengineering/ui'
   import view from '@hcengineering/view'
-  import { getCurrentWorkspaceUrl } from '@hcengineering/presentation'
+  import presentation, { getCurrentWorkspaceUrl } from '@hcengineering/presentation'
   import { allowGuestSignUpStore } from '../utils'
 
   export let onRemove: () => void
@@ -22,7 +23,7 @@
       {#if $allowGuestSignUpStore}
         <Button label={view.string.ReadOnlyJoinWorkspace} stopPropagation={false} on:click={joinWorkspace} />
       {/if}
-      <a href="https://huly.io/signup" target="_blank">
+      <a href={getMetadata(presentation.metadata.SignupUrl)} target="_blank">
         <Button label={view.string.ReadOnlySignUp} stopPropagation={false} kind="primary" />
       </a>
     </div>

plugins/workbench-resources/src/components/AccountPopup.svelte

@@ -18,7 +18,12 @@
   import core, { AccountRole, getCurrentAccount, hasAccountRole } from '@hcengineering/core'
   import rating, { type PersonRating } from '@hcengineering/rating'
   import login, { loginId } from '@hcengineering/login'
-  import { createQuery, getCurrentWorkspaceUrl, hasResource, isDisabled } from '@hcengineering/presentation'
+  import presentation, {
+    createQuery,
+    getCurrentWorkspaceUrl,
+    hasResource,
+    isDisabled
+  } from '@hcengineering/presentation'
   import setting, { settingId, SettingsCategory } from '@hcengineering/setting'
   import {
     Action,
@@ -37,7 +42,7 @@
   import HelpAndSupport from './HelpAndSupport.svelte'
   import { Analytics } from '@hcengineering/analytics'
   import { allowGuestSignUpStore } from '@hcengineering/view-resources'
-  import { getClient } from '@hcengineering/account-client'
+  import { getMetadata } from '@hcengineering/platform'
 
   let items: SettingsCategory[] = []
 
@@ -179,7 +184,7 @@
         icon: setting.icon.InviteWorkspace,
         label: view.string.ReadOnlySignUp,
         action: async () => {
-          open('https://huly.io/signup')
+          open(getMetadata(presentation.metadata.SignupUrl))
         },
         group: 'end'
       })

plugins/workbench-resources/src/components/HelpAndSupport.svelte

@@ -13,10 +13,10 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Asset, IntlString } from '@hcengineering/platform'
+  import { Asset, getMetadata, IntlString } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
   import setting, { settingId } from '@hcengineering/setting'
-  import support, { docsLink, reportBugLink, supportLink, privacyPolicyLink } from '@hcengineering/support'
+  import support from '@hcengineering/support'
   import {
     AnySvelteComponent,
     Button,
@@ -95,7 +95,7 @@
       title: workbench.string.Documentation,
       description: workbench.string.OpenPlatformGuide,
       onClick: () => {
-        window.open(docsLink, '_blank')
+        window.open(getMetadata(support.metadata.DocsLink), '_blank')
         Analytics.handleEvent(WorkbenchEvents.DocumentationOpened)
       }
     },
@@ -203,13 +203,13 @@
     </Scroller>
   {/if}
   <div class="footer">
-    <a href={privacyPolicyLink} target="_blank">
+    <a href={getMetadata(support.metadata.PrivacyPolicyLink)} target="_blank">
       <Button id="privacy-policy" kind={'ghost'} label={support.string.PrivacyPolicy} stopPropagation={false} />
     </a>
-    <a href={reportBugLink} target="_blank">
+    <a href={getMetadata(support.metadata.ReportBugLink)} target="_blank">
       <Button id="report-a-bug" kind={'primary'} label={support.string.ReportBug} stopPropagation={false} />
     </a>
-    <a href={supportLink}>
+    <a href={getMetadata(support.metadata.SupportLink)} target="_blank">
       <Button
         id="contact-us"
         icon={support.icon.Support}