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

Merge all changes from develop #104

Merged
merged 98 commits into from
Mar 7, 2024
Merged

Merge all changes from develop #104

merged 98 commits into from
Mar 7, 2024

Conversation

ssb-jnk
Copy link
Contributor

@ssb-jnk ssb-jnk commented Mar 7, 2024

Testing CI/CD

johnnadeluy and others added 30 commits January 16, 2024 13:09
@johnnadeluy
Add Table component with conditional styling for table cells
3ef64f9 
DPSTAT-801
@johnnadeluy
Update table props
1adfb63 
DPSTAT-801
@johnnadeluy
Make table scrollable on mobile with css
50bfc0b 
DPSTAT-801
@johnnadeluy
Use teamApi data for table data (wip)
b7d1c19 
DPSTAT-801
@johnnadeluy
Merge branch 'develop' of https://github.com/statisticsnorway/dapla-ctrl
3a1a324 
 into feature/table_component
@johnnadeluy
Minor code refactoring and added comments
d0c788a 
DPSTAT-801
@johnnadeluy
Add responsive view for Table component (wip)
9596e65 
DPSTAT-801
@johnnadeluy
Minor styling tweaks and code refactoring
ce33169 
DPSTAT-801
@johnnadeluy
Revert changes in Users page
7e206a6 
DPSTAT-801
@johnnadeluy
Merge pull request #9 from statisticsnorway/feature/table_component
60a9211 
Table Component
@dependabot
Bump vite from 5.0.11 to 5.0.12
1e7dbcf 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.11 to 5.0.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.0.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.0.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
@johnnadeluy
Dpstat 817 secure authentication (#11)
22cb052 
* Store JWT in cookies instead of localStorage; use js-cookie lib

DPSTAT-817

* Use expired and same site properties for token storing

DPSTAT-817

* Add auth file for js-cookie function imports (WIP)

DPSTAT-817

* Import js-cookie into team api file directly

DPSTAT-817

* Minor refactor in ProtectRoute and VerifyKeycloakToken

DPSTAT-817

* Minor code refactoring; token -> access_token

DPSTAT-817

* Pass the same attributes to the deletion of Cookies; secure and sameSite

DPSTAT-817

* Use react-secure-storage to store tokens instead of cookies

DPSTAT-817

* Include node in eslint config to remove process is not defined linting error

* Revert vite config changes; readd comma

* Use prop type password for token input

DPSTAT-817

* Revert react-secure-storage changes; keep storing tokens in local storage temporarily
@dependabot
Merge pull request #10 from statisticsnorway/dependabot/npm_and_yarn/…
5ba41eb 
…vite-5.0.12
@ssb-jnk
Dpstat 800 - header (#12)
159c395 
* Add header component
* Add UserProfile endpoint
@sigurdrj
Rename teamApi.ts to TeamApi.ts, Linux has a case-sensitive filesystem
0b1caa9
@sigurdrj
Merge pull request #13 from statisticsnorway/rename-teamapi
13414fd 
Rename teamApi.ts to TeamApi.ts, Linux has a case-sensitive filesystem
@ssb-jnk
fix bug where if userprofile is deleted the website dont render (#14)
fa8e2ef
@ssb-jnk @johnnadeluy
Data handling rework (#16)
46b4820 
* teamoverview

* fix async error

* handle fetchAPIData error

* add error handling that respects external apis errorcode and message

* add error middleware

* .

* fix fallback error message

* added teamoverview data endpoints and fetched data on frontend

* fetched teams in TeamOverView

* cleaned up stuff and added title

* title and interface for pages

* added loading, section name

* cleaned up and moved reusable interfaces to @types

* updated protectedroute and validateToken

* .

* .

* Minor code refactoring

* Fix mobile styling for tables

---------

Co-authored-by: johnnadeluy <[email protected]>
@ssb-jnk
Add UserProfile (#17)
a821504
@ssb-jnk
Fix bug, header not showing (#18)
8de5393
@johnnadeluy
Part 1: Setup prettier (#19)
6a94c9d 
* Setup prettier for formatting; add scripts command for linting and formatting

* Apply prettier formatting on all files by running lint:format script
@ssb-jnk
changed provider and breadcrumb variables (#20)
98983fa 
changed provider and breadcrumb variables, and also made reuseable functions in server.js
@sigurdrj @johnnadeluy
404 page (#21)
4709b0a 
* Basic 404 page

* Move Header and Breadcrumb to PageLayout for pages like Login and NotFound etc

* Add styling to NotFound

* Center everything

* Run lint:format

* Make class names camelCase

---------

Co-authored-by: johnnadeluy <[email protected]>
@johnnadeluy
Part 2: Fix eslint warnings and ts errors (#22)
4636a51 
* Fix eslint missing dependency array in useEffect warnings

* Fix ts errors; breadcrumbs user profile display name and ignore line in server.js

* Minor code refactoring
@ssb-jnk
added preperations for teamDetail page (#23)
420ef63 
* added preperations for teamDetail endpoint
@ssb-jnk
removed trailing main (#25)
7ecf037
@johnnadeluy
Part 3: Add workflow build and lint (#26)
d725b81 
* Adds a workflow that builds and lints on open pull-requests to develop

* Include auto fix for linting in workflow

* Minor code refactoring and adjust Prettier warnings to error

* Fix type error for breadcrumbsUserProfileDisplayName

* Temporary hide unused const in TeamDetail to prevent build fail

* Adjustments to not include autofix ESLint and Prettier in workflow

* Update README.md with ESLint and Prettier documentation with ChatGPT assistance

* Autofix prettier format errors

* Bump actions/checkout@v3 to actions/checkout@v4

* Minor code refactoring; rewording
@sigurdrj
Add Dependabot and workflow to auto-merge its PRs for minor semver up…
e1cdb7f 
…dates (#24)

* Create dependabot.yml

* Add auto-merge for dependabot PRs that are only semver-patch updates
@dependabot
Bump @statisticsnorway/ssb-component-library from 2.0.96 to 2.0.97 (#28)
7788994 
Bumps [@statisticsnorway/ssb-component-library](https://github.com/statisticsnorway/ssb-component-library) from 2.0.96 to 2.0.97.
- [Release notes](https://github.com/statisticsnorway/ssb-component-library/releases)
- [Commits](statisticsnorway/ssb-component-library@2.0.96...2.0.97)

---
updated-dependencies:
- dependency-name: "@statisticsnorway/ssb-component-library"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump dotenv from 16.3.1 to 16.4.1
c90c009 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 16.3.1 to 16.4.1.
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](motdotla/dotenv@v16.3.1...v16.4.1)

---
updated-dependencies:
- dependency-name: dotenv
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
dependabot bot and others added 27 commits March 5, 2024 07:15
@dependabot
Merge pull request #63 from statisticsnorway/dependabot/npm_and_yarn/…
ca1182f 
…nodemon-3.1.0
@dependabot
Bump eslint from 8.56.0 to 8.57.0 (#66)
e2c7f92
@johnnadeluy
Disables sorting function for empty tables in Table component (#79)
bddf92e
@dependabot
Bump express from 4.18.2 to 4.18.3 (#81)
47ea3b0 
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.2...4.18.3)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump react-router-dom from 6.22.1 to 6.22.2 (#82)
d47747b 
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.22.1 to 6.22.2.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/[email protected]/packages/react-router-dom)

---
updated-dependencies:
- dependency-name: react-router-dom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @emotion/react from 11.11.3 to 11.11.4 (#83)
16c3ae8 
Bumps [@emotion/react](https://github.com/emotion-js/emotion) from 11.11.3 to 11.11.4.
- [Release notes](https://github.com/emotion-js/emotion/releases)
- [Changelog](https://github.com/emotion-js/emotion/blob/main/CHANGELOG.md)
- [Commits](https://github.com/emotion-js/emotion/compare/@emotion/[email protected]...@emotion/[email protected])

---
updated-dependencies:
- dependency-name: "@emotion/react"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @types/react from 18.2.58 to 18.2.62 (#84)
2dddcd1 
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.58 to 18.2.62.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @mui/material from 5.15.10 to 5.15.11 (#85)
98dcc6f 
Bumps [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) from 5.15.10 to 5.15.11.
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v5.15.11/packages/mui-material)

---
updated-dependencies:
- dependency-name: "@mui/material"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ssb-jnk
remove dialog and instead display the empty table (#80)
f4d0dd9
@johnnadeluy
Part 1: Shared buckets in Team Detail page (#86)
7242e65 
* Implements shared buckets view for TeamDetail page

DPSTAT-813

* Fix typing errors and adds fallback for metrics

* Add FormattedTableColumn component for formatted table columns
Refactoring for TeamDetail
@ssb-jnk @johnnadeluy
Refactored to remove login page and all references to accessToken (#87)
1282b68 
Refactored

Co-authored-by: johnnadeluy <[email protected]>
@johnnadeluy
Refactor pages (#88)
a36e0e3 
* Refactor Tab properties across pages

* Refactor TeamDetail Tab properties

* Destructure prepData across all pages
Add conditional rendering to FormattedTableColumn

* More refactoring in TeamDetail and TODO comments

* .
@johnnadeluy @ssb-jnk
Part 2: Shared Buckets page (#90)
8925414 
* Add Shared Bucket Detail Page with current available information

DPSTAT-813

* Makes adjustment to description styling; move global styling to page layout for pages

* .

Co-authored-by: Johnny Niklasson <[email protected]>

---------

Co-authored-by: Johnny Niklasson <[email protected]>
@johnnadeluy
Show Table sort icon by default (#91)
a6eec2f 
* Show Table sort icon on first column by default

DPSTAT-882

* .
@dependabot
Bump vite from 5.0.12 to 5.1.5 (#78)
c1d5e8e
@dependabot
Bump @typescript-eslint/eslint-plugin from 6.21.0 to 7.0.0 (#52)
2d2adc1
@dependabot
Bump @types/react from 18.2.62 to 18.2.63 (#92)
d1c93bf 
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.62 to 18.2.63.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @mui/material from 5.15.11 to 5.15.12 (#93)
7182037 
Bumps [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) from 5.15.11 to 5.15.12.
- [Release notes](https://github.com/mui/material-ui/releases)
- [Changelog](https://github.com/mui/material-ui/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mui/material-ui/commits/v5.15.12/packages/mui-material)

---
updated-dependencies:
- dependency-name: "@mui/material"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @types/react-dom from 18.2.19 to 18.2.20 (#94)
9cf10a5 
Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.2.19 to 18.2.20.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom)

---
updated-dependencies:
- dependency-name: "@types/react-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ssb-jnk
Made changes for deployment to bip (#95)
866de90 
* added workflow for build and push
@ssb-jnk
fix permission for workflow (#96)
f26b68d 
fix permission for workflow
@ssb-jnk
cleaned up server.js (#97)
2389461
@ssb-jnk
use metadata for tagging images (#98)
757efd3
@dependabot
Bump @types/react-dom from 18.2.20 to 18.2.21 (#100)
170964a 
Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.2.20 to 18.2.21.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom)

---
updated-dependencies:
- dependency-name: "@types/react-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ssb-jnk
move registry path for image (#102)
59c7fc5
@dependabot @ssb-jnk
Bump @types/react from 18.2.63 to 18.2.64 (#101)
b42462c 
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.63 to 18.2.64.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Johnny Niklasson <[email protected]>
@ssb-jnk
allow to trigger workflow manually (#103)
cba6fa1
@ssb-jnk ssb-jnk requested a review from a team as a code owner March 7, 2024 11:42
@ssb-jnk ssb-jnk merged commit b921314 into main Mar 7, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnnadeluy johnnadeluy johnnadeluy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ssb-jnk @johnnadeluy @sigurdrj