minor changes

valory-xyz · Apr 4, 2024 · 2db3081 · 2db3081
1 parent e02f353
commit 2db3081
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 24 deletions.
diff --git a/apps/autonolas-registry/components/ListAgents/details.jsx b/apps/autonolas-registry/components/ListAgents/details.jsx
@@ -1,8 +1,8 @@
+import { useCallback } from 'react';
 import { useRouter } from 'next/router';
 
-import Details from 'common-util/Details';
-import { useHelpers } from 'common-util/hooks';
-import { useCallback } from 'react';
+import Details from '../../common-util/Details';
+import { useHelpers } from '../../common-util/hooks';
 import {
   getAgentDetails,
   updateAgentHashes,

diff --git a/apps/autonolas-registry/components/ListAgents/useAgents.jsx b/apps/autonolas-registry/components/ListAgents/useAgents.jsx
@@ -56,8 +56,8 @@ export const useMyAgents = () => {
             first: ${TOTAL_VIEW_COUNT}, 
             skip: ${TOTAL_VIEW_COUNT * (currentPage - 1)},
             where: { 
-              owner: "${ownerAddress}", 
               packageType: agent
+              owner_contains_nocase: "${ownerAddress}", 
             },
             orderBy: tokenId,
           ) ${columnsForAgentsAndComponents}
@@ -117,12 +117,7 @@ const useMyAgentsBySearch = () => {
               and: [
                 { packageType: "agent" }
                 { owner_contains_nocase: "${ownerAddress}" }
-                { 
-                  or: [
-                    { publicId_contains_nocase: "${searchValue}" }
-                    { packageHash_contains_nocase: "${searchValue}" }
-                  ]
-                }
+                ${getSearchFilterSubQueryForAgentsAndComponents(searchValue)}
               ]
             }
             orderBy: tokenId

diff --git a/apps/autonolas-registry/components/ListAgents/utils.jsx b/apps/autonolas-registry/components/ListAgents/utils.jsx
@@ -1,7 +1,7 @@
-import { getMechMinterContract, getAgentContract } from 'common-util/Contracts';
-import { getFirstAndLastIndex } from 'common-util/List/functions';
-import { getListByAccount } from 'common-util/ContractUtils/myList';
-import { sendTransaction } from 'common-util/functions';
+import { getMechMinterContract, getAgentContract } from '../../common-util/Contracts';
+import { getFirstAndLastIndex } from '../../common-util/List/functions';
+import { getListByAccount } from '../../common-util/ContractUtils/myList';
+import { sendTransaction } from '../../common-util/functions';
 
 // --------- HELPER METHODS ---------
 export const getAgentOwner = async (agentId) => {

diff --git a/apps/autonolas-registry/components/ListComponents/details.jsx b/apps/autonolas-registry/components/ListComponents/details.jsx
@@ -1,8 +1,8 @@
+import { useCallback } from 'react';
 import { useRouter } from 'next/router';
 
-import Details from 'common-util/Details';
-import { useHelpers } from 'common-util/hooks';
-import { useCallback } from 'react';
+import Details from '../../common-util/Details';
+import { useHelpers } from '../../common-util/hooks';
 import {
   getComponentDetails,
   updateComponentHashes,

diff --git a/apps/autonolas-registry/components/ListComponents/useComponents.jsx b/apps/autonolas-registry/components/ListComponents/useComponents.jsx
@@ -59,8 +59,8 @@ export const useMyComponents = () => {
             first: ${TOTAL_VIEW_COUNT}, 
             skip: ${TOTAL_VIEW_COUNT * (currentPage - 1)},
             where: { 
-              owner: "${ownerAddress}", 
               ${componentPackageType}
+              owner_contains_nocase: "${ownerAddress}", 
             },
             orderBy: tokenId,
           ) ${columnsForAgentsAndComponents}
@@ -120,12 +120,7 @@ const useMyComponentsBySearch = () => {
               and: [
                 { ${componentPackageType} }
                 { owner_contains_nocase: "${ownerAddress}" }
-                { 
-                  or: [
-                    { publicId_contains_nocase: "${searchValue}" }
-                    { packageHash_contains_nocase: "${searchValue}" }
-                  ]
-                }
+                ${getSearchFilterSubQueryForAgentsAndComponents(searchValue)}
               ]
             }
             orderBy: tokenId