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

add search and category select fields #559

Merged
merged 1 commit into from
Dec 23, 2024
Merged
Changes from all commits
Commits
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
80 changes: 70 additions & 10 deletions client/src/components/templates/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,28 @@
<v-container>

<v-row class="justify-space-between">
<v-col cols="6" sm="6" md="6" lg="6" xl="6">
<v-col cols="6" sm="12" md="12" lg="6" xl="6">
<h1>Templates</h1>
</v-col>
<v-col cols="3" sm="6" md="3">
<v-text-field
label="Search"
v-model="search"
color="secondary"
@input="searchTemplates"
density="comfortable"
></v-text-field>
</v-col>
<v-col cols="3" sm="6" md="3">
<v-select
:items="categories"
color="secondary"
density="comfortable"
@update:modelValue="filterByCategory"
label="Category"
:v-model="selectedCategory"
></v-select>
</v-col>
</v-row>
<v-row>
<v-tabs v-if="templates.catalogs.length > 1">
Expand All @@ -19,7 +38,7 @@
</v-row>
<v-row>
<v-col cols="12" sm="12" md="3"
v-for="template in services.services" :key="template.name">
v-for="template in showedTemplates.services" :key="template.name">
<v-card
style="padding-bottom: 40px;"
height="320px"
Expand Down Expand Up @@ -123,6 +142,7 @@

<script lang="ts">
import axios from "axios";
import { forEach } from "lodash";
import { defineComponent } from 'vue'

type Pipeline = {
Expand All @@ -139,10 +159,6 @@ type Pipeline = {
}[]
}

type PipelineList = {
items: Pipeline[]
}

type Template = {
name: string,
description: string,
Expand All @@ -154,6 +170,13 @@ type Template = {
screenshots: string[],
dirname: string,
template: string,
addons: string[],
language: string,
categories: string[],
created_at: string,
last_updated: string,
last_pushed: string,
status: string,
}

type Templates = {
Expand All @@ -173,8 +196,13 @@ type Catalog = {
}
}

type Services = {
type TemplatesList = {
services: Template[],
categories: Object,
// categories: {
// title: string,
// count: number,
// }[]
}

export default defineComponent({
Expand All @@ -189,7 +217,8 @@ export default defineComponent({
phase: '',
pipelines: [] as string[],
phases: {} as { [key: string]: string[] },
services: {} as Services,
templatesList: {} as TemplatesList,
showedTemplates: {} as TemplatesList,
dialog: false,
clickedTemplate: {} as Template,
catalogId: 0,
Expand All @@ -198,6 +227,14 @@ export default defineComponent({
catalogs: [] as Catalog[],
},
catalogTabs: [] as string[],
categories: [
{ title: 'All', value: 'All' },
],
search: '',
selectedCategory: {
title: 'All',
value: 'All',
},
}),
components: {
},
Expand All @@ -224,7 +261,7 @@ export default defineComponent({
const self = this;
axios.get(`/api/config/catalogs`)
.then(response => {
self.templates = response.data;
self.templates = response.data as Templates;
if (self.templates.catalogs.length > 0 && self.templates.enabled == true) {
self.loadTemplates(self.templates.catalogs[catalogId].index.url)
}
Expand All @@ -234,11 +271,34 @@ export default defineComponent({
console.log(error);
});
},
filterByCategory(selectedCategory: string) {
console.log(selectedCategory);
if (selectedCategory === 'All') {
this.showedTemplates.services = this.templatesList.services;
} else {
this.showedTemplates.services = this.templatesList.services.filter((template) => {
return template.categories.includes(selectedCategory);
});
}
},
searchTemplates() {
if (this.search !== '') {
this.showedTemplates.services = this.templatesList.services.filter((template) => {
return template.name.toLowerCase().includes(this.search.toLowerCase());
});
} else {
this.showedTemplates.services = this.templatesList.services;
}
},
async loadTemplates(indexUrl: string) {
const self = this;
axios.get(indexUrl)
.then(response => {
self.services = response.data;
self.templatesList = response.data;
forEach(self.templatesList.categories, (value, key) => {
self.categories.push({ title: key + ' (' + value + ')', value: key });
});
self.searchTemplates();
})
.catch(error => {
console.log(error);
Expand Down