{
diff --git a/plugins/contact-resources/src/plugin.ts b/plugins/contact-resources/src/plugin.ts
index 134723e859..4d42312665 100644
--- a/plugins/contact-resources/src/plugin.ts
+++ b/plugins/contact-resources/src/plugin.ts
@@ -49,7 +49,6 @@ export default mergeIds(contactId, contact, {
NoExpire: '' as IntlString,
StatusDueDateTooltip: '' as IntlString,
CopyToClipboard: '' as IntlString,
- Copied: '' as IntlString,
ViewFullProfile: '' as IntlString,
Member: '' as IntlString,
Members: '' as IntlString,
diff --git a/plugins/guest-assets/lang/en.json b/plugins/guest-assets/lang/en.json
index 4af58917be..892c7bac0b 100644
--- a/plugins/guest-assets/lang/en.json
+++ b/plugins/guest-assets/lang/en.json
@@ -5,7 +5,6 @@
"Revoke": "Revoke",
"RevokeConfirmation": "This will cause previously shared link to stop working. Are you sure you want to revoke this public link?",
"LinkWasRevoked": "Public link was revoked",
- "Copy": "Copy",
- "Copied": "Copied"
+ "Copy": "Copy"
}
}
diff --git a/plugins/guest-assets/lang/es.json b/plugins/guest-assets/lang/es.json
index 10855c5b7c..bc7db79273 100644
--- a/plugins/guest-assets/lang/es.json
+++ b/plugins/guest-assets/lang/es.json
@@ -5,7 +5,6 @@
"Revoke": "Revocar",
"RevokeConfirmation": "¿Está seguro de que desea revocar este enlace público? Esto hará que el enlace compartido anteriormente deje de funcionar.",
"LinkWasRevoked": "Enlace público revocado",
- "Copy": "Copiar",
- "Copied": "Copiado"
+ "Copy": "Copiar"
}
}
\ No newline at end of file
diff --git a/plugins/guest-assets/lang/pt.json b/plugins/guest-assets/lang/pt.json
index 681f709b89..1db58c7f13 100644
--- a/plugins/guest-assets/lang/pt.json
+++ b/plugins/guest-assets/lang/pt.json
@@ -5,7 +5,6 @@
"Revoke": "Revogar",
"RevokeConfirmation": "Isto fará com que o link compartilhado anteriormente pare de funcionar. Tem certeza de que deseja revogar este link público?",
"LinkWasRevoked": "Link público revogado",
- "Copy": "Copiar",
- "Copied": "Copiado"
+ "Copy": "Copiar"
}
}
\ No newline at end of file
diff --git a/plugins/guest-assets/lang/ru.json b/plugins/guest-assets/lang/ru.json
index ad4001724d..9c4de2fbfa 100644
--- a/plugins/guest-assets/lang/ru.json
+++ b/plugins/guest-assets/lang/ru.json
@@ -5,7 +5,6 @@
"Revoke": "Отозвать",
"RevokeConfirmation": "Это приведет к тому, что ранее созданная ссылка перестанет работать. Вы уверены, что хотите отозвать эту публичную ссылку?",
"LinkWasRevoked": "Ссылка была отозвана",
- "Copy": "Копировать",
- "Copied": "Скопировано"
+ "Copy": "Копировать"
}
}
diff --git a/plugins/guest-resources/src/components/CreatePublicLink.svelte b/plugins/guest-resources/src/components/CreatePublicLink.svelte
index 9abaeb0539..1107b1cf26 100644
--- a/plugins/guest-resources/src/components/CreatePublicLink.svelte
+++ b/plugins/guest-resources/src/components/CreatePublicLink.svelte
@@ -116,7 +116,7 @@
{/if}
{#if link?.url !== undefined && link.url !== ''}
-
+
{/if}
diff --git a/plugins/guest-resources/src/plugin.ts b/plugins/guest-resources/src/plugin.ts
index 648ab24fc3..b7f438ef22 100644
--- a/plugins/guest-resources/src/plugin.ts
+++ b/plugins/guest-resources/src/plugin.ts
@@ -7,7 +7,6 @@ export default mergeIds(guestId, guest, {
PublicLink: '' as IntlString,
Revoke: '' as IntlString,
Copy: '' as IntlString,
- Copied: '' as IntlString,
RevokeConfirmation: '' as IntlString,
LinkWasRevoked: '' as IntlString
}
diff --git a/plugins/login-resources/src/components/InviteLink.svelte b/plugins/login-resources/src/components/InviteLink.svelte
index 01fdebedd5..2f8e18dcdb 100644
--- a/plugins/login-resources/src/components/InviteLink.svelte
+++ b/plugins/login-resources/src/components/InviteLink.svelte
@@ -73,21 +73,7 @@
async function getLink (expHours: number, mask: string, limit: number | undefined, role: AccountRole): Promise
{
loading = true
- const inviteId = await getInviteLink(expHours, mask, limit, role)
- const loc = getCurrentLocation()
- loc.path[0] = loginId
- loc.path[1] = 'join'
- loc.path.length = 2
- loc.query = {
- inviteId
- }
- loc.fragment = undefined
-
- const url = locationToUrl(loc)
-
- const frontUrl = getMetadata(presentation.metadata.FrontUrl)
- const host = frontUrl ?? document.location.origin
- link = host + url
+ link = await getInviteLink(expHours, mask, limit ?? -1, role)
loading = false
}
diff --git a/plugins/login-resources/src/index.ts b/plugins/login-resources/src/index.ts
index de0e3ed8a9..4a461341c1 100644
--- a/plugins/login-resources/src/index.ts
+++ b/plugins/login-resources/src/index.ts
@@ -25,7 +25,8 @@ import {
sendInvite,
getEnpoint,
fetchWorkspace,
- createMissingEmployee
+ createMissingEmployee,
+ getInviteLink
} from './utils'
/*!
* Anticrm Platform™ Login Plugin
@@ -47,7 +48,8 @@ export default async () => ({
CreateEmployee: createMissingEmployee,
GetWorkspaces: getWorkspaces,
SendInvite: sendInvite,
- GetEndpoint: getEnpoint
+ GetEndpoint: getEnpoint,
+ GetInviteLink: getInviteLink
}
})
diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts
index 0f531a72b6..abadb05641 100644
--- a/plugins/login-resources/src/utils.ts
+++ b/plugins/login-resources/src/utils.ts
@@ -15,7 +15,7 @@
import { Analytics } from '@hcengineering/analytics'
import { AccountRole, type Doc, type Ref, concatLink } from '@hcengineering/core'
-import login, { type LoginInfo, type Workspace, type WorkspaceLoginInfo } from '@hcengineering/login'
+import login, { loginId, type LoginInfo, type Workspace, type WorkspaceLoginInfo } from '@hcengineering/login'
import {
OK,
PlatformError,
@@ -527,6 +527,29 @@ export async function checkJoined (inviteId: string): Promise<[Status, Workspace
}
export async function getInviteLink (
+ expHours: number,
+ mask: string,
+ limit: number | undefined,
+ role: AccountRole
+): Promise {
+ const inviteId = await getInviteLinkId(expHours, mask, limit ?? -1, role)
+ const loc = getCurrentLocation()
+ loc.path[0] = loginId
+ loc.path[1] = 'join'
+ loc.path.length = 2
+ loc.query = {
+ inviteId
+ }
+ loc.fragment = undefined
+
+ const url = locationToUrl(loc)
+
+ const frontUrl = getMetadata(presentation.metadata.FrontUrl)
+ const host = frontUrl ?? document.location.origin
+ return concatLink(host, url)
+}
+
+export async function getInviteLinkId (
expHours: number,
emailMask: string,
limit: number,
diff --git a/plugins/login/src/index.ts b/plugins/login/src/index.ts
index f9c4644ae8..11aa625020 100644
--- a/plugins/login/src/index.ts
+++ b/plugins/login/src/index.ts
@@ -79,6 +79,9 @@ export default plugin(loginId, {
},
function: {
SendInvite: '' as Resource<(email: string, personId?: Ref, role?: AccountRole) => Promise>,
+ GetInviteLink: '' as Resource<
+ (expHours: number, mask: string, limit: number | undefined, role: AccountRole) => Promise
+ >,
LeaveWorkspace: '' as Resource<(email: string) => Promise>,
ChangePassword: '' as Resource<(oldPassword: string, password: string) => Promise>,
SelectWorkspace: '' as Resource<(workspace: string) => Promise<[Status, WorkspaceLoginInfo | undefined]>>,
diff --git a/plugins/view-assets/assets/icons.svg b/plugins/view-assets/assets/icons.svg
index e601db4e8e..37e8ffedfc 100644
--- a/plugins/view-assets/assets/icons.svg
+++ b/plugins/view-assets/assets/icons.svg
@@ -155,4 +155,8 @@
+
+
+
+
diff --git a/plugins/view-assets/lang/en.json b/plugins/view-assets/lang/en.json
index e5e3fb253d..bf93bf6978 100644
--- a/plugins/view-assets/lang/en.json
+++ b/plugins/view-assets/lang/en.json
@@ -123,6 +123,7 @@
"Archived": "Archived",
"MoreActions": "More actions",
"Leave": "Leave",
- "Join": "Join"
+ "Join": "Join",
+ "Copied": "Copied"
}
}
diff --git a/plugins/view-assets/lang/es.json b/plugins/view-assets/lang/es.json
index f11d416886..52aabe52f6 100644
--- a/plugins/view-assets/lang/es.json
+++ b/plugins/view-assets/lang/es.json
@@ -116,6 +116,7 @@
"Pin": "Fijar",
"Unpin": "Desfijar",
"Leave": "Salir",
- "Join": "Unirse"
+ "Join": "Unirse",
+ "Copied": "Copiado"
}
}
\ No newline at end of file
diff --git a/plugins/view-assets/lang/pt.json b/plugins/view-assets/lang/pt.json
index 670d351676..ac2213b8c6 100644
--- a/plugins/view-assets/lang/pt.json
+++ b/plugins/view-assets/lang/pt.json
@@ -116,6 +116,7 @@
"Pin": "Fixar",
"Unpin": "Desafixar",
"Leave": "Sair",
- "Join": "Ingressar"
+ "Join": "Ingressar",
+ "Copied": "Copiado"
}
}
\ No newline at end of file
diff --git a/plugins/view-assets/lang/ru.json b/plugins/view-assets/lang/ru.json
index 99f004897d..ccbf7ea272 100644
--- a/plugins/view-assets/lang/ru.json
+++ b/plugins/view-assets/lang/ru.json
@@ -120,6 +120,7 @@
"Archived": "Архивированные",
"MoreActions": "Больше действий",
"Leave": "Покинуть",
- "Join": "Присоединиться"
+ "Join": "Присоединиться",
+ "Copied": "Скопировано"
}
}
diff --git a/plugins/view-assets/src/index.ts b/plugins/view-assets/src/index.ts
index f6688c23f7..de6c0f503f 100644
--- a/plugins/view-assets/src/index.ts
+++ b/plugins/view-assets/src/index.ts
@@ -53,5 +53,6 @@ loadMetadata(view.icon, {
SeparatorLine: `${icons}#separator-line`,
Circle: `${icons}#circle`,
Join: `${icons}#join`,
- Leave: `${icons}#leave`
+ Leave: `${icons}#leave`,
+ Copy: `${icons}#copy`
})
diff --git a/plugins/view/src/index.ts b/plugins/view/src/index.ts
index fbe214f92f..0a552fc012 100644
--- a/plugins/view/src/index.ts
+++ b/plugins/view/src/index.ts
@@ -205,7 +205,8 @@ const view = plugin(viewId, {
Pin: '' as IntlString,
Unpin: '' as IntlString,
Join: '' as IntlString,
- Leave: '' as IntlString
+ Leave: '' as IntlString,
+ Copied: '' as IntlString
},
icon: {
Table: '' as Asset,
@@ -243,7 +244,8 @@ const view = plugin(viewId, {
SeparatorLine: '' as Asset,
Circle: '' as Asset,
Join: '' as Asset,
- Leave: '' as Asset
+ Leave: '' as Asset,
+ Copy: '' as Asset
},
category: {
General: '' as Ref,