Skip to content

Commit

Permalink
BC-5557: remove vue-filter-ui dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
muratmerdoglu-dp committed Dec 20, 2023
1 parent 272f1f3 commit c231fe4
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 51 deletions.
29 changes: 1 addition & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"vue": "^3.3.4",
"vue-dndrop": "^1.3.1",
"vue-dompurify-html": "^4.1.4",
"vue-filter-ui": "^0.8.0",
"vue-i18n": "^9.2.2",
"vue-router": "^4.2.4",
"vue3-mq": "^3.1.3",
Expand Down
11 changes: 0 additions & 11 deletions src/pages/administration/StudentOverview.page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@
</template>
</base-input>

<data-filter
:filters="filters"
:backend-filtering="true"
v-model:update:active-filters="currentFilterQuery"
data-testid="data_filter"
/>

<NewDataFilter @update:filter="onUpdateFilter" filter-for="student" />

<backend-data-table
Expand Down Expand Up @@ -142,9 +135,7 @@ import { mapGetters } from "vuex";
import { envConfigModule, notifierModule, schoolsModule } from "@/store";
import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
import BackendDataTable from "@/components/organisms/DataTable/BackendDataTable";
import DataFilter from "@/components/organisms/DataFilter/DataFilter";
import AdminTableLegend from "@/components/molecules/AdminTableLegend";
import { studentFilter } from "@/utils/adminFilter";
import print from "@/mixins/print";
import UserHasPermission from "@/mixins/UserHasPermission";
import { printDate, printDateFromDeUTC } from "@/plugins/datetime";
Expand All @@ -156,7 +147,6 @@ import NewDataFilter from "@/components/organisms/NewDataFilter/NewDataFilter.vu
export default {
components: {
DataFilter,
DefaultWireframe,
BackendDataTable,
AdminTableLegend,
Expand Down Expand Up @@ -264,7 +254,6 @@ export default {
disabled: true,
},
],
filters: studentFilter(this),
active: false,
searchQuery:
(this.getUiState("filter", "pages.administration.students.index") &&
Expand Down
12 changes: 1 addition & 11 deletions src/pages/administration/TeacherOverview.page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@
</template>
</base-input>

<data-filter
:filters="filters"
:backend-filtering="true"
v-model:active-filters="currentFilterQuery"
data-testid="data_filter"
/>

<NewDataFilter @update:filter="onUpdateFilter" filter-for="teacher" />

<backend-data-table
Expand Down Expand Up @@ -134,8 +127,7 @@ import { mapGetters } from "vuex";
import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
import BackendDataTable from "@/components/organisms/DataTable/BackendDataTable";
import AdminTableLegend from "@/components/molecules/AdminTableLegend";
import DataFilter from "@/components/organisms/DataFilter/DataFilter";
import { teacherFilter } from "@/utils/adminFilter";
import print from "@/mixins/print";
import UserHasPermission from "@/mixins/UserHasPermission";
import { printDate } from "@/plugins/datetime";
Expand All @@ -152,7 +144,6 @@ import NewDataFilter from "@/components/organisms/NewDataFilter/NewDataFilter.vu
export default {
components: {
DataFilter,
DefaultWireframe,
BackendDataTable,
AdminTableLegend,
Expand Down Expand Up @@ -295,7 +286,6 @@ export default {
label: this.$t("utils.adminFilter.consent.label.missing"),
},
],
filters: teacherFilter(this),
searchQuery:
(this.getUiState("filter", "pages.administration.teachers.index") &&
this.getUiState("filter", "pages.administration.teachers.index")
Expand Down

0 comments on commit c231fe4

Please sign in to comment.