UBERF-5870: Fix cache control and some minor enhancements (hcengineer…

…ing#4869) UBERF-5870: Fix cache control and some minor enhancements Signed-off-by: Andrey Sobolev <haiodo@gmail.com> Signed-off-by: Tiago Cruz <tcruz@netic.io>
tjaoc · Mar 5, 2024 · c29dd03 · c29dd03
1 parent 66b52fa
commit c29dd03
Show file tree

Hide file tree

Showing 14 changed files with 293 additions and 115 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
@@ -539,7 +539,12 @@ export function isCollectionAttr (hierarchy: Hierarchy, key: KeyedAttribute): bo
  * @public
  */
 export function decodeTokenPayload (token: string): any {
-  return JSON.parse(atob(token.split('.')[1]))
+  try {
+    return JSON.parse(atob(token.split('.')[1]))
+  } catch (err: any) {
+    console.error(err)
+    return {}
+  }
 }
 
 export function isAdminUser (): boolean {

diff --git a/plugins/login-resources/src/components/SelectWorkspace.svelte b/plugins/login-resources/src/components/SelectWorkspace.svelte
@@ -16,8 +16,15 @@
 <script lang="ts">
   import { LoginInfo, Workspace } from '@hcengineering/login'
   import { OK, Severity, Status } from '@hcengineering/platform'
-  import presentation, { NavLink } from '@hcengineering/presentation'
-  import { Button, Label, Scroller, deviceOptionsStore as deviceInfo, setMetadataLocalStorage } from '@hcengineering/ui'
+  import presentation, { NavLink, isAdminUser } from '@hcengineering/presentation'
+  import {
+    Button,
+    Label,
+    Scroller,
+    SearchEdit,
+    deviceOptionsStore as deviceInfo,
+    setMetadataLocalStorage
+  } from '@hcengineering/ui'
   import { onMount } from 'svelte'
   import login from '../plugin'
   import { getAccount, getHref, getWorkspaces, goTo, navigateToWorkspace, selectWorkspace } from '../utils'
@@ -84,6 +91,9 @@
       throw err
     }
   }
+  $: isAdmin = isAdminUser()
+
+  let search: string = ''
 </script>
 
 <form class="container" style:padding={$deviceInfo.docWidth <= 480 ? '1.25rem' : '5rem'}>
@@ -95,16 +105,32 @@
   <div class="status">
     <StatusControl {status} />
   </div>
+  {#if isAdmin}
+    <div class="ml-2 mr-2 mb-2 flex-grow">
+      <SearchEdit bind:value={search} width={'100%'} />
+    </div>
+  {/if}
   {#await _getWorkspaces() then}
     <Scroller padding={'.125rem 0'}>
       <div class="form">
-        {#each workspaces as workspace}
+        {#each workspaces.filter((it) => search === '' || (it.workspaceName?.includes(search) ?? false) || it.workspace.includes(search)) as workspace}
+          {@const wsName = workspace.workspaceName ?? workspace.workspace}
           <!-- svelte-ignore a11y-click-events-have-key-events -->
+          <!-- svelte-ignore a11y-no-static-element-interactions -->
           <div
             class="workspace flex-center fs-title cursor-pointer focused-button bordered form-row"
             on:click={() => select(workspace.workspace)}
           >
-            {workspace.workspaceName ?? workspace.workspace}
+            <div class="flex flex-col flex-grow">
+              <span class="label overflow-label flex-center">
+                {wsName}
+              </span>
+              {#if isAdmin && wsName !== workspace.workspace}
+                <span class="text-xs flex-center">
+                  {workspace.workspace}
+                </span>
+              {/if}
+            </div>
           </div>
         {/each}
         {#if workspaces.length === 0 && account?.confirmed === true}

diff --git a/plugins/login-resources/src/utils.ts b/plugins/login-resources/src/utils.ts
@@ -203,7 +203,8 @@ export async function getWorkspaces (): Promise<Workspace[]> {
     if (endpoint !== undefined) {
       return [
         {
-          workspace: DEV_WORKSPACE
+          workspace: DEV_WORKSPACE,
+          workspaceId: DEV_WORKSPACE
         }
       ]
     }

diff --git a/plugins/login/src/index.ts b/plugins/login/src/index.ts
@@ -26,8 +26,9 @@ export const loginId = 'login' as Plugin
  * @public
  */
 export interface Workspace {
-  workspace: string //
+  workspace: string // workspace Url
   workspaceName?: string // A company name
+  workspaceId: string // A unique identifier for the workspace
 }
 
 /**