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 pagination to explore #200

Merged
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3c8a8a6
feat: :sparkles: add pagination to udata-front-plugin-helpers
nicolaskempf57 Jan 24, 2023
ffa8540
refactor: :recycle: use composition API
nicolaskempf57 Jan 24, 2023
fcb7e6b
build: :construction_worker: use vue-tsc
nicolaskempf57 Jan 24, 2023
e702828
feat: :package: 1.0.2-2
nicolaskempf57 Jan 24, 2023
8caae80
build: :construction_worker: build udata-front-helper-plugins types i…
nicolaskempf57 Jan 24, 2023
fdd5cac
build: :construction_worker: move files to own dir
nicolaskempf57 Jan 24, 2023
1ddc339
build: :sparkles: add exports to index
nicolaskempf57 Jan 25, 2023
5fe8f37
feat: :sparkles: use pagination from udata-front-plugin-helpers
nicolaskempf57 Jan 25, 2023
644aa94
refactor: :construction: remove udata-front pagination WIP
nicolaskempf57 Jan 25, 2023
3370cdc
chore: :see_no_evil: ignore coverage directory from udata-front-plugi…
nicolaskempf57 Jan 26, 2023
fe78440
test(plugin_helpers): :white_check_mark: add tests
nicolaskempf57 Jan 26, 2023
d09b99d
ci: :wrench: add udata-front-plugin-helpers to CI
nicolaskempf57 Jan 26, 2023
2c3cdf0
chore: :arrow_up: update udata-front-plugin-helpers to 1.0.2-7
nicolaskempf57 Jan 26, 2023
ad4f460
test: :fire: remove tests move to udata-front-plugin-helpers
nicolaskempf57 Jan 26, 2023
d334db9
docs: :memo: update changelog
nicolaskempf57 Jan 26, 2023
c0c6b27
build: :wrench: fix vue-i18n-extract config
nicolaskempf57 Jan 26, 2023
d73cd2e
Merge branch 'master' into feat/add-pagination-to-explore
nicolaskempf57 Feb 2, 2023
586a2a6
chore: :package: version 1.1.0
nicolaskempf57 Feb 2, 2023
093265b
chore: :package: next development version
nicolaskempf57 Feb 2, 2023
2b9f23e
chore: :arrow_up: update @etalab/udata-front-plugins-helper version i…
nicolaskempf57 Feb 2, 2023
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: 36 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,38 @@ jobs:
paths:
- udata_front/theme/gouvfr/static

plugin_helper:
docker:
- image: cimg/node:lts
steps:
- checkout
- run:
name: Compute JS dependencies key
command: cat udata-front-plugins-helper/package.json > helper-js.deps
- run:
name: Get the base reference branch
command: export BASE_BRANCH=$(base_branch)
- restore_cache:
keys:
- js-cache-{{ arch }}-{{ checksum "helper-js.deps" }}
- js-cache-{{ arch }}-{{ .Branch }}
- js-cache-{{ arch }}-{{ .Environment.BASE_BRANCH }}
- run:
name: Install NodeJS and dependencies
command: npm install
working_directory: ./udata-front-plugins-helper
- save_cache:
key: js-cache-{{ arch }}-{{ checksum "helper-js.deps" }}
paths:
- udata-front-plugins-helper/node_modules
- save_cache:
key: js-cache-{{ arch }}-{{ .Branch }}
paths:
- udata-front-plugins-helper/node_modules
- run:
name: Compile and test package
working_directory: ./udata-front-plugins-helper
command: npm run preversion

lighthouse:
docker:
Expand Down Expand Up @@ -245,6 +277,10 @@ workflows:
filters:
tags:
only: /v[0-9]+(\.[0-9]+)*/
- plugin_helper:
filters:
tags:
only: /v[0-9]+(\.[0-9]+)*/
- lighthouse:
requires:
- deps
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ bower
.DS_Store
*.min.css
*.min.js
*.d.ts
*.d.ts.map
/instance/
/static/
node_modules
Expand All @@ -47,6 +49,7 @@ pip-log.txt
cover
nosetests.xml
/reports
/*/coverage

# Translations
*.mo
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Current (in progress)

- Nothing yet
- Move Pagination to `@etalab/udata-front-plugin-helpers` and add tests [#200](https://github.com/etalab/udata-front/pull/200)

## 3.1.1 (2023-01-20)

Expand Down
46 changes: 0 additions & 46 deletions cypress/integration/pagination.js

This file was deleted.

14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"devDependencies": {
"@conciergerie.dev/select-a11y": "^3.1.0",
"@etalab/udata-front-plugins-helper": "1.0.1",
"@etalab/udata-front-plugins-helper": "1.0.2-7",
"@gouvfr/dsfr": "^1.5.1",
"@intlify/unplugin-vue-i18n": "^0.8.0",
"@lhci/cli": "^0.8.2",
Expand Down
2 changes: 1 addition & 1 deletion theme/js/components/dataset/resource/resources.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import {useI18n} from 'vue-i18n'
import {onMounted, ref, watch, defineComponent} from 'vue';
import Loader from "../loader.vue";
import Pagination from "../../pagination/pagination.vue";
import { Pagination } from "@etalab/udata-front-plugins-helper";
import Resource from "./resource.vue";
import config from "../../../config";
import {useToast} from "../../../composables/useToast";
Expand Down
2 changes: 1 addition & 1 deletion theme/js/components/discussions/threads.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ import {defineComponent} from "vue";
import config from "../../config";
import i18n from "../../plugins/i18n";

import Pagination from "../pagination/pagination.vue";
import { Pagination } from "@etalab/udata-front-plugins-helper";
import CreateThread from "./threads-create.vue";
import Thread from "./thread.vue";
import Loader from "./loader.vue";
Expand Down
2 changes: 1 addition & 1 deletion theme/js/components/search/search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ import Dataset from "../dataset/search-result.vue";
import Loader from "../dataset/loader.vue";
import SchemaFilter from "./schema-filter.vue";
import Empty from "./empty.vue";
import Pagination from "../pagination/pagination.vue";
import { Pagination } from "@etalab/udata-front-plugins-helper";
import MultiSelect from "./multi-select.vue";
import { search_autocomplete_debounce } from "../../config";
import { debounce } from "../../composables/useDebouncedRef";
Expand Down
41 changes: 0 additions & 41 deletions theme/js/components/vanilla/pagination.js

This file was deleted.

Loading