Skip to content

Commit

Permalink
[23.2] Remove SingleItemSelector deselect label, fix history filter…
Browse files Browse the repository at this point in the history
…s scroll

In this PR:
- removed the `deselectLabel` for `SingleItemSelector`, since it
is used to only select 1 item
- added `overflow-auto` class to History `Index` to prevent filters
in advanced menu from being hidden on smaller/zoomed-in screen
- fixed `PanelViewMenu` when advanced filters are shown in tool
panel; currently it can be confusing as it shows panel views even
when filter menu is toggled
  • Loading branch information
ahmedhamidawan committed Dec 15, 2023
1 parent 392c8e1 commit e87c9ee
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
5 changes: 4 additions & 1 deletion client/src/components/History/Index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<template>
<div v-if="currentUser && currentHistory" id="current-history-panel" class="d-flex flex-column history-index">
<div
v-if="currentUser && currentHistory"
id="current-history-panel"
class="d-flex flex-column history-index overflow-auto">
<HistoryPanel
v-if="!breadcrumbs.length"
:list-offset="listOffset"
Expand Down
13 changes: 13 additions & 0 deletions client/src/components/Panels/Menus/PanelViewMenu.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<template>
<b-button
v-if="showAdvanced"
variant="link"
class="w-100"
size="sm"
@click="$emit('update:show-advanced', !showAdvanced)">
<slot name="panel-view-selector"></slot><span class="sr-only">Close advanced tool search menu</span>
</b-button>
<b-dropdown
v-else
v-b-tooltip.hover.top.noninteractive
right
block
Expand Down Expand Up @@ -59,6 +68,10 @@ export default {
currentPanelView: {
type: String,
},
showAdvanced: {
type: Boolean,
default: false,
},
storeLoading: {
type: Boolean,
default: false,
Expand Down
1 change: 1 addition & 0 deletions client/src/components/Panels/ToolPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ function onInsertWorkflowSteps(workflowId: string, workflowStepCount: number | u
v-if="panelViews && Object.keys(panelViews).length > 1"
:panel-views="panelViews"
:current-panel-view="currentPanelView"
:show-advanced.sync="showAdvanced"
:store-loading="loading"
@updatePanelView="updatePanelView">
<template v-slot:panel-view-selector>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/SingleItemSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Multiselect
v-if="items"
v-model="selectedItem"
deselect-label="Can't remove this value"
:deselect-label="null"
track-by="id"
label="text"
:options="items"
Expand Down

0 comments on commit e87c9ee

Please sign in to comment.