Skip to content

Commit 8be60c2

Browse files
committed
Merge branch 'feature/137-files-table-filters-ui' of https://github.com/IQSS/dataverse-frontend into feature/136-files-table-checkboxes-selection-ui
2 parents 22273f1 + 0510baa commit 8be60c2

88 files changed

Lines changed: 14456 additions & 6818 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env

Lines changed: 0 additions & 1 deletion
This file was deleted.

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VITE_DATAVERSE_BACKEND_URL=http://localhost:8080
1+
VITE_DATAVERSE_BACKEND_URL=http://localhost:8080

.github/workflows/chromatic-design-system.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
run: |
1616
cp .npmrc.example .npmrc
1717
sed -i -e 's/<YOUR_GITHUB_AUTH_TOKEN>/${{ secrets.GITHUB_TOKEN }}/g' .npmrc
18+
sed -i -e 's/<YOUR_NPM_AUTH_TOKEN>/${{ secrets.NPM_AUTH_TOKEN }}/g' .npmrc
1819
- name: Install dependencies
1920
# 👇 Install dependencies with the same package manager used in the project (replace it as needed), e.g. yarn, npm, pnpm
2021
run: npm install

.github/workflows/chromatic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
run: |
1616
cp .npmrc.example .npmrc
1717
sed -i -e 's/<YOUR_GITHUB_AUTH_TOKEN>/${{ secrets.GITHUB_TOKEN }}/g' .npmrc
18+
sed -i -e 's/<YOUR_NPM_AUTH_TOKEN>/${{ secrets.NPM_AUTH_TOKEN }}/g' .npmrc
1819
- name: Install dependencies
1920
# 👇 Install dependencies with the same package manager used in the project (replace it as needed), e.g. yarn, npm, pnpm
2021
run: npm install

.github/workflows/deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
run: |
3737
cp .npmrc.example .npmrc
3838
sed -i -e 's/<YOUR_GITHUB_AUTH_TOKEN>/${{ secrets.GITHUB_TOKEN }}/g' .npmrc
39+
sed -i -e 's/<YOUR_NPM_AUTH_TOKEN>/${{ secrets.NPM_AUTH_TOKEN }}/g' .npmrc
3940
4041
- name: Install Dependencies
4142
run: npm install

.github/workflows/lint.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ jobs:
1111

1212
- uses: actions/setup-node@v3
1313
with:
14-
node-version: 19
14+
node-version: 18
1515
cache: 'npm'
1616

1717
- name: Create .npmrc
1818
run: |
1919
cp .npmrc.example .npmrc
2020
sed -i -e 's/<YOUR_GITHUB_AUTH_TOKEN>/${{ secrets.GITHUB_TOKEN }}/g' .npmrc
21+
sed -i -e 's/<YOUR_NPM_AUTH_TOKEN>/${{ secrets.NPM_AUTH_TOKEN }}/g' .npmrc
2122
2223
- name: Install Dependencies
2324
run: npm install
@@ -26,5 +27,11 @@ jobs:
2627
working-directory: packages/design-system
2728
run: npm run build
2829

29-
- name: Lint
30-
run: npm run lint
30+
- name: ESLint
31+
run: npm run lint:eslint
32+
33+
- name: Stylelint
34+
run: npm run lint:stylelint
35+
36+
- name: Prettier
37+
run: npm run lint:prettier

.github/workflows/test.yml

Lines changed: 53 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,58 @@ name: test
22

33
on: push
44

5+
env:
6+
E2E_DATAVERSE_IMAGE_TAG: unstable
7+
58
jobs:
6-
# Temporarily commented out, until we set up a suitable e2e environment for running GitHub actions
7-
# e2e:
8-
# runs-on: ubuntu-latest
9-
# environment: e2e
10-
11-
# steps:
12-
# - uses: actions/checkout@v3
13-
14-
# - uses: actions/setup-node@v3
15-
# with:
16-
# node-version: 18
17-
# cache: 'npm'
18-
19-
# - name: Install Dependencies
20-
# run: npm install
21-
22-
# - name: Build Dataverse Design System
23-
# working-directory: packages/design-system
24-
# run: npm run build
25-
26-
# - name: Create and populate .env file
27-
# env:
28-
# DATAVERSE_BACKEND_URL: ${{ secrets.DATAVERSE_BACKEND_URL }}
29-
# run: |
30-
# touch .env
31-
# echo VITE_DATAVERSE_BACKEND_URL="$DATAVERSE_BACKEND_URL" >> .env
32-
# shell: bash
33-
34-
# - name: Cypress run
35-
# uses: cypress-io/github-action@v5
36-
# with:
37-
# build: npm run build
38-
# start: npm run preview
39-
# wait-on: 'npx wait-on --timeout 60000 http://localhost:5173'
9+
e2e:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v3
14+
15+
- uses: actions/setup-node@v3
16+
with:
17+
node-version: 18
18+
cache: 'npm'
19+
20+
- name: Create .npmrc
21+
run: |
22+
cp .npmrc.example .npmrc
23+
sed -i -e 's/<YOUR_GITHUB_AUTH_TOKEN>/${{ secrets.GITHUB_TOKEN }}/g' .npmrc
24+
sed -i -e 's/<YOUR_NPM_AUTH_TOKEN>/${{ secrets.NPM_AUTH_TOKEN }}/g' .npmrc
25+
26+
- name: Install Dependencies
27+
run: npm install
28+
29+
- name: Build Dataverse Design System
30+
working-directory: packages/design-system
31+
run: npm run build
32+
33+
- name: Create and populate .env file
34+
env:
35+
DATAVERSE_BACKEND_URL: 'http://localhost:8000'
36+
run: |
37+
touch .env
38+
echo VITE_DATAVERSE_BACKEND_URL="$DATAVERSE_BACKEND_URL" >> .env
39+
shell: bash
40+
41+
- name: Update registry for the containerized development environment
42+
working-directory: dev-env
43+
run: |
44+
sed -i~ '/^REGISTRY=/s/=.*/=docker.io/' .env
45+
shell: bash
46+
47+
- name: Start containers
48+
working-directory: dev-env
49+
run: ./run-env.sh "$E2E_DATAVERSE_IMAGE_TAG"
50+
51+
- name: Wait for containers to be ready
52+
run: timeout 300s sh -c 'while ! docker logs dev_dataverse_bootstrap 2>&1 | grep -q "your instance has been configured"; do sleep 2; done'
53+
54+
- name: Run e2e tests
55+
run: npm run test:e2e
56+
4057
component:
4158
runs-on: ubuntu-latest
4259

@@ -52,6 +69,7 @@ jobs:
5269
run: |
5370
cp .npmrc.example .npmrc
5471
sed -i -e 's/<YOUR_GITHUB_AUTH_TOKEN>/${{ secrets.GITHUB_TOKEN }}/g' .npmrc
72+
sed -i -e 's/<YOUR_NPM_AUTH_TOKEN>/${{ secrets.NPM_AUTH_TOKEN }}/g' .npmrc
5573
5674
- name: Install Dependencies
5775
run: npm install
@@ -106,6 +124,7 @@ jobs:
106124
run: |
107125
cp .npmrc.example .npmrc
108126
sed -i -e 's/<YOUR_GITHUB_AUTH_TOKEN>/${{ secrets.GITHUB_TOKEN }}/g' .npmrc
127+
sed -i -e 's/<YOUR_NPM_AUTH_TOKEN>/${{ secrets.NPM_AUTH_TOKEN }}/g' .npmrc
109128
110129
- name: Install Dependencies
111130
run: npm install

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
# misc
2929
.DS_Store
30-
./.env
30+
.env
3131
.env.local
3232
.env.development.local
3333
.env.test.local

.npmrc.example

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
legacy-peer-deps=true
2-
registry=https://npm.pkg.github.com/IQSS
2+
3+
# design-system registry
4+
//registry.npmjs.org/:_authToken=<YOUR_NPM_AUTH_TOKEN>
5+
@iqss:registry=https://registry.npmjs.org/
6+
7+
# js-dataverse registry
38
//npm.pkg.github.com/:_authToken=<YOUR_GITHUB_AUTH_TOKEN>
9+
@iqss:registry=https://npm.pkg.github.com/

.storybook/preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Preview } from '@storybook/react'
2-
import { ThemeProvider } from 'dataverse-design-system'
2+
import { ThemeProvider } from '@iqss/dataverse-design-system'
33
import { initialize, mswDecorator } from 'msw-storybook-addon'
44

55
/*

0 commit comments

Comments
 (0)