Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RUN-2464-Feat/unit test for activity filter #9124

Merged
merged 9 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,70 @@
<dropdown
v-if="query.recentFilter !== '-' && displayOpts.showRecentFilter"
style="vertical-align: inherit"
data-test-id="dropdown"
>
<span class="dropdown-toggle text-info cursor-pointer mr-2">
<span
class="dropdown-toggle text-info cursor-pointer mr-2"
data-test-id="dropdown-toggle"
>
{{ $t(`period.label.${period.name}`) }}
<span class="caret"></span>
</span>
<template #dropdown>
<li v-for="perobj in periods" :key="perobj.name">
<a role="button" @click="changePeriod(perobj)">
<li
v-for="perobj in periods"
:key="perobj.name"
data-test-id="dropdown-item"
>
<a
role="button"
@click="changePeriod(perobj)"
data-test-id="period-option"
>
{{ $t(`period.label.${perobj.name}`) }}
<span v-if="period.name === perobj.name">√</span>
</a>
</li>
</template>
</dropdown>

<btn
v-if="displayOpts.showFilter"
v-tooltip="hasQuery ? $t('Click to edit Search Query') : ''"
size="xs"
:class="hasQuery ? 'btn-queried btn-info' : 'btn-default'"
@click="filterOpen = true"
data-test-id="filter-button"
>
<span v-if="hasQuery" class="query-params-summary">
<ul class="list-inline">
<li v-for="qname in queryParamsList" :key="qname">
<li
v-for="qname in queryParamsList"
:key="qname"
data-test-id="query-param"
>
{{ $t(`jobquery.title.${qname}`) }}:
<code class="queryval">{{ query[qname] }}</code>
</li>
</ul>
</span>
<span v-else>{{ $t("search.ellipsis") }}</span>
</btn>

<saved-filters
v-if="modelValue && displayOpts.showSavedFilters"
:query="modelValue"
:has-query="hasQuery"
:event-bus="eventBus"
@select_filter="selectFilter($event)"
data-test-id="saved-filters"
></saved-filters>

<modal
id="activityFilter"
v-model="filterOpen"
:title="$t('Search Activity')"
size="lg"
append-to-body
@hide="closing"
data-test-id="modal"
>
<div>
<div class="base-filters">
Expand All @@ -67,9 +83,9 @@
autofocus="true"
class="form-control"
:placeholder="$t('jobquery.title.jobFilter')"
data-test-id="job-filter"
/>
</div>

<div v-if="query.jobIdFilter" class="form-group">
<label for="jobIdFilter" class="sr-only">
{{ $t("jobquery.title.jobIdFilter") }}
Expand All @@ -80,6 +96,7 @@
name="jobIdFilter"
class="form-control"
:placeholder="$t('jobquery.title.jobIdFilter')"
data-test-id="job-id-filter"
/>
</div>
</div>
Expand All @@ -94,6 +111,7 @@
name="userFilter"
class="form-control"
:placeholder="$t('jobquery.title.userFilter')"
data-test-id="user-filter"
/>
</div>
</div>
Expand All @@ -108,6 +126,7 @@
name="execnodeFilter"
class="form-control"
:placeholder="$t('jobquery.title.filter')"
data-test-id="execnode-filter"
/>
</div>
</div>
Expand All @@ -124,6 +143,7 @@
name="titleFilter"
class="form-control"
:placeholder="$t('jobquery.title.titleFilter')"
data-test-id="title-filter"
/>
</div>
</div>
Expand All @@ -138,6 +158,7 @@
noSelection="['': 'Any']"
valueMessagePrefix="status.label"
class="form-control"
data-test-id="stat-filter"
>
<option value>Any</option>
<option>succeed</option>
Expand All @@ -157,6 +178,7 @@
v-model="query.recentFilter"
name="recentFilter"
class="form-control"
data-test-id="recent-filter"
>
<option value>Any Time</option>
<option
Expand All @@ -176,12 +198,14 @@
<div
v-if="query.recentFilter === '-'"
class="date-filters panel panel-default"
data-test-id="date-filters"
>
<div class="panel-body form-horizontal">
<div
v-for="df in DateFilters"
:key="df.name"
class="container-fluid"
data-test-id="date-filter-container"
>
<date-filter v-model="df.filter">{{
$t("jobquery.title." + df.name)
Expand All @@ -208,15 +232,27 @@ import { defineComponent } from "vue";
import DateTimePicker from "./dateTimePicker.vue";
import DateFilter from "./dateFilter.vue";
import SavedFilters from "./savedFilters.vue";

export default defineComponent({
name: "ActivityFilter",
components: {
DateTimePicker,
DateFilter,
SavedFilters,
},
props: ["eventBus", "modelValue", "eventBus", "opts"],
props: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

eventBus: {
type: Object,
required: true,
},
modelValue: {
type: Object,
required: true,
},
opts: {
type: Object,
required: true,
},
},
emit: ["update:modelValue"],
data() {
return {
Expand Down Expand Up @@ -252,7 +288,6 @@ export default defineComponent({
datetime: "",
},
},

{
name: "startbeforeFilter",
filter: {
Expand Down Expand Up @@ -297,7 +332,6 @@ export default defineComponent({
"1m": "1 Month",
},
didSearch: false,

period: { name: "All", params: {} },
periods: [
{ name: "All", params: { recentFilter: "" } },
Expand Down Expand Up @@ -326,7 +360,7 @@ export default defineComponent({
deep: true,
},
DateFilters: {
handler(newValue, oldVale) {
handler(newValue, oldValue) {
newValue.forEach((element) => {
if (element.filter.enabled) {
this.query["do" + element.name] = "true";
Expand All @@ -347,7 +381,6 @@ export default defineComponent({
methods: {
checkQueryIsPresent() {
const isquery = this.QueryNames.findIndex((q) => this.query[q]) >= 0;

this.hasQuery = isquery;
},
updated() {
Expand All @@ -370,7 +403,6 @@ export default defineComponent({
if (filter.query.recentFilter) {
this.query.recentFilter = filter.query.recentFilter;
}

this.query.filterName = filter.filterName;
this.checkQueryIsPresent();
this.updateSelectedPeriod();
Expand Down Expand Up @@ -420,7 +452,7 @@ export default defineComponent({
this.query.recentFilter !== this.period.params.recentFilter
) {
const p = this.periods.find(
(v) => v.params.recentFilter === this.query.recentFilter,
(v) => v.params.recentFilter === this.query.recentFilter
);
if (p && p !== this.period) {
this.period = p;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="form-group">
<span class="checkbox col-sm-2">
<span class="checkbox col-sm-2" data-testid="checkbox-span">
<input :id="uid" v-model="enabled" type="checkbox" class="checkbox" />
<label :for="uid"><slot>Enabled</slot></label>
</span>
Expand Down