Merge branch 'master' into feat/list-custom-fields-cost-centers

vtex-apps · Jul 17, 2024 · e0d74e4 · e0d74e4
2 parents 51015d8 + 45de0c9
commit e0d74e4
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Changes listing of custom fields from organization to cost center
 
+## [1.32.0] - 2024-07-17
+
+### Fixed
+
+- Adjust search list many organations at change organization modal
+
 ## [1.31.11] - 2024-07-05
 
 ## [1.31.10] - 2024-07-03

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "b2b-organizations",
   "vendor": "vtex",
-  "version": "1.31.11",
+  "version": "1.32.0",
   "title": "B2B Organizations",
   "description": "App to create and manage B2B Organizations and Cost Centers",
   "mustUpdateAt": "2022-08-28",

diff --git a/react/components/UserWidget.tsx b/react/components/UserWidget.tsx
@@ -321,27 +321,6 @@ const UserWidget: VtexFunctionComponent<UserWidgetProps> = ({
     value: organizationsState.costCenterInput,
   }
 
-  useEffect(() => {
-    const dataList = userWidgetData?.getOrganizationsByEmail
-      ?.filter((organization: any) => {
-        return (
-          organization.organizationName
-            .toLowerCase()
-            .includes(searchTerm.toLowerCase()) ||
-          organization.costCenterName
-            .toLowerCase()
-            .includes(searchTerm.toLowerCase())
-        )
-      })
-      .sort(sortOrganizations)
-
-    setOrganizationsState({
-      ...organizationsState,
-      dataList,
-      totalDataList: dataList?.length,
-    })
-  }, [searchTerm])
-
   useEffect(() => {
     if (!userWidgetData?.getOrganizationsByEmail) {
       return
@@ -480,6 +459,37 @@ const UserWidget: VtexFunctionComponent<UserWidgetProps> = ({
   )
     return null
 
+  const handleSearchOrganizations = (e: any) => {
+    const { value }: { value: string } = e.target
+    let dataList
+
+    setSearchTerm(e.target.value)
+
+    dataList = userWidgetData?.getOrganizationsByEmail?.sort(sortOrganizations)
+
+    if (value.trim() !== '') {
+      dataList =
+        userWidgetData?.getOrganizationsByEmail
+          ?.filter((organization: any) => {
+            return (
+              organization.organizationName
+                .toLowerCase()
+                .includes(value.toLowerCase()) ||
+              organization.costCenterName
+                .toLowerCase()
+                .includes(value.toLowerCase())
+            )
+          })
+          ?.slice(0, 15) ?? []
+    }
+
+    setOrganizationsState({
+      ...organizationsState,
+      dataList,
+      totalDataList: dataList?.length,
+    })
+  }
+
   return (
     <div
       className={`${handles.userWidgetContainer} w-100 flex flex-column mv3 bg-base--inverted`}
@@ -498,13 +508,15 @@ const UserWidget: VtexFunctionComponent<UserWidgetProps> = ({
               </h1>
               <div className={`${handles.userWidgetModalInput} flex`}>
                 <Input
-                  onChange={(e: any) => setSearchTerm(e.target.value)}
+                  onChange={handleSearchOrganizations}
                   value={searchTerm}
                   placeholder={`${formatMessage(messages.search)}...`}
                 />
-                <Button variation="primary">
-                  {formatMessage(messages.search)}
-                </Button>
+                <div className="ml4">
+                  <Button variation="primary">
+                    {formatMessage(messages.search)}
+                  </Button>
+                </div>
               </div>
               <div className={`${handles.userWidgetModalTotal} pt4 mb4`}>
                 {organizationsState?.totalDataList}{' '}

diff --git a/react/package.json b/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vtex.b2b-organizations",
-  "version": "1.31.11",
+  "version": "1.32.0",
   "license": "UNLICENSED",
   "scripts": {
     "test": "vtex-test-tools test --passWithNoTests"