Merge pull request #1025 from dpfaffenbauer/issue-933

[All] make CoreShop stores more async, don't load them initially
coreshop · Jul 11, 2019 · 0926fbf · 0926fbf
2 parents cc3c1b3 + 8919676
commit 0926fbf
Show file tree

Hide file tree

Showing 40 changed files with 188 additions and 280 deletions.
diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/resource.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/resource.js
@@ -28,12 +28,6 @@ coreshop.address.resource = Class.create(coreshop.resource, {
             value: true
         });
 
-        pimcore.globalmanager.get('coreshop_countries').load();
-        pimcore.globalmanager.get('coreshop_address_identifier').load();
-        pimcore.globalmanager.get('coreshop_countries_active').load();
-        pimcore.globalmanager.get('coreshop_states').load();
-        pimcore.globalmanager.get('coreshop_zones').load();
-
         coreshop.broker.fireEvent('resource.register', 'coreshop.address', this);
     },
 
@@ -77,4 +71,4 @@ coreshop.address.resource = Class.create(coreshop.resource, {
 
 coreshop.broker.addListener('pimcore.ready', function() {
     new coreshop.address.resource();
-});
+});
diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/resource/country.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/resource/country.js
@@ -4,10 +4,7 @@ Ext.define('CoreShop.store.Country', {
 
     name: 'country',
     fieldLabel: t('coreshop_country'),
-
-    initComponent: function () {
-        this.store = pimcore.globalmanager.get('coreshop_countries');
-
-        this.callParent();
+    store: {
+        type: 'coreshop_countries'
     }
-});
+});
diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/resource/state.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/resource/state.js
@@ -4,10 +4,7 @@ Ext.define('CoreShop.store.State', {
 
     name: 'state',
     fieldLabel: t('coreshop_state'),
-
-    initComponent: function () {
-        this.store = pimcore.globalmanager.get('coreshop_states');
-
-        this.callParent();
+    store: {
+        type: 'coreshop_states'
     }
-});
+});
diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/resource/zone.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/resource/zone.js
@@ -4,10 +4,7 @@ Ext.define('CoreShop.store.Zone', {
 
     name: 'zone',
     fieldLabel: t('coreshop_zone'),
-
-    initComponent: function () {
-        this.store = pimcore.globalmanager.get('coreshop_zones');
-
-        this.callParent();
+    store: {
+        type: 'coreshop_zones'
     }
-});
+});
diff --git a/...Shop/Bundle/CoreBundle/Resources/public/pimcore/js/cart/pricerules/conditions/carriers.js b/...Shop/Bundle/CoreBundle/Resources/public/pimcore/js/cart/pricerules/conditions/carriers.js
@@ -16,14 +16,15 @@ coreshop.cart.pricerules.conditions.carriers = Class.create(coreshop.rules.condi
 
     getForm: function () {
         var me = this;
-        var store = pimcore.globalmanager.get('coreshop_carriers');
 
         var carriers = {
             fieldLabel: t('coreshop_carrier'),
             typeAhead: true,
             listWidth: 100,
             width: 500,
-            store: store,
+            store: {
+                type: 'coreshop_carriers'
+            },
             displayField: 'identifier',
             valueField: 'id',
             forceSelection: true,
@@ -32,15 +33,7 @@ coreshop.cart.pricerules.conditions.carriers = Class.create(coreshop.rules.condi
             name: 'carriers',
             maxHeight: 400,
             delimiter: false,
-            listeners: {
-                beforerender: function () {
-                    if (!store.isLoaded() && !store.isLoading())
-                        store.load();
-
-                    if (me.data && me.data.carriers)
-                        this.setValue(me.data.carriers);
-                }
-            }
+            value: me.data.carriers
         };
 
         if (this.data && this.data.carriers) {

diff --git a/...op/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStorePrice.js b/...op/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStorePrice.js
@@ -220,4 +220,4 @@ pimcore.object.tags.coreShopStorePrice = Class.create(pimcore.object.tags.abstra
 
         return false;
     }
-});
+});
diff --git a/...le/CoreBundle/Resources/public/pimcore/js/notification/conditions/invoice/invoiceState.js b/...le/CoreBundle/Resources/public/pimcore/js/notification/conditions/invoice/invoiceState.js
@@ -24,7 +24,9 @@ coreshop.notification.rule.conditions.invoiceState = Class.create(coreshop.rules
                     name: 'invoiceState',
                     value: this.data ? this.data.invoiceState : [],
                     width: 250,
-                    store: pimcore.globalmanager.get('coreshop_states_invoice'),
+                    store: {
+                        type: 'coreshop_states_invoice'
+                    },
                     triggerAction: 'all',
                     typeAhead: false,
                     editable: false,

diff --git a/...p/Bundle/CoreBundle/Resources/public/pimcore/js/notification/conditions/order/carriers.js b/...p/Bundle/CoreBundle/Resources/public/pimcore/js/notification/conditions/order/carriers.js
@@ -17,14 +17,15 @@ coreshop.notification.rule.conditions.carriers = Class.create(coreshop.rules.con
 
     getForm: function () {
         var me = this;
-        var store = pimcore.globalmanager.get('coreshop_carriers');
 
         var carriers = {
             fieldLabel: t('coreshop_carrier'),
             typeAhead: true,
             listWidth: 100,
             width: 500,
-            store: store,
+            store: {
+                type: 'coreshop_carriers'
+            },
             displayField: 'identifier',
             valueField: 'id',
             forceSelection: true,
@@ -33,15 +34,7 @@ coreshop.notification.rule.conditions.carriers = Class.create(coreshop.rules.con
             name: 'carriers',
             maxHeight: 400,
             delimiter: false,
-            listeners: {
-                beforerender: function () {
-                    if (!store.isLoaded() && !store.isLoading())
-                        store.load();
-
-                    if (me.data && me.data.carriers)
-                        this.setValue(me.data.carriers);
-                }
-            }
+            value: me.data.carriers
         };
 
         if (this.data && this.data.carriers) {

diff --git a/...le/CoreBundle/Resources/public/pimcore/js/notification/conditions/payment/paymentState.js b/...le/CoreBundle/Resources/public/pimcore/js/notification/conditions/payment/paymentState.js
@@ -24,7 +24,9 @@ coreshop.notification.rule.conditions.paymentState = Class.create(coreshop.rules
                     name: 'paymentState',
                     value: this.data ? this.data.paymentState : [],
                     width: 250,
-                    store: pimcore.globalmanager.get('coreshop_states_payment'),
+                    store: {
+                        type: 'coreshop_states_payment'
+                    },
                     triggerAction: 'all',
                     typeAhead: false,
                     editable: false,

diff --git a/.../CoreBundle/Resources/public/pimcore/js/notification/conditions/shipment/shipmentState.js b/.../CoreBundle/Resources/public/pimcore/js/notification/conditions/shipment/shipmentState.js
@@ -24,7 +24,9 @@ coreshop.notification.rule.conditions.shipmentState = Class.create(coreshop.rule
                     name: 'shipmentState',
                     value: this.data ? this.data.shipmentState : [],
                     width: 250,
-                    store: pimcore.globalmanager.get('coreshop_states_shipment'),
+                    store: {
+                        type: 'coreshop_states_shipment'
+                    },
                     triggerAction: 'all',
                     typeAhead: false,
                     editable: false,

diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/order/shipment.js b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/order/shipment.js
@@ -15,10 +15,7 @@ coreshop.order.order.shipment = Class.create(coreshop.order.order.shipment, {
     cb: null,
 
     createWindow: function ($super, shipAbleItems) {
-        pimcore.globalmanager.get('coreshop_carriers').load();
-
         var window = $super(shipAbleItems),
-            store = pimcore.globalmanager.get('coreshop_carriers'),
             hasCarrier = this.order.shippingPayment.carrier !== null,
             orderCarrierId = parseInt(this.order.carrier),
             orderCarrierName = this.order.shippingPayment.carrier,
@@ -28,7 +25,9 @@ coreshop.order.order.shipment = Class.create(coreshop.order.order.shipment, {
             xtype: 'combo',
             fieldLabel: t('coreshop_carrier'),
             mode: 'local',
-            store: store,
+            store: {
+                type: 'coreshop_carriers'
+            },
             displayField: 'identifier',
             valueField: 'id',
             forceSelection: true,
@@ -60,25 +59,6 @@ coreshop.order.order.shipment = Class.create(coreshop.order.order.shipment, {
                 },
                 change: function() {
                     showToolTip = false;
-                },
-                afterrender: function () {
-                    if (hasCarrier === true) {
-                        var orderCarrierIndex;
-                        if (store.isLoaded()) {
-                            orderCarrierIndex = store.findExact('id', orderCarrierId);
-                            if (orderCarrierIndex !== -1) {
-                                this.setValue(store.getAt(orderCarrierIndex));
-                            }
-                        } else {
-                            store.load();
-                            store.on('load', function (store, records, options) {
-                                orderCarrierIndex = store.findExact('id', orderCarrierId);
-                                if (orderCarrierIndex !== -1) {
-                                    this.setValue(store.getAt(orderCarrierIndex));
-                                }
-                            }.bind(this));
-                        }
-                    }
                 }
             }
         });

diff --git a/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/settings.js b/src/CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/settings.js
@@ -27,12 +27,19 @@ coreshop.core.settings = Class.create({
 
                 this.data = Ext.decode(response.responseText).data;
 
-                this.getTabPanel();
+                this.loadStores();
 
             }.bind(this)
         });
     },
 
+    loadStores: function()
+    {
+        this.stores = Ext.create('store.coreshop_stores').load(function() {
+            this.getTabPanel();
+        }.bind(this));
+    },
+
     getValue: function (shopId, key) {
         var current = null;
 
@@ -248,8 +255,7 @@ coreshop.core.settings = Class.create({
 
         var me = this,
             shopPanel,
-            store = pimcore.globalmanager.get('coreshop_stores'),
-            shop = store.getById(shopId);
+            shop = this.stores.getById(shopId);
 
         if (!shop) {
             alert('STORE NOT FOUND!');

diff --git a/...Shop/Bundle/CoreBundle/Resources/public/pimcore/js/shipping/rules/conditions/countries.js b/...Shop/Bundle/CoreBundle/Resources/public/pimcore/js/shipping/rules/conditions/countries.js
@@ -16,14 +16,15 @@ coreshop.shippingrule.conditions.countries = Class.create(coreshop.rules.conditi
 
     getForm: function () {
         var me = this;
-        var store = pimcore.globalmanager.get('coreshop_countries');
 
         var countries = {
             fieldLabel: t('coreshop_condition_countries'),
             typeAhead: true,
             listWidth: 100,
             width: 500,
-            store: store,
+            store: {
+                type: 'coreshop_countries'
+            },
             displayField: 'name',
             valueField: 'id',
             forceSelection: true,
@@ -32,15 +33,7 @@ coreshop.shippingrule.conditions.countries = Class.create(coreshop.rules.conditi
             name: 'countries',
             height: 400,
             delimiter: false,
-            listeners: {
-                beforerender: function () {
-                    if (!store.isLoaded() && !store.isLoading())
-                        store.load();
-
-                    if (me.data && me.data.countries)
-                        this.setValue(me.data.countries);
-                }
-            }
+            value: me.data.countries
         };
 
 

diff --git a/...hop/Bundle/CoreBundle/Resources/public/pimcore/js/shipping/rules/conditions/currencies.js b/...hop/Bundle/CoreBundle/Resources/public/pimcore/js/shipping/rules/conditions/currencies.js
@@ -16,14 +16,15 @@ coreshop.shippingrule.conditions.currencies = Class.create(coreshop.rules.condit
 
     getForm: function () {
         var me = this;
-        var store = pimcore.globalmanager.get('coreshop_currencies');
 
         var currencies = {
             fieldLabel: t('coreshop_condition_currencies'),
             typeAhead: true,
             listWidth: 100,
             width: 500,
-            store: store,
+            store: {
+                type: 'coreshop_currencies'
+            },
             displayField: 'name',
             valueField: 'id',
             forceSelection: true,
@@ -32,15 +33,7 @@ coreshop.shippingrule.conditions.currencies = Class.create(coreshop.rules.condit
             name: 'currencies',
             maxHeight: 400,
             delimiter: false,
-            listeners: {
-                beforerender: function () {
-                    if (!store.isLoaded() && !store.isLoading())
-                        store.load();
-
-                    if (me.data && me.data.currencies)
-                        this.setValue(me.data.currencies);
-                }
-            }
+            value: me.data.currencies
         };
 
         if (this.data && this.data.currencies) {

diff --git a/...CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/shipping/rules/conditions/zones.js b/...CoreShop/Bundle/CoreBundle/Resources/public/pimcore/js/shipping/rules/conditions/zones.js
@@ -16,14 +16,15 @@ coreshop.shippingrule.conditions.zones = Class.create(coreshop.rules.conditions.
 
     getForm: function () {
         var me = this;
-        var store = pimcore.globalmanager.get('coreshop_zones');
 
         var zones = {
             fieldLabel: t('coreshop_condition_zones'),
             typeAhead: true,
             listWidth: 100,
             width: 500,
-            store: store,
+            store: {
+                type: 'coreshop_zones'
+            },
             displayField: 'name',
             valueField: 'id',
             forceSelection: true,
@@ -32,15 +33,7 @@ coreshop.shippingrule.conditions.zones = Class.create(coreshop.rules.conditions.
             name: 'zones',
             maxHeight: 400,
             delimiter: false,
-            listeners: {
-                beforerender: function () {
-                    if (!store.isLoaded() && !store.isLoading())
-                        store.load();
-
-                    if (me.data && me.data.zones)
-                        this.setValue(me.data.zones);
-                }
-            }
+            value: me.data.zones
         };
 
         if (this.data && this.data.zones) {
-Original file line number
+Diff line change
@@ Expand Up @@
             return false;
         }
-    });
+    });