Merge pull request #11510 from richard-cox/fix-pag-label-select

Paginated Label Select Fixes
rancher · Jul 23, 2024 · e108b95 · e108b95
2 parents 9171bfe + 08f05e2
commit e108b95
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
@@ -126,11 +126,17 @@ export default defineComponent({
 
   computed: {
     labelSelectAttributes() {
+      // This component is a wrapper for LabelSelect, so pass through everything
+      const allAttrs = {
+        ...this.$attrs, // Attributes (other than props)
+        ...this.$props, // Attributes that are props
+      };
+
       return this.paginate ? {
-        ...this.$attrs,
+        ...allAttrs,
         ...this.paginatedResourceSettings?.labelSelectOptions || {}
       } : {
-        ...this.$attrs,
+        ...allAttrs,
         ...this.allResourcesSettings?.labelSelectOptions || {}
       };
     },
@@ -156,7 +162,9 @@ export default defineComponent({
       }
 
       const { filter } = opts;
-      const filters = !!filter ? [PaginationParamFilter.createSingleField({ field: 'metadata.name', value: filter })] : [];
+      const filters = !!filter ? [PaginationParamFilter.createSingleField({
+        field: 'metadata.name', value: filter, exact: false
+      })] : [];
       const defaultOptions: LabelSelectPaginationFunctionOptions = {
         opts,
         filters,

diff --git a/shell/components/form/labeled-select-utils/labeled-select.utils.ts b/shell/components/form/labeled-select-utils/labeled-select.utils.ts
@@ -109,7 +109,7 @@ export async function labelSelectPaginationFunction<T>({
 
     return {
       page:  resPage,
-      pages: res.pages,
+      pages: res.pages || Math.ceil(res.count / (pageSize || Number.MAX_SAFE_INTEGER)),
       total: res.count
     };
   } catch (err) {

diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
@@ -419,7 +419,7 @@ export default {
         },
         result: {
           count:     out.count,
-          pages:     out.pages,
+          pages:     out.pages || Math.ceil(out.count / (opt.pagination.pageSize || Number.MAX_SAFE_INTEGER)),
           timestamp: new Date().getTime()
         }
       } : undefined,

diff --git a/shell/types/store/pagination.types.ts b/shell/types/store/pagination.types.ts
@@ -227,7 +227,7 @@ export class PaginationParamFilter extends PaginationParam {
   /**
    * Convenience method when you just want an instance of {@link PaginationParamFilter} with a simple `filter=x=y` param
    */
-  static createSingleField(field: { field?: string; value: string; equals?: boolean; }): PaginationParam {
+  static createSingleField(field: { field?: string; value: string; equals?: boolean; exact?: boolean }): PaginationParam {
     return new PaginationParamFilter({ fields: [new PaginationFilterField(field)] });
   }