From db269b326f182298c059a47e13ed05f9218faa64 Mon Sep 17 00:00:00 2001 From: Eduard Aksamitov Date: Thu, 14 Mar 2024 14:02:45 +0300 Subject: [PATCH 1/2] fix: missed `login` assets Signed-off-by: Eduard Aksamitov --- plugins/login-assets/src/index.ts | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/plugins/login-assets/src/index.ts b/plugins/login-assets/src/index.ts index c3af9c5b916..6f508629751 100644 --- a/plugins/login-assets/src/index.ts +++ b/plugins/login-assets/src/index.ts @@ -1,23 +1,23 @@ -// // -// // 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. -// // +// +// 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 login from '@hcengineering/login' -// import { loadMetadata } from '@hcengineering/platform' +import login from '@hcengineering/login' +import { loadMetadata } from '@hcengineering/platform' -// const icons = require('../assets/icons.svg') as string // eslint-disable-line -// loadMetadata(login.icon, { -// InviteWorkspace: `${icons}#inviteWorkspace` -// }) +const icons = require('../assets/icons.svg') as string // eslint-disable-line +loadMetadata(login.icon, { + InviteWorkspace: `${icons}#inviteWorkspace` +}) From 8edf658d1031304407a0b3d9aaf39947b698ecfe Mon Sep 17 00:00:00 2001 From: Eduard Aksamitov Date: Thu, 14 Mar 2024 20:00:52 +0300 Subject: [PATCH 2/2] chore: move invite icon from `login` to `setting` plugin Signed-off-by: Eduard Aksamitov --- plugins/login-assets/assets/icons.svg | 7 ------- plugins/login-assets/src/index.ts | 8 -------- plugins/setting-assets/assets/icons.svg | 5 +++++ plugins/setting-assets/src/index.ts | 3 ++- plugins/setting-resources/src/components/Settings.svelte | 2 +- plugins/setting/src/index.ts | 3 ++- .../src/components/AccountPopup.svelte | 2 +- 7 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 plugins/login-assets/assets/icons.svg diff --git a/plugins/login-assets/assets/icons.svg b/plugins/login-assets/assets/icons.svg deleted file mode 100644 index 0701404f395..00000000000 --- a/plugins/login-assets/assets/icons.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/plugins/login-assets/src/index.ts b/plugins/login-assets/src/index.ts index 6f508629751..dd71a1868f0 100644 --- a/plugins/login-assets/src/index.ts +++ b/plugins/login-assets/src/index.ts @@ -13,11 +13,3 @@ // See the License for the specific language governing permissions and // limitations under the License. // - -import login from '@hcengineering/login' -import { loadMetadata } from '@hcengineering/platform' - -const icons = require('../assets/icons.svg') as string // eslint-disable-line -loadMetadata(login.icon, { - InviteWorkspace: `${icons}#inviteWorkspace` -}) diff --git a/plugins/setting-assets/assets/icons.svg b/plugins/setting-assets/assets/icons.svg index 66009eab079..9b9e5d43296 100644 --- a/plugins/setting-assets/assets/icons.svg +++ b/plugins/setting-assets/assets/icons.svg @@ -56,4 +56,9 @@ + + + + + diff --git a/plugins/setting-assets/src/index.ts b/plugins/setting-assets/src/index.ts index e9c921d4d36..bf1da8ade5b 100644 --- a/plugins/setting-assets/src/index.ts +++ b/plugins/setting-assets/src/index.ts @@ -30,5 +30,6 @@ loadMetadata(setting.icon, { SelectWorkspace: `${icons}#selectWorkspace`, Clazz: `${icons}#clazz`, Enums: `${icons}#enums`, - InviteSettings: `${icons}#inviteSettings` + InviteSettings: `${icons}#inviteSettings`, + InviteWorkspace: `${icons}#inviteWorkspace` }) diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte index e5e4049082f..5bb264864e1 100644 --- a/plugins/setting-resources/src/components/Settings.svelte +++ b/plugins/setting-resources/src/components/Settings.svelte @@ -168,7 +168,7 @@ on:click={selectWorkspace} /> diff --git a/plugins/setting/src/index.ts b/plugins/setting/src/index.ts index 472d5988433..9575f211989 100644 --- a/plugins/setting/src/index.ts +++ b/plugins/setting/src/index.ts @@ -200,7 +200,8 @@ export default plugin(settingId, { SelectWorkspace: '' as Asset, Clazz: '' as Asset, Enums: '' as Asset, - InviteSettings: '' as Asset + InviteSettings: '' as Asset, + InviteWorkspace: '' as Asset }, templateFieldCategory: { Integration: '' as Ref diff --git a/plugins/workbench-resources/src/components/AccountPopup.svelte b/plugins/workbench-resources/src/components/AccountPopup.svelte index cb5db5e4c0e..f68577b2076 100644 --- a/plugins/workbench-resources/src/components/AccountPopup.svelte +++ b/plugins/workbench-resources/src/components/AccountPopup.svelte @@ -133,7 +133,7 @@ actions.push( ...getMenu(items, ['main']), { - icon: login.icon.InviteWorkspace, + icon: setting.icon.InviteWorkspace, label: setting.string.InviteWorkspace, action: async () => { inviteWorkspace()