@vendure/admin-ui 3.1.0-next.2 → 3.1.0-next.4

package/catalog/components/collection-data-table/collection-data-table.component.d.ts

@@ -1,6 +1,6 @@
-import { CdkDrag, CdkDragDrop, CdkDropList, DragDrop, DragRef } from '@angular/cdk/drag-drop';
+import { CdkDrag, CdkDragDrop, CdkDropList, DragRef } from '@angular/cdk/drag-drop';
 import { AfterViewInit, ChangeDetectorRef, EventEmitter, OnChanges, QueryList, SimpleChanges } from '@angular/core';
-import { DataService, DataTable2Component, GetCollectionListQuery, ItemOf, LocalStorageService } from '@vendure/admin-ui/core';
+import { DataService, DataTable2Component, GetCollectionListQuery, ItemOf } from '@vendure/admin-ui/core';
 import * as i0 from "@angular/core";
 export type CollectionTableItem = ItemOf<GetCollectionListQuery, 'collections'>;
 export type CollectionOrderEvent = {
@@ -10,9 +10,7 @@ export type CollectionOrderEvent = {
 };
 export declare class CollectionDataTableComponent extends DataTable2Component<CollectionTableItem> implements OnChanges, AfterViewInit {
     protected changeDetectorRef: ChangeDetectorRef;
-    protected localStorageService: LocalStorageService;
     protected dataService: DataService;
-    private dragDrop;
     subCollections: CollectionTableItem[];
     changeOrder: EventEmitter<CollectionOrderEvent>;
     dropList: CdkDropList<{
@@ -24,7 +22,7 @@ export declare class CollectionDataTableComponent extends DataTable2Component<Co
     absoluteIndex: {
         [id: string]: number;
     };
-    constructor(changeDetectorRef: ChangeDetectorRef, localStorageService: LocalStorageService, dataService: DataService, dragDrop: DragDrop);
+    constructor(changeDetectorRef: ChangeDetectorRef, dataService: DataService);
     ngOnChanges(changes: SimpleChanges): void;
     ngAfterViewInit(): void;
     getSubcollections(item: CollectionTableItem): {

package/catalog/components/collection-detail/collection-detail.component.d.ts

@@ -21,7 +21,7 @@ export declare class CollectionDetailComponent extends TypedBaseDetailComponent<
         inheritFilters: import("@angular/forms").FormControl<boolean | null>;
         filters: import("@angular/forms").FormArray<import("@angular/forms").FormControl<unknown>>;
         customFields: import("@angular/forms").FormGroup<{
-            [x: string]: import("@angular/forms").FormControl<false | "" | 0 | Date | null>;
+            [x: string]: import("@angular/forms").FormControl<{} | null>;
         }>;
     }>;
     assetChanges: {

package/catalog/components/collection-list/collection-list.component.d.ts

@@ -11,6 +11,7 @@ export declare class CollectionListComponent extends TypedBaseListComponent<type
     activeCollectionTitle$: Observable<string>;
     subCollections$: Observable<Array<ItemOf<GetCollectionListQuery, 'collections'>>>;
     expandedIds: string[];
+    dataTableListId: string;
     readonly customFields: import("@vendure/admin-ui/core").CustomFieldConfig[];
     readonly filters: import("@vendure/admin-ui/core").DataTableFilterCollection<import("@vendure/admin-ui/core").CollectionFilterParameter>;
     readonly sorts: import("@vendure/admin-ui/core").DataTableSortCollection<import("@vendure/admin-ui/core").CollectionSortParameter, ["createdAt", "updatedAt", "name", "slug", "position"]>;

package/catalog/components/facet-detail/facet-detail.component.d.ts

@@ -23,7 +23,7 @@ export declare class FacetDetailComponent extends TypedBaseDetailComponent<typeo
             name: FormControl<string | null>;
             visible: FormControl<boolean | null>;
             customFields: FormGroup<{
-                [x: string]: FormControl<false | "" | 0 | Date | null>;
+                [x: string]: FormControl<{} | null>;
             }>;
         }>;
         values: FormGroup<{

package/catalog/components/facet-list/facet-list.component.d.ts

@@ -8,6 +8,7 @@ export declare class FacetListComponent extends TypedBaseListComponent<typeof Ge
     displayLimit: {
         [id: string]: number;
     };
+    dataTableListId: string;
     readonly customFields: import("@vendure/admin-ui/core").CustomFieldConfig[];
     readonly filters: import("@vendure/admin-ui/core").DataTableFilterCollection<import("@vendure/admin-ui/core").FacetFilterParameter>;
     readonly sorts: import("@vendure/admin-ui/core").DataTableSortCollection<import("@vendure/admin-ui/core").FacetSortParameter, ["id", "createdAt", "updatedAt", "name", "code"]>;

package/catalog/components/product-detail/product-detail.component.d.ts

@@ -26,7 +26,7 @@ export declare class ProductDetailComponent extends TypedBaseDetailComponent<typ
         description: import("@angular/forms").FormControl<string | null>;
         facetValueIds: import("@angular/forms").FormControl<string[] | null>;
         customFields: import("@angular/forms").FormGroup<{
-            [x: string]: import("@angular/forms").FormControl<false | "" | 0 | Date | null>;
+            [x: string]: import("@angular/forms").FormControl<{} | null>;
         }>;
     }>;
     assetChanges: SelectedAssets;

package/catalog/components/product-list/product-list.component.d.ts

@@ -7,9 +7,11 @@ export declare class ProductListComponent extends TypedBaseListComponent<typeof
     private notificationService;
     private jobQueueService;
     pendingSearchIndexUpdates: number;
+    dataTableListId: string;
+    pageLocationId: string;
     readonly customFields: import("@vendure/admin-ui/core").CustomFieldConfig[];
     readonly filters: import("@vendure/admin-ui/core").DataTableFilterCollection<import("@vendure/admin-ui/core").ProductFilterParameter>;
-    readonly sorts: import("@vendure/admin-ui/core").DataTableSortCollection<import("@vendure/admin-ui/core").ProductSortParameter, ["name" | "slug" | "id" | "createdAt" | "updatedAt"]>;
+    readonly sorts: import("@vendure/admin-ui/core").DataTableSortCollection<import("@vendure/admin-ui/core").ProductSortParameter, ["name" | "id" | "createdAt" | "updatedAt" | "slug"]>;
     constructor(dataService: DataService, modalService: ModalService, notificationService: NotificationService, jobQueueService: JobQueueService);
     rebuildSearchIndex(): void;
     deleteProduct(productId: string): void;

package/catalog/components/product-variant-list/product-variant-list.component.d.ts

@@ -7,7 +7,7 @@ export declare class ProductVariantListComponent extends TypedBaseListComponent<
     dataTableId: DataTableLocationId | undefined;
     readonly customFields: import("@vendure/admin-ui/core").CustomFieldConfig[];
     readonly filters: import("@vendure/admin-ui/core").DataTableFilterCollection<ProductVariantFilterParameter>;
-    readonly sorts: import("@vendure/admin-ui/core").DataTableSortCollection<import("@vendure/admin-ui/core").ProductVariantSortParameter, ["name" | "id" | "createdAt" | "updatedAt" | "price" | "sku" | "priceWithTax"]>;
+    readonly sorts: import("@vendure/admin-ui/core").DataTableSortCollection<import("@vendure/admin-ui/core").ProductVariantSortParameter, ["name" | "price" | "sku" | "id" | "createdAt" | "updatedAt" | "priceWithTax"]>;
     constructor();
     static ɵfac: i0.ɵɵFactoryDeclaration<ProductVariantListComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ProductVariantListComponent, "vdr-product-variant-list", never, { "productId": { "alias": "productId"; "required": false; }; "hideLanguageSelect": { "alias": "hideLanguageSelect"; "required": false; }; "dataTableId": { "alias": "dataTableId"; "required": false; }; }, {}, never, never, false, never>;

package/core/common/base-list.component.d.ts

@@ -6,9 +6,12 @@ import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { DataService } from '../data/providers/data.service';
 import { QueryResult } from '../data/query-result';
 import { ServerConfigService } from '../data/server-config';
+import { DataTableConfigService } from '../providers/data-table/data-table-config.service';
 import { DataTableFilterCollection } from '../providers/data-table/data-table-filter-collection';
 import { DataTableSortCollection } from '../providers/data-table/data-table-sort-collection';
 import { PermissionsService } from '../providers/permissions/permissions.service';
+import { DataTable2ColumnComponent } from '../shared/components/data-table-2/data-table-column.component';
+import { DataTableCustomFieldColumnComponent } from '../shared/components/data-table-2/data-table-custom-field-column.component';
 import { CustomFieldConfig, CustomFields, LanguageCode } from './generated-types';
 import { SelectionManager } from './utilities/selection-manager';
 import * as i0 from "@angular/core";
@@ -51,6 +54,7 @@ export declare class BaseListComponent<ResultType, ItemType, VariableType extend
     private onPageChangeFn;
     protected refresh$: BehaviorSubject<undefined>;
     private defaults;
+    protected visibleCustomFieldColumnChange$: Subject<DataTableCustomFieldColumnComponent<any>[]>;
     constructor(router: Router, route: ActivatedRoute);
     /**
      * @description
@@ -79,6 +83,7 @@ export declare class BaseListComponent<ResultType, ItemType, VariableType extend
      * Sets the number of items per page in the url.
      */
     setItemsPerPage(perPage: number): void;
+    setVisibleColumns(columns: Array<DataTable2ColumnComponent<any>>): void;
     /**
      * @description
      * Re-fetch the current page of results.
@@ -116,6 +121,14 @@ export declare class TypedBaseListComponent<T extends TypedDocumentNode<any, Var
     protected router: Router;
     protected serverConfigService: ServerConfigService;
     protected permissionsService: PermissionsService;
+    protected dataTableConfigService: DataTableConfigService;
+    /**
+     * This was introduced to allow us to more easily manage the relation between the
+     * DataTableComponent and the BaseListComponent. It allows the base class to
+     * correctly look up the currently-visible custom field columns, which can then
+     * be passed to the `dataService.query()` method.
+     */
+    protected dataTableListId: string | undefined;
     private refreshStreams;
     private collections;
     constructor();