{ dispatch('close') }} />
+ {
+ return await new Promise((resolve) => {
+ const reader = new FileReader()
+
+ reader.addEventListener('load', () => resolve(reader.result as string), false)
+ reader.readAsDataURL(blob)
+ })
+}
+
/**
* @public
*/
diff --git a/plugins/attachment-resources/src/components/Attachments.svelte b/plugins/attachment-resources/src/components/Attachments.svelte
index 98c4268a7a..4d9e91a375 100644
--- a/plugins/attachment-resources/src/components/Attachments.svelte
+++ b/plugins/attachment-resources/src/components/Attachments.svelte
@@ -38,7 +38,7 @@
async function createAttachment (file: File) {
loading++
try {
- const uuid = await uploadFile(space, file, objectId)
+ const uuid = await uploadFile(file, space, objectId)
console.log('uploaded file uuid', uuid)
client.addCollection(attachment.class.Attachment, space, objectId, _class, 'attachments', {
name: file.name,
diff --git a/plugins/attachment-resources/src/index.ts b/plugins/attachment-resources/src/index.ts
index cb140ad7d4..86ddc95acd 100644
--- a/plugins/attachment-resources/src/index.ts
+++ b/plugins/attachment-resources/src/index.ts
@@ -17,6 +17,7 @@ import AttachmentsPresenter from './components/AttachmentsPresenter.svelte'
import AttachmentPresenter from './components/AttachmentPresenter.svelte'
import TxAttachmentCreate from './components/activity/TxAttachmentCreate.svelte'
import Attachments from './components/Attachments.svelte'
+import { uploadFile } from './utils'
export { Attachments, AttachmentsPresenter }
@@ -28,5 +29,8 @@ export default async () => ({
},
activity: {
TxAttachmentCreate
+ },
+ helper: {
+ UploadFile: uploadFile
}
})
diff --git a/plugins/attachment-resources/src/utils.ts b/plugins/attachment-resources/src/utils.ts
index f61a3d32d9..787fb3eddc 100644
--- a/plugins/attachment-resources/src/utils.ts
+++ b/plugins/attachment-resources/src/utils.ts
@@ -18,14 +18,19 @@ import type { Doc, Ref, Space } from '@anticrm/core'
import login from '@anticrm/login'
import { getMetadata } from '@anticrm/platform'
-export async function uploadFile (space: Ref, file: File, attachedTo: Ref): Promise {
+export async function uploadFile (file: File, space?: Ref, attachedTo?: Ref): Promise {
console.log(file)
const uploadUrl = getMetadata(login.metadata.UploadUrl)
const data = new FormData()
data.append('file', file)
- const url = `${uploadUrl as string}?space=${space}&name=${encodeURIComponent(file.name)}&attachedTo=${attachedTo}`
+ const params = [['space', space], ['attachedTo', attachedTo]]
+ .filter((x): x is [string, Ref] => x[1] !== undefined)
+ .map(([name, value]) => `${name}=${value}`)
+ .join('&')
+
+ const url = `${uploadUrl as string}?name=${encodeURIComponent(file.name)}&${params}`
const resp = await fetch(url, {
method: 'POST',
headers: {
diff --git a/plugins/attachment/src/index.ts b/plugins/attachment/src/index.ts
index 3e41f1953d..677790c096 100644
--- a/plugins/attachment/src/index.ts
+++ b/plugins/attachment/src/index.ts
@@ -14,8 +14,8 @@
// limitations under the License.
//
-import type { Ref, Class, AttachedDoc } from '@anticrm/core'
-import { plugin } from '@anticrm/platform'
+import type { Ref, Class, AttachedDoc, Space, Doc } from '@anticrm/core'
+import { plugin, Resource } from '@anticrm/platform'
import type { Asset, Plugin } from '@anticrm/platform'
import { AnyComponent } from '@anticrm/ui'
@@ -44,5 +44,8 @@ export default plugin(attachmentId, {
},
class: {
Attachment: '' as Ref>
+ },
+ helper: {
+ UploadFile: '' as Resource<(file: File, space?: Ref, attachedTo?: Ref) => Promise>
}
})
diff --git a/plugins/contact-resources/package.json b/plugins/contact-resources/package.json
index c2c426aeaf..963e6a49ba 100644
--- a/plugins/contact-resources/package.json
+++ b/plugins/contact-resources/package.json
@@ -41,6 +41,7 @@
"@anticrm/view": "~0.6.0",
"@anticrm/attachment-resources": "~0.6.0",
"@anticrm/panel": "~0.6.0",
- "@anticrm/view-resources": "~0.6.0"
+ "@anticrm/view-resources": "~0.6.0",
+ "@anticrm/attachment": "~0.6.1"
}
}
diff --git a/plugins/contact-resources/src/components/CreatePerson.svelte b/plugins/contact-resources/src/components/CreatePerson.svelte
index 7096f5c715..adcc808b08 100644
--- a/plugins/contact-resources/src/components/CreatePerson.svelte
+++ b/plugins/contact-resources/src/components/CreatePerson.svelte
@@ -16,9 +16,11 @@
{#if object !== undefined}
+ {#await CropperP then Cropper}
+
+
+
diff --git a/packages/presentation/src/components/EditableAvatar.svelte b/packages/presentation/src/components/EditableAvatar.svelte
new file mode 100644
index 0000000000..79a2d4d19a
--- /dev/null
+++ b/packages/presentation/src/components/EditableAvatar.svelte
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+ {/await}
+
+
diff --git a/packages/presentation/src/index.ts b/packages/presentation/src/index.ts
index 338db59d99..20b0f02de0 100644
--- a/packages/presentation/src/index.ts
+++ b/packages/presentation/src/index.ts
@@ -23,6 +23,7 @@ export * from './attributes'
export { default as UserBox } from './components/UserBox.svelte'
export { default as UserInfo } from './components/UserInfo.svelte'
export { default as Avatar } from './components/Avatar.svelte'
+export { default as EditableAvatar } from './components/EditableAvatar.svelte'
export { default as MessageViewer } from './components/MessageViewer.svelte'
export { default as AttributesBar } from './components/AttributesBar.svelte'
export { default as AttributeBarEditor } from './components/AttributeBarEditor.svelte'
diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
index db1a8d6082..a9b8e5d2df 100644
--- a/packages/presentation/src/utils.ts
+++ b/packages/presentation/src/utils.ts
@@ -114,6 +114,15 @@ export function getFileUrl (file: string): string {
return url
}
+export async function getBlobURL (blob: Blob): Promise
-
diff --git a/plugins/image-cropper-resources/.eslintrc.js b/plugins/image-cropper-resources/.eslintrc.js
new file mode 100644
index 0000000000..a327214967
--- /dev/null
+++ b/plugins/image-cropper-resources/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+ extends: ['./node_modules/@anticrm/platform-rig/profiles/ui/config/eslint.config.json'],
+ parserOptions: { tsconfigRootDir: __dirname },
+ settings: {
+ 'svelte3/ignore-styles': () => true
+ }
+}
diff --git a/plugins/image-cropper-resources/package.json b/plugins/image-cropper-resources/package.json
new file mode 100644
index 0000000000..622e8d46ca
--- /dev/null
+++ b/plugins/image-cropper-resources/package.json
@@ -0,0 +1,38 @@
+{
+ "name": "@anticrm/image-cropper-resources",
+ "version": "0.6.0",
+ "main": "src/index.ts",
+ "author": "Anticrm Platform Contributors",
+ "license": "EPL-2.0",
+ "scripts": {
+ "build": "echo 'no build for ui'",
+ "build:docs": "api-extractor run --local",
+ "lint": "svelte-check && eslint",
+ "lint:fix": "eslint --fix src",
+ "format": "prettier --write --plugin-search-dir=. src && eslint --fix src"
+ },
+ "devDependencies": {
+ "@anticrm/platform-rig": "~0.6.0",
+ "svelte-loader": "^3.1.2",
+ "sass": "^1.37.5",
+ "svelte-preprocess": "^4.7.4",
+ "@typescript-eslint/eslint-plugin": "^5.4.0",
+ "eslint-plugin-import": "^2.25.3",
+ "eslint-plugin-promise": "^5.1.1",
+ "eslint-plugin-node": "^11.1.0",
+ "eslint": "^7.32.0",
+ "@typescript-eslint/parser": "^5.4.0",
+ "eslint-config-standard-with-typescript": "^21.0.1",
+ "eslint-plugin-svelte3": "~3.2.1",
+ "prettier-plugin-svelte": "^2.2.0",
+ "prettier": "^2.4.1",
+ "svelte-check": "^2.2.10",
+ "typescript": "^4.3.5"
+ },
+ "dependencies": {
+ "svelte": "^3.37.0",
+ "@anticrm/platform": "~0.6.5",
+ "cropperjs": "~1.5.12",
+ "smartcrop": "~2.0.5"
+ }
+}
diff --git a/plugins/image-cropper-resources/postcss.config.js b/plugins/image-cropper-resources/postcss.config.js
new file mode 100644
index 0000000000..88752c6cb0
--- /dev/null
+++ b/plugins/image-cropper-resources/postcss.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+ plugins: [
+ require('autoprefixer')
+ ]
+}
diff --git a/plugins/image-cropper-resources/src/components/Cropper.svelte b/plugins/image-cropper-resources/src/components/Cropper.svelte
new file mode 100644
index 0000000000..2593fd3964
--- /dev/null
+++ b/plugins/image-cropper-resources/src/components/Cropper.svelte
@@ -0,0 +1,102 @@
+
+
+
+ => ({
+ component: {
+ Cropper
+ }
+})
diff --git a/plugins/image-cropper-resources/svelte.config.js b/plugins/image-cropper-resources/svelte.config.js
new file mode 100644
index 0000000000..944a06f73e
--- /dev/null
+++ b/plugins/image-cropper-resources/svelte.config.js
@@ -0,0 +1,5 @@
+const sveltePreprocess = require('svelte-preprocess')
+
+module.exports = {
+ preprocess: sveltePreprocess()
+};
\ No newline at end of file
diff --git a/plugins/image-cropper-resources/tsconfig.json b/plugins/image-cropper-resources/tsconfig.json
new file mode 100644
index 0000000000..cabe5aefad
--- /dev/null
+++ b/plugins/image-cropper-resources/tsconfig.json
@@ -0,0 +1,15 @@
+{
+ "compilerOptions": {
+ "moduleResolution": "node",
+ "target": "esnext",
+ "module": "esnext",
+ "declaration": true,
+ "outDir": "./lib",
+ "strict": true,
+ "esModuleInterop": true,
+ "lib": [
+ "esnext",
+ "dom"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/plugins/image-cropper/.eslintrc.js b/plugins/image-cropper/.eslintrc.js
new file mode 100644
index 0000000000..5da5872d4a
--- /dev/null
+++ b/plugins/image-cropper/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+ extends: ['./node_modules/@anticrm/platform-rig/profiles/default/config/eslint.config.json'],
+ parserOptions: {
+ tsconfigRootDir: __dirname,
+ project: './tsconfig.json'
+ }
+}
diff --git a/plugins/image-cropper/.npmignore b/plugins/image-cropper/.npmignore
new file mode 100644
index 0000000000..e3ec093c38
--- /dev/null
+++ b/plugins/image-cropper/.npmignore
@@ -0,0 +1,4 @@
+*
+!/lib/**
+!CHANGELOG.md
+/lib/**/__tests__/
diff --git a/plugins/image-cropper/config/rig.json b/plugins/image-cropper/config/rig.json
new file mode 100644
index 0000000000..af1257a896
--- /dev/null
+++ b/plugins/image-cropper/config/rig.json
@@ -0,0 +1,18 @@
+// The "rig.json" file directs tools to look for their config files in an external package.
+// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
+{
+ "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
+
+ /**
+ * (Required) The name of the rig package to inherit from.
+ * It should be an NPM package name with the "-rig" suffix.
+ */
+ "rigPackageName": "@anticrm/platform-rig"
+
+ /**
+ * (Optional) Selects a config profile from the rig package. The name must consist of
+ * lowercase alphanumeric words separated by hyphens, for example "sample-profile".
+ * If omitted, then the "default" profile will be used."
+ */
+ // "rigProfile": "your-profile-name"
+}
diff --git a/plugins/image-cropper/package.json b/plugins/image-cropper/package.json
new file mode 100644
index 0000000000..bc4b6c55b2
--- /dev/null
+++ b/plugins/image-cropper/package.json
@@ -0,0 +1,32 @@
+{
+ "name": "@anticrm/image-cropper",
+ "version": "0.6.0",
+ "main": "lib/index.js",
+ "author": "Anticrm Platform Contributors",
+ "license": "EPL-2.0",
+ "scripts": {
+ "build": "heft build",
+ "build:watch": "tsc",
+ "lint:fix": "eslint --fix src",
+ "lint": "eslint src",
+ "format": "prettier --write src && eslint --fix src"
+ },
+ "devDependencies": {
+ "@anticrm/platform-rig": "~0.6.0",
+ "@types/heft-jest": "^1.0.2",
+ "@typescript-eslint/eslint-plugin": "^5.4.0",
+ "eslint-plugin-import": "^2.25.3",
+ "eslint-plugin-promise": "^5.1.1",
+ "eslint-plugin-node": "^11.1.0",
+ "eslint": "^7.32.0",
+ "@typescript-eslint/parser": "^5.4.0",
+ "eslint-config-standard-with-typescript": "^21.0.1",
+ "prettier": "^2.4.1",
+ "@rushstack/heft": "^0.41.1",
+ "typescript": "^4.3.5"
+ },
+ "dependencies": {
+ "@anticrm/platform": "~0.6.5",
+ "@anticrm/ui": "~0.6.0"
+ }
+}
diff --git a/plugins/image-cropper/src/index.ts b/plugins/image-cropper/src/index.ts
new file mode 100644
index 0000000000..b70c2167ea
--- /dev/null
+++ b/plugins/image-cropper/src/index.ts
@@ -0,0 +1,29 @@
+//
+// Copyright © 2020, 2021 Anticrm Platform Contributors.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { plugin } from '@anticrm/platform'
+import type { Plugin } from '@anticrm/platform'
+import type { AnyComponent } from '@anticrm/ui'
+
+/**
+ * @public
+ */
+export const imageCropperId = 'image-cropper' as Plugin
+
+export default plugin(imageCropperId, {
+ component: {
+ Cropper: '' as AnyComponent
+ }
+})
diff --git a/plugins/image-cropper/tsconfig.json b/plugins/image-cropper/tsconfig.json
new file mode 100644
index 0000000000..32045300ce
--- /dev/null
+++ b/plugins/image-cropper/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "./node_modules/@anticrm/platform-rig/profiles/default/tsconfig.json",
+
+ "compilerOptions": {
+ "rootDir": "./src",
+ "outDir": "./lib",
+ "lib": ["esnext", "dom"]
+ }
+}
\ No newline at end of file
diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte
index 3f91478468..3dac469a8a 100644
--- a/plugins/recruit-resources/src/components/CreateCandidate.svelte
+++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte
@@ -18,13 +18,12 @@
import contact, { combineName, Person } from '@anticrm/contact'
import type { Data, MixinData, Ref } from '@anticrm/core'
import { generateId } from '@anticrm/core'
- import { setPlatformStatus, unknownError } from '@anticrm/platform'
- import { Avatar, Card, Channels, getClient, PDFViewer } from '@anticrm/presentation'
+ import { getResource, setPlatformStatus, unknownError } from '@anticrm/platform'
+ import { EditableAvatar, Card, Channels, getClient, PDFViewer } from '@anticrm/presentation'
import type { Candidate } from '@anticrm/recruit'
import { CircleButton, EditBox, IconAdd, IconFile as FileIcon, Label, Link, showPopup, Spinner } from '@anticrm/ui'
import { createEventDispatcher } from 'svelte'
import recruit from '../plugin'
- import { uploadFile } from '../utils'
import FileUpload from './icons/FileUpload.svelte'
import YesNo from './YesNo.svelte'
@@ -50,10 +49,15 @@
const candidateId = generateId()
async function createCandidate () {
+ const uploadFile = await getResource(attachment.helper.UploadFile)
+ const avatarUUID = avatar !== undefined
+ ? await uploadFile(avatar)
+ : undefined
const candidate: Data = {
name: combineName(firstName, lastName),
city: object.city,
- channels: object.channels
+ channels: object.channels,
+ avatar: avatarUUID
}
const candidateData: MixinData = {
title: object.title,
@@ -86,7 +90,9 @@
async function createAttachment (file: File) {
loading = true
try {
- resume.uuid = await uploadFile(space, file, candidateId)
+ const uploadFile = await getResource(attachment.helper.UploadFile)
+
+ resume.uuid = await uploadFile(file, space, candidateId)
resume.name = file.name
resume.size = file.size
resume.type = file.type
@@ -111,6 +117,15 @@
const file = inputFile.files?.[0]
if (file !== undefined) { createAttachment(file) }
}
+
+ let avatar: File | undefined
+
+ function onAvatarDone (e: any) {
+ const { file } = e.detail
+
+ avatar = file
+ }
+
@@ -124,7 +139,7 @@
, file: File, attachedTo: Ref): Promise {
- console.log(file)
- const uploadUrl = getMetadata(login.metadata.UploadUrl)
-
- const data = new FormData()
- data.append('file', file)
-
- const url = `${uploadUrl}?space=${space}&name=${encodeURIComponent(file.name)}&attachedTo=${attachedTo}`
- const resp = await fetch(url, {
- method: 'POST',
- headers: {
- 'Authorization': 'Bearer ' + getMetadata(login.metadata.LoginToken)
- },
- body: data
- })
- if (resp.status !== 200) {
- throw new Error('Can\'t upload file.')
- }
- const uuid = await resp.text()
- console.log(uuid)
- return uuid
-}
diff --git a/rush.json b/rush.json
index f06c3451c5..4857fdb943 100644
--- a/rush.json
+++ b/rush.json
@@ -691,6 +691,16 @@
"projectFolder": "models/demo",
"shouldPublish": true
},
+ {
+ "packageName": "@anticrm/image-cropper",
+ "projectFolder": "plugins/image-cropper",
+ "shouldPublish": true
+ },
+ {
+ "packageName": "@anticrm/image-cropper-resources",
+ "projectFolder": "plugins/image-cropper-resources",
+ "shouldPublish": true
+ },
{
"packageName": "@anticrm/dev-server-chunter-resources",
"projectFolder": "dev/server-chunter-resources",
diff --git a/server/front/src/app.ts b/server/front/src/app.ts
index 404a039b08..4bfb4dbf35 100644
--- a/server/front/src/app.ts
+++ b/server/front/src/app.ts
@@ -159,9 +159,9 @@ export function start (config: { transactorEndpoint: string, elasticUrl: string,
const uuid = await minioUpload(config.minio, payload.workspace, file)
console.log('uploaded uuid', uuid)
- const name = req.query.name as string
- const space = req.query.space as Ref
- const attachedTo = req.query.attachedTo as Ref
+ const name = req.query.name as string | undefined
+ const space = req.query.space as Ref | undefined
+ const attachedTo = req.query.attachedTo as Ref | undefined
// const name = req.query.name as string
// await createAttachment(
@@ -175,20 +175,22 @@ export function start (config: { transactorEndpoint: string, elasticUrl: string,
// fileId
// )
- const elastic = await createElasticAdapter(config.elasticUrl, payload.workspace)
+ if (name !== undefined && space !== undefined && attachedTo !== undefined) {
+ const elastic = await createElasticAdapter(config.elasticUrl, payload.workspace)
- const indexedDoc: IndexedDoc = {
- id: generateId() + '/attachments/' + name as Ref,
- _class: attachment.class.Attachment,
- space,
- modifiedOn: Date.now(),
- modifiedBy: 'core:account:System' as Ref,
- attachedTo,
- data: file.data.toString('base64')
+ const indexedDoc: IndexedDoc = {
+ id: generateId() + '/attachments/' + name as Ref,
+ _class: attachment.class.Attachment,
+ space,
+ modifiedOn: Date.now(),
+ modifiedBy: 'core:account:System' as Ref,
+ attachedTo,
+ data: file.data.toString('base64')
+ }
+
+ await elastic.index(indexedDoc)
}
- await elastic.index(indexedDoc)
-
res.status(200).send(uuid)
} catch (error) {
console.log(error)
+ ![img]()
+ {#await init()}
+ Waiting...
+ {/await}
+
+
+
\ No newline at end of file
diff --git a/plugins/image-cropper-resources/src/index.ts b/plugins/image-cropper-resources/src/index.ts
new file mode 100644
index 0000000000..e995c43b7a
--- /dev/null
+++ b/plugins/image-cropper-resources/src/index.ts
@@ -0,0 +1,25 @@
+//
+// Copyright © 2020, 2021 Anticrm Platform Contributors.
+// Copyright © 2021 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Resources } from '@anticrm/platform'
+
+import Cropper from './components/Cropper.svelte'
+
+export default async (): Promise
-