Skip to content

Commit 2e54595

Browse files
authored
replace wildcard tooltip with static text, replace the instructions text (#2383)
* replace wildcard tooltip with static text, replace the instructions text
1 parent 15356bb commit 2e54595

File tree

2 files changed

+14
-25
lines changed

2 files changed

+14
-25
lines changed

src/Frontend/src/components/audit/AuditList.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,11 @@ watch(autoRefreshValue, (newValue) => dataRetriever.updateTimeout(newValue));
159159
<div class="row">
160160
<FiltersPanel />
161161
</div>
162+
<div class="row">
163+
<div class="col format-showing-tip">
164+
<div>Use <i class="fa fa-asterisk asterisk" /> as a wildcard. Eg: <i class="fa fa-asterisk asterisk"></i>World! or Hello<i class="fa fa-asterisk asterisk"></i> finds Hello World!</div>
165+
</div>
166+
</div>
162167
<div class="row">
163168
<ResultsCount :displayed="messages.length" :total="totalCount" />
164169
</div>
@@ -297,4 +302,9 @@ watch(autoRefreshValue, (newValue) => dataRetriever.updateTimeout(newValue));
297302
.retry-issued {
298303
background-image: url("@/assets/status_retry_issued.svg");
299304
}
305+
.format-showing-tip {
306+
display: flex;
307+
align-items: flex-end;
308+
font-style: italic;
309+
}
300310
</style>

src/Frontend/src/components/audit/FiltersPanel.vue

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ import FilterInput from "@/components/FilterInput.vue";
33
import { storeToRefs } from "pinia";
44
import { FieldNames, useAuditStore } from "@/stores/AuditStore.ts";
55
import ListFilterSelector from "@/components/audit/ListFilterSelector.vue";
6-
import { computed, useTemplateRef } from "vue";
6+
import { computed } from "vue";
77
import DatePickerRange from "@/components/audit/DatePickerRange.vue";
8-
import { Tippy, TippyComponent } from "vue-tippy";
98
109
const store = useAuditStore();
1110
const { sortBy, messageFilterString, selectedEndpointName, endpoints, itemsPerPage, dateRange } = storeToRefs(store);
1211
const endpointNames = computed(() => {
1312
return [...new Set(endpoints.value.map((endpoint) => endpoint.name))].sort();
1413
});
15-
const wildcardTooltipRef = useTemplateRef<TippyComponent | null>("wildcardTooltipRef");
14+
1615
const sortByItemsMap = new Map([
1716
["Latest sent", `${FieldNames.TimeSent},desc`],
1817
["Oldest sent", `${FieldNames.TimeSent},asc`],
@@ -53,30 +52,14 @@ function findKeyByValue(searchValue: string) {
5352
}
5453
return "";
5554
}
56-
57-
function toggleWildcardToolTip(show: boolean) {
58-
if (show) {
59-
wildcardTooltipRef.value?.show();
60-
} else {
61-
wildcardTooltipRef.value?.hide();
62-
}
63-
}
6455
</script>
6556

6657
<template>
6758
<div class="filters">
6859
<div class="filter">
6960
<div class="filter-label"></div>
7061
<div class="filter-component text-search-container">
71-
<Tippy ref="wildcardTooltipRef" trigger="click" :hideOnClick="false">
72-
<template #content>
73-
<h4>Use <i class="fa fa-asterisk asterisk" /> to do wildcard searches</h4>
74-
<p>
75-
Example: <i><i class="fa fa-asterisk asterisk" />World!</i> or <i>Hello<i class="fa fa-asterisk asterisk" /></i>, to look for <i>Hello World!</i>
76-
</p>
77-
</template>
78-
<FilterInput v-model="messageFilterString" placeholder="Search messages..." aria-label="Search messages" @focus="() => toggleWildcardToolTip(true)" @blur="() => toggleWildcardToolTip(false)" @input="() => toggleWildcardToolTip(false)" />
79-
</Tippy>
62+
<FilterInput v-model="messageFilterString" placeholder="Search messages..." aria-label="Search messages" />
8063
</div>
8164
</div>
8265
<div class="filter">
@@ -94,7 +77,7 @@ function toggleWildcardToolTip(show: boolean) {
9477
<div class="filter">
9578
<div class="filter-label">Show:</div>
9679
<div class="filter-component">
97-
<ListFilterSelector :items="numberOfItemsPerPage" instructions="Select how many result to display" v-model="selectedItemsPerPage" item-name="result" :can-clear="false" :show-clear="false" :show-filter="false" />
80+
<ListFilterSelector :items="numberOfItemsPerPage" instructions="Max results to display" v-model="selectedItemsPerPage" item-name="result" :can-clear="false" :show-clear="false" :show-filter="false" />
9881
</div>
9982
</div>
10083
<div class="filter">
@@ -107,10 +90,6 @@ function toggleWildcardToolTip(show: boolean) {
10790
</template>
10891

10992
<style scoped>
110-
.asterisk {
111-
color: #04b9ff;
112-
font-size: 1.2rem;
113-
}
11493
.filters {
11594
background-color: #f3f3f3;
11695
border: #8c8c8c 1px solid;

0 commit comments

Comments
 (0)