Merge pull request #541 from Ferlab-Ste-Justine/fix/SJIP-959

fix(quickfilter): SJIP-959 range should not show a button dropdown in…
Ferlab-Ste-Justine · Oct 17, 2024 · 8aaa5a5 · 8aaa5a5
2 parents 8446a89 + a8b06df
commit 8aaa5a5
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 29 deletions.
diff --git a/packages/ui/Release.md b/packages/ui/Release.md
@@ -1,3 +1,6 @@
+### 10.10.8 2024-10-17
+- fix: SJIP-959 Range should not show a button dropdown in quickfilter
+
 ### 10.10.8 2024-10-16
 - fix: CLIN-3284 fix error 500 query
 

diff --git a/packages/ui/package-lock.json b/packages/ui/package-lock.json
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ferlab/ui",
-    "version": "10.10.8",
+    "version": "10.10.9",
     "description": "Core components for scientific research data portals",
     "publishConfig": {
         "access": "public"

diff --git a/packages/ui/src/components/SidebarMenu/QuickFilter/index.tsx b/packages/ui/src/components/SidebarMenu/QuickFilter/index.tsx
@@ -250,32 +250,48 @@ const QuickFilter = ({
                                                 >
                                                     {get(dictionary, 'actions.clear', 'Clear')}
                                                 </Button>
-                                                <Dropdown.Button
-                                                    className={styles.applyBtn}
-                                                    disabled={selectedFacet && !selectedFacetOptions.length}
-                                                    menu={{
-                                                        items: [
-                                                            {
-                                                                key: TermOperators.in,
-                                                                label: get(dictionary, 'operators.anyOf', 'Any of'),
-                                                            },
-                                                            {
-                                                                key: TermOperators.all,
-                                                                label: get(dictionary, 'operators.allOf', 'All of'),
-                                                            },
-                                                            {
-                                                                key: TermOperators['not-in'],
-                                                                label: get(dictionary, 'operators.noneOf', 'None of'),
-                                                            },
-                                                        ],
-                                                        onClick: (e) => applyFacetFilters(e.key as TermOperators),
-                                                    }}
-                                                    onClick={() => applyFacetFilters(TermOperators.in)}
-                                                    size="small"
-                                                    type="primary"
-                                                >
-                                                    {get(dictionary, 'actions.apply', 'Apply')}
-                                                </Dropdown.Button>
+                                                {qfFacetOptions?.filterGroup.type != VisualType.Range ? (
+                                                    <Dropdown.Button
+                                                        className={styles.applyBtn}
+                                                        disabled={selectedFacet && !selectedFacetOptions.length}
+                                                        menu={{
+                                                            items: [
+                                                                {
+                                                                    key: TermOperators.in,
+                                                                    label: get(dictionary, 'operators.anyOf', 'Any of'),
+                                                                },
+                                                                {
+                                                                    key: TermOperators.all,
+                                                                    label: get(dictionary, 'operators.allOf', 'All of'),
+                                                                },
+                                                                {
+                                                                    key: TermOperators['not-in'],
+                                                                    label: get(
+                                                                        dictionary,
+                                                                        'operators.noneOf',
+                                                                        'None of',
+                                                                    ),
+                                                                },
+                                                            ],
+                                                            onClick: (e) => applyFacetFilters(e.key as TermOperators),
+                                                        }}
+                                                        onClick={() => applyFacetFilters(TermOperators.in)}
+                                                        size="small"
+                                                        type="primary"
+                                                    >
+                                                        {get(dictionary, 'actions.apply', 'Apply')}
+                                                    </Dropdown.Button>
+                                                ) : (
+                                                    <Button
+                                                        className={styles.applyBtn}
+                                                        disabled={selectedFacet && !selectedFacetOptions.length}
+                                                        onClick={() => applyFacetFilters(TermOperators.in)}
+                                                        size="small"
+                                                        type="primary"
+                                                    >
+                                                        {get(dictionary, 'actions.apply', 'Apply')}
+                                                    </Button>
+                                                )}
                                             </div>
                                         </>
                                     ) : (