ordering-ui-admin-external 1.33.1 → 1.35.0

package/template/pages/GiftCardsList/index.js

@@ -3,10 +3,14 @@ import { HelmetTags } from '../../components/HelmetTags'
 import { GiftCardsListing as GiftCardsListingController } from '../../../src/components/Orders'
 
 export const GiftCardsList = (props) => {
+  const giftCardProps = {
+    ...props,
+    isUseQuery: true
+  }
   return (
     <>
       <HelmetTags page='gift_cards' />
-      <GiftCardsListingController {...props} />
+      <GiftCardsListingController {...giftCardProps} />
     </>
   )
 }

package/template/pages/ManagersList/index.js

@@ -1,13 +1,14 @@
 import React from 'react'
 import { HelmetTags } from '../../components/HelmetTags'
-import { useEvent, useLanguage } from 'ordering-components-admin-external'
+import { useLanguage } from 'ordering-components-admin-external'
 import { UsersListing } from '../../../src/components/Users'
+import { addQueryToUrl, removeQueryToUrl } from '../../../src/utils'
 
 export const ManagersList = (props) => {
   const [, t] = useLanguage()
-  const [events] = useEvent()
   const usersProps = {
     ...props,
+    isUseQuery: true,
     headerTitle: t('MANAGERS', 'Managers'),
     defaultUserTypesSelected: [0, 2, 9],
     propsToFetch: [
@@ -19,9 +20,9 @@ export const ManagersList = (props) => {
     ],
     onUserRedirect: (userId) => {
       if (!userId) {
-        return events.emit('go_to_page', { page: 'managers', replace: true })
+        return removeQueryToUrl(['id', 'section', 'tab'])
       }
-      return events.emit('go_to_page', { page: 'managers', search: `?id=${userId}` })
+      return addQueryToUrl({ id: userId })
     }
   }
   return (

package/template/pages/MessagesList/index.js

@@ -3,10 +3,14 @@ import { HelmetTags } from '../../components/HelmetTags'
 import { MessagesListing } from '../../../src/components/Messages'
 
 export const MessagesList = (props) => {
+  const messagesListProps = {
+    ...props,
+    isUseQuery: true
+  }
   return (
     <>
       <HelmetTags page='messages' />
-      <MessagesListing {...props} />
+      <MessagesListing {...messagesListProps} />
     </>
   )
 }

package/template/pages/OpenCarts/index.js

@@ -1,18 +1,17 @@
 import React from 'react'
 import { HelmetTags } from '../../components/HelmetTags'
-import { useEvent } from 'ordering-components-admin-external'
 import { OpenCartListing as OpenCartListingController } from '../../../src/components/CartRecovery'
+import { addQueryToUrl, removeQueryToUrl } from '../../../src/utils'
 
 export const OpenCarts = (props) => {
-  const [events] = useEvent()
-
   const openCartsProps = {
     ...props,
+    isUseQuery: true,
     onCartRedirect: (id) => {
       if (!id) {
-        return events.emit('go_to_page', { page: 'open_carts', replace: true })
+        return removeQueryToUrl(['id'])
       }
-      return events.emit('go_to_page', { page: 'open_carts', search: `?id=${id}` })
+      return addQueryToUrl({ id: id })
     }
   }
 

package/template/pages/OrderingProducts/index.js

@@ -6,7 +6,8 @@ export const OrderingProducts = (props) => {
   const orderingProductsProps = {
     ...props,
     isSearchByName: true,
-    isSearchByDescription: true
+    isSearchByDescription: true,
+    isUseQuery: true
   }
   return (
     <>

package/template/pages/OrdersList/index.js

@@ -1,17 +1,17 @@
 import React from 'react'
 import { HelmetTags } from '../../components/HelmetTags'
-import { useEvent } from 'ordering-components-admin-external'
 import { OrdersManager as OrdersManagerController } from '../../../src/components/Orders'
+import { addQueryToUrl, removeQueryToUrl } from '../../../src/utils'
 
 export const OrdersList = (props) => {
-  const [events] = useEvent()
   const ordersListProps = {
     ...props,
+    isUseQuery: true,
     onOrderRedirect: (orderId) => {
       if (!orderId) {
-        return events.emit('go_to_page', { page: 'orders', replace: true })
+        return removeQueryToUrl(['id', 'section', 'tab'])
       }
-      return events.emit('go_to_page', { page: 'orders', search: `?id=${orderId}` })
+      return addQueryToUrl({ id: orderId })
     }
   }
   return (

package/template/pages/Professionals/index.js

@@ -1,13 +1,14 @@
 import React from 'react'
 import { HelmetTags } from '../../components/HelmetTags'
-import { useEvent, useLanguage } from 'ordering-components-admin-external'
+import { useLanguage } from 'ordering-components-admin-external'
 import { ProfessionalListing } from '../../../src/components/Users'
+import { addQueryToUrl, removeQueryToUrl } from '../../../src/utils'
 
 export const Professionals = (props) => {
   const [, t] = useLanguage()
-  const [events] = useEvent()
   const professionalProps = {
     ...props,
+    isUseQuery: true,
     headerTitle: t('PROFESSIONALS', 'Professionals'),
     defaultUserTypesSelected: [8],
     propsToFetch: [
@@ -19,9 +20,9 @@ export const Professionals = (props) => {
     ],
     onUserRedirect: (userId) => {
       if (!userId) {
-        return events.emit('go_to_page', { page: 'professionals', replace: true })
+        return removeQueryToUrl(['id', 'section', 'tab'])
       }
-      return events.emit('go_to_page', { page: 'professionals', search: `?id=${userId}` })
+      return addQueryToUrl({ id: userId })
     }
   }
 

package/template/pages/RecoveryActionListing/index.js

@@ -3,10 +3,14 @@ import { HelmetTags } from '../../components/HelmetTags'
 import { RecoveryActionListing as RecoveryActionListingController } from '../../../src/components/CartRecovery'
 
 export const RecoveryActionListing = (props) => {
+  const recoveryActionListProps = {
+    ...props,
+    isUseQuery: true
+  }
   return (
     <>
       <HelmetTags page='recovery_actions' />
-      <RecoveryActionListingController {...props} />
+      <RecoveryActionListingController {...recoveryActionListProps} />
     </>
   )
 }

package/template/pages/ReviewsList/index.js

@@ -3,10 +3,14 @@ import { HelmetTags } from '../../components/HelmetTags'
 import { ReviewsListing as ReviewsListingController } from '../../../src/components/BusinessIntelligence'
 
 export const ReviewsList = (props) => {
+  const reviewsProps = {
+    ...props,
+    isUseQuery: true
+  }
   return (
     <>
       <HelmetTags page='reviews' />
-      <ReviewsListingController {...props} />
+      <ReviewsListingController {...reviewsProps} />
     </>
   )
 }