Add support for third-party services #1303
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cmeessen
force-pushed
the
1288-integrating-third-party-services
branch
7 times, most recently
from
c7aae51
to
ab028b4
Compare
cmeessen
force-pushed
the
1288-integrating-third-party-services
branch
from
ab028b4
to
07ba123
Compare
cmeessen
changed the title
cmeessen
force-pushed
the
1288-integrating-third-party-services
branch
from
07ba123
to
f6018a2
Compare
dmijatovic
reviewed
Sep 27, 2024
dmijatovic
reviewed
Sep 27, 2024
dmijatovic
reviewed
Sep 27, 2024
dmijatovic
reviewed
Sep 27, 2024
dmijatovic
approved these changes
Sep 30, 2024
cmeessen
force-pushed
the
1288-integrating-third-party-services
branch
3 times, most recently
from
19cc951
to
9580d69
Compare
ewan-escience
requested changes
Oct 2, 2024
There was a problem hiding this comment.
I'm requesting changes here to prevent this PR from being merged while not being ready. First, #1310 should be improved upon and merged into this branch, resolving the issue that the plugins are not reachable from the Next.js server when running the frontend in prod mode (i.e. built in Docker).
…er types refactor: show modals after the open flag is set to true in order to populate the default form data on load.
For json, typescript, nginx, bash
refactor: user menu hook moved inside component fix: create license files tests: create svg component test and fix muiSnackbar test refactor: update plugin config url
Listen to main server block so that requests to port 80 that do not match server_names are not handled by the first block
cmeessen
force-pushed
the
1288-integrating-third-party-services
branch
from
5ec608d
to
f201d6a
Compare
dmijatovic
reviewed
Oct 7, 2024
frontend/config/getPlugins.ts
Outdated
Comment on lines
14
to
25
| if (/^(https?:\/\/)/.test(pluginName)) { | ||
| return pluginName | ||
| } else if (process.env.NODE_ENV === 'development') { | ||
| return `http://localhost/plugin/${pluginName}` | ||
| } else { | ||
| const baseUrl = process.env.RSD_REVERSE_PROXY_URL | ||
| return `${baseUrl}/plugin/${pluginName}` | ||
| } | ||
| } | ||
|
|
||
| async function getPlugin({pluginName, token}:{pluginName: string, token?: string}){ | ||
| const url = getPluginBaseUrl(pluginName) + '/api/v1/config' |
There was a problem hiding this comment.
Maybe move /api/v1/config into getPluginUrl and use it only in elseif cases (when only plugin name is provided)?
dmijatovic
approved these changes
Oct 7, 2024
dmijatovic
reviewed
Oct 7, 2024
frontend/config/getPlugins.ts
Outdated
| } else if (process.env.NODE_ENV === 'development') { | ||
| return `http://localhost/plugin/${pluginName}` | ||
| } else { | ||
| const baseUrl = process.env.RSD_REVERSE_PROXY_URL |
There was a problem hiding this comment.
Maybe we can add default http://nginx?
const baseUrl = process.env.RSD_REVERSE_PROXY_URL ?? 'http://nginx'
ewan-escience
approved these changes
Oct 7, 2024
BREAKING: adds a new environment variable RSD_REVERSE_PROXY url that is required by the frontend container to construct the plugin base url when running it in the same docker network.
cmeessen
force-pushed
the
1288-integrating-third-party-services
branch
from
f201d6a
to
c0e9d0c
Compare
|
|
|
Sonar cloud complains about |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1288
Changes proposed in this pull request:
userMenuandsoftwareEditNav(seetype PluginSlot)dataattribute to the user token which containseduPersonEntitlementsif the user logs in via HelmholtzIDHow to test:
PR Checklist:
docker-compose.yml