@ytsaurus/ui 1.21.0 → 1.22.1

package/dist/public/build/manifest.json

@@ -1,6 +1,6 @@
 {
   "main.css": "css/main.77009ada.css",
-  "main.js": "js/main.53d3bdc5.js",
+  "main.js": "js/main.724df837.js",
   "runtime.js": "js/runtime.22e88c00.js",
   "css/861.c5a67589.chunk.css": "css/861.c5a67589.chunk.css",
   "js/861.a0939319.chunk.js": "js/861.a0939319.chunk.js",
@@ -52,7 +52,7 @@
   "assets/images/ui.jpg": "assets/images/ui.bab31938.jpg",
   "assets/images/cluster-2x.svg": "assets/images/cluster-2x.e53788d6.svg",
   "main.77009ada.css.map": "css/main.77009ada.css.map",
-  "main.53d3bdc5.js.map": "js/main.53d3bdc5.js.map",
+  "main.724df837.js.map": "js/main.724df837.js.map",
   "runtime.22e88c00.js.map": "js/runtime.22e88c00.js.map",
   "861.c5a67589.chunk.css.map": "css/861.c5a67589.chunk.css.map",
   "861.a0939319.chunk.js.map": "js/861.a0939319.chunk.js.map",

package/dist/server/ServerFactory.d.ts

@@ -8,6 +8,9 @@ export interface ServerFactory {
     renderLayout(params: AppLayoutConfig, req: Request, res: Response): Promise<string>;
 }
 export declare function rememberApp(v: ExpressKit): void;
+/**
+ * @deprecated use req.ctx.config instead of App().config
+ */
 export declare function getApp(): ExpressKit;
 export declare function configureServerFactory(overrides: Partial<ServerFactory>): void;
 declare const _default: ServerFactory;

package/dist/server/ServerFactory.js

@@ -16,6 +16,9 @@ function rememberApp(v) {
     app = v;
 }
 exports.rememberApp = rememberApp;
+/**
+ * @deprecated use req.ctx.config instead of App().config
+ */
 function getApp() {
     return app;
 }

package/dist/server/controllers/availability.js

@@ -8,7 +8,6 @@ const axios_1 = __importDefault(require("axios"));
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../components/utils");
 const utils_2 = require("../utils");
-const ServerFactory_1 = require("../ServerFactory");
 function getClusterAvailability(clusterConfig, odinPath) {
     const ODIN_PERIOD = 5;
     const ODIN_METRIC = 'master';
@@ -28,38 +27,57 @@ function getClusterAvailability(clusterConfig, odinPath) {
         return response.data;
     });
 }
-function getAvailability(req, clusters, odinPath) {
-    const url = `${odinPath}/is_alive`;
-    return axios_1.default
-        .request({ url, responseType: 'json' })
-        .then((res) => {
-        if (res.data !== true) {
+function getAvailability(req, clusters) {
+    const odinBaseUrl = req.ctx.config.odinBaseUrl;
+    const isMultiOdinBaseUrl = 'string' !== typeof odinBaseUrl;
+    const makeOdinIsAliveUrl = (odinBaseUrl) => `${odinBaseUrl}/is_alive`;
+    const commonIsAlive = isMultiOdinBaseUrl
+        ? Promise.resolve({ data: true })
+        : axios_1.default.request({ url: makeOdinIsAliveUrl(odinBaseUrl) });
+    return commonIsAlive
+        .then(({ data: commonAlive }) => {
+        if (!commonAlive) {
             return [];
         }
         return Promise.all(lodash_1.default.map(clusters, (clusterConfig) => {
-            const id = clusterConfig.id;
-            return getClusterAvailability(clusterConfig, odinPath)
-                .then((availability) => ({ id, availability }))
-                .catch((error) => {
-                req.ctx.logError('getAvailability error', error);
-                return { id };
+            const odinPath = isMultiOdinBaseUrl
+                ? odinBaseUrl === null || odinBaseUrl === void 0 ? void 0 : odinBaseUrl[clusterConfig.id]
+                : odinBaseUrl;
+            if (!odinPath) {
+                return {};
+            }
+            const alive = isMultiOdinBaseUrl
+                ? axios_1.default.get(makeOdinIsAliveUrl(odinPath)).catch((e) => {
+                    req.ctx.logError(`Error of getting ${odinPath}`, e);
+                    return { data: false };
+                })
+                : Promise.resolve({ data: true });
+            return alive.then(({ data }) => {
+                if (data != true) {
+                    return {};
+                }
+                return getClusterAvailability(clusterConfig, odinPath)
+                    .then((availability) => ({ id: clusterConfig.id, availability }))
+                    .catch((error) => {
+                    req.ctx.logError('getAvailability error', error);
+                    return {};
+                });
             });
         }));
     })
         .catch((e) => {
-        req.ctx.logError(`Error of getting ${url}`, e);
+        req.ctx.logError(`Error of getting ${odinBaseUrl}`, e);
         return [];
     });
 }
 async function getClustersAvailability(req, res) {
-    var _a;
-    const odinPath = (_a = (0, ServerFactory_1.getApp)().config) === null || _a === void 0 ? void 0 : _a.odinBaseUrl;
-    if (!odinPath) {
+    const odinBaseUrl = req.ctx.config.odinBaseUrl;
+    if (!odinBaseUrl) {
         (0, utils_2.sendAndLogError)(req.ctx, res, 500, new Error('odin base url is not configured'));
         return;
     }
     const clusters = (0, utils_1.getClustersFromConfig)();
-    await getAvailability(req, clusters, odinPath)
+    await getAvailability(req, clusters)
         .then((data) => (0, utils_2.sendResponse)(res, data))
         .catch((error) => (0, utils_2.sendError)(res, error));
 }

package/dist/server/controllers/odin-proxy-api.js

@@ -8,7 +8,6 @@ const lodash_1 = __importDefault(require("lodash"));
 const axios_1 = __importDefault(require("axios"));
 const qs_1 = __importDefault(require("qs"));
 const utils_1 = require("../utils");
-const ServerFactory_1 = require("../ServerFactory");
 async function odinProxyApi(req, res) {
     try {
         await odinProxyApiImpl(req, res);
@@ -23,14 +22,14 @@ async function odinProxyApi(req, res) {
 }
 exports.odinProxyApi = odinProxyApi;
 async function odinProxyApiImpl(req, res) {
-    var _a;
-    const odinPath = (_a = (0, ServerFactory_1.getApp)().config) === null || _a === void 0 ? void 0 : _a.odinBaseUrl;
+    const { action, ytAuthCluster: cluster } = req.params;
+    const { odinBaseUrl } = req.ctx.config;
+    const odinPath = typeof odinBaseUrl === 'string' ? odinBaseUrl : odinBaseUrl === null || odinBaseUrl === void 0 ? void 0 : odinBaseUrl[cluster];
     if (!odinPath) {
         return (0, utils_1.sendAndLogError)(req.ctx, res, 500, new Error('Odin base url is not configured'));
     }
     const { ctx, query } = req;
     const search = lodash_1.default.isEmpty(query) ? '' : `?${qs_1.default.stringify(query)}`;
-    const { action, ytAuthCluster: cluster } = req.params;
     const allowedActionsUrls = {
         service_list: `${odinPath}/service_list`,
         exists: `${odinPath}/${action}/${cluster}`,

package/dist/server/index.js

@@ -13,6 +13,7 @@ const routes_1 = __importDefault(require("./routes"));
 const oauth_1 = require("./middlewares/oauth");
 const authorization_1 = require("./middlewares/authorization");
 const authorization_2 = require("./utils/authorization");
+const check_configuration_1 = require("./middlewares/check-configuration");
 const nodekit = new nodekit_1.NodeKit({ configsPath: path_1.default.resolve(__dirname, './configs') });
 const { appName, appEnv, appInstallation, appDevMode } = nodekit.config;
 nodekit.ctx.log('AppConfig details', {
@@ -37,6 +38,10 @@ if (authMiddlewares.length) {
     nodekit.config.appAuthHandler = (0, authorization_1.createAuthMiddleware)();
 }
 (_b = (_a = nodekit.config).adjustAppConfig) === null || _b === void 0 ? void 0 : _b.call(_a, nodekit);
+const configurationErrors = (0, check_configuration_1.createConfigurationErrorsMidleware)(nodekit.config);
+if (configurationErrors) {
+    nodekit.config.appBeforeAuthMiddleware = [configurationErrors];
+}
 const app = new expresskit_1.ExpressKit(nodekit, routes_1.default);
 (0, configure_app_1.configureApp)(app);
 if (require.main === module) {

package/dist/server/middlewares/check-configuration.d.ts

@@ -0,0 +1,3 @@
+import { AppMiddleware } from '@gravity-ui/expresskit';
+import { AppConfig } from '@gravity-ui/nodekit';
+export declare function createConfigurationErrorsMidleware(config: AppConfig): AppMiddleware | undefined;

package/dist/server/middlewares/check-configuration.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createConfigurationErrorsMidleware = void 0;
+function checkConfigurationMiddleware(errors) {
+    return function checkConfiguration(_req, res) {
+        res.setHeader('Content-Type', 'text/html; charset=utf-8');
+        const body = `Please fix the problems below:<br>
+            <ol>
+                ${errors.map((i) => `<li>${i}</li>`).join('\n')}
+            </ol>
+            Please refer to the <a target='_blank' href='https://github.com/ytsaurus/ytsaurus-ui/tree/main/packages/ui#migration'>migration notices<a/> for more details.
+        `;
+        res.status(500).end(body);
+    };
+}
+function createConfigurationErrorsMidleware(config) {
+    const configurationErrors = [];
+    if (process.env.YT_AUTH_CLUSTER_ID) {
+        configurationErrors.push('The YT_AUTH_CLUSTER_ID environment variable is no longer supported, please replace it with ALLOW_PASSWORD_AUTH');
+    }
+    if ('ytAuthCluster' in config) {
+        configurationErrors.push('The config setting `config.ytAuthCluster` is no longer supported, please replace it with `config.allowPasswordAuth` or use ALLOW_PASSWORD_AUTH environment variable');
+    }
+    return configurationErrors.length > 0
+        ? checkConfigurationMiddleware([...configurationErrors])
+        : undefined;
+}
+exports.createConfigurationErrorsMidleware = createConfigurationErrorsMidleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ytsaurus/ui",
-  "version": "1.21.0",
+  "version": "1.22.1",
   "repository": {
     "type": "github",
     "url": "https://github.com/YTsaurus/ytsaurus-ui/tree/main/packages/ui"
@@ -186,7 +186,7 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "02a00348a20fe6173f4d11026d4dac02a3bdd468",
+  "gitHead": "0b406a4e7f0d5f7def958b64b92c278b6afa57eb",
   "overrides": {
     "react-split-pane": {
       "react": "$react",