Merge branch 'minor' into major

monrostar · Sep 27, 2023 · 41e7189 · 41e7189
2 parents 0c3f6c4 + cff726c
commit 41e7189
Show file tree

Hide file tree

Showing 92 changed files with 1,564 additions and 670 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## <small>2.0.8 (2023-09-27)</small>
+
+
+#### Fixes
+
+* **admin-ui** Fix creating nullable string fields ([7e2c17a](https://github.com/vendure-ecommerce/vendure/commit/7e2c17a)), closes [#2343](https://github.com/vendure-ecommerce/vendure/issues/2343)
+* **admin-ui** Fix link to Asset detail from asset picker ([4539de3](https://github.com/vendure-ecommerce/vendure/commit/4539de3)), closes [#2411](https://github.com/vendure-ecommerce/vendure/issues/2411)
+* **core** Implement Refund lines fields resolver ([6b4da6c](https://github.com/vendure-ecommerce/vendure/commit/6b4da6c)), closes [#2406](https://github.com/vendure-ecommerce/vendure/issues/2406)
+* **core** Prevent negative total from compounded promotions ([0740c87](https://github.com/vendure-ecommerce/vendure/commit/0740c87)), closes [#2385](https://github.com/vendure-ecommerce/vendure/issues/2385)
+* **payments-plugin** Fix stripe payment transaction handling (#2402) ([fd8a777](https://github.com/vendure-ecommerce/vendure/commit/fd8a777)), closes [#2402](https://github.com/vendure-ecommerce/vendure/issues/2402)
+* **admin-ui** Add image carousel to asset preview dialog (#2370) ([bd834d0](https://github.com/vendure-ecommerce/vendure/commit/bd834d0)), closes [#2370](https://github.com/vendure-ecommerce/vendure/issues/2370) [#2129](https://github.com/vendure-ecommerce/vendure/issues/2129)
+
 ## <small>2.0.7 (2023-09-08)</small>
 
 

diff --git a/CHANGELOG_NEXT.md b/CHANGELOG_NEXT.md
@@ -1,3 +1,34 @@
+## 2.1.0-next.6 (2023-09-27)
+
+
+#### Features
+
+* **admin-ui** Add filter preset support to Collection list ([cbfb402](https://github.com/vendure-ecommerce/vendure/commit/cbfb402))
+* **admin-ui** Display original quantity after order has been modified ([a36c6e0](https://github.com/vendure-ecommerce/vendure/commit/a36c6e0))
+* **admin-ui** Implement job queue filtering by status ([baeb036](https://github.com/vendure-ecommerce/vendure/commit/baeb036))
+* **admin-ui** Implement values pagination for Facet detail view ([4cf1826](https://github.com/vendure-ecommerce/vendure/commit/4cf1826)), closes [#1257](https://github.com/vendure-ecommerce/vendure/issues/1257)
+* **admin-ui** Improve naming & layout of catalog & stock locations ([8452300](https://github.com/vendure-ecommerce/vendure/commit/8452300))
+* **core** Pass variant to ProductVariantPriceCalculationStrategy ([fee995c](https://github.com/vendure-ecommerce/vendure/commit/fee995c)), closes [#2398](https://github.com/vendure-ecommerce/vendure/issues/2398)
+* **create** Allow selection of package manager ([6561bb7](https://github.com/vendure-ecommerce/vendure/commit/6561bb7))
+* **job-queue-plugin** Implement default cleanup of old BullMQ jobs ([6c1d7bb](https://github.com/vendure-ecommerce/vendure/commit/6c1d7bb)), closes [#1425](https://github.com/vendure-ecommerce/vendure/issues/1425)
+* **payments-plugin** Allow custom params to be passed to Stripe API ([1b29097](https://github.com/vendure-ecommerce/vendure/commit/1b29097)), closes [#2412](https://github.com/vendure-ecommerce/vendure/issues/2412)
+
+#### Fixes
+
+* **admin-ui** Correctly display job retries ([d3107fd](https://github.com/vendure-ecommerce/vendure/commit/d3107fd)), closes [#1467](https://github.com/vendure-ecommerce/vendure/issues/1467)
+* **job-queue-plugin** Correct behaviour of job list query with BullMQ ([c148a92](https://github.com/vendure-ecommerce/vendure/commit/c148a92)), closes [#2120](https://github.com/vendure-ecommerce/vendure/issues/2120) [#1327](https://github.com/vendure-ecommerce/vendure/issues/1327)
+* **job-queue-plugin** Correct retry setting for BullMQ jobs ([972ba0e](https://github.com/vendure-ecommerce/vendure/commit/972ba0e)), closes [#1467](https://github.com/vendure-ecommerce/vendure/issues/1467)
+
+
+### BREAKING CHANGE
+
+* In the Admin UI, the "stock locations" list and detail views
+have been moved from the "catalog" module to the "settings" module. Also, the
+menu item & breadcrumb for "inventory" has been renamed to "products".
+
+  This is an end-user breaking change rather than a code breaking change. Any UI
+extensions that link to a `/catalog/inventory/...` route will still work as there
+is a redirect in place to `/catalog/products/...`.
 ## 2.1.0-next.5 (2023-09-18)
 
 
@@ -10,6 +41,8 @@
 * **admin-ui** Improved control over ActionBar buttons ([065a2b4](https://github.com/vendure-ecommerce/vendure/commit/065a2b4))
 * **create** Better defaults for project scaffold ([fa683e7](https://github.com/vendure-ecommerce/vendure/commit/fa683e7))
 * **cli** Introduce new `@vendure/cli` package which exposes a `vendure` binary. Currently supports `vendure new plugin` command.
+* **cli** Implement plugin scaffold command ([a6df4c1](https://github.com/vendure-ecommerce/vendure/commit/a6df4c1))
+* **cli** Include custom CRUD permissions with plugin scaffold ([0c62b6f](https://github.com/vendure-ecommerce/vendure/commit/0c62b6f))
 
 #### Fixes
 

diff --git a/docs/docs/guides/getting-started/installation/index.md b/docs/docs/guides/getting-started/installation/index.md
@@ -18,34 +18,10 @@ The recommended way to get started with Vendure is by using the [@vendure/create
 
 ### 1. Run the command
 
-<Tabs>
-<TabItem value="npx" label="npx" default>
-
 ```
 npx @vendure/create my-shop
 ```
 
-</TabItem>
-<TabItem value="npm init" label="npm init">
-
-```
-npm init @vendure my-shop
-```
-
-</TabItem>
-<TabItem value="yarn create" label="yarn create">
-
-```
-yarn create @vendure my-shop
-``` 
-
-</TabItem>
-</Tabs>
-
-:::note
-By default, the `@vendure/create` tool will use [Yarn](https://yarnpkg.com/) to manage your dependencies if you have it installed. If you want to force it to use npm, use the `--use-npm` flag.
-:::
-
 ### 2. Select a database
 
 Vendure supports a number of different databases. The `@vendure/create` tool will prompt you to select one. 

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
     "packages": ["packages/*"],
-    "version": "2.1.0-next.5",
+    "version": "2.1.0-next.6",
     "npmClient": "yarn",
     "command": {
         "version": {

diff --git a/packages/admin-ui-plugin/package.json b/packages/admin-ui-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui-plugin",
-    "version": "2.1.0-next.5",
+    "version": "2.1.0-next.6",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
@@ -21,8 +21,8 @@
     "devDependencies": {
         "@types/express": "^4.17.8",
         "@types/fs-extra": "^9.0.1",
-        "@vendure/common": "2.1.0-next.5",
-        "@vendure/core": "2.1.0-next.5",
+        "@vendure/common": "2.1.0-next.6",
+        "@vendure/core": "2.1.0-next.6",
         "express": "^4.17.1",
         "rimraf": "^3.0.2",
         "typescript": "4.9.5"

diff --git a/packages/admin-ui/i18n-coverage.json b/packages/admin-ui/i18n-coverage.json
@@ -1,81 +1,81 @@
 {
-  "generatedOn": "2023-08-28T09:13:19.132Z",
-  "lastCommit": "8b52e6fc44c9ebe04d9f012c39b0d9ea4961c215",
+  "generatedOn": "2023-09-26T14:59:13.502Z",
+  "lastCommit": "8452300ac7407d04794507cee99cf4436e4fce71",
   "translationStatus": {
     "ar": {
-      "tokenCount": 755,
-      "translatedCount": 746,
-      "percentage": 99
+      "tokenCount": 761,
+      "translatedCount": 760,
+      "percentage": 100
     },
     "cs": {
-      "tokenCount": 755,
-      "translatedCount": 551,
-      "percentage": 73
+      "tokenCount": 761,
+      "translatedCount": 570,
+      "percentage": 75
     },
     "de": {
-      "tokenCount": 755,
-      "translatedCount": 746,
-      "percentage": 99
+      "tokenCount": 761,
+      "translatedCount": 760,
+      "percentage": 100
     },
     "en": {
-      "tokenCount": 755,
-      "translatedCount": 754,
+      "tokenCount": 761,
+      "translatedCount": 760,
       "percentage": 100
     },
     "es": {
-      "tokenCount": 755,
-      "translatedCount": 746,
-      "percentage": 99
+      "tokenCount": 761,
+      "translatedCount": 760,
+      "percentage": 100
     },
     "fr": {
-      "tokenCount": 755,
-      "translatedCount": 742,
-      "percentage": 98
+      "tokenCount": 761,
+      "translatedCount": 757,
+      "percentage": 99
     },
     "he": {
-      "tokenCount": 755,
-      "translatedCount": 746,
-      "percentage": 99
+      "tokenCount": 761,
+      "translatedCount": 760,
+      "percentage": 100
     },
     "it": {
-      "tokenCount": 755,
-      "translatedCount": 576,
-      "percentage": 76
+      "tokenCount": 761,
+      "translatedCount": 759,
+      "percentage": 100
     },
     "pl": {
-      "tokenCount": 755,
-      "translatedCount": 386,
-      "percentage": 51
+      "tokenCount": 761,
+      "translatedCount": 399,
+      "percentage": 52
     },
     "pt_BR": {
-      "tokenCount": 755,
-      "translatedCount": 745,
-      "percentage": 99
+      "tokenCount": 761,
+      "translatedCount": 759,
+      "percentage": 100
     },
     "pt_PT": {
-      "tokenCount": 755,
-      "translatedCount": 585,
-      "percentage": 77
+      "tokenCount": 761,
+      "translatedCount": 608,
+      "percentage": 80
     },
     "ru": {
-      "tokenCount": 755,
-      "translatedCount": 746,
-      "percentage": 99
+      "tokenCount": 761,
+      "translatedCount": 760,
+      "percentage": 100
     },
     "uk": {
-      "tokenCount": 755,
-      "translatedCount": 575,
-      "percentage": 76
+      "tokenCount": 761,
+      "translatedCount": 595,
+      "percentage": 78
     },
     "zh_Hans": {
-      "tokenCount": 755,
-      "translatedCount": 521,
-      "percentage": 69
+      "tokenCount": 761,
+      "translatedCount": 540,
+      "percentage": 71
     },
     "zh_Hant": {
-      "tokenCount": 755,
-      "translatedCount": 366,
-      "percentage": 48
+      "tokenCount": 761,
+      "translatedCount": 386,
+      "percentage": 51
     }
   }
 }
diff --git a/packages/admin-ui/package-lock.json b/packages/admin-ui/package-lock.json
diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui",
-    "version": "2.1.0-next.5",
+    "version": "2.1.0-next.6",
     "license": "MIT",
     "scripts": {
         "ng": "ng",
@@ -49,7 +49,7 @@
         "@ng-select/ng-select": "^11.1.1",
         "@ngx-translate/core": "^15.0.0",
         "@ngx-translate/http-loader": "^8.0.0",
-        "@vendure/common": "2.1.0-next.5",
+        "@vendure/common": "2.1.0-next.6",
         "@webcomponents/custom-elements": "^1.6.0",
         "apollo-angular": "^5.0.0",
         "apollo-upload-client": "^17.0.0",

diff --git a/packages/admin-ui/src/lib/catalog/src/catalog.module.ts b/packages/admin-ui/src/lib/catalog/src/catalog.module.ts
@@ -66,13 +66,6 @@ import {
 import { ProductVariantQuickJumpComponent } from './components/product-variant-quick-jump/product-variant-quick-jump.component';
 import { ProductVariantsEditorComponent } from './components/product-variants-editor/product-variants-editor.component';
 import { ProductVariantsTableComponent } from './components/product-variants-table/product-variants-table.component';
-import { StockLocationDetailComponent } from './components/stock-location-detail/stock-location-detail.component';
-import {
-    assignStockLocationsToChannelBulkAction,
-    deleteStockLocationsBulkAction,
-    removeStockLocationsFromChannelBulkAction,
-} from './components/stock-location-list/stock-location-list-bulk-actions';
-import { StockLocationListComponent } from './components/stock-location-list/stock-location-list.component';
 import { UpdateProductOptionDialogComponent } from './components/update-product-option-dialog/update-product-option-dialog.component';
 import { VariantPriceDetailComponent } from './components/variant-price-detail/variant-price-detail.component';
 
@@ -109,13 +102,12 @@ const CATALOG_COMPONENTS = [
     CreateProductVariantDialogComponent,
     CreateProductOptionGroupDialogComponent,
     ProductVariantQuickJumpComponent,
-    StockLocationListComponent,
 ];
 
 @NgModule({
     imports: [SharedModule, RouterModule.forChild([])],
     exports: [...CATALOG_COMPONENTS],
-    declarations: [...CATALOG_COMPONENTS, StockLocationDetailComponent],
+    declarations: [...CATALOG_COMPONENTS],
     providers: [
         {
             provide: ROUTES,
@@ -147,10 +139,6 @@ export class CatalogModule {
         bulkActionRegistryService.registerBulkAction(removeCollectionsFromChannelBulkAction);
         bulkActionRegistryService.registerBulkAction(deleteCollectionsBulkAction);
 
-        bulkActionRegistryService.registerBulkAction(assignStockLocationsToChannelBulkAction);
-        bulkActionRegistryService.registerBulkAction(removeStockLocationsFromChannelBulkAction);
-        bulkActionRegistryService.registerBulkAction(deleteStockLocationsBulkAction);
-
         pageService.registerPageTab({
             priority: 0,
             location: 'product-list',
@@ -182,30 +170,30 @@ export class CatalogModule {
             route: 'variants',
             component: ProductVariantListComponent,
         });
-        pageService.registerPageTab({
-            priority: 0,
-            location: 'stock-location-detail',
-            tab: _('catalog.stock-location'),
-            route: '',
-            component: detailComponentWithResolver({
-                component: StockLocationDetailComponent,
-                query: GetStockLocationDetailDocument,
-                entityKey: 'stockLocation',
-                getBreadcrumbs: entity => [
-                    {
-                        label: entity ? entity.name : _('catalog.create-new-stock-location'),
-                        link: [entity?.id],
-                    },
-                ],
-            }),
-        });
-        pageService.registerPageTab({
-            priority: 0,
-            location: 'product-list',
-            tab: _('catalog.stock-locations'),
-            route: 'stock-locations',
-            component: StockLocationListComponent,
-        });
+        // pageService.registerPageTab({
+        //     priority: 0,
+        //     location: 'stock-location-detail',
+        //     tab: _('catalog.stock-location'),
+        //     route: '',
+        //     component: detailComponentWithResolver({
+        //         component: StockLocationDetailComponent,
+        //         query: GetStockLocationDetailDocument,
+        //         entityKey: 'stockLocation',
+        //         getBreadcrumbs: entity => [
+        //             {
+        //                 label: entity ? entity.name : _('catalog.create-new-stock-location'),
+        //                 link: [entity?.id],
+        //             },
+        //         ],
+        //     }),
+        // });
+        // pageService.registerPageTab({
+        //     priority: 0,
+        //     location: 'product-list',
+        //     tab: _('catalog.stock-locations'),
+        //     route: 'stock-locations',
+        //     component: StockLocationListComponent,
+        // });
         pageService.registerPageTab({
             priority: 0,
             location: 'product-variant-detail',
@@ -218,7 +206,7 @@ export class CatalogModule {
                 getBreadcrumbs: entity => [
                     {
                         label: `${entity?.product.name}`,
-                        link: ['/catalog', 'inventory', entity?.product.id],
+                        link: ['/catalog', 'products', entity?.product.id],
                     },
                     {
                         label: `${entity?.name} (${entity?.sku})`,