mirror of
https://github.com/hcengineering/platform.git
synced 2025-01-22 19:38:17 +00:00
uberf-8425: more adjustments after rebase
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
This commit is contained in:
Alexey Zinoviev
parent
360a4c694e
commit
b4dc15601b
@ -62,6 +62,9 @@ dependencies:
|
||||
'@rush-temp/account':
|
||||
specifier: file:./projects/account.tgz
|
||||
version: file:projects/account.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2)
|
||||
'@rush-temp/account-client':
|
||||
specifier: file:./projects/account-client.tgz
|
||||
version: file:projects/account-client.tgz(ts-node@10.9.2)
|
||||
'@rush-temp/account-service':
|
||||
specifier: file:./projects/account-service.tgz
|
||||
version: file:projects/account-service.tgz
|
||||
@ -1358,6 +1361,9 @@ dependencies:
|
||||
'@types/pdfjs-dist':
|
||||
specifier: 2.10.378
|
||||
version: 2.10.378
|
||||
'@types/pg':
|
||||
specifier: ^8.11.6
|
||||
version: 8.11.6
|
||||
'@types/png-chunks-extract':
|
||||
specifier: ^1.0.2
|
||||
version: 1.0.2
|
||||
@ -21983,6 +21989,37 @@ packages:
|
||||
resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
|
||||
dev: false
|
||||
|
||||
file:projects/account-client.tgz(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-FkRKbBNGlGqZC8ARB9eLF2Amo0LjmURkQ7SYyfsxme0P2mxFKuozDZqBIik3GuETni+zI97L+scsv7f8gMIsFg==, tarball: file:projects/account-client.tgz}
|
||||
id: file:projects/account-client.tgz
|
||||
name: '@rush-temp/account-client'
|
||||
version: 0.0.0
|
||||
dependencies:
|
||||
'@types/jest': 29.5.12
|
||||
'@types/node': 20.11.19
|
||||
'@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.6.2)
|
||||
'@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2)
|
||||
cross-env: 7.0.3
|
||||
esbuild: 0.20.1
|
||||
eslint: 8.56.0
|
||||
eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.6.2)
|
||||
eslint-plugin-import: 2.29.1(eslint@8.56.0)
|
||||
eslint-plugin-n: 15.7.0(eslint@8.56.0)
|
||||
eslint-plugin-promise: 6.1.1(eslint@8.56.0)
|
||||
jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2)
|
||||
prettier: 3.2.5
|
||||
ts-jest: 29.1.2(esbuild@0.20.1)(jest@29.7.0)(typescript@5.6.2)
|
||||
typescript: 5.6.2
|
||||
transitivePeerDependencies:
|
||||
- '@babel/core'
|
||||
- '@jest/types'
|
||||
- babel-jest
|
||||
- babel-plugin-macros
|
||||
- node-notifier
|
||||
- supports-color
|
||||
- ts-node
|
||||
dev: false
|
||||
|
||||
file:projects/account-service.tgz:
|
||||
resolution: {integrity: sha512-Kxz4jt8+j+W4r7hgcpPq5D1wVL5G4AmpEWF6yxyUTR6+vxQERCTILfJo6wRbecPBvEPcFvA7Snogo8exY2YJQg==, tarball: file:projects/account-service.tgz}
|
||||
name: '@rush-temp/account-service'
|
||||
@ -22034,7 +22071,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/account.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-R9WSNuYeIemHJ7eAv7sCyf8IZHZott9CY1b/KJLAknaJfozXLQ6yOYszJjS/iWQRPl4TFFLgYsQaLWd1gDiqww==, tarball: file:projects/account.tgz}
|
||||
resolution: {integrity: sha512-VKZb/oHXpZ/USlNWje5cavwP4IYVf/2jGvI83nTAryOLieUblSgtGZ+oKcvuinLQlncuHDmowpoVdFpFp9CUpQ==, tarball: file:projects/account.tgz}
|
||||
id: file:projects/account.tgz
|
||||
name: '@rush-temp/account'
|
||||
version: 0.0.0
|
||||
@ -22441,7 +22478,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/api-client.tgz(bufferutil@4.0.8)(esbuild@0.20.1)(utf-8-validate@6.0.4):
|
||||
resolution: {integrity: sha512-tyhf+5DHkF+HpWZlimhdgls3Gp3L7PR0UHYEu0YH7e0UmOoZSuvAVbRbwY/6UnVG1am+xQnrs0xiZ93AHIsgBA==, tarball: file:projects/api-client.tgz}
|
||||
resolution: {integrity: sha512-lFsfqbx6XIWKo8wq95O25j0RYJ9pUMgtb3T/tVUKfWG36NUuImICpStaQRmcm6MPYq7Gtb0KKuOXyQJg3y/80w==, tarball: file:projects/api-client.tgz}
|
||||
id: file:projects/api-client.tgz
|
||||
name: '@rush-temp/api-client'
|
||||
version: 0.0.0
|
||||
@ -23319,7 +23356,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/cloud-transactor-http-api.tgz(bufferutil@4.0.8)(esbuild@0.20.1)(ts-node@10.9.2)(utf-8-validate@6.0.4):
|
||||
resolution: {integrity: sha512-LSWaK4sfpV46uBRWBY4cdxkGVyNFJeXrrzzUjrpLXSeJbfdLMxFyU8OYaEw8dKIkOAz+10O6t3ueX5t720utWQ==, tarball: file:projects/cloud-transactor-http-api.tgz}
|
||||
resolution: {integrity: sha512-4vV2jdYPYycGKl0jomdYmnEvZgancPc2pdhJ6khPP3qR4FZFhHx5lF/uLuREoZ3d7GuQqNs4J+fKL/+iriCkaA==, tarball: file:projects/cloud-transactor-http-api.tgz}
|
||||
id: file:projects/cloud-transactor-http-api.tgz
|
||||
name: '@rush-temp/cloud-transactor-http-api'
|
||||
version: 0.0.0
|
||||
@ -23454,7 +23491,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/collaborator.tgz(@tiptap/pm@2.6.6)(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-protocols@1.0.6):
|
||||
resolution: {integrity: sha512-IfReKxVgch+Vfy/kKHkRRNE0N7svP5c5NCHBhC+DiXMjVXNhkMvUYyhGv1RUTmJUzUWvHo3K75m/23c9yAuylw==, tarball: file:projects/collaborator.tgz}
|
||||
resolution: {integrity: sha512-cq/FoG5u/g2MGSXzKFbr1wYoJr8w8f5Qxbcdud6F6tFACRhv5Qq4iEa3ikNne1Fv4kmViUD7+sYUFyoEtMI7zg==, tarball: file:projects/collaborator.tgz}
|
||||
id: file:projects/collaborator.tgz
|
||||
name: '@rush-temp/collaborator'
|
||||
version: 0.0.0
|
||||
@ -23548,7 +23585,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/contact-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-NwGEZHpomoqLYe2i/Z3Wm9xLB1Cl7okFToLBn51JWhFebje+20w47PFde2tUX77f5bfYuLJ0ykZbKnfDbFz9TA==, tarball: file:projects/contact-resources.tgz}
|
||||
resolution: {integrity: sha512-rq42qBhxHD87uw8OYjHxizt6YiWtqTg0Tna8mpQyj7yasEs6/KCtwlt/jwT6f78+JlXlOJRpAMXINxvf5WCt6w==, tarball: file:projects/contact-resources.tgz}
|
||||
id: file:projects/contact-resources.tgz
|
||||
name: '@rush-temp/contact-resources'
|
||||
version: 0.0.0
|
||||
@ -23593,7 +23630,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/contact.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-sjRtgKszoagGm79PFQKes/sfRMcddH1qEMG3/xKuRLKlVcVJJ56twJaCCUeXP+7MsXMH5eEcS3sNCIdtznuASg==, tarball: file:projects/contact.tgz}
|
||||
resolution: {integrity: sha512-HC62TiFyFu4UuqiL3vi2aEp8faqL4DCQA2fTuvYxiEpNWiv71YBayzTaHKaxt4Y+l1qbn3X+zPbiZMA8gbvRhQ==, tarball: file:projects/contact.tgz}
|
||||
id: file:projects/contact.tgz
|
||||
name: '@rush-temp/contact'
|
||||
version: 0.0.0
|
||||
@ -23611,6 +23648,7 @@ packages:
|
||||
jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2)
|
||||
prettier: 3.2.5
|
||||
prettier-plugin-svelte: 3.2.1(prettier@3.2.5)(svelte@4.2.11)
|
||||
svelte: 4.2.19
|
||||
ts-jest: 29.1.2(esbuild@0.20.1)(jest@29.7.0)(typescript@5.3.3)
|
||||
typescript: 5.3.3
|
||||
transitivePeerDependencies:
|
||||
@ -24753,7 +24791,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/guest-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-L4MqVvcbdcwXDathjxIeHXDClV1x0WwrosQA9VOfjxrgdlsIo17FnBa1SB73RXlF3O3DRLKn8A+5lvtzf8qlkg==, tarball: file:projects/guest-resources.tgz}
|
||||
resolution: {integrity: sha512-D2+9Q4pu7DylNjXr7q3TEK8/oKUHNSR88k/uHzXEbvOHaQF1pQ3wz/V+DODegBkMA11rVDuVzfk0Mn2TswP0LQ==, tarball: file:projects/guest-resources.tgz}
|
||||
id: file:projects/guest-resources.tgz
|
||||
name: '@rush-temp/guest-resources'
|
||||
version: 0.0.0
|
||||
@ -25436,7 +25474,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/login-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(file-loader@6.2.0)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2)(webpack@5.97.1):
|
||||
resolution: {integrity: sha512-NARTLQpe+poR8P/l3cOTAEPFutkH24EQqjw6zY6pIChSPhBVtK4GJu4yRJo7WtZPjBTq8qL7q3bDoZ7+aooAWw==, tarball: file:projects/login-resources.tgz}
|
||||
resolution: {integrity: sha512-n8jvuqgHgissnRkZBIXW6EP6zXR66DrwC4vVG6+DV2rMmZq25W/PBT9mam+lwFo/L0DcQ5sBGerhyDrLbjq64w==, tarball: file:projects/login-resources.tgz}
|
||||
id: file:projects/login-resources.tgz
|
||||
name: '@rush-temp/login-resources'
|
||||
version: 0.0.0
|
||||
@ -25484,7 +25522,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/login.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-jX5cfakMhaPs02qHZsnzTtFknqMhyz1mI7Wqd0NLthHsSfVP9NIbnB/DhUG9hChVm3Szj7cBrXg+skvv0aDCSQ==, tarball: file:projects/login.tgz}
|
||||
resolution: {integrity: sha512-V3NnYilBtJGxpAF6i9WDcIlvqzmy84XaRuv0ekKYxIUYjQGGLaKRGs5cwONvsBgm02ZJ9VGh9nqGV5S3YPUTBg==, tarball: file:projects/login.tgz}
|
||||
id: file:projects/login.tgz
|
||||
name: '@rush-temp/login'
|
||||
version: 0.0.0
|
||||
@ -27690,7 +27728,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/pod-analytics-collector.tgz(bufferutil@4.0.8)(utf-8-validate@6.0.4):
|
||||
resolution: {integrity: sha512-Uh9AOsNnUvJ1kc3y+xED2TM8wcYlk9+p4QyoLbNspEdtmwQRL7rUCbctTmzh5UioF05kBp7j7EKUdXvB7MQV9Q==, tarball: file:projects/pod-analytics-collector.tgz}
|
||||
resolution: {integrity: sha512-rt3++WHY4km/N0LBBnsoX2h3+53pz8SMuPuKwiuC0FPKqPtXozPkYrDoTyuOba2fM3p2p7sAwHnP5zgWg7Bqig==, tarball: file:projects/pod-analytics-collector.tgz}
|
||||
id: file:projects/pod-analytics-collector.tgz
|
||||
name: '@rush-temp/pod-analytics-collector'
|
||||
version: 0.0.0
|
||||
@ -27957,7 +27995,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/pod-github.tgz(bufferutil@4.0.8)(utf-8-validate@6.0.4)(y-prosemirror@1.2.12):
|
||||
resolution: {integrity: sha512-pkMWryw2zK18WiZfg0V4rvnxwviyP8f6tMqgiPzJ6GqPB30n7UA1T9rvnhhXOTUQ7VALpszkiFBPdlZyQzvS2A==, tarball: file:projects/pod-github.tgz}
|
||||
resolution: {integrity: sha512-4e6WOSyEn8+oh5ObYWw+ulNgcWx+JYkE+dtNwQ7Au1Dtbc7JSuH2dTlom61FqW64e74LG2ZBTq4lfSdrN/HQng==, tarball: file:projects/pod-github.tgz}
|
||||
id: file:projects/pod-github.tgz
|
||||
name: '@rush-temp/pod-github'
|
||||
version: 0.0.0
|
||||
@ -29866,7 +29904,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-calendar-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-Rpdy7Nx56rXrJ1apUsvlancAVa5USFSwXboZ8iexTJ4Jaebv1yf32j5LUo/fLKwpZyL9KaUHT+A4N+nJKoRVWg==, tarball: file:projects/server-calendar-resources.tgz}
|
||||
resolution: {integrity: sha512-92TFFDbAxCmUu4V3IaNDOLhbEEqTCB5dRohzpV1nzmroO8r+JneZjdV1j8OPHJF65ml0uqciDFPOct+kMzx5fg==, tarball: file:projects/server-calendar-resources.tgz}
|
||||
id: file:projects/server-calendar-resources.tgz
|
||||
name: '@rush-temp/server-calendar-resources'
|
||||
version: 0.0.0
|
||||
@ -29928,7 +29966,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-chunter-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-Kpp8RTEJ+z5d8Rq7HbOhui8ZyV8OvKEXVkAXT80Ju/qhVnZ5Mnw/jk33dgwur1NPVjCWOK2SPECHf+eqzwXpBg==, tarball: file:projects/server-chunter-resources.tgz}
|
||||
resolution: {integrity: sha512-AlzwHz14NkmqegaOiYqf+AxHJlBZZ6k1QswBFpbiAnbiddtkoHNpt0lMihLuVpptzthiUaEHHMVmU6hNsPpj+A==, tarball: file:projects/server-chunter-resources.tgz}
|
||||
id: file:projects/server-chunter-resources.tgz
|
||||
name: '@rush-temp/server-chunter-resources'
|
||||
version: 0.0.0
|
||||
@ -30087,7 +30125,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-contact-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-uBxxy/nVfaqq3u6dPETKCjoQOHCJDRGQFjaau9Lf2ThmJ7ZdxxIZcJ05CfJD4OSgQ1vgf13ZEB4OkDpzqQM5mw==, tarball: file:projects/server-contact-resources.tgz}
|
||||
resolution: {integrity: sha512-6R2S1cbwLtDKCesTPG9tJVy7mJB6EJogkf8TDAv9RFPRqxBkzdQh6OlgkLQsRMgpuneoJjwmSxXFHhX3btVnug==, tarball: file:projects/server-contact-resources.tgz}
|
||||
id: file:projects/server-contact-resources.tgz
|
||||
name: '@rush-temp/server-contact-resources'
|
||||
version: 0.0.0
|
||||
@ -30118,7 +30156,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-contact.tgz(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-wH/4AxAjJUi/wU5hR5gbRK1k46L4FW5ydkphun1gbkO/GtNeSSdYAU48PfxJ6MkHTp+Hn0Ww7C5UxHfHjFOjAw==, tarball: file:projects/server-contact.tgz}
|
||||
resolution: {integrity: sha512-3mD30C7Q8n6xsDge6A0OHJUS6I+9gRI/mw8LyhI98B04o/wJ81fIAM4Fmg6hRPmL1hvgylkNr55Ui1IQr5Cksw==, tarball: file:projects/server-contact.tgz}
|
||||
id: file:projects/server-contact.tgz
|
||||
name: '@rush-temp/server-contact'
|
||||
version: 0.0.0
|
||||
@ -30149,7 +30187,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-controlled-documents-resources.tgz(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-g27+rhbyGhRdYikNstWia5wPng1EUiDp4DoEu51KVFrE4MOeaEXvB85Zb/4Jxg1RL4H7P6o7VRABeVqv6fkqsg==, tarball: file:projects/server-controlled-documents-resources.tgz}
|
||||
resolution: {integrity: sha512-vZn34lK4sw+3yx7RKlIMmtdSAxXAtAD1dWXjYkayJ06D5IqkzusJFzZv9rOrCKDwV6P5q3q9b3B2l1WMi9tYPA==, tarball: file:projects/server-controlled-documents-resources.tgz}
|
||||
id: file:projects/server-controlled-documents-resources.tgz
|
||||
name: '@rush-temp/server-controlled-documents-resources'
|
||||
version: 0.0.0
|
||||
@ -30634,7 +30672,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-hr-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-dRJrMwYzzZFaZ64iHkfaKQjP4EAnbFTn9HonG2w59T0KBGSk1cQlldj1G0DObovPhgl3bTcTJyiFTZo8sEKqVQ==, tarball: file:projects/server-hr-resources.tgz}
|
||||
resolution: {integrity: sha512-sKDUqKJLI+KIEHICNUuvsHH5aGiVd2dOODfwoKmroe3y2bGYFcwHqFmWhWXCX9UyJ5ovfLdh/niY3Bqtx5V26w==, tarball: file:projects/server-hr-resources.tgz}
|
||||
id: file:projects/server-hr-resources.tgz
|
||||
name: '@rush-temp/server-hr-resources'
|
||||
version: 0.0.0
|
||||
@ -30852,7 +30890,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-love-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(svelte@4.2.19)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-v5wtIer348LTlHf515DVi+LYLwL2iWTmHWpVt0IRGZG459gmW0Sge546mo9Nt2N64uACSWW+LVza6x6rDqzVEQ==, tarball: file:projects/server-love-resources.tgz}
|
||||
resolution: {integrity: sha512-C+m2Gxq+YZ2PBgCWEH8C4dWcFeWNwWha7rP5ugPzmt4E6InyZBBUVZD36j4hYJpVIiffWUvjJ5Qm9ImO4zplbw==, tarball: file:projects/server-love-resources.tgz}
|
||||
id: file:projects/server-love-resources.tgz
|
||||
name: '@rush-temp/server-love-resources'
|
||||
version: 0.0.0
|
||||
@ -30916,7 +30954,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-notification-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-DhxiRHwKgwqkX4WP2ZmqGL7fHs0Ev3rtxHT/uylk5SPCPbKmBe20xyEzheSahP0Vm6kIS9XerGQuxGrI31eVBw==, tarball: file:projects/server-notification-resources.tgz}
|
||||
resolution: {integrity: sha512-9uxnou+ENHlKT17DAB8jSE4mgx03+cO7IPnuWkE2GIClDtSqyq7Qc4t3kZtd0NPQjDtPrxvHuTSwB7qNrDWnkg==, tarball: file:projects/server-notification-resources.tgz}
|
||||
id: file:projects/server-notification-resources.tgz
|
||||
name: '@rush-temp/server-notification-resources'
|
||||
version: 0.0.0
|
||||
@ -31485,7 +31523,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-time-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-WePYLAz/QHfFL+jMa/ZE6JQIvNYK4tGBs4ur6UBG3inJigtt9p7AR4PO+nr7dtGZqG8RT0T0TrGREcdV7pX5Gw==, tarball: file:projects/server-time-resources.tgz}
|
||||
resolution: {integrity: sha512-c6dLF7iTeNKl1tkGckc4or/Na6YWkIiluUwb8A/P/T5lH+Ed1II3mwW6n7mvlfzYxs9ynZDdtY7qxhI+kpkaKA==, tarball: file:projects/server-time-resources.tgz}
|
||||
id: file:projects/server-time-resources.tgz
|
||||
name: '@rush-temp/server-time-resources'
|
||||
version: 0.0.0
|
||||
@ -31623,7 +31661,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server-tracker-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-VmLhXIzNRo1VeABIkcyYrRK7P2+OtDpXpYCrutGgmUqT+ioPHxaefntsS+wzItpblY78u4DJYSIkfOhtQXCTtg==, tarball: file:projects/server-tracker-resources.tgz}
|
||||
resolution: {integrity: sha512-U1lyO7riSG7fS2E/nkLeyUkzdeQXZEAJzmbQ+9NNYMwYq3HhT76j82z+wmTfIQSA2vqd+Lk4YIfEdsSAO1Qetw==, tarball: file:projects/server-tracker-resources.tgz}
|
||||
id: file:projects/server-tracker-resources.tgz
|
||||
name: '@rush-temp/server-tracker-resources'
|
||||
version: 0.0.0
|
||||
@ -31853,7 +31891,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/server.tgz(esbuild@0.20.1)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-PwdTpzGoD5SYmDTSD4hJT7ZkG2b05H030bVz5I+vz5f/AmgAzowxfxa0pbMujI6tEiU+o6hDiK25PQXn2xduHA==, tarball: file:projects/server.tgz}
|
||||
resolution: {integrity: sha512-378GorQHM5ihU3dZLis+aq/JRjXeIgVOzIV/W3k27KB8EzoZGDbZQbDuKC07vAPxNBaoJ5yYcLTdGWx6XHnwzw==, tarball: file:projects/server.tgz}
|
||||
id: file:projects/server.tgz
|
||||
name: '@rush-temp/server'
|
||||
version: 0.0.0
|
||||
@ -31915,7 +31953,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/setting-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-XudJm31jzp8dEwS9TsP8lpxB2/yYjvafLULunIlgG46LdhQBfDG711m9w9gLb41Jj9O1quj2egHI87fHfmwrrg==, tarball: file:projects/setting-resources.tgz}
|
||||
resolution: {integrity: sha512-f1+pi6AyYD3Vr5UbZfqt4sOwCRC3ZL5x3EQBDUqD+XKx/XbVfCMF3fp7E1Jw+tA3v/Rp+b7w+DBUQnxa4nVRDQ==, tarball: file:projects/setting-resources.tgz}
|
||||
id: file:projects/setting-resources.tgz
|
||||
name: '@rush-temp/setting-resources'
|
||||
version: 0.0.0
|
||||
@ -33839,7 +33877,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/workbench-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2):
|
||||
resolution: {integrity: sha512-nZAKVxiPb+M5GhOjfLOC3JzipkYWeqvnzwn26FaqScCCIX6ldsnkpyLpI24XWGl8AZQp8bg1pCkLVRcCPSBosA==, tarball: file:projects/workbench-resources.tgz}
|
||||
resolution: {integrity: sha512-8Z+ZK2dzU/qcsK2Vq8xPJJGLVOVYWDwcMxz2XRDwr7F1gbpCpF5QqMu0m0uhz7aGXUL4BNdlNUxWj5MNZZ2kEw==, tarball: file:projects/workbench-resources.tgz}
|
||||
id: file:projects/workbench-resources.tgz
|
||||
name: '@rush-temp/workbench-resources'
|
||||
version: 0.0.0
|
||||
@ -33916,7 +33954,7 @@ packages:
|
||||
dev: false
|
||||
|
||||
file:projects/workspace-service.tgz:
|
||||
resolution: {integrity: sha512-IR3/iTBvQghKkF9qL3ZBgdRhW+64Za+lK4MInjR3mNXC5ausFY9KpqhnS2lcFbguSQv1oiXOPX3wQEEEcIcuQg==, tarball: file:projects/workspace-service.tgz}
|
||||
resolution: {integrity: sha512-3R4hT/W/RSAJwqaOtOYl6impeya8O/im0dHipO7v/qHaevf2uVG+5+AK/Iv61QN3EQsAkvhTyaRanReZ37bwFg==, tarball: file:projects/workspace-service.tgz}
|
||||
name: '@rush-temp/workspace-service'
|
||||
version: 0.0.0
|
||||
dependencies:
|
||||
|
||||
@ -1056,7 +1056,7 @@ export async function removeDuplicateIds (
|
||||
// const initWS = workspaces.filter((p) => initWorkspaces.includes(p.uuid))
|
||||
// const ids = new Map<string, RelatedDocument[]>()
|
||||
// for (const workspace of initWS) {
|
||||
// const db = getWorkspaceMongoDB(_client, (workspace as any).dbName)
|
||||
// const db = getWorkspaceMongoDB(_client, workspace.dataId)
|
||||
|
||||
// const txex = await db.collection(DOMAIN_TX).find<TxCUD<Doc>>({}).toArray()
|
||||
// const txesArr = []
|
||||
@ -1106,10 +1106,10 @@ export async function removeDuplicateIds (
|
||||
|
||||
// ctx.info(`Processing workspace ${workspace.name ?? workspace.url ?? workspace.uuid}`)
|
||||
// const workspaceId = workspace.uuid
|
||||
// const db = getWorkspaceMongoDB(_client, (workspace as any).dbName)
|
||||
// const db = getWorkspaceMongoDB(_client, workspace.dataId)
|
||||
// const plugins = [workspace.uuid]
|
||||
// if ((workspace as any).dbName != null) {
|
||||
// plugins.push((workspace as any).dbName)
|
||||
// if (workspace.dataId != null) {
|
||||
// plugins.push(workspace.dataId)
|
||||
// }
|
||||
|
||||
// const check = await db.collection(DOMAIN_MIGRATION).findOne({ state, plugin: { $in: plugins } })
|
||||
|
||||
@ -1346,7 +1346,7 @@ export function devTool (
|
||||
// .description('restore workspace transactions and minio resources from previous dump.')
|
||||
// .action(async (workspace: string, cmd) => {
|
||||
// const { dbUrl, txes } = prepareTools()
|
||||
// await diffWorkspace(dbUrl, getWorkspaceId(workspace), txes)
|
||||
// await diffWorkspace(dbUrl, workspace, txes)
|
||||
// })
|
||||
|
||||
// program
|
||||
|
||||
@ -602,8 +602,7 @@ export interface Workspace {
|
||||
workspaceName: string
|
||||
workspaceUuid: WorkspaceUuid
|
||||
workspaceUrl: string
|
||||
// TODO: make it optional after fixing all type errors
|
||||
workspaceDataId: string
|
||||
workspaceDataId?: string
|
||||
branding: Branding | null
|
||||
}
|
||||
|
||||
|
||||
@ -202,7 +202,7 @@ export async function upgradeWorkspace (
|
||||
const wsUrl: WorkspaceIds = {
|
||||
uuid: ws.uuid,
|
||||
url: ws.url ?? '',
|
||||
dbName: (ws as any).dbName
|
||||
dataId: ws.dataId
|
||||
}
|
||||
|
||||
await upgradeWorkspaceWith(
|
||||
@ -261,31 +261,26 @@ export async function upgradeWorkspaceWith (
|
||||
toVersion: versionStr,
|
||||
workspace: ws.uuid
|
||||
})
|
||||
const wsId: WorkspaceIds = {
|
||||
const wsIds: WorkspaceIds = {
|
||||
uuid: ws.uuid,
|
||||
url: ws.url ?? '',
|
||||
dbName: (ws as any).dbName
|
||||
dataId: ws.dataId
|
||||
}
|
||||
|
||||
const token = generateToken(systemAccountUuid, wsId.uuid, { service: 'workspace' })
|
||||
const token = generateToken(systemAccountUuid, wsIds.uuid, { service: 'workspace' })
|
||||
let progress = 0
|
||||
|
||||
const updateProgressHandle = setInterval(() => {
|
||||
void handleWsEvent?.('progress', version, progress)
|
||||
}, 5000)
|
||||
|
||||
const wsUrl: WorkspaceIds = {
|
||||
uuid: ws.uuid,
|
||||
url: ws.url ?? '',
|
||||
dbName: (ws as any).dbName
|
||||
}
|
||||
try {
|
||||
const contextData = new SessionDataImpl(
|
||||
systemAccount,
|
||||
'backup',
|
||||
true,
|
||||
{ targets: {}, txes: [] },
|
||||
wsUrl,
|
||||
wsIds,
|
||||
null,
|
||||
true,
|
||||
new Map(),
|
||||
@ -299,7 +294,7 @@ export async function upgradeWorkspaceWith (
|
||||
await upgradeModel(
|
||||
ctx,
|
||||
await getTransactorEndpoint(token, external ? 'external' : 'internal'),
|
||||
wsId,
|
||||
wsIds,
|
||||
txes,
|
||||
pipeline,
|
||||
connection,
|
||||
|
||||
@ -774,7 +774,7 @@ export class PlatformWorker {
|
||||
workerCtx,
|
||||
this.installations,
|
||||
{
|
||||
dbName: (workspaceInfo as any).dbName,
|
||||
dataId: workspaceInfo.dataId,
|
||||
url: workspaceInfo.url,
|
||||
uuid: workspaceInfo.uuid
|
||||
},
|
||||
|
||||
@ -24,7 +24,7 @@ import {
|
||||
unpackModel
|
||||
} from '@hcengineering/cloud-transactor-api'
|
||||
import contact, { AvatarType, type Person } from '@hcengineering/contact'
|
||||
import core, { generateId, type AccountClient, type Ref, type TxCreateDoc, TxOperations } from '@hcengineering/core'
|
||||
import core, { buildSocialIdString, type Client, generateId, type Ref, SocialIdType, type TxCreateDoc, TxOperations } from '@hcengineering/core'
|
||||
|
||||
async function callClient<T> (client: T, method: () => Promise<any>): Promise<Response> {
|
||||
try {
|
||||
@ -66,11 +66,11 @@ export default {
|
||||
return await transactorService.openRpc(info.token, params.workspace)
|
||||
}
|
||||
|
||||
async function rpcClient (params: Record<string, any>): Promise<AccountClient> {
|
||||
async function rpcClient (params: Record<string, any>): Promise<Client> {
|
||||
return await createRpcClient(transactorService, getConnectOpts(params))
|
||||
}
|
||||
|
||||
async function httpClient (params: Record<string, any>): Promise<AccountClient> {
|
||||
async function httpClient (params: Record<string, any>): Promise<Client> {
|
||||
return await createHttpClient(env.HTTP_API_URL, getConnectOpts(params))
|
||||
}
|
||||
|
||||
@ -114,8 +114,8 @@ export default {
|
||||
})
|
||||
.get('/demo-tx-raw/:email/:password/:workspace', async ({ params }) => {
|
||||
const client = await rawClient(params)
|
||||
const socialString = buildSocialIdString({ type: SocialIdType.EMAIL, value: params.email })
|
||||
return await callClient(client, async () => {
|
||||
const account = await client.getAccount()
|
||||
const id = generateId()
|
||||
const tx: TxCreateDoc<Person> = {
|
||||
_id: id as Ref<TxCreateDoc<Person>>,
|
||||
@ -123,10 +123,10 @@ export default {
|
||||
space: core.space.Tx,
|
||||
objectId: id as Ref<Person>,
|
||||
objectClass: contact.class.Person,
|
||||
objectSpace: account.space,
|
||||
objectSpace: contact.space.Contacts,
|
||||
modifiedOn: Date.now(),
|
||||
modifiedBy: account._id,
|
||||
createdBy: account._id,
|
||||
modifiedBy: socialString,
|
||||
createdBy: socialString,
|
||||
attributes: {
|
||||
name: 'Person ' + id,
|
||||
city: 'Unknown',
|
||||
@ -139,9 +139,9 @@ export default {
|
||||
.get('/demo-tx-rpc/:email/:password/:workspace', async ({ params }) => {
|
||||
const client = await rpcClient({ ...params, loadModel: true })
|
||||
return await callClient(client, async () => {
|
||||
const account = await client.getAccount()
|
||||
const txops = new TxOperations(client, account._id)
|
||||
return await txops.createDoc(contact.class.Person, account.space, {
|
||||
const socialString = buildSocialIdString({ type: SocialIdType.EMAIL, value: params.email })
|
||||
const txops = new TxOperations(client, socialString)
|
||||
return await txops.createDoc(contact.class.Person, contact.space.Contacts, {
|
||||
name: 'Person ' + generateId(),
|
||||
city: 'Unknown',
|
||||
avatarType: AvatarType.COLOR
|
||||
@ -151,9 +151,9 @@ export default {
|
||||
.get('/demo-tx-http/:email/:password/:workspace', async ({ params }) => {
|
||||
const client = await httpClient({ ...params, loadModel: true })
|
||||
return await callClient(client, async () => {
|
||||
const account = await client.getAccount()
|
||||
const txops = new TxOperations(client, account._id)
|
||||
return await txops.createDoc(contact.class.Person, account.space, {
|
||||
const socialString = buildSocialIdString({ type: SocialIdType.EMAIL, value: params.email })
|
||||
const txops = new TxOperations(client, socialString)
|
||||
return await txops.createDoc(contact.class.Person, contact.space.Contacts, {
|
||||
name: 'Person ' + generateId(),
|
||||
city: 'Unknown',
|
||||
avatarType: AvatarType.COLOR
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
import {
|
||||
type Account,
|
||||
type AccountClient,
|
||||
type Client,
|
||||
type Class,
|
||||
type Doc,
|
||||
type DocumentQuery,
|
||||
@ -35,7 +35,7 @@ import { type ConnectOptions } from './types'
|
||||
import { getWorkspaceLogin } from './account'
|
||||
import { decodeModel } from './utils'
|
||||
|
||||
export async function createHttpClient (httpApiWorkerUrl: string, options: ConnectOptions): Promise<AccountClient> {
|
||||
export async function createHttpClient (httpApiWorkerUrl: string, options: ConnectOptions): Promise<Client> {
|
||||
let token = options.workspaceToken
|
||||
if (token === undefined) {
|
||||
if (options.authOptions === undefined) {
|
||||
@ -54,7 +54,7 @@ export async function createHttpClient (httpApiWorkerUrl: string, options: Conne
|
||||
return client
|
||||
}
|
||||
|
||||
class TransactorHttpClient implements AccountClient {
|
||||
class TransactorHttpClient implements Client {
|
||||
private model: ModelDb | undefined
|
||||
private hierarchy: Hierarchy | undefined
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
import {
|
||||
type Account,
|
||||
type AccountClient,
|
||||
type Client,
|
||||
type Class,
|
||||
type Doc,
|
||||
type DocumentQuery,
|
||||
@ -48,7 +48,7 @@ export interface TransactorRawApi extends Storage {
|
||||
export async function createRpcClient (
|
||||
transactorService: TransactorService,
|
||||
options: ConnectOptions
|
||||
): Promise<AccountClient> {
|
||||
): Promise<Client> {
|
||||
let token = options.workspaceToken
|
||||
if (token === undefined) {
|
||||
if (options.authOptions === undefined) {
|
||||
@ -67,7 +67,7 @@ export async function createRpcClient (
|
||||
return client
|
||||
}
|
||||
|
||||
class TransactorRpcClient implements AccountClient {
|
||||
class TransactorRpcClient implements Client {
|
||||
private disposed = false
|
||||
private model: ModelDb | undefined
|
||||
private hierarchy: Hierarchy | undefined
|
||||
|
||||
@ -79,7 +79,7 @@ class TransactorRpcTarget extends RpcTarget {
|
||||
export class TransactorRpc extends WorkerEntrypoint<Env> {
|
||||
async openRpc (token: string, workspaceId: string): Promise<TransactorRpcTarget> {
|
||||
const decodedToken = decodeToken(token, true, this.env.SERVER_SECRET)
|
||||
const id = this.env.TRANSACTOR.idFromName(decodedToken.workspace.name)
|
||||
const id = this.env.TRANSACTOR.idFromName(decodedToken.workspace)
|
||||
const stub = this.env.TRANSACTOR.get(id)
|
||||
return new TransactorRpcTarget(token, workspaceId, stub)
|
||||
}
|
||||
|
||||
@ -338,7 +338,7 @@ export class Transactor extends DurableObject<Env> {
|
||||
}
|
||||
// By design, all fetches to this durable object will be for the same workspace
|
||||
if (this.workspace === '') {
|
||||
this.workspace = token.workspace.name
|
||||
this.workspace = token.workspace
|
||||
}
|
||||
return session.session
|
||||
}
|
||||
@ -354,7 +354,19 @@ export class Transactor extends DurableObject<Env> {
|
||||
const cs = this.createDummyClientSocket()
|
||||
try {
|
||||
const session = await this.makeRpcSession(rawToken, cs)
|
||||
result = await session.findAllRaw(this.measureCtx, _class, query ?? {}, options ?? {})
|
||||
const sessionCtx: ClientSessionCtx = {
|
||||
ctx: this.measureCtx,
|
||||
socialStringsToUsers: new Map(), // TODO: Implement
|
||||
sendResponse: async (msg) => {
|
||||
result = msg
|
||||
},
|
||||
// TODO: Inedeed, the pipeline doesn't return errors,
|
||||
// it just logs them to console and return an empty result
|
||||
sendError: async (msg, error) => {
|
||||
result = { error: `${msg}`, status: `${error}` }
|
||||
}
|
||||
}
|
||||
result = await session.findAllRaw(sessionCtx, _class, query ?? {}, options ?? {})
|
||||
} catch (error: any) {
|
||||
result = { error: `${error}` }
|
||||
} finally {
|
||||
@ -370,6 +382,7 @@ export class Transactor extends DurableObject<Env> {
|
||||
const session = await this.makeRpcSession(rawToken, cs)
|
||||
const sessionCtx: ClientSessionCtx = {
|
||||
ctx: this.measureCtx,
|
||||
socialStringsToUsers: new Map(), // TODO: Implement
|
||||
sendResponse: async (msg) => {
|
||||
result = msg
|
||||
},
|
||||
@ -403,6 +416,7 @@ export class Transactor extends DurableObject<Env> {
|
||||
const session = await this.makeRpcSession(rawToken, cs)
|
||||
const sessionCtx: ClientSessionCtx = {
|
||||
ctx: this.measureCtx,
|
||||
socialStringsToUsers: new Map(), // TODO: Implement
|
||||
sendResponse: async (msg) => {
|
||||
result = msg
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user