memdb fix

Signed-off-by: Andrey Platov <andrey@hardcoreeng.com>
2025-04-13 03:40:48 +00:00 · 2021-09-28 14:09:43 +02:00 · 2021-09-28 14:09:43 +02:00 · f8a593148e
commit f8a593148e
parent 789f21e8d4
10 changed files with 852 additions and 774 deletions
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@ -5824,6 +5824,10 @@ packages:
      verror: 1.10.0
    dev: false

+  /just-clone/3.2.1:
+    resolution: {integrity: sha512-PFotEVrrzAnwuWTUOFquDShWrHnUnhxNrVs1VFqkNfnoH3Sn5XUlDOePYn2Vv5cN8xV2y69jf8qEoQHm7eoLnw==}
+    dev: false
+
  /jwt-simple/0.5.6:
    resolution: {integrity: sha512-40aUybvhH9t2h71ncA1/1SbtTNCVZHgsTsTgqPUxGWDmUDrXyDf2wMNQKEbdBjbf4AI+fQhbECNTV6lWxQKUzg==}
    engines: {node: '>= 0.4.0'}
@ -9583,7 +9587,7 @@ packages:
    dev: false

  file:projects/core.tgz_6c259fadfeb3a4b20890aefe87070b8b:
-    resolution: {integrity: sha512-ysnlXH1pr2scWoJZmFim7f6kkIJjEDaYdgWWjEVGzVqt8OGASxitVlXqkEqN+wtzAkm5rV+z5iaOiPubJuB78A==, tarball: file:projects/core.tgz}
+    resolution: {integrity: sha512-Up03GksJRgEntzDTW8lWmdbhpVZ2dMdnKBjG4RHICPKeT+abgdeiKelWScjcr8xzAX4c5cBxqxeFWVDeJliFcw==, tarball: file:projects/core.tgz}
    id: file:projects/core.tgz
    name: '@rush-temp/core'
    version: 0.0.0
@ -9595,6 +9599,7 @@ packages:
      eslint-plugin-import: 2.23.4_eslint@7.32.0
      eslint-plugin-node: 11.1.0_eslint@7.32.0
      eslint-plugin-promise: 4.3.1
+      just-clone: 3.2.1
      simplytyped: 3.3.0_typescript@4.3.5
    transitivePeerDependencies:
      - '@typescript-eslint/parser'
@ -9794,7 +9799,7 @@ packages:
    dev: false

  file:projects/model-all.tgz_6c259fadfeb3a4b20890aefe87070b8b:
-    resolution: {integrity: sha512-QR7GrR4b35b1LyxXKoNu8DcruASc5AGXUiXs30ELSojOd5n9ZujDn1pKtuKiXGCi4QePCEOEgek3BK7+CfEvZA==, tarball: file:projects/model-all.tgz}
+    resolution: {integrity: sha512-EUV+Mm7aWdUxnioD7XlTsx0a9Vj5nRqQmXy0eB6Fipicq9zFgLo7IfG4N0zN/aJ7l3iVkFZa6hqbI9J83MVU5g==, tarball: file:projects/model-all.tgz}
    id: file:projects/model-all.tgz
    name: '@rush-temp/model-all'
    version: 0.0.0
@ -10182,7 +10187,7 @@ packages:
    dev: false

  file:projects/prod.tgz_sass@1.37.5+typescript@4.3.5:
-    resolution: {integrity: sha512-AWA9mq0Y9LG3jOjY+7OnWnUVjK1EVeIIYYOLYx6+MeZQ/AJR4rXtfupyICWRxDtZpqKc1dfwW9jd/KzI75KMqA==, tarball: file:projects/prod.tgz}
+    resolution: {integrity: sha512-GKv+eruG+V29obV3ncNZAaiWtA476VfyIL8nxHNOjiAZ0opOAooOZDNwO8PkSTwC5lUeUD7ghZpqVOp62POFXg==, tarball: file:projects/prod.tgz}
    id: file:projects/prod.tgz
    name: '@rush-temp/prod'
    version: 0.0.0
@ -10245,7 +10250,7 @@ packages:
    dev: false

  file:projects/recruit-resources.tgz_c38cf1a7a413db8918b0b4754c21e4c5:
-    resolution: {integrity: sha512-NZIT85JNysKCeQsNuixboDXKqKUZL+3bqrPGWEHiND9FXlRgyq0kibX71TyF8xRtEPKO/ARe32oQKfHKIRvN1Q==, tarball: file:projects/recruit-resources.tgz}
+    resolution: {integrity: sha512-jrMBOKQPXVfZycis2A48V5FaRuXx7f2g22+K4eeVyKlgqnTmREhY8cT0Ycsb7oGfIWkQR9W4SSeiz9rup6TCfA==, tarball: file:projects/recruit-resources.tgz}
    id: file:projects/recruit-resources.tgz
    name: '@rush-temp/recruit-resources'
    version: 0.0.0
@ -10310,7 +10315,7 @@ packages:
    dev: false

  file:projects/server-chunter.tgz_6c259fadfeb3a4b20890aefe87070b8b:
-    resolution: {integrity: sha512-QOBIdplF+DBQYpzKm9CCDT9YWM3KQANfBJxbMYSaAw7F65gJVfASy545NIpeVCeubOaw2wLTQOSGXSg34/RWGw==, tarball: file:projects/server-chunter.tgz}
+    resolution: {integrity: sha512-7Beaf+cyEpSBuHs6fcP1FB7sviht6trs3hHDiiQAPEMRTmnnnxkQqdquVr8eiyPyIvKXfa7pTNg2PGFd2LsO1w==, tarball: file:projects/server-chunter.tgz}
    id: file:projects/server-chunter.tgz
    name: '@rush-temp/server-chunter'
    version: 0.0.0
@ -10368,7 +10373,7 @@ packages:
    dev: false

  file:projects/server-recruit.tgz_6c259fadfeb3a4b20890aefe87070b8b:
-    resolution: {integrity: sha512-YE2Am2CQHPrBIRms2AlvoRXD6peHDmCgHwSI8/HDGOF5c92tGMHd8itPiiTJkzxsYdvQ3I/MuBSsUeaCBZTx/w==, tarball: file:projects/server-recruit.tgz}
+    resolution: {integrity: sha512-CaA56lAyOqvbKspGXTfIXxpbNJuWnz/w/7C1haoX/nLe2rBunYDkXv0VkU/rvMGi7Z4rQblQYo4rPcew4LSowg==, tarball: file:projects/server-recruit.tgz}
    id: file:projects/server-recruit.tgz
    name: '@rush-temp/server-recruit'
    version: 0.0.0
@ -10414,7 +10419,7 @@ packages:
    dev: false

  file:projects/server.tgz_6c259fadfeb3a4b20890aefe87070b8b:
-    resolution: {integrity: sha512-MEVHXm1K1YXXILA5Aq14mHsfYoFCd9Y43+vOFu6SHjXEphIn7J7neQm08DOqMWiSKbWK9uvkNjHEr5Fw12Mbog==, tarball: file:projects/server.tgz}
+    resolution: {integrity: sha512-poB0llkMF+pocNmOZ15BTztnNgZ3SsLL46mMrrYc/+JaimMpn7o/6TDzqFPs3oB2/w4RLX/g4lc8BWEP/KC3qg==, tarball: file:projects/server.tgz}
    id: file:projects/server.tgz
    name: '@rush-temp/server'
    version: 0.0.0
--- a/dev/storage/src/model.tx.json
+++ b/dev/storage/src/model.tx.json
--- a/dev/tool/src/model.tx.json
+++ b/dev/tool/src/model.tx.json
--- a/models/core/src/security.ts
+++ b/models/core/src/security.ts
@ -13,9 +13,10 @@
 // limitations under the License.
 //

+import type { IntlString } from '@anticrm/platform'
 import type { Account, Arr, Ref, Space, Domain, State } from '@anticrm/core'
 import { DOMAIN_MODEL } from '@anticrm/core'
-import { Model } from '@anticrm/model'
+import { Model, Prop, TypeString } from '@anticrm/model'
 import core from './component'
 import { TDoc } from './core'

@ -38,7 +39,9 @@ export class TAccount extends TDoc implements Account {

@Model(core.class.State, core.class.Doc, DOMAIN_STATE)
 export class TState extends TDoc implements State {
+  @Prop(TypeString(), 'Title' as IntlString)
  title!: string
+
  color!: string
 }

--- a/packages/core/package.json
+++ b/packages/core/package.json
@ -21,6 +21,7 @@
    "@rushstack/heft": "^0.35.0"
  },
  "dependencies": {
-    "@anticrm/platform": "~0.6.5"
+    "@anticrm/platform": "~0.6.5",
+    "just-clone": "^3.2.1"
  }
 }
--- a/packages/core/src/memdb.ts
+++ b/packages/core/src/memdb.ts
@ -23,6 +23,8 @@ import { findProperty, resultSort } from './query'
 import type { DocumentQuery, FindOptions, FindResult, Storage, WithLookup, LookupData, Refs } from './storage'
 import { TxProcessor } from './tx'

+import clone from 'just-clone'
+
 /**
 * @public
 */
@ -119,7 +121,7 @@ export abstract class MemDb extends TxProcessor {
    if (options?.lookup !== undefined) result = this.lookup(result as T[], options.lookup)

    result = result.slice(0, options?.limit)
-    return result as T[]
+    return clone(result) as T[]
  }

  addDoc (doc: Doc): void {
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@ -3,6 +3,7 @@

  "compilerOptions": {
    "rootDir": "./src",
-    "outDir": "./lib"
+    "outDir": "./lib",
+    "esModuleInterop": true
  }
 }
--- a/plugins/recruit-resources/src/components/EditCandidate.svelte
+++ b/plugins/recruit-resources/src/components/EditCandidate.svelte
@ -65,10 +65,10 @@
      <Avatar />
    </div>
    <div class="flex-col">
-      <div class="name"><AttributeEditor maxWidth="20rem" _class={recruit.class.Candidate} bind:object={object} key="firstName"/></div>
-      <div class="name"><AttributeEditor maxWidth="20rem" _class={recruit.class.Candidate} bind:object={object} key="lastName"/></div>
-      <div class="title"><AttributeEditor maxWidth="20rem" _class={recruit.class.Candidate} bind:object={object} key="title"/></div>
-      <div class="city"><AttributeEditor maxWidth="20rem" _class={recruit.class.Candidate} bind:object={object} key="city"/></div>
+      <div class="name"><AttributeEditor maxWidth="20rem" _class={recruit.class.Candidate} {object} key="firstName"/></div>
+      <div class="name"><AttributeEditor maxWidth="20rem" _class={recruit.class.Candidate} {object} key="lastName"/></div>
+      <div class="title"><AttributeEditor maxWidth="20rem" _class={recruit.class.Candidate} {object} key="title"/></div>
+      <div class="city"><AttributeEditor maxWidth="20rem" _class={recruit.class.Candidate} {object} key="city"/></div>
    </div>
  </div>

--- a/plugins/workbench-resources/src/components/EditStatuses.svelte
+++ b/plugins/workbench-resources/src/components/EditStatuses.svelte
@ -17,7 +17,7 @@
 <script lang="ts">
  import type { Ref, SpaceWithStates, State } from '@anticrm/core'
  import { CircleButton, IconAdd, Label, IconMoreH, ActionIcon } from '@anticrm/ui'
-  import { createQuery, getClient } from '@anticrm/presentation'
+  import { createQuery, getClient, AttributeEditor } from '@anticrm/presentation'
  import { createEventDispatcher } from 'svelte'
  import Close from './icons/Close.svelte'
  import Circles from './icons/Circles.svelte'
@ -92,6 +92,18 @@
  }

  const dispatch = createEventDispatcher()
+
+  async function addStatus () {
+    const state = await client.createDoc(core.class.State, _id, {
+      title: 'New State',
+      color: '#7C6FCD'
+    })
+    await client.updateDoc(core.class.SpaceWithStates, core.space.Model, _id, {
+      $push: {
+        states: state
+      }
+    })
+  }
 </script>

 <div class="flex-col floatdialog-container">
@ -108,7 +120,7 @@
  <div class="content">
    <div class="flex-between states-header">
      <Label label={'ACTIVE STATUSES'} />
-      <CircleButton icon={IconAdd} size={'medium'} />
+      <div on:click={addStatus}><CircleButton icon={IconAdd} size={'medium'} /></div>
    </div>
    {#each states as state, i}
      {#if state}
@ -131,7 +143,7 @@
        >
          <div class="bar"><Circles /></div>
          <div class="color" style="background-color: {state.color}" />
-          <div class="flex-grow caption-color">{state.title}</div>
+          <div class="flex-grow caption-color"><AttributeEditor maxWidth="20rem" _class={core.class.State} object={state} key="title"/></div>
          <div class="tool"><ActionIcon icon={IconMoreH} label={'More...'} size={'medium'} /></div>
        </div>
      {/if}
--- a/server/workspace/src/model.tx.json
+++ b/server/workspace/src/model.tx.json