Merge branch 'main' of https://github.com/vtex/affiliates into FIX-va…

…lidator-loading Merge Adjustments
vtex · Aug 10, 2022 · d76ef77 · d76ef77
2 parents 9537e31 + f0766b3
commit d76ef77
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,15 +7,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.57.1] - 2022-08-09
+
 ### Fixed
 
 - Fixed block structure
+## [0.57.0] - 2022-08-09
 
 ### Added
 
 - Component `ProfileModal` added
 - Hook `UseDisclosure` added
 - Some messages added to the StoreMessage utils
+## [0.56.1] - 2022-08-08
+
+### Changed
+
+- Status filters values to match the status enum
 
 ## [0.56.0] - 2022-07-27
 

diff --git a/manifest.json b/manifest.json
@@ -1,14 +1,14 @@
 {
   "name": "affiliates",
   "vendor": "vtex",
-  "version": "0.56.0",
+  "version": "0.57.1",
   "title": "Affiliates",
   "description": "App that adds support for affiliates on IO stores",
   "mustUpdateAt": "2018-01-04",
   "categories": [],
   "dependencies": {
     "vtex.affiliates-order-form-spy": "0.x",
-    "vtex.affiliates-commission-service": "1.x",
+    "vtex.affiliates-commission-service": "2.x",
     "vtex.store": "2.x",
     "vtex.rich-text": "0.x",
     "vtex.flex-layout": "0.x",

diff --git a/node/package.json b/node/package.json
@@ -34,5 +34,5 @@
     "lint": "tsc --noEmit --pretty",
     "test": "vtex-test-tools test --collectCoverage"
   },
-  "version": "0.56.0"
+  "version": "0.57.1"
 }
diff --git a/react/AffiliateProfileTable.tsx b/react/AffiliateProfileTable.tsx
@@ -77,15 +77,15 @@ function AffiliateProfileTable() {
       label: intl.formatMessage(storeMessages.affiliatesTableIsApprovedTextAny),
     },
     {
-      value: 'ongoing',
+      value: 'ONGOING',
       label: intl.formatMessage(storeMessages.onGoingTitle),
     },
     {
-      value: 'cancel',
+      value: 'CANCEL',
       label: intl.formatMessage(storeMessages.cancelledTitle),
     },
     {
-      value: 'invoiced',
+      value: 'INVOICED',
       label: intl.formatMessage(storeMessages.invoicedTitle),
     },
   ]

diff --git a/react/components/admin/dashboard/AffiliateOrdersTable.tsx b/react/components/admin/dashboard/AffiliateOrdersTable.tsx
@@ -410,22 +410,22 @@ const AffiliateOrdersTable: FC = () => {
           value={statusFilter}
           onChange={handleSelectChange}
         >
-          <option value="any">
+          <option value="">
             {intl.formatMessage(messages.affiliatesTableIsApprovedTextAny)}
           </option>
-          <option value="order-created">
+          <option value="ORDER_CREATED">
             {intl.formatMessage(messages.orderStatusCreatedLabel)}
           </option>
-          <option value="payment-approved">
+          <option value="PAYMENT_APPROVED">
             {intl.formatMessage(messages.orderStatusPaidLabel)}
           </option>
-          <option value="payment-pending">
+          <option value="PAYMENT_PENDING">
             {intl.formatMessage(messages.orderStatusPendingLabel)}
           </option>
-          <option value="invoiced">
+          <option value="INVOICED">
             {intl.formatMessage(messages.orderStatusInvoicedLabel)}
           </option>
-          <option value="cancel">
+          <option value="CANCEL">
             {intl.formatMessage(messages.orderStatusCancelLabel)}
           </option>
         </Select>

diff --git a/react/components/store/ProfileModal/ProfileModal.tsx b/react/components/store/ProfileModal/ProfileModal.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Modal, ActionMenu, IconOptionsDots } from 'vtex.styleguide'
+import { Modal, ActionMenu, IconOptionsDots, Spinner } from 'vtex.styleguide'
 import { useQuery } from 'react-apollo'
 import type { QueryAffiliateOrderArgs } from 'vtex.affiliates-commission-service'
 import { useIntl } from 'react-intl'
@@ -57,7 +57,7 @@ function ProfileModal(props: Props) {
         aria-describedby="modal-order-details"
       >
         {loading ? (
-          <></>
+          <Spinner />
         ) : (
           <>
             <header className="mb-3">
@@ -104,7 +104,7 @@ function ProfileModal(props: Props) {
                           </strong>
                           {intl.formatNumber(
                             data?.affiliateOrder?.orderTotal
-                              ? data?.affiliateOrder?.orderTotal *
+                              ? data.affiliateOrder.orderTotal *
                                   (item.commission / 100)
                               : 0,
                             {

diff --git a/react/components/store/affiliateProfileButton/ProfileButton.tsx b/react/components/store/affiliateProfileButton/ProfileButton.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import type { FC } from 'react'
 import React, { useCallback } from 'react'
 import { useIntl } from 'react-intl'

diff --git a/react/package.json b/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vtex.affiliates",
-  "version": "0.56.0",
+  "version": "0.57.1",
   "scripts": {
     "test": "vtex-test-tools test --collectCoverage"
   },