Fix search behavior in tree (#794)

* Fix searchg behavior in tree * Automatic frontend build --------- Co-authored-by: vin0401 <[email protected]>
pimcore · Dec 3, 2024 · 7d37a0d · 7d37a0d
1 parent afa66e6
commit 7d37a0d
Show file tree

Hide file tree

Showing 35 changed files with 1,907 additions and 1,902 deletions.
diff --git a/assets/js/src/core/components/element-tree/element-tree.tsx b/assets/js/src/core/components/element-tree/element-tree.tsx
@@ -30,6 +30,7 @@ import { Box } from '../box/box'
 
 export interface TreeSearchProps {
   node: TreeNodeProps
+  isLoading?: boolean
   mergeAdditionalQueryParams?: Dispatch<unknown>
   total: number
 }

diff --git a/assets/js/src/core/components/element-tree/list/tree-list.tsx b/assets/js/src/core/components/element-tree/list/tree-list.tsx
@@ -34,7 +34,7 @@ export const TreeList = ({ node }: TreeListProps): React.JSX.Element => {
   const { isLoading, isFetching, isError, data } = apiHookResult
   const { uploadFileList, uploadingNode } = useContext(UploadContext)!
 
-  if (isLoading === true || isFetching === true) {
+  if (isLoading === true) {
     return (
       <Skeleton style={ { paddingLeft: token.paddingSM + (node.level + 1.5) * 24 } } />
     )
@@ -54,6 +54,7 @@ export const TreeList = ({ node }: TreeListProps): React.JSX.Element => {
           style={ { paddingLeft: token.paddingSM + (node.level + 1) * 24 } }
         >
           <RenderFilter
+            isLoading={ isFetching }
             mergeAdditionalQueryParams={ mergeAdditionalQueryParams }
             node={ node }
             total={ total }

diff --git a/assets/js/src/core/modules/asset/tree/search/search-container.tsx b/assets/js/src/core/modules/asset/tree/search/search-container.tsx
@@ -20,6 +20,7 @@ const SearchContainer = (props: TreeSearchProps): React.JSX.Element => {
   const { t } = useTranslation()
   return (
     <BaseSearchContainer
+      { ...props }
       label={ t('asset.asset-tree.search', { folderName: props.node.label }) }
       node={ props.node }
       total={ props.total }

diff --git a/assets/js/src/core/modules/data-object/tree/search/search-container.tsx b/assets/js/src/core/modules/data-object/tree/search/search-container.tsx
@@ -20,6 +20,7 @@ const SearchContainer = (props: TreeSearchProps): React.JSX.Element => {
   const { t } = useTranslation()
   return (
     <BaseSearchContainer
+      { ...props }
       label={ t('data-object.data-object-tree.search', { folderName: props.node.label }) }
       node={ props.node }
       total={ props.total }

diff --git a/assets/js/src/core/modules/element/tree/search/search-container.tsx b/assets/js/src/core/modules/element/tree/search/search-container.tsx
@@ -46,6 +46,7 @@ const SearchContainer = (props: SearchContainerProps): React.JSX.Element => {
   return (
     <Search
       aria-label={ props.label }
+      loading={ props.isLoading }
       onSearch={ onSearch }
       placeholder={ props.label }
       size='small'

diff --git a/...b37049-db4f-4146-9a7f-9c30ff6aacea/105.js → ...1a0a5f-e169-4c5b-b107-1591f630254f/105.js b/...b37049-db4f-4146-9a7f-9c30ff6aacea/105.js → ...1a0a5f-e169-4c5b-b107-1591f630254f/105.js
diff --git a/...4146-9a7f-9c30ff6aacea/105.js.LICENSE.txt → ...4c5b-b107-1591f630254f/105.js.LICENSE.txt b/...4146-9a7f-9c30ff6aacea/105.js.LICENSE.txt → ...4c5b-b107-1591f630254f/105.js.LICENSE.txt
diff --git a/...-db4f-4146-9a7f-9c30ff6aacea/core-dll.css → ...-e169-4c5b-b107-1591f630254f/core-dll.css b/...-db4f-4146-9a7f-9c30ff6aacea/core-dll.css → ...-e169-4c5b-b107-1591f630254f/core-dll.css
diff --git a/public/build/0a1a0a5f-e169-4c5b-b107-1591f630254f/core-dll.js b/public/build/0a1a0a5f-e169-4c5b-b107-1591f630254f/core-dll.js
diff --git a/...9a7f-9c30ff6aacea/core-dll.js.LICENSE.txt → ...b107-1591f630254f/core-dll.js.LICENSE.txt b/...9a7f-9c30ff6aacea/core-dll.js.LICENSE.txt → ...b107-1591f630254f/core-dll.js.LICENSE.txt
diff --git a/public/build/0a1a0a5f-e169-4c5b-b107-1591f630254f/entrypoints.json b/public/build/0a1a0a5f-e169-4c5b-b107-1591f630254f/entrypoints.json
@@ -0,0 +1,12 @@
+{
+  "entrypoints": {
+    "core-dll": {
+      "css": [
+        "/bundles/pimcorestudioui/build/0a1a0a5f-e169-4c5b-b107-1591f630254f/core-dll.css"
+      ],
+      "js": [
+        "/bundles/pimcorestudioui/build/0a1a0a5f-e169-4c5b-b107-1591f630254f/core-dll.js"
+      ]
+    }
+  }
+}
diff --git a/...9c30ff6aacea/fonts/Lato-Bold.636be8de.ttf → ...1591f630254f/fonts/Lato-Bold.636be8de.ttf b/...9c30ff6aacea/fonts/Lato-Bold.636be8de.ttf → ...1591f630254f/fonts/Lato-Bold.636be8de.ttf
diff --git a/...c30ff6aacea/fonts/Lato-Light.c7400fca.ttf → ...591f630254f/fonts/Lato-Light.c7400fca.ttf b/...c30ff6aacea/fonts/Lato-Light.c7400fca.ttf → ...591f630254f/fonts/Lato-Light.c7400fca.ttf
diff --git a/...0ff6aacea/fonts/Lato-Regular.9d883d54.ttf → ...1f630254f/fonts/Lato-Regular.9d883d54.ttf b/...0ff6aacea/fonts/Lato-Regular.9d883d54.ttf → ...1f630254f/fonts/Lato-Regular.9d883d54.ttf
diff --git a/...c30ff6aacea/images/layers-2x.8f2c4d11.png → ...591f630254f/images/layers-2x.8f2c4d11.png b/...c30ff6aacea/images/layers-2x.8f2c4d11.png → ...591f630254f/images/layers-2x.8f2c4d11.png
diff --git a/...f-9c30ff6aacea/images/layers.416d9136.png → ...7-1591f630254f/images/layers.416d9136.png b/...f-9c30ff6aacea/images/layers.416d9136.png → ...7-1591f630254f/images/layers.416d9136.png
diff --git a/...0ff6aacea/images/marker-icon.2b3e1faf.png → ...1f630254f/images/marker-icon.2b3e1faf.png b/...0ff6aacea/images/marker-icon.2b3e1faf.png → ...1f630254f/images/marker-icon.2b3e1faf.png
diff --git a/...6aacea/images/spritesheet-2x.7ea3a6d4.png → ...30254f/images/spritesheet-2x.7ea3a6d4.png b/...6aacea/images/spritesheet-2x.7ea3a6d4.png → ...30254f/images/spritesheet-2x.7ea3a6d4.png
diff --git a/...0ff6aacea/images/spritesheet.a4e0eb7a.svg → ...1f630254f/images/spritesheet.a4e0eb7a.svg b/...0ff6aacea/images/spritesheet.a4e0eb7a.svg → ...1f630254f/images/spritesheet.a4e0eb7a.svg
diff --git a/...0ff6aacea/images/spritesheet.ef32ea2b.png → ...1f630254f/images/spritesheet.ef32ea2b.png b/...0ff6aacea/images/spritesheet.ef32ea2b.png → ...1f630254f/images/spritesheet.ef32ea2b.png
diff --git a/...db4f-4146-9a7f-9c30ff6aacea/manifest.json → ...e169-4c5b-b107-1591f630254f/manifest.json b/...db4f-4146-9a7f-9c30ff6aacea/manifest.json → ...e169-4c5b-b107-1591f630254f/manifest.json
diff --git a/public/build/1699de6e-f6c7-4629-93c2-7f156f5e2764/entrypoints.json b/public/build/1699de6e-f6c7-4629-93c2-7f156f5e2764/entrypoints.json
@@ -0,0 +1,9 @@
+{
+  "entrypoints": {
+    "main": {
+      "js": [
+        "/bundles/pimcorestudioui/build/1699de6e-f6c7-4629-93c2-7f156f5e2764/main.js"
+      ]
+    }
+  }
+}
diff --git a/...2bb55-3510-49bb-b34c-e07a4e7db229/main.js → ...9de6e-f6c7-4629-93c2-7f156f5e2764/main.js b/...2bb55-3510-49bb-b34c-e07a4e7db229/main.js → ...9de6e-f6c7-4629-93c2-7f156f5e2764/main.js
diff --git a/...9bb-b34c-e07a4e7db229/main.js.LICENSE.txt → ...629-93c2-7f156f5e2764/main.js.LICENSE.txt b/...9bb-b34c-e07a4e7db229/main.js.LICENSE.txt → ...629-93c2-7f156f5e2764/main.js.LICENSE.txt
diff --git a/public/build/1699de6e-f6c7-4629-93c2-7f156f5e2764/manifest.json b/public/build/1699de6e-f6c7-4629-93c2-7f156f5e2764/manifest.json
@@ -0,0 +1,3 @@
+{
+  "bundles/pimcorestudioui/build/1699de6e-f6c7-4629-93c2-7f156f5e2764/main.js": "/bundles/pimcorestudioui/build/1699de6e-f6c7-4629-93c2-7f156f5e2764/main.js"
+}
diff --git a/public/build/1b62bb55-3510-49bb-b34c-e07a4e7db229/entrypoints.json b/public/build/1b62bb55-3510-49bb-b34c-e07a4e7db229/entrypoints.json
diff --git a/public/build/1b62bb55-3510-49bb-b34c-e07a4e7db229/manifest.json b/public/build/1b62bb55-3510-49bb-b34c-e07a4e7db229/manifest.json
diff --git a/public/build/44b37049-db4f-4146-9a7f-9c30ff6aacea/core-dll.js b/public/build/44b37049-db4f-4146-9a7f-9c30ff6aacea/core-dll.js
diff --git a/public/build/44b37049-db4f-4146-9a7f-9c30ff6aacea/entrypoints.json b/public/build/44b37049-db4f-4146-9a7f-9c30ff6aacea/entrypoints.json
diff --git a/public/build/c039e59c-0c00-4dc1-b9e7-b255eeab7ee0/entrypoints.json b/public/build/c039e59c-0c00-4dc1-b9e7-b255eeab7ee0/entrypoints.json
diff --git a/public/build/c039e59c-0c00-4dc1-b9e7-b255eeab7ee0/manifest.json b/public/build/c039e59c-0c00-4dc1-b9e7-b255eeab7ee0/manifest.json
diff --git a/public/build/e0cd0b29-8931-451e-950d-a8be133c96e1/entrypoints.json b/public/build/e0cd0b29-8931-451e-950d-a8be133c96e1/entrypoints.json
@@ -0,0 +1,9 @@
+{
+  "entrypoints": {
+    "vendor": {
+      "js": [
+        "/bundles/pimcorestudioui/build/e0cd0b29-8931-451e-950d-a8be133c96e1/vendor.js"
+      ]
+    }
+  }
+}
diff --git a/public/build/e0cd0b29-8931-451e-950d-a8be133c96e1/manifest.json b/public/build/e0cd0b29-8931-451e-950d-a8be133c96e1/manifest.json
@@ -0,0 +1,3 @@
+{
+  "bundles/pimcorestudioui/build/e0cd0b29-8931-451e-950d-a8be133c96e1/vendor.js": "/bundles/pimcorestudioui/build/e0cd0b29-8931-451e-950d-a8be133c96e1/vendor.js"
+}
diff --git a/...59c-0c00-4dc1-b9e7-b255eeab7ee0/vendor.js → ...b29-8931-451e-950d-a8be133c96e1/vendor.js b/...59c-0c00-4dc1-b9e7-b255eeab7ee0/vendor.js → ...b29-8931-451e-950d-a8be133c96e1/vendor.js
diff --git a/...1-b9e7-b255eeab7ee0/vendor.js.LICENSE.txt → ...e-950d-a8be133c96e1/vendor.js.LICENSE.txt b/...1-b9e7-b255eeab7ee0/vendor.js.LICENSE.txt → ...e-950d-a8be133c96e1/vendor.js.LICENSE.txt