Added Bookmarsk to Image Picker

ibexa · Aug 23, 2024 · d013818 · d013818
1 parent bab28a8
commit d013818
Show file tree

Hide file tree

Showing 6 changed files with 151 additions and 122 deletions.
diff --git a/src/bundle/Resources/config/universal_discovery_widget.yaml b/src/bundle/Resources/config/universal_discovery_widget.yaml
@@ -35,6 +35,15 @@ system:
                         browse:
                             items_per_page: 50
                             priority: 30
+                    image_picker_tabs_config:
+                        image_picker:
+                            id: 'image_picker'
+                            priority: 40
+                            hidden: false
+                        image_picker_bookmarks:
+                            id: 'image_picker_bookmarks'
+                            priority: 50
+                            hidden: false
 
                 # These inherit _default configuration
                 create:

diff --git a/src/bundle/Resources/public/scss/_mixins.scss b/src/bundle/Resources/public/scss/_mixins.scss
@@ -12,6 +12,7 @@
 @import 'mixins/containers';
 @import 'mixins/drag-and-drop';
 @import 'mixins/spinner';
+@import 'mixins/tab-selector';
 
 @mixin datetime-field() {
     &.is-invalid {

diff --git a/src/bundle/Resources/public/scss/mixins/_tab-selector.scss b/src/bundle/Resources/public/scss/mixins/_tab-selector.scss
@@ -0,0 +1,43 @@
+@mixin tab-selector {
+    &__item {
+        height: calculateRem(48px);
+        width: calculateRem(48px);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+        border-radius: $ibexa-border-radius;
+        margin: calculateRem(12px) calculateRem(8px) calculateRem(24px);
+        position: relative;
+
+        .ibexa-icon {
+            fill: $ibexa-color-black;
+        }
+
+        &--selected {
+            background-color: $ibexa-color-light-400;
+
+            .ibexa-icon {
+                fill: $ibexa-color-black;
+            }
+        }
+
+        &:not(:first-of-type) {
+            &:before {
+                content: '';
+                position: absolute;
+                top: calculateRem(-12px);
+                left: calculateRem(12px);
+                height: calculateRem(1.5px);
+                width: calculateRem(24px);
+                background-color: $ibexa-color-dark-200;
+            }
+        }
+
+        &:hover {
+            .ibexa-icon {
+                fill: $ibexa-color-primary;
+            }
+        }
+    }
+}
diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_tab.selector.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_tab.selector.scss
@@ -1,43 +1,3 @@
 .c-tab-selector {
-    &__item {
-        height: calculateRem(48px);
-        width: calculateRem(48px);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        cursor: pointer;
-        border-radius: $ibexa-border-radius;
-        margin: calculateRem(12px) calculateRem(8px) calculateRem(24px);
-        position: relative;
-
-        .ibexa-icon {
-            fill: $ibexa-color-black;
-        }
-
-        &--selected {
-            background-color: $ibexa-color-light-400;
-
-            .ibexa-icon {
-                fill: $ibexa-color-black;
-            }
-        }
-
-        &:not(:first-of-type) {
-            &:before {
-                content: '';
-                position: absolute;
-                top: calculateRem(-12px);
-                left: calculateRem(12px);
-                height: calculateRem(1.5px);
-                width: calculateRem(24px);
-                background-color: $ibexa-color-dark-200;
-            }
-        }
-
-        &:hover {
-            .ibexa-icon {
-                fill: $ibexa-color-primary;
-            }
-        }
-    }
+    @include tab-selector();
 }
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js b/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js
@@ -44,6 +44,7 @@ export const useSearchByQueryFetch = () => {
             filters = {},
             fullTextCriterion = null,
             contentNameCriterion = null,
+            isBookmarked = null,
         ) => {
             const handleFetch = (response) => {
                 dispatchLoadedLocationsAction({ type: 'CLEAR_LOCATIONS' });
@@ -75,6 +76,10 @@ export const useSearchByQueryFetch = () => {
                 query.SubtreeCriterion = subtreePathString;
             }
 
+            if (isBookmarked) {
+                query.IsBookmarkedCriterion = isBookmarked;
+            }
+
             const isImageCriterionDataEmpty = !imageCriterionData || Object.keys(imageCriterionData).length === 0;
 
             if (!isImageCriterionDataEmpty) {