Skip to content

feat: injecting env properties dynamically in admin-ui built #1720 #1734

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 2 commits into from
May 30, 2024
Merged

feat: injecting env properties dynamically in admin-ui built #1720 #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51234a5
feat: injecting env properties dynamically in admin-ui built #1720
duttarnab May 30, 2024
345432d
feat: add env file for local
duttarnab May 30, 2024
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
2 changes: 1 addition & 1 deletion admin-ui/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
BASE_PATH=/admin/
NPM_TOKEN=
NPM_TOKEN=
4 changes: 0 additions & 4 deletions admin-ui/.env.goldencrane
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion admin-ui/.env.adminuitest → admin-ui/.env.local
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BASE_PATH=/admin/
BASE_PATH=/
CONFIG_API_BASE_URL=https://admin-ui-test.gluu.org/jans-config-api
API_BASE_URL=https://admin-ui-test.gluu.org/jans-config-api/admin-ui
NPM_TOKEN=
3 changes: 0 additions & 3 deletions admin-ui/.env.test
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions admin-ui/.env.tmp
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion admin-ui/build/webpack.config.client.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const CircularDependencyPlugin = require('circular-dependency-plugin')
const config = require('./../config')
require('dotenv').config({
path: (process.env.NODE_ENV && `.env.${process.env.NODE_ENV}`) || '.env',
path: (process.env.NODE_ENV && `.env.${process.env.NODE_ENV}`) || '.env.local',
})


const BASE_PATH = process.env.BASE_PATH || '/'
const CONFIG_API_BASE_URL =
process.env.CONFIG_API_BASE_URL || 'https://sample.com'
Expand Down
4 changes: 1 addition & 3 deletions admin-ui/env-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
const CONFIG_API_BASE_URL = "https://%(hostname)s/jans-config-api"
const API_BASE_URL = "https://%(hostname)s/jans-config-api/admin-ui"
const BASE_PATH = "/admin/"

window.configApiBaseUrl = CONFIG_API_BASE_URL
window.apiBaseUrl = API_BASE_URL
window.basePath = BASE_PATH
window.apiBaseUrl = API_BASE_URL
2 changes: 1 addition & 1 deletion admin-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"test": "set NODE_ENV=test&& jest --forceExit",
"clear_jest": "jest --clearCache",
"test:watch": "npm test -- --watch",
"start": "export $(cat .env | xargs) && npm run start:dev",
"start": "npm run start:dev",
"build:dev": "node ./build/cli-tools.js --clear dist --create dist && webpack --config ./build/webpack.config.client.dev.js",
"build:prod": "node ./build/cli-tools.js --clear dist --create dist && webpack --config ./build/webpack.config.client.prod.js",
"build:adminuitest": "NODE_ENV=adminuitest node ./build/cli-tools.js --clear dist --create dist && NODE_ENV=adminuitest webpack --config ./build/webpack.config.client.prod.js",
Expand Down