fix(admin-ui): Correctly sort assets

vendure-ecommerce · May 7, 2019 · e57450b · e57450b
1 parent 1c543db
commit e57450b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/admin-ui/src/app/catalog/components/asset-list/asset-list.component.ts b/admin-ui/src/app/catalog/components/asset-list/asset-list.component.ts
@@ -4,6 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { PaginationInstance } from 'ngx-pagination';
 import { combineLatest, Observable } from 'rxjs';
 import { debounceTime, map, takeUntil } from 'rxjs/operators';
+import { SortOrder } from 'shared/generated-shop-types';
 import { GetAssetList } from 'shared/generated-types';
 
 import { BaseListComponent } from '../../../common/base-list.component';
@@ -40,6 +41,9 @@ export class AssetListComponent extends BaseListComponent<GetAssetList.Query, Ge
                             contains: this.searchTerm.value,
                         },
                     },
+                    sort: {
+                        createdAt: SortOrder.DESC,
+                    },
                 },
             }),
         );

diff --git a/admin-ui/src/app/catalog/components/asset-picker-dialog/asset-picker-dialog.component.ts b/admin-ui/src/app/catalog/components/asset-picker-dialog/asset-picker-dialog.component.ts
@@ -3,7 +3,7 @@ import { FormControl } from '@angular/forms';
 import { PaginationInstance } from 'ngx-pagination';
 import { Observable, Subject } from 'rxjs';
 import { debounceTime, map, takeUntil, tap } from 'rxjs/operators';
-import { Asset, GetAssetList } from 'shared/generated-types';
+import { Asset, GetAssetList, SortOrder } from 'shared/generated-types';
 
 import { _ } from '../../../core/providers/i18n/mark-for-extraction';
 import { NotificationService } from '../../../core/providers/notification/notification.service';
@@ -21,7 +21,7 @@ import { Dialog } from '../../../shared/providers/modal/modal.service';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AssetPickerDialogComponent implements OnInit, OnDestroy, Dialog<Asset[]> {
-    assets$: Observable<Asset[]>;
+    assets$: Observable<GetAssetList.Items[]>;
     paginationConfig: PaginationInstance = {
         currentPage: 1,
         itemsPerPage: 25,
@@ -106,6 +106,9 @@ export class AssetPickerDialogComponent implements OnInit, OnDestroy, Dialog<Ass
                         contains: searchTerm,
                     },
                 },
+                sort: {
+                    createdAt: SortOrder.DESC,
+                },
             },
         });
     }

diff --git a/admin-ui/src/app/data/definitions/product-definitions.ts b/admin-ui/src/app/data/definitions/product-definitions.ts
@@ -3,6 +3,7 @@ import gql from 'graphql-tag';
 export const ASSET_FRAGMENT = gql`
     fragment Asset on Asset {
         id
+        createdAt
         name
         fileSize
         mimeType

diff --git a/admin-ui/src/app/data/providers/product-data.service.ts b/admin-ui/src/app/data/providers/product-data.service.ts
@@ -13,6 +13,7 @@ import {
     GetProductWithVariants,
     RemoveOptionGroupFromProduct,
     SearchProducts,
+    SortOrder,
     UpdateProduct,
     UpdateProductInput,
     UpdateProductVariantInput,
@@ -184,6 +185,9 @@ export class ProductDataService {
             options: {
                 skip,
                 take,
+                sort: {
+                    createdAt: SortOrder.DESC,
+                },
             },
         });
     }