Merge pull request #112 from PRO-Robotech/feature/dev

notifications instead messages for factory secret | remove backlink env option
This commit is contained in:
typescreep
2025-08-25 21:38:32 +03:00
committed by GitHub
7 changed files with 21 additions and 10 deletions

2
.env
View File

@@ -26,3 +26,5 @@ VITE_NODE_TERMINAL_DEFAULT_PROFILE=baseline
VITE_LOGIN_URL=/oauth/token
VITE_LOGOUT_URL=/oauth/logout
VITE_LOGIN_USERNAME_FIELD=name
VITE_REMOVE_BACKLINK=true

View File

@@ -25,6 +25,8 @@ BFF_URL=
NODE_TERMINAL_DEFAULT_PROFILE=
VITE_LOGIN_URL=
VITE_LOGOUT_URL=
VITE_LOGIN_USERNAME_FIELD=
LOGIN_URL=
LOGOUT_URL=
LOGIN_USERNAME_FIELD=
REMOVE_BACKLINK=

8
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"@ant-design/icons": "5.6.0",
"@monaco-editor/react": "4.6.0",
"@originjs/vite-plugin-federation": "1.3.6",
"@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.107",
"@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.108",
"@readme/openapi-parser": "4.0.0",
"@reduxjs/toolkit": "2.2.5",
"@tanstack/react-query": "5.62.2",
@@ -2802,9 +2802,9 @@
}
},
"node_modules/@prorobotech/openapi-k8s-toolkit": {
"version": "0.0.1-alpha.107",
"resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.107.tgz",
"integrity": "sha512-fZs0iIJSewim/IB43veNm9/hWmttCRhkVeOVKl/12v4g0Mnm/OtZAAu2MqQlpr85Gkm1d6SKj1vd+umK5XOT7w==",
"version": "0.0.1-alpha.108",
"resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.108.tgz",
"integrity": "sha512-D+ReXNzuE3rELv7s3ZhYRAoaXDuGLzlJZEKzuIxQmnFj0bb5mtVEHYhPaYUsHf9uGLVhjRq+SMa8pCFNzJOtTQ==",
"license": "MIT",
"dependencies": {
"@monaco-editor/react": "4.6.0",

View File

@@ -20,7 +20,7 @@
"@ant-design/icons": "5.6.0",
"@monaco-editor/react": "4.6.0",
"@originjs/vite-plugin-federation": "1.3.6",
"@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.107",
"@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.108",
"@readme/openapi-parser": "4.0.0",
"@reduxjs/toolkit": "2.2.5",
"@tanstack/react-query": "5.62.2",

View File

@@ -62,6 +62,8 @@ const LOGOUT_URL = process.env.LOCAL === 'true' ? options?.LOGOUT_URL : process.
const LOGIN_USERNAME_FIELD =
process.env.LOCAL === 'true' ? options?.LOGIN_USERNAME_FIELD : process.env.LOGIN_USERNAME_FIELD
const REMOVE_BACKLINK = process.env.LOCAL === 'true' ? options?.REMOVE_BACKLINK : process.env.REMOVE_BACKLINK
const healthcheck = require('express-healthcheck')
const promBundle = require('express-prom-bundle')
@@ -184,7 +186,8 @@ app.get(`${basePrefix ? basePrefix : ''}/env.js`, (_, res) => {
NODE_TERMINAL_DEFAULT_PROFILE: ${JSON.stringify(NODE_TERMINAL_DEFAULT_PROFILE) || '"general"'},
LOGIN_URL: ${JSON.stringify(LOGIN_URL) || '"check envs"'},
LOGOUT_URL: ${JSON.stringify(LOGOUT_URL) || '"check envs"'},
LOGIN_USERNAME_FIELD: ${JSON.stringify(LOGIN_USERNAME_FIELD) || '"check envs"'}
LOGIN_USERNAME_FIELD: ${JSON.stringify(LOGIN_USERNAME_FIELD) || '"check envs"'},
REMOVE_BACKLINK: ${!!REMOVE_BACKLINK ? REMOVE_BACKLINK.toString().toLowerCase() : '"false"'}
}
`,
)

View File

@@ -1,6 +1,7 @@
import React, { FC } from 'react'
import { To } from 'react-router-dom'
import { ArrowLeftOutlined } from '@ant-design/icons'
import { BASE_REMOVE_BACKLINK } from 'constants/customizationApiGroupAndVersion'
import { TitleWithNoMargin } from '../TitleWithNoMargin'
import { Styled } from './styled'
@@ -13,7 +14,7 @@ type TBackLinkProps = {
export const BackLink: FC<TBackLinkProps> = ({ to, title }) => {
return (
<Styled.Container>
{to && (
{to && !BASE_REMOVE_BACKLINK && (
<Styled.CustomLink to={to}>
<TitleWithNoMargin level={5}>
<ArrowLeftOutlined />

View File

@@ -32,3 +32,6 @@ export const NODE_TERMINAL_DEFAULT_PROFILE =
export const LOGIN_URL = window._env_.LOGIN_URL || import.meta.env.VITE_LOGIN_URL
export const LOGOUT_URL = window._env_.LOGOUT_URL || import.meta.env.VITE_LOGOUT_URL
export const LOGIN_USERNAME_FIELD = window._env_.LOGIN_USERNAME_FIELD || import.meta.env.VITE_LOGIN_USERNAME_FIELD
export const BASE_REMOVE_BACKLINK =
window._env_.REMOVE_BACKLINK === 'true' || import.meta.env.VITE_REMOVE_BACKLINK.toString().toLowerCase() === 'true'