Remove extra strings (#5603)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
2024-12-22 11:01:54 +03:00 · 2024-05-15 20:41:21 +05:00 · 2024-05-15 20:41:21 +05:00 · 167ad3378b
commit 167ad3378b
parent 2249425265
23 changed files with 58 additions and 43 deletions
--- a/plugins/contact-assets/lang/en.json
+++ b/plugins/contact-assets/lang/en.json
@ -56,7 +56,6 @@
    "TypeLabel": "Type",
    "StatusDueDateTooltip": "Until {date}",
    "CopyToClipboard": "Copy",
-    "Copied": "Copied",
    "ViewFullProfile": "View full profile",
    "Member": "Member",
    "Members": "Members",
--- a/plugins/contact-assets/lang/es.json
+++ b/plugins/contact-assets/lang/es.json
@ -56,7 +56,6 @@
    "TypeLabel": "Tipo",
    "StatusDueDateTooltip": "Hasta {date}",
    "CopyToClipboard": "Copiar",
-    "Copied": "Copiado",
    "ViewFullProfile": "Ver perfil completo",
    "Member": "Miembro",
    "Members": "Miembros",
--- a/plugins/contact-assets/lang/pt.json
+++ b/plugins/contact-assets/lang/pt.json
@ -56,7 +56,6 @@
    "TypeLabel": "Tipo",
    "StatusDueDateTooltip": "Até {date}",
    "CopyToClipboard": "Copiar",
-    "Copied": "Copiado",
    "ViewFullProfile": "Ver perfil completo",
    "Member": "Membro",
    "Members": "Membros",
--- a/plugins/contact-assets/lang/ru.json
+++ b/plugins/contact-assets/lang/ru.json
@ -56,7 +56,6 @@
    "TypeLabel": "Тип",
    "StatusDueDateTooltip": "До {date}",
    "CopyToClipboard": "Скопировать",
-    "Copied": "Скопировано",
    "ViewFullProfile": "Посмотреть профиль",
    "Member": "Сотрудник компании",
    "Members": "Участники",
--- a/plugins/contact-resources/src/components/ChannelEditor.svelte
+++ b/plugins/contact-resources/src/components/ChannelEditor.svelte
@ -55,7 +55,7 @@

  const copyChannel = (): void => {
    if (label === plugin.string.CopyToClipboard) {
-      copyTextToClipboard(value).then(() => (label = plugin.string.Copied))
+      copyTextToClipboard(value).then(() => (label = view.string.Copied))
      setTimeout(() => {
        label = plugin.string.CopyToClipboard
      }, 3000)
@ -98,7 +98,7 @@
 <FocusHandler manager={mgr} />
 {#if editable}
  <div class="editor-container {dir} buttons-group xsmall-gap">
-    <div class="cover-channel" class:show class:copied={label === plugin.string.Copied} data-tooltip={lTraslate}>
+    <div class="cover-channel" class:show class:copied={label === view.string.Copied} data-tooltip={lTraslate}>
      <input
        bind:this={input}
        class="search"
@ -179,7 +179,7 @@
    <span
      class="select-text cover-channel overflow-label with-tooltip"
      class:show
-      class:copied={label === plugin.string.Copied}
+      class:copied={label === view.string.Copied}
      class:cursor-pointer={openable}
      data-tooltip={lTraslate}
      on:click={() => {
--- 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,
--- 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"
  }
 }
--- 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"
  }
 }
--- 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"
  }
 }
--- a/plugins/guest-assets/lang/ru.json
+++ b/plugins/guest-assets/lang/ru.json
@ -5,7 +5,6 @@
    "Revoke": "Отозвать",
    "RevokeConfirmation": "Это приведет к тому, что ранее созданная ссылка перестанет работать. Вы уверены, что хотите отозвать эту публичную ссылку?",
    "LinkWasRevoked": "Ссылка была отозвана",
-    "Copy": "Копировать",
-    "Copied": "Скопировано"
+    "Copy": "Копировать"
  }
 }
--- a/plugins/guest-resources/src/components/CreatePublicLink.svelte
+++ b/plugins/guest-resources/src/components/CreatePublicLink.svelte
@ -116,7 +116,7 @@
      <Button label={guest.string.Revoke} kind={'dangerous'} size={'large'} on:click={revoke} />
    {/if}
    {#if link?.url !== undefined && link.url !== ''}
-      <Button label={copied ? guest.string.Copied : guest.string.Copy} size={'medium'} on:click={copy} />
+      <Button label={copied ? view.string.Copied : guest.string.Copy} size={'medium'} on:click={copy} />
    {/if}
  </svelte:fragment>
 </Card>
--- 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
  }
--- 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<void> {
    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
  }

--- 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
  }
 })

--- 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<string> {
+  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,
--- 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<Doc>, role?: AccountRole) => Promise<void>>,
+    GetInviteLink: '' as Resource<
+    (expHours: number, mask: string, limit: number | undefined, role: AccountRole) => Promise<string>
+    >,
    LeaveWorkspace: '' as Resource<(email: string) => Promise<void>>,
    ChangePassword: '' as Resource<(oldPassword: string, password: string) => Promise<void>>,
    SelectWorkspace: '' as Resource<(workspace: string) => Promise<[Status, WorkspaceLoginInfo | undefined]>>,
--- a/plugins/view-assets/assets/icons.svg
+++ b/plugins/view-assets/assets/icons.svg
@ -155,4 +155,8 @@
    <path fill-rule="evenodd" clip-rule="evenodd" d="M18 4C19.1046 4 20 4.89543 20 6V7C20 7.55228 20.4477 8 21 8C21.5523 8 22 7.55228 22 7V6C22 3.79086 20.2091 2 18 2H10C7.79086 2 6 3.79086 6 6V26C6 28.2091 7.79086 30 10 30H18C20.2091 30 22 28.2091 22 26V25C22 24.4477 21.5523 24 21 24C20.4477 24 20 24.4477 20 25V26C20 27.1046 19.1046 28 18 28H10C8.89543 28 8 27.1046 8 26V6C8 4.89543 8.89543 4 10 4H18Z" />
    <path d="M22.59 20.59L26.17 17H13C12.4477 17 12 16.5523 12 16C12 15.4477 12.4477 15 13 15H26.17L22.59 11.41L24 10L30 16L24 22L22.59 20.59Z" />
  </symbol>
+  <symbol id="copy" viewBox="0 0 16 16">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M5 3C5 1.89543 5.89543 1 7 1H12C13.1046 1 14 1.89543 14 3V10C14 11.1046 13.1046 12 12 12H7C5.89543 12 5 11.1046 5 10V3ZM7 2C6.44772 2 6 2.44772 6 3V10C6 10.5523 6.44772 11 7 11H12C12.5523 11 13 10.5523 13 10V3C13 2.44772 12.5523 2 12 2H7Z" />
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M4 5C3.44772 5 3 5.44772 3 6V13C3 13.5523 3.44772 14 4 14H9C9.55228 14 10 13.5523 10 13V12H11V13C11 14.1046 10.1046 15 9 15H4C2.89543 15 2 14.1046 2 13V6C2 4.89543 2.89543 4 4 4H5V5H4Z" />
+  </symbol>
 </svg>
--- 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"
  }
 }
--- 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"
  }
 }
--- 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"
  }
 }
--- a/plugins/view-assets/lang/ru.json
+++ b/plugins/view-assets/lang/ru.json
@ -120,6 +120,7 @@
    "Archived": "Архивированные",
    "MoreActions": "Больше действий",
    "Leave": "Покинуть",
-    "Join": "Присоединиться"
+    "Join": "Присоединиться",
+    "Copied": "Скопировано"
  }
 }
--- 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`
 })
--- 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<ActionCategory>,