Skip to content

Update dependencies fixing critical vulnerabilities. #1585

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

Merged
merged 1 commit into from
Mar 17, 2025
Merged

Update dependencies fixing critical vulnerabilities. #1585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 18 additions & 18 deletions projects/mercury/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ please read about the [project structure](Structure.md) first.

Prerequisites:

- [nodejs and npm](https://www.npmjs.com/get-npm)
- [yarn](https://yarnpkg.com/lang/en/)
- docker
- Java 17
- [nodejs and npm](https://www.npmjs.com/get-npm)
- [yarn](https://yarnpkg.com/lang/en/)
- docker
- Java 17

The Mercury frontend app needs a backend to communicate with. For convenience, there are a few scripts to use for local development:

- `yarn localdevelopment` starts Keycloak at port `5100`.
- `yarn saturn` starts the backend at port `8090`.
- `yarn pluto` starts a proxy server that also serves the frontend at port `8080`.
- `yarn start` starts the frontend and exposes it at port `3000`.
- `yarn localdevelopment` starts Keycloak at port `5100`.
- `yarn saturn` starts the backend at port `8090`.
- `yarn pluto` starts a proxy server that also serves the frontend at port `8080`.
- `yarn start` starts the frontend and exposes it at port `3000`.

For the first run, execute the following command to install all dependencies locally:

Expand All @@ -40,12 +40,12 @@ yarn dev

This will start:

- Keycloak (http://localhost:5100)
- PostgreSQL (port `9432`)
- Saturn (JDK 17 required, port `8090`)
- Pluto (proxy, including Mercury frontend, http://localhost:8080)
- Mercury frontend in development mode (http://localhost:3000)
- a [backend proxy](src/setupProxy.js) for Mercury
- Keycloak (http://localhost:5100)
- PostgreSQL (port `9432`)
- Saturn (JDK 17 required, port `8090`)
- Pluto (proxy, including Mercury frontend, http://localhost:8080)
- Mercury frontend in development mode (http://localhost:3000)
- a [backend proxy](src/setupProxy.js) for Mercury

The backend and frontend application will be available at http://localhost:8080/

Expand All @@ -58,10 +58,10 @@ In Keycloak, one setting needs to be configured manually: the permissions of the

### Libraries

- The UI uses many components from [Material UI](https://material-ui.com/).
- [axios](https://github.com/axios/axios) is used for http requests.
- [webdav](https://github.com/perry-mitchell/webdav-client) is used for connecting to WebDAV servers.
- [jsonld](https://github.com/digitalbazaar/jsonld.js) is used for unpacking JSON-LD responses.
- The UI uses many components from [Material UI](https://material-ui.com/).
- [axios](https://github.com/axios/axios) is used for http requests.
- [webdav](https://github.com/perry-mitchell/webdav-client) is used for connecting to WebDAV servers.
- [jsonld](https://github.com/digitalbazaar/jsonld.js) is used for unpacking JSON-LD responses.

### Code style

Expand Down
74 changes: 37 additions & 37 deletions projects/mercury/Structure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,36 @@ The project follows the [feature based approach](https://reactjs.org/docs/faq-st

The feature folders (`collections`, `file`, `metadata`, `users`, `workspaces`) contain:

- \*API.js
- Service file to communicate with the backend.
- \*Page
- The main entry point for the feature/route
- Other specialized components specific to the feature
- \*API.js
- Service file to communicate with the backend.
- \*Page
- The main entry point for the feature/route
- Other specialized components specific to the feature

## Shared components and functions

- `/common` (Shared code)
- `/components`
- [CollectionInformationDrawer](src/collections/CollectionInformationDrawer.js) (Side panel contains collection info, collaborators/permissions and metadata for selected collection, directories or files)
- `/context` (shared/injected state/logic) [Read on React Context](https://reactjs.org/docs/context.html)
- `/hooks` (pure logic/state no UI) [Read on React Hooks](https://reactjs.org/docs/hooks-intro.html)
- [/services/Config.js](./src/common/services/Config.js) (configuration from backend)
- `/utils` (Utility files, pure functions)
- `/metadata` (could be renamed to linkeddata)
- Generic components (for metadata and vocabulary) are called LinkedData\*.js
- `/common` (shared components between Vocabulary and Metadata)
- values (the different form fields, text input, dates, dropdown etc.)
- [LinkedDataEntityForm](./src/metadata/common/LinkedDataEntityForm.js) This component and its child components are probably the most complex areas in the frontend code. Some refactoring might be required in case there is any expected changes and in order to make the code easier to maintain.
- [LinkedDataContext](./src/metadata/LinkedDataContext.js) with a provider [LinkedDataMetadataProvider](./src/metadata/LinkedDataMetadataProvider.js)
- [LinkedDataWrapper](./src/metadata/LinkedDataWrapper.js)
- 2 Wrappers to provide needed values to either metadata or vocabulary
- [UseLinkedData](src/metadata/common/UseLinkedData.js)
- Fetches the entity whether it's part of the metadata or vocabulary, using the provided subject
- [UseFormData](src/metadata/common/UseFormData.js)
- Contains the currently loaded form/entity values, changes, validation state and form operations.
- [UseFormSubmission](src/metadata/common/UseFormSubmission.js)
- Submits form changes and handles submission errors
- `/permissions`
- `/common` (Shared code)
- `/components`
- [CollectionInformationDrawer](src/collections/CollectionInformationDrawer.js) (Side panel contains collection info, collaborators/permissions and metadata for selected collection, directories or files)
- `/context` (shared/injected state/logic) [Read on React Context](https://reactjs.org/docs/context.html)
- `/hooks` (pure logic/state no UI) [Read on React Hooks](https://reactjs.org/docs/hooks-intro.html)
- [/services/Config.js](./src/common/services/Config.js) (configuration from backend)
- `/utils` (Utility files, pure functions)
- `/metadata` (could be renamed to linkeddata)
- Generic components (for metadata and vocabulary) are called LinkedData\*.js
- `/common` (shared components between Vocabulary and Metadata)
- values (the different form fields, text input, dates, dropdown etc.)
- [LinkedDataEntityForm](./src/metadata/common/LinkedDataEntityForm.js) This component and its child components are probably the most complex areas in the frontend code. Some refactoring might be required in case there is any expected changes and in order to make the code easier to maintain.
- [LinkedDataContext](./src/metadata/LinkedDataContext.js) with a provider [LinkedDataMetadataProvider](./src/metadata/LinkedDataMetadataProvider.js)
- [LinkedDataWrapper](./src/metadata/LinkedDataWrapper.js)
- 2 Wrappers to provide needed values to either metadata or vocabulary
- [UseLinkedData](src/metadata/common/UseLinkedData.js)
- Fetches the entity whether it's part of the metadata or vocabulary, using the provided subject
- [UseFormData](src/metadata/common/UseFormData.js)
- Contains the currently loaded form/entity values, changes, validation state and form operations.
- [UseFormSubmission](src/metadata/common/UseFormSubmission.js)
- Submits form changes and handles submission errors
- `/permissions`

## Metadata forms

Expand All @@ -48,16 +48,16 @@ key/IRI is the list of values for this property.

The forms components can be broken down as:

- [LinkedDataEntityFormContainer](./src/metadata/common/LinkedDataEntityFormContainer.js)
- Applies some specific logic according to the type of linked data (metadata or vocabulary) using [LinkedDataContext](./src/metadata/LinkedDataContext.js)
- This component fetches the linked data entity
- Keeps form values, changes and validations using useFormData
- Submits changes using useFormSubmission
- Supplies properties and callback functions to [LinkedDataEntityForm](./src/metadata/common/LinkedDataEntityForm.js)
- [LinkedDataEntityForm](./src/metadata/common/LinkedDataEntityForm.js)
- The main form view that provides each property and delegates actions to [LinkedDataProperty](./src/metadata/common/LinkedDataProperty.js)
- [LinkedDataProperty](./src/metadata/common/LinkedDataProperty.js)
- This is the one that is concerned with rendering each field. It uses the [LinkedDataValueComponentFactory](./src/metadata/common/values/LinkedDataValueComponentFactory.js) which is coming from [LinkedDataContext](./src/metadata/LinkedDataContext.js) to pick the right edit and add component of the field. The [LinkedDataValueComponentFactory](./src/metadata/common/values/LinkedDataValueComponentFactory.js) mainly uses the property datatype (plus a few attributes such as isRdfList) to the proper 'value' input component. There is a big list of value components, such as, [StringValue](./src/metadata/common/values/StringValue.js), [NumberValue](./src/metadata/common/values/NumberValue.js) and [SwitchValue](./src/metadata/common/values/SwitchValue.js) etc. that are found in the [/metadata/common/values](src/metadata/common/values) directory. Then depending on the property whether it's a relation shape (Relation shapes are reference values to other entities) or not the component will render either [LinkedDataRelationTable](./src/metadata/common/LinkedDataRelationTable.js) or [LinkedDataInputFieldsTable](./src/metadata/common/LinkedDataInputFieldsTable.js).
- [LinkedDataEntityFormContainer](./src/metadata/common/LinkedDataEntityFormContainer.js)
- Applies some specific logic according to the type of linked data (metadata or vocabulary) using [LinkedDataContext](./src/metadata/LinkedDataContext.js)
- This component fetches the linked data entity
- Keeps form values, changes and validations using useFormData
- Submits changes using useFormSubmission
- Supplies properties and callback functions to [LinkedDataEntityForm](./src/metadata/common/LinkedDataEntityForm.js)
- [LinkedDataEntityForm](./src/metadata/common/LinkedDataEntityForm.js)
- The main form view that provides each property and delegates actions to [LinkedDataProperty](./src/metadata/common/LinkedDataProperty.js)
- [LinkedDataProperty](./src/metadata/common/LinkedDataProperty.js)
- This is the one that is concerned with rendering each field. It uses the [LinkedDataValueComponentFactory](./src/metadata/common/values/LinkedDataValueComponentFactory.js) which is coming from [LinkedDataContext](./src/metadata/LinkedDataContext.js) to pick the right edit and add component of the field. The [LinkedDataValueComponentFactory](./src/metadata/common/values/LinkedDataValueComponentFactory.js) mainly uses the property datatype (plus a few attributes such as isRdfList) to the proper 'value' input component. There is a big list of value components, such as, [StringValue](./src/metadata/common/values/StringValue.js), [NumberValue](./src/metadata/common/values/NumberValue.js) and [SwitchValue](./src/metadata/common/values/SwitchValue.js) etc. that are found in the [/metadata/common/values](src/metadata/common/values) directory. Then depending on the property whether it's a relation shape (Relation shapes are reference values to other entities) or not the component will render either [LinkedDataRelationTable](./src/metadata/common/LinkedDataRelationTable.js) or [LinkedDataInputFieldsTable](./src/metadata/common/LinkedDataInputFieldsTable.js).

## Keep in mind

Expand Down
7 changes: 4 additions & 3 deletions projects/mercury/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@mui/x-date-pickers": "^5.0.11",
"@testing-library/react-hooks": "^8.0.1",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"axios": "^1.7.5",
"axios": "^1.8.2",
"body-parser": "^1.20.3",
"classnames": "^2.2.6",
"cors": "^2.8.5",
Expand Down Expand Up @@ -62,10 +62,11 @@
"webdav": "^4.11.4"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/helper-builder-binary-assignment-operator-visitor": "^7.21.11",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"concurrently": "^5.0.0",
"enzyme": "^3.11.0",
"eslint": "^8.57.0",
Expand All @@ -81,7 +82,7 @@
"flow-bin": "^0.117.0",
"hermes-eslint": "^0.20.0",
"history": "^5.0.0",
"keycloak-connect": "^26.0.6",
"keycloak-connect": "^26.1.1",
"node-fetch": "^2.6.1",
"nodemon": "^3.1.0",
"prettier": "^3.2.5",
Expand Down
Loading