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.

Sign up for GitHub

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

Jump to bottom

feat(ui) Reworked the Trigger page to show only columns that have data #5555

Merged
merged 10 commits into from
Oct 24, 2024
Merged

feat(ui) Reworked the Trigger page to show only columns that have data #5555

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd517a5
made changes to ui/src/components/plugins/toe.vue inside ui
MRADUL9936 Oct 17, 2024
ed89212
made changes to trigger.vue
MRADUL9936 Oct 19, 2024
903764c
Merge branch 'develop' into develop
MRADUL9936 Oct 20, 2024
46962c9
Merge branch 'develop' into develop
MilosPaunovic Oct 21, 2024
57c0b65
Revert "made changes to trigger.vue"
MRADUL9936 Oct 23, 2024
b4b1473
updated ui/src/componenets/admin
MRADUL9936 Oct 23, 2024
14a4ac8
Merge branch 'develop' of https://github.com/MRADUL9936/kestra into d…
MRADUL9936 Oct 23, 2024
a164278
Merge branch 'develop' into develop
MilosPaunovic Oct 23, 2024
2a0793d
update ui/src/compoenents/admin/triggers.vue
MRADUL9936 Oct 23, 2024
9d3a2ad
Merge branch 'develop' of https://github.com/MRADUL9936/kestra into d…
MRADUL9936 Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions ui/src/components/admin/Triggers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,14 @@
</bulk-select>
</template>
<el-table-column
v-if="visibleColumns.triggerId"
prop="triggerId"
sortable="custom"
:sort-orders="['ascending', 'descending']"
:label="$t('id')"
/>
<el-table-column
v-if="visibleColumns.flowId"
prop="flowId"
sortable="custom"
:sort-orders="['ascending', 'descending']"
Expand All @@ -105,6 +107,7 @@
</template>
</el-table-column>
<el-table-column
MilosPaunovic marked this conversation as resolved.
Show resolved Hide resolved
v-if="visibleColumns.namespace"
prop="namespace"
sortable="custom"
:sort-orders="['ascending', 'descending']"
Expand All @@ -115,7 +118,7 @@
</template>
</el-table-column>

<el-table-column :label="$t('current execution')">
<el-table-column v-if="visibleColumns.executionId" :label="$t('current execution')">
<template #default="scope">
<router-link
v-if="scope.row.executionId"
Expand All @@ -126,7 +129,7 @@
</template>
</el-table-column>

<el-table-column :label="$t('state')">
<el-table-column v-if="visibleColumns.executionCurrentState" :label="$t('state')">
<template #default="scope">
<status
v-if="scope.row.executionCurrentState"
Expand All @@ -135,30 +138,30 @@
/>
</template>
</el-table-column>
<el-table-column prop="workerId" :label="$t('workerId')">
<el-table-column v-if="visibleColumns.workerId" prop="workerId" :label="$t('workerId')">
<template #default="scope">
<id
:value="scope.row.workerId"
:shrink="true"
/>
</template>
</el-table-column>
<el-table-column :label="$t('date')">
<el-table-column v-if="visibleColumns.date" :label="$t('date')">
<template #default="scope">
<date-ago :inverted="true" :date="scope.row.date" />
</template>
</el-table-column>
<el-table-column :label="$t('updated date')">
<el-table-column v-if="visibleColumns.updatedDate" :label="$t('updated date')">
<template #default="scope">
<date-ago :inverted="true" :date="scope.row.updatedDate" />
</template>
</el-table-column>
<el-table-column :label="$t('next execution date')">
<el-table-column v-if="visibleColumns.nextExecutionDate" :label="$t('next execution date')">
<template #default="scope">
<date-ago :inverted="true" :date="scope.row.nextExecutionDate" />
</template>
</el-table-column>
<el-table-column :label="$t('evaluation lock date')">
<el-table-column v-if="visibleColumns.evaluateRunningDate" :label="$t('evaluation lock date')">
<template #default="scope">
<date-ago :inverted="true" :date="scope.row.evaluateRunningDate" />
</template>
Expand Down Expand Up @@ -475,6 +478,25 @@

const disabled = this.state === "DISABLED" ? true : false;
return all.filter(trigger => trigger.disabled === disabled);
},
visibleColumns() {
const columns = [
{prop: "triggerId", label: this.$t("id")},
{prop: "flowId", label: this.$t("flow")},
{prop: "namespace", label: this.$t("namespace")},
{prop: "executionId", label: this.$t("current execution")},
{prop: "executionCurrentState", label: this.$t("state")},
{prop: "workerId", label: this.$t("workerId")},
{prop: "date", label: this.$t("date")},
{prop: "updatedDate", label: this.$t("updated date")},
{prop: "nextExecutionDate", label: this.$t("next execution date")},
{prop: "evaluateRunningDate", label: this.$t("evaluation lock date")},
];

return columns.reduce((acc, column) => {
acc[column.prop] = this.triggersMerged.some(trigger => trigger[column.prop]);
return acc;
}, {});
}
}
};
Expand Down
Loading