TSK-1668: Side changes from Surveys

.github/pull_request_template.md

@@ -7,7 +7,7 @@
 * [ ] - UI test added to added/changed functionality?
 * [ ] - Screenshot is added to PR if applicable ?
 * [ ] - Does a local formatting is applied (rush format)
-* [ ] - Does a local svele-check is applied (rush svelte check)
+* [ ] - Does a local svele-check is applied (rush svelte-check)
 * [ ] - Does a local UI tests are executed [UI Testing](../tests/readme.md)
 * [ ] - Does the code work? Check whether function and logic are correct.
 * [ ] - Does Changelog.md is updated with changes?

dev/prod/package.json

@@ -161,9 +161,6 @@
     "@hcengineering/support": "^0.6.1",
     "@hcengineering/support-assets": "^0.6.1",
     "@hcengineering/support-resources": "^0.6.0",
-    "@hcengineering/survey": "^0.6.0",
-    "@hcengineering/survey-assets": "^0.6.0",
-    "@hcengineering/survey-resources": "^0.6.0",
     "@hcengineering/request": "^0.6.6",
     "@hcengineering/request-assets": "^0.6.0",
     "@hcengineering/request-resources": "^0.6.0",

dev/prod/src/platform.ts

@@ -34,7 +34,6 @@ import rekoni from '@hcengineering/rekoni'
 import { requestId } from '@hcengineering/request'
 import { settingId } from '@hcengineering/setting'
 import { supportId } from '@hcengineering/support'
-import { surveyId } from '@hcengineering/survey'
 import { tagsId } from '@hcengineering/tags'
 import { taskId } from '@hcengineering/task'
 import telegram, { telegramId } from '@hcengineering/telegram'
@@ -64,7 +63,6 @@ import '@hcengineering/recruit-assets'
 import '@hcengineering/request-assets'
 import '@hcengineering/setting-assets'
 import '@hcengineering/support-assets'
-import '@hcengineering/survey-assets'
 import '@hcengineering/tags-assets'
 import '@hcengineering/task-assets'
 import '@hcengineering/telegram-assets'
@@ -123,7 +121,6 @@ function configureI18n(): void {
    addStringsLoader(requestId, async (lang: string) => await import(`@hcengineering/request-assets/lang/${lang}.json`))
    addStringsLoader(settingId, async (lang: string) => await import(`@hcengineering/setting-assets/lang/${lang}.json`))
    addStringsLoader(supportId, async (lang: string) => await import(`@hcengineering/support-assets/lang/${lang}.json`))
-   addStringsLoader(surveyId, async (lang: string) => await import(`@hcengineering/survey-assets/lang/${lang}.json`))
    addStringsLoader(tagsId, async (lang: string) => await import(`@hcengineering/tags-assets/lang/${lang}.json`))
    addStringsLoader(taskId, async (lang: string) => await import(`@hcengineering/task-assets/lang/${lang}.json`))
    addStringsLoader(telegramId, async (lang: string) => await import(`@hcengineering/telegram-assets/lang/${lang}.json`))
@@ -200,7 +197,6 @@ export async function configurePlatform() {
   addLocation(bitrixId, () => import(/* webpackChunkName: "bitrix" */ '@hcengineering/bitrix-resources'))
   addLocation(requestId, () => import(/* webpackChunkName: "request" */ '@hcengineering/request-resources'))
   addLocation(supportId, () => import(/* webpackChunkName: "support" */ '@hcengineering/support-resources'))
-  addLocation(surveyId, () => import(/* webpackChunkName: "support" */ '@hcengineering/survey-resources'))
 
   setMetadata(client.metadata.FilterModel, true)
   setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin])

dev/tool/src/index.ts

@@ -120,7 +120,7 @@ export function devTool (
 
   program.version('0.0.1')
 
-  // create-user john.appleseed@gmail.com --password 123 --workspace workspace --fullname "John Appleseed"
+  // create-account john.appleseed@gmail.com --password 123 --workspace workspace --fullname "John Appleseed"
   program
     .command('create-account <email>')
     .description('create user and corresponding account in master database')
@@ -476,7 +476,7 @@ export function devTool (
 
   program
     .command('clean-workspace <workspace>')
-    .description('set user role')
+    .description('clean workspace')
     .option('--recruit', 'Clean recruit', false)
     .option('--tracker', 'Clean tracker', false)
     .option('--removedTx', 'Clean removed transactions', false)
@@ -501,7 +501,7 @@ export function devTool (
 
   program
     .command('clean-removed-transactions <workspace>')
-    .description('set user role')
+    .description('clean removed transactions')
     .action(async (workspace: string, cmd: any) => {
       await cleanRemovedTransactions(getWorkspaceId(workspace, productId), transactorUrl)
     })

models/all/package.json

@@ -80,7 +80,6 @@
     "@hcengineering/model-server-activity": "^0.6.0",
     "@hcengineering/model-server-openai": "^0.6.0",
     "@hcengineering/model-server-translate": "^0.6.0",
-    "@hcengineering/model-support": "^0.6.0",
-    "@hcengineering/model-survey": "^0.6.0"
+    "@hcengineering/model-support": "^0.6.0"
   }
 }

models/all/src/index.ts

@@ -60,7 +60,6 @@ import { taskId, createModel as taskModel } from '@hcengineering/model-task'
 import telegram, { telegramId, createModel as telegramModel } from '@hcengineering/model-telegram'
 import { templatesId, createModel as templatesModel } from '@hcengineering/model-templates'
 import { textEditorId, createModel as textEditorModel } from '@hcengineering/model-text-editor'
-import survey, { surveyId, createModel as surveyModel } from '@hcengineering/model-survey'
 import tracker, { trackerId, createModel as trackerModel } from '@hcengineering/model-tracker'
 import view, { viewId, createModel as viewModel } from '@hcengineering/model-view'
 import workbench, { workbenchId, createModel as workbenchModel } from '@hcengineering/model-workbench'
@@ -254,25 +253,14 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[
       requestModel,
       requestId,
       {
-        label: survey.string.ConfigLabel,
-        description: survey.string.ConfigDescription,
+        // request: request.string.ConfigLabel,
+        // request: request.string.ConfigDescription,
         enabled: false,
         beta: true,
-        icon: survey.icon.SurveyApplication,
         classFilter: defaultFilter
       }
     ],
     [supportModel, supportId],
-    [
-      surveyModel,
-      surveyId,
-      {
-        // TODO: icon, label, description?
-        enabled: true,
-        beta: true,
-        classFilter: defaultFilter
-      }
-    ],
 
     [serverCoreModel, serverCoreId],
     [serverAttachmentModel, serverAttachmentId],

models/bitrix/src/plugin.ts

@@ -19,7 +19,7 @@ import bitrix from '@hcengineering/bitrix-resources/src/plugin'
 import { type IntlString, mergeIds } from '@hcengineering/platform'
 import { type Action } from '@hcengineering/view'
 
-import { type Ref } from '@hcengineering/core'
+import { type Doc, type Ref } from '@hcengineering/core'
 import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(bitrixId, bitrix, {
@@ -34,6 +34,6 @@ export default mergeIds(bitrixId, bitrix, {
     ConfigDescription: '' as IntlString
   },
   action: {
-    BitrixImport: '' as Ref<Action>
+    BitrixImport: '' as Ref<Action<Doc, any>>
   }
 })

models/chunter/src/plugin.ts

@@ -41,9 +41,9 @@ export default mergeIds(chunterId, chunter, {
     ArchiveChannel: '' as Ref<Action>,
     UnarchiveChannel: '' as Ref<Action>,
     ConvertToPrivate: '' as Ref<Action>,
-    CopyCommentLink: '' as Ref<Action>,
-    CopyThreadMessageLink: '' as Ref<Action>,
-    CopyMessageLink: '' as Ref<Action>
+    CopyCommentLink: '' as Ref<Action<Doc, any>>,
+    CopyThreadMessageLink: '' as Ref<Action<Doc, any>>,
+    CopyMessageLink: '' as Ref<Action<Doc, any>>
   },
   actionImpl: {
     MarkUnread: '' as ViewAction,

models/contact/src/plugin.ts

@@ -121,7 +121,7 @@ export default mergeIds(contactId, contact, {
   action: {
     KickEmployee: '' as Ref<Action>,
     DeleteEmployee: '' as Ref<Action>,
-    MergePersons: '' as Ref<Action>
+    MergePersons: '' as Ref<Action<Doc, any>>
   },
   actionImpl: {
     KickEmployee: '' as ViewAction,

models/gmail/src/plugin.ts

@@ -25,7 +25,7 @@ import { type NotificationGroup } from '@hcengineering/notification'
 
 export default mergeIds(gmailId, gmail, {
   action: {
-    WriteEmail: '' as Ref<Action>
+    WriteEmail: '' as Ref<Action<Doc, any>>
   },
   string: {
     MessageID: '' as IntlString,