Skip to content

Commit b9d8255

Browse files
committed
Change filter input clear icon to differentiate from failed task icon
1 parent d5979f5 commit b9d8255

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

src/components/cylc/TaskFilter.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2727
<v-text-field
2828
data-cy="filter-task-name"
2929
clearable
30+
:clear-icon="$options.icons.mdiClose"
3031
dense
3132
flat
3233
hide-details
3334
outlined
3435
placeholder="Filter by task name"
3536
v-model="localValue.name"
3637
ref="filterNameInput"
37-
></v-text-field>
38+
/>
3839
</v-col>
3940
<v-col
4041
cols="12"
@@ -45,6 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
4546
data-cy="filter-task-states"
4647
:items="allStates"
4748
clearable
49+
:clear-icon="$options.icons.mdiClose"
4850
dense
4951
flat
5052
hide-details
@@ -76,6 +78,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
7678
<script>
7779
import Task from '@/components/cylc/Task'
7880
import { TaskStateUserOrder } from '@/model/TaskState.model'
81+
import { mdiClose } from '@mdi/js'
7982
8083
export default {
8184
name: 'TaskFilter',
@@ -101,6 +104,10 @@ export default {
101104
this.$emit('input', value)
102105
}
103106
}
107+
},
108+
// Misc options
109+
icons: {
110+
mdiClose
104111
}
105112
}
106113
</script>

src/components/cylc/gscan/GScan.vue

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2828
<v-text-field
2929
v-model="searchWorkflows"
3030
clearable
31+
:clear-icon="$options.icons.mdiClose"
3132
flat
3233
dense
3334
hide-details
@@ -52,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
5253
id="c-gscan-filter-tooltip-btn"
5354
@click="showFilterTooltip = !showFilterTooltip"
5455
>
55-
<v-icon>{{ svgPaths.filter }}</v-icon>
56+
<v-icon>{{ $options.icons.mdiFilter }}</v-icon>
5657
</v-btn>
5758
</template>
5859
<!-- filters tooltip -->
@@ -200,7 +201,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
200201
</template>
201202

202203
<script>
203-
import { mdiFilter } from '@mdi/js'
204+
import { mdiClose, mdiFilter } from '@mdi/js'
204205
import uniq from 'lodash/uniq'
205206
import TaskState from '@/model/TaskState.model'
206207
import { WorkflowState } from '@/model/WorkflowState.model'
@@ -233,9 +234,6 @@ export default {
233234
data () {
234235
return {
235236
maximumTasksDisplayed: 5,
236-
svgPaths: {
237-
filter: mdiFilter
238-
},
239237
/**
240238
* The filtered workflows. This is the result of applying the filters
241239
* on the workflows prop.
@@ -470,6 +468,12 @@ export default {
470468
return validValues.includes(entry[0])
471469
})
472470
}
471+
},
472+
473+
// Misc options
474+
icons: {
475+
mdiClose,
476+
mdiFilter
473477
}
474478
}
475479
</script>

0 commit comments

Comments
 (0)