UBER-500: Confusing Show More button in table (#3590)

Signed-off-by: Maxim Karmatskikh <mkarmatskih@gmail.com>
hcengineering · Aug 15, 2023 · 85d1a95 · 85d1a95
1 parent 18f328e
commit 85d1a95
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/plugins/document-resources/src/components/Documents.svelte b/plugins/document-resources/src/components/Documents.svelte
@@ -80,6 +80,7 @@
       config={preference?.config ?? viewlet.config}
       options={viewlet.options}
       query={resultQuery}
+      totalQuery={query}
       showNotification
     />
   {/if}

diff --git a/plugins/lead-resources/src/components/MyLeads.svelte b/plugins/lead-resources/src/components/MyLeads.svelte
@@ -131,6 +131,7 @@
       config={preference?.config ?? viewlet.config}
       options={viewlet.options}
       query={resultQuery}
+      totalQuery={baseQuery}
       showNotification
     />
   {/if}

diff --git a/plugins/recruit-resources/src/components/Organizations.svelte b/plugins/recruit-resources/src/components/Organizations.svelte
@@ -244,6 +244,7 @@
       query={{
         ...resultQuery
       }}
+      totalQuery={{}}
       showNotification
     />
   {/if}

diff --git a/plugins/recruit-resources/src/components/Vacancies.svelte b/plugins/recruit-resources/src/components/Vacancies.svelte
@@ -189,6 +189,7 @@
       ...resultQuery,
       archived
     }}
+    totalQuery={{}}
     showNotification
   />
 {/if}
diff --git a/plugins/view-resources/src/components/Table.svelte b/plugins/view-resources/src/components/Table.svelte
@@ -384,15 +384,21 @@
       <span class="select-text">
         <Label label={view.string.Total} params={{ total: gtotal }} />
       </span>
-      {#if objects.length > 0 && objects.length < gtotal}
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
+
+      {#if objects.length > 0 && (total !== gtotal || objects.length < total)}
         <span class="select-text ml-2">
           <Label
             label={view.string.Shown}
-            params={{ total: objects.length === total ? -1 : total, len: objects.length }}
+            params={{
+              total: objects.length === total || total === gtotal ? -1 : total,
+              len: objects.length
+            }}
           />
         </span>
+      {/if}
 
+      {#if objects.length > 0 && objects.length < total}
+        <!-- svelte-ignore a11y-click-events-have-key-events -->
         <Button
           label={ui.string.ShowMore}
           kind={'ghost'}