Merge pull request #3499 from mirumee/refactor-product-selection-dialogs

Refactor product selection dialogs

CHANGELOG.md

@@ -47,3 +47,4 @@ All notable, unreleased changes to this project will be documented in this file.
 - Change TypeScript loader to speed up the build process - #3545 by @patrys
 - Fix storybook dependencies conflict - #3544 by @dominik-zeglen
 - Unique validation SKU when default variant create in GraphQL API - #3555 by @fowczarek
+- Restyle product selection dialogs - #3499 by @dominik-zeglen, @maarcingebala

package.json

@@ -23,6 +23,7 @@
     "@types/enzyme": "^3.1.15",
     "@types/moment-timezone": "^0.5.9",
     "@types/react-helmet": "^5.0.7",
+    "@types/react-infinite-scroller": "^1.2.0",
     "@types/storybook__addon-storyshots": "^3.4.3",
     "@types/storybook__react": "^4.0.0",
     "@types/string-similarity": "^1.2.0",
@@ -67,6 +68,7 @@
     "react-apollo": "^2.3.2",
     "react-dom": "^16.6.3",
     "react-helmet": "^5.2.0",
+    "react-infinite-scroller": "^1.2.2",
     "react-inlinesvg": "^0.8.1",
     "react-jss": "^8.4.0",
     "react-moment": "^0.7.7",

saleor/checkout/models.py

@@ -67,7 +67,7 @@ class Cart(models.Model):
     objects = CartQueryset.as_manager()
 
     class Meta:
-        ordering = ('-last_change',)
+        ordering = ('-last_change', )
 
     def __repr__(self):
         return 'Cart(quantity=%s)' % (self.quantity,)

saleor/graphql/order/mutations/draft_orders.py

@@ -212,53 +212,54 @@ def mutate(cls, root, info, id):
         return DraftOrderComplete(order=order)
 
 
-class DraftOrderLineCreate(BaseMutation):
-    order = graphene.Field(Order, description='A related draft order.')
-    order_line = graphene.Field(
-        OrderLine, description='A newly created order line.')
+class DraftOrderLinesCreate(BaseMutation):
+    order = graphene.Field(
+        graphene.NonNull(Order), description='A related draft order.')
+    order_lines = graphene.List(
+        graphene.NonNull(OrderLine),
+        description='List of newly added order lines.', required=True)
 
     class Arguments:
         id = graphene.ID(
             required=True,
             description='ID of the draft order to add the lines to.')
-        input = OrderLineCreateInput(
-            required=True,
-            description=dedent("""
-            Variant line input consisting of variant ID and quantity of
-            products."""))
+        input = graphene.List(
+            OrderLineCreateInput, required=True,
+            description=dedent("""Fields required to add order lines."""))
 
     class Meta:
-        description = 'Create an order line for a draft order.'
+        description = 'Create order lines for a draft order.'
 
     @classmethod
     @permission_required('order.manage_orders')
     def mutate(cls, root, info, id, input):
         errors = []
         order = cls.get_node_or_error(info, id, errors, 'id', Order)
-        variant_id = input['variant_id']
-        variant = cls.get_node_or_error(
-            info, variant_id, errors, 'lines', ProductVariant)
-
-        if not (order or variant):
-            return DraftOrderLineCreate(errors=errors)
-
+        if not order:
+            return DraftOrderLinesCreate(errors=errors)
         if order.status != OrderStatus.DRAFT:
             cls.add_error(
                 errors, 'order_id', 'Only draft orders can be edited.')
 
-        quantity = input['quantity']
-        if quantity <= 0:
-            cls.add_error(
-                errors, 'quantity',
-                'Ensure this value is greater than or equal to 1.')
-
-        line = None
-        if not errors:
-            line = add_variant_to_order(
-                order, variant, quantity, allow_overselling=True)
-            recalculate_order(order)
-        return DraftOrderLineCreate(
-            order=order, order_line=line, errors=errors)
+        lines = []
+        for input_line in input:
+            variant_id = input_line['variant_id']
+            variant = cls.get_node_or_error(
+                info, variant_id, errors, 'variant_id', ProductVariant)
+            quantity = input_line['quantity']
+            if quantity > 0:
+                if variant:
+                    line = add_variant_to_order(
+                        order, variant, quantity, allow_overselling=True)
+                    lines.append(line)
+            else:
+                cls.add_error(
+                    errors, 'quantity',
+                    'Ensure this value is greater than or equal to 1.')
+
+        recalculate_order(order)
+        return DraftOrderLinesCreate(
+            order=order, order_lines=lines, errors=errors)
 
 
 class DraftOrderLineDelete(BaseMutation):

saleor/graphql/order/schema.py

@@ -10,7 +10,7 @@
 from .enums import OrderStatusFilter
 from .mutations.draft_orders import (
     DraftOrderComplete, DraftOrderCreate, DraftOrderDelete,
-    DraftOrderLineCreate, DraftOrderLineDelete, DraftOrderLineUpdate,
+    DraftOrderLinesCreate, DraftOrderLineDelete, DraftOrderLineUpdate,
     DraftOrderUpdate)
 from .mutations.fulfillments import (
     FulfillmentCancel, FulfillmentCreate, FulfillmentUpdateTracking)
@@ -67,7 +67,7 @@ class OrderMutations(graphene.ObjectType):
     draft_order_complete = DraftOrderComplete.Field()
     draft_order_create = DraftOrderCreate.Field()
     draft_order_delete = DraftOrderDelete.Field()
-    draft_order_line_create = DraftOrderLineCreate.Field()
+    draft_order_lines_create = DraftOrderLinesCreate.Field()
     draft_order_line_delete = DraftOrderLineDelete.Field()
     draft_order_line_update = DraftOrderLineUpdate.Field()
     draft_order_update = DraftOrderUpdate.Field()

saleor/graphql/product/types.py

@@ -283,6 +283,7 @@ def resolve_thumbnail_url(self, info, *, size=None):
             self.get_first_image(), size, method='thumbnail')
         return info.context.build_absolute_uri(url)
 
+    @gql_optimizer.resolver_hints(prefetch_related='images')
     def resolve_thumbnail(self, info, *, size=None):
         image = self.get_first_image()
         if not size:

saleor/graphql/schema.graphql

@@ -587,22 +587,22 @@ input DraftOrderInput {
   voucher: ID
 }
 
-type DraftOrderLineCreate {
+type DraftOrderLineDelete {
   errors: [Error!]
   order: Order
   orderLine: OrderLine
 }
 
-type DraftOrderLineDelete {
+type DraftOrderLineUpdate {
   errors: [Error!]
   order: Order
   orderLine: OrderLine
 }
 
-type DraftOrderLineUpdate {
+type DraftOrderLinesCreate {
   errors: [Error!]
-  order: Order
-  orderLine: OrderLine
+  order: Order!
+  orderLines: [OrderLine!]!
 }
 
 type DraftOrderUpdate {
@@ -876,7 +876,7 @@ type Mutations {
   draftOrderComplete(id: ID!): DraftOrderComplete
   draftOrderCreate(input: DraftOrderCreateInput!): DraftOrderCreate
   draftOrderDelete(id: ID!): DraftOrderDelete
-  draftOrderLineCreate(id: ID!, input: OrderLineCreateInput!): DraftOrderLineCreate
+  draftOrderLinesCreate(id: ID!, input: [OrderLineCreateInput]!): DraftOrderLinesCreate
   draftOrderLineDelete(id: ID!): DraftOrderLineDelete
   draftOrderLineUpdate(id: ID!, input: OrderLineInput!): DraftOrderLineUpdate
   draftOrderUpdate(id: ID!, input: DraftOrderInput!): DraftOrderUpdate

saleor/menu/models.py

@@ -15,10 +15,10 @@ class Menu(models.Model):
     json_content = JSONField(blank=True, default=dict)
 
     class Meta:
-        ordering = ['pk']
+        ordering = ('pk', )
         permissions = ((
-            'manage_menus', pgettext_lazy(
-                'Permission description', 'Manage navigation.')),)
+            'manage_menus',
+            pgettext_lazy('Permission description', 'Manage navigation.')), )
 
     def __str__(self):
         return self.name
@@ -46,7 +46,7 @@ class MenuItem(MPTTModel, SortableModel):
     translated = TranslationProxy()
 
     class Meta:
-        ordering = ('sort_order',)
+        ordering = ('sort_order', )
         app_label = 'menu'
 
     def __str__(self):

saleor/order/models.py

@@ -126,7 +126,7 @@ class Order(models.Model):
     objects = OrderQueryset.as_manager()
 
     class Meta:
-        ordering = ('-pk',)
+        ordering = ('-pk', )
         permissions = ((
             'manage_orders',
             pgettext_lazy('Permission description', 'Manage orders.')),)
@@ -308,7 +308,7 @@ class OrderLine(models.Model):
         max_digits=5, decimal_places=2, default=Decimal('0.0'))
 
     class Meta:
-        ordering = ('pk',)
+        ordering = ('pk', )
 
     def __str__(self):
         return self.product_name

saleor/page/models.py

@@ -38,7 +38,7 @@ class Page(SeoModel):
     translated = TranslationProxy()
 
     class Meta:
-        ordering = ('slug',)
+        ordering = ('slug', )
         permissions = ((
             'manage_pages', pgettext_lazy(
                 'Permission description', 'Manage pages.')),)

saleor/payment/models.py

@@ -83,7 +83,7 @@ class Payment(models.Model):
         validators=[MinValueValidator(1000)], null=True, blank=True)
 
     class Meta:
-        ordering = ['pk']
+        ordering = ('pk', )
 
     def __repr__(self):
         return 'Payment(gateway=%s, is_active=%s, created=%s, charge_status=%s)' % (