From 439b973f88b162d7f0b585c17e50a6d71e52220c Mon Sep 17 00:00:00 2001 From: typescreep Date: Mon, 25 Aug 2025 21:24:55 +0300 Subject: [PATCH 1/2] notifications instead messages for factory secret --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1266ff1..be4b70e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index 13bb19d..0462d92 100644 --- a/package.json +++ b/package.json @@ -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", From 8071264316752f25ee82b3bd12de89b9f156a984 Mon Sep 17 00:00:00 2001 From: typescreep Date: Mon, 25 Aug 2025 21:36:54 +0300 Subject: [PATCH 2/2] remove backlink env option --- .env | 2 ++ .env.options.dist | 8 +++++--- server/index.ts | 5 ++++- src/components/atoms/BackLink/BackLink.tsx | 3 ++- src/constants/customizationApiGroupAndVersion.ts | 3 +++ 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 01150d0..eefb96d 100644 --- a/.env +++ b/.env @@ -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 diff --git a/.env.options.dist b/.env.options.dist index 9770521..42fd77f 100644 --- a/.env.options.dist +++ b/.env.options.dist @@ -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= diff --git a/server/index.ts b/server/index.ts index 954b79c..7a45852 100644 --- a/server/index.ts +++ b/server/index.ts @@ -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"'} } `, ) diff --git a/src/components/atoms/BackLink/BackLink.tsx b/src/components/atoms/BackLink/BackLink.tsx index 1c7eae3..8d1df92 100644 --- a/src/components/atoms/BackLink/BackLink.tsx +++ b/src/components/atoms/BackLink/BackLink.tsx @@ -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 = ({ to, title }) => { return ( - {to && ( + {to && !BASE_REMOVE_BACKLINK && ( diff --git a/src/constants/customizationApiGroupAndVersion.ts b/src/constants/customizationApiGroupAndVersion.ts index a205dfb..b2036c9 100644 --- a/src/constants/customizationApiGroupAndVersion.ts +++ b/src/constants/customizationApiGroupAndVersion.ts @@ -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'