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

Staticbuild v1.3.0 update #690

Merged
merged 12 commits into from
Jan 16, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Some modifications to remove the build and linting errors that came u…
…p after the merge with latest branch.
  • Loading branch information
downiec committed Nov 8, 2024
commit 4ee1fdf0ffeec63bb05e93418b1035601f1720d9
5 changes: 5 additions & 0 deletions backend/.envs/.postgres
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
POSTGRES_HOST=postgres
POSTGRES_PORT=5432
POSTGRES_DB=postgres
POSTGRES_USER=postgres
POSTGRES_PASSWORD=postgres
18 changes: 13 additions & 5 deletions backend/config/settings/base.py
Original file line number Diff line number Diff line change
@@ -388,10 +388,15 @@
)

FRONTEND_SETTINGS = {
"REACT_APP_CLIENT_ID": env("REACT_APP_CLIENT_ID", default="frontend"),
"REACT_APP_GOOGLE_ANALYTICS_TRACKING_ID": env(
"REACT_APP_GOOGLE_ANALYTICS_TRACKING_ID", default=""
"REACT_APP_PREVIOUS_URL": env("REACT_APP_PREVIOUS_URL", default=""),
"REACT_APP_AUTHENTICATION_METHOD": env(
"REACT_APP_AUTHENTICATION_METHOD", default="keycloak"
),
"REACT_APP_GLOBUS_REDIRECT": env(
"REACT_APP_GLOBUS_REDIRECT",
default="https://localhost:8080/cart/items",
),
"REACT_APP_CLIENT_ID": env("REACT_APP_CLIENT_ID", default="frontend"),
"REACT_APP_GLOBUS_NODES": env.list(
"REACT_APP_GLOBUS_NODES",
default=[
@@ -400,6 +405,9 @@
"esgf-data2.llnl.gov",
],
),
"REACT_APP_ESGF_SOLR_URL": env(
"REACT_APP_ESGF_SOLR_URL", default="https://esgf-node.llnl.gov/solr"
),
"REACT_APP_KEYCLOAK_REALM": env(
"REACT_APP_KEYCLOAK_REALM", default="esgf"
),
@@ -411,8 +419,8 @@
),
"REACT_APP_HOTJAR_ID": env("REACT_APP_HOTJAR_ID", default=1234),
"REACT_APP_HOTJAR_SV": env("REACT_APP_HOTJAR_SV", default=1234),
"REACT_APP_AUTHENTICATION_METHOD": env(
"REACT_APP_AUTHENTICATION_METHOD", default="keycloak"
"REACT_APP_GOOGLE_ANALYTICS_TRACKING_ID": env(
"REACT_APP_GOOGLE_ANALYTICS_TRACKING_ID", default=""
),
}

10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
version: "3"

networks:
metagrid:
ipam:
config:
- subnet: 10.89.9.81/24
- subnet: 10.89.9.0/24

volumes:
local_postgres_data: {}
@@ -23,9 +21,9 @@ services:
env_file:
- ./backend/.envs/.postgres
ports:
- 5432
- 5432:5432
healthcheck:
test: pg_isready
test: [ "CMD", "pg_isready", "-U", "postgres", "-d", "postgres" ]
start_period: 5s
interval: 5s
timeout: 2s
@@ -62,6 +60,8 @@ services:

keycloak:
image: quay.io/keycloak/keycloak:23.0.6
depends_on:
- react
command: start-dev --import-realm
volumes:
- ./keycloak/realm.json:/opt/keycloak/data/import/realm.json
7 changes: 3 additions & 4 deletions frontend/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ module.exports = {
},
extends: [
'airbnb',
'prettier',
'airbnb-typescript',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
@@ -19,12 +20,10 @@ module.exports = {
project: './tsconfig.json',
},
rules: {
'prettier/prettier': ['error'],
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
'react/destructuring-assignment': 'off',
'react/jsx-filename-extension': [
1,
{ extensions: ['.js', '.jsx', '.ts', '.tsx'] },
],
'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx', '.ts', '.tsx'] }],
'react/jsx-props-no-spreading': 'off',
'react/prop-types': 'off',
'@typescript-eslint/no-misused-promises': 'off',
2 changes: 1 addition & 1 deletion frontend/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"useTabs": false,
"tabWidth": 2,
"printWidth": 80,
"printWidth": 100,
"singleQuote": true,
"semi": true
}
7 changes: 1 addition & 6 deletions frontend/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -37,12 +37,7 @@
"typescript.updateImportsOnFileMove.enabled": "always",
// ESLint
// -----------------------------
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
// Jest
// -----------------------------
"jest.pathToJest": "yarn test:watch",
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Pull official base image
FROM node:slim as build
FROM node:slim AS build

# Set working directory
WORKDIR /app
9 changes: 2 additions & 7 deletions frontend/public/index.html
Original file line number Diff line number Diff line change
@@ -6,10 +6,7 @@
<link rel="icon" href="$PUBLIC_URL/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="$PUBLIC_URL/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
@@ -29,9 +26,7 @@

<!-- Load config from backend -->
<script type="text/javascript">
window.METAGRID = fetch('/frontend-config.js').then((response) =>
response.json()
);
window.METAGRID = fetch('/frontend-config.js').then((response) => response.json());
</script>
</head>
<body>
7 changes: 4 additions & 3 deletions frontend/public/messages/metagrid_messages.md
Original file line number Diff line number Diff line change
@@ -5,19 +5,20 @@ To view the latest documentation and FAQ, please visit this page:

## Globus Transfers enhanced

This version of Metagrid enhances the user of Globus to transfer ESGF datasets to your institutional or personal endpoint. The feature can be accessed at the bottom of the Data Cart page. At present only data published at DOE sites: ANL, ORNL, or LLNL are available for Globus Transfer via Metagrid. The enhancement allows users to save frequently used Globus Collections and destination pathnames.
This version of Metagrid enhances the user of Globus to transfer ESGF datasets to your institutional or personal endpoint. The feature can be accessed at the bottom of the Data Cart page. At present only data published at DOE sites: ANL, ORNL, or LLNL are available for Globus Transfer via Metagrid. The enhancement allows users to save frequently used Globus Collections and destination pathnames.

For more information about Globus Transfers please see: https://app.globus.org/help

## WGET script reminder

Most data projects (if not all) no longer require any authentication for data access. However the inclusion of authentication was previously assumed to be a default in the WGET script. Users must run the script with the `-s` option to skip the authentication process. For example:
Most data projects (if not all) no longer require any authentication for data access. However the inclusion of authentication was previously assumed to be a default in the WGET script. Users must run the script with the `-s` option to skip the authentication process. For example:

```
$ bash wget-XXXX.sh -s
```

## Upcoming changes to ESGF @LLNL

We are excited to be planning to have an official release of the Metagrid platform onto scalable infrastructure. In the meantime we will be testing new features.
We are excited to be planning to have an official release of the Metagrid platform onto scalable infrastructure. In the meantime we will be testing new features.

- Improved redundancy and backend deployment enhancements utilizing our Kubernetes cluster.
Loading