Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3576 Fix bulk order management race condition #3590

Merged
merged 13 commits into from
Mar 21, 2019
Merged

3576 Fix bulk order management race condition #3590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2d7498b
Hide elements before Angular is loaded
mkllnk Mar 8, 2019
37d37a6
Speed up initial spec log in
mkllnk Mar 8, 2019
52fd7b1
Unify visiting bulk order management
mkllnk Mar 8, 2019
e00a3ee
Use clearer and more reliable waiting in spec
mkllnk Mar 8, 2019
4574a77
Synchronise dereferencing and initilising
mkllnk Mar 8, 2019
30c1a8d
Move ng-cloak CSS to components
mkllnk Mar 11, 2019
9e33ef8
Style ng-cloak directive
mkllnk Mar 11, 2019
6f875e8
Remove unconventional and unused ng:cloak selector
mkllnk Mar 11, 2019
0c6a5d7
Add spaces around HAML brackets
mkllnk Mar 11, 2019
af9e80e
Load data after all callbacks are installed
mkllnk Mar 11, 2019
49a6b52
Remove duplicate expectations from spec
mkllnk Mar 11, 2019
7270a9e
DRY date calculation in BOM js
mkllnk Mar 12, 2019
d129665
Wait for orders being loaded in bulk order manage
mkllnk Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/assets/stylesheets/admin/angular.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// https://docs.angularjs.org/api/ng/directive/ngCloak
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
display: none !important;
}
luisramos0 marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 4 additions & 4 deletions app/views/spree/admin/orders/bulk_management.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

%hr.divider.sixteen.columns.alpha.omega{ ng: { show: 'unitsVariantSelected()' } }

%div.sixteen.columns.alpha.omega#group_buy_calculation{ ng: { show: 'unitsVariantSelected()' } }
%div.sixteen.columns.alpha.omega#group_buy_calculation{ ng: { show: 'unitsVariantSelected()', cloak: true } }
%div.shared_resource{ :class => "four columns alpha" }
%span{ :class => 'three columns alpha' }
%input{ type: 'checkbox', :id => 'shared_resource', 'ng-model' => 'sharedResource'}
Expand Down Expand Up @@ -106,11 +106,11 @@
%h1
= t("admin.orders.bulk_management.loading")

%div{ :class => "sixteen columns alpha", 'ng-show' => '!RequestMonitor.loading && filteredLineItems.length == 0'}
%div{ class: "sixteen columns alpha", ng: {show: '!RequestMonitor.loading && filteredLineItems.length == 0', cloak: true}}
%h1#no_results
= t("admin.orders.bulk_management.no_results")

.margin-bottom-50{ 'ng-hide' => 'RequestMonitor.loading || filteredLineItems.length == 0' }
.margin-bottom-50{ ng: {hide: 'RequestMonitor.loading || filteredLineItems.length == 0', cloak: true } }
luisramos0 marked this conversation as resolved.
Show resolved Hide resolved
%form{ name: 'bulk_order_form' }
%table.index#listing_orders.bulk{ :class => "sixteen columns alpha", ng: { show: "initialized" } }
%thead
Expand Down Expand Up @@ -157,7 +157,7 @@
= t("admin.orders.bulk_management.ask")
%input{ :type => 'checkbox', 'ng-model' => "confirmDelete" }

%tr.line_item{ 'ng-repeat' => "line_item in filteredLineItems = ( lineItems | filter:quickSearch | selectFilter:supplierFilter:distributorFilter:orderCycleFilter | variantFilter:selectedUnitsProduct:selectedUnitsVariant:sharedResource | orderBy:sorting.predicate:sorting.reverse )", 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'", ng: { attr: { id: "li_{{line_item.id}}" } } }
%tr.line_item{ ng: {repeat: "line_item in filteredLineItems = ( lineItems | filter:quickSearch | selectFilter:supplierFilter:distributorFilter:orderCycleFilter | variantFilter:selectedUnitsProduct:selectedUnitsVariant:sharedResource | orderBy:sorting.predicate:sorting.reverse )", 'class-even' => "'even'", 'class-odd' => "'odd'", attr: { id: "li_{{line_item.id}}" } } }
%td.bulk
%input{ :type => "checkbox", :name => 'bulk', 'ng-model' => 'line_item.checked', 'ignore-dirty' => true }
%td.order_no{ 'ng-show' => 'columns.order_no.visible' } {{ line_item.order.number }}
Expand Down