COMMERCE-2908 JS improvements and small fixes on Account Selector

liferay · Jan 26, 2021 · 4aa3853 · 4aa3853
1 parent 34eb3b9
commit 4aa3853
Show file tree

Hide file tree

Showing 12 changed files with 401 additions and 317 deletions.
diff --git a/modules/apps/commerce/commerce-frontend-js/package.json b/modules/apps/commerce/commerce-frontend-js/package.json
@@ -9,6 +9,7 @@
 		"@clayui/form": "3.14.2",
 		"@clayui/icon": "3.1.0",
 		"@clayui/label": "3.4.1",
+		"@clayui/layout": "3.2.0",
 		"@clayui/link": "3.2.0",
 		"@clayui/list": "3.4.5",
 		"@clayui/loading-indicator": "3.2.0",

diff --git a/.../main/resources/META-INF/resources/ServiceProvider/commerce-admin-account/v1.0/Account.js b/.../main/resources/META-INF/resources/ServiceProvider/commerce-admin-account/v1.0/Account.js
@@ -23,5 +23,6 @@ function resolveCatalogPath(basePath = '') {
 }
 
 export default (basePath) => ({
+	baseURL: resolveCatalogPath(basePath),
 	getAccounts: () => AJAX.GET(resolveCatalogPath(basePath)),
 });
diff --git a/.../src/main/resources/META-INF/resources/ServiceProvider/commerce-admin-order/v1.0/Order.js b/.../src/main/resources/META-INF/resources/ServiceProvider/commerce-admin-order/v1.0/Order.js
@@ -14,14 +14,15 @@
 
 import AJAX from '../../../utilities/AJAX/index';
 
-const ACCOUNTS_PATH = '/orders';
+const ORDERS_PATH = '/orders';
 
 const VERSION = 'v1.0';
 
 function resolveCatalogPath(basePath = '') {
-	return `${basePath}${VERSION}${ACCOUNTS_PATH}`;
+	return `${basePath}${VERSION}${ORDERS_PATH}`;
 }
 
 export default (basePath) => ({
-	getAccounts: () => AJAX.GET(resolveCatalogPath(basePath)),
+	baseURL: resolveCatalogPath(basePath),
+	getOrders: () => AJAX.GET(resolveCatalogPath(basePath)),
 });
diff --git a/.../src/main/resources/META-INF/resources/ServiceProvider/commerce-admin-order/v1.0/index.js b/.../src/main/resources/META-INF/resources/ServiceProvider/commerce-admin-order/v1.0/index.js
@@ -12,4 +12,4 @@
  * details.
  */
 
-export {default as accountAPI} from './Order';
+export {default as orderAPI} from './Order';
diff --git a/...merce/commerce-frontend-js/src/main/resources/META-INF/resources/ServiceProvider/index.js b/...merce/commerce-frontend-js/src/main/resources/META-INF/resources/ServiceProvider/index.js
@@ -12,12 +12,16 @@
  * details.
  */
 
+import AdminAccountAPI from './commerce-admin-account/index';
 import AdminCatalogAPI from './commerce-admin-catalog/index';
+import AdminOrderAPI from './commerce-admin-order/index';
 import AdminPricingAPI from './commerce-admin-pricing/index';
 import DeliveryCartAPI from './commerce-delivery-cart/index';
 
 const ServiceProvider = {
+	AdminAccountAPI,
 	AdminCatalogAPI,
+	AdminOrderAPI,
 	AdminPricingAPI,
 	DeliveryCartAPI,
 };