Tenant setting to select the default palette (#2917)

Author: kuzmadom

dev/env/opensource/development.env

@@ -18,3 +18,5 @@ ZITADEL_COOKIE_SECRET=!@OUVOF$@E@%F^&@$*ER!F
 
 SERVICE_CLIENT_ID=charts
 SERVICE_CLIENT_SECRET=uvdZDsiZJslDj8bKbTlKR43oMHqEiNGppxhMjCQWqQXkHUmGpW2iuLYNJ5tdmmlL
+
+US_MASTER_TOKEN=us-master-token

src/server/components/charts-engine/components/processor/worker-chart-builder.ts

@@ -54,7 +54,6 @@ export const getWizardChartBuilder = async (
     const defaultColorPaletteId = getDefaultColorPaletteId({
         ctx: app.nodekit.ctx,
         tenantSettings,
-        palettes,
     });
 
     // Nothing happens here - just for compatibility with the editor

src/server/components/features/features-list/EnableTenantSettingPalettes.ts

@@ -4,7 +4,7 @@ import {createFeatureConfig} from '../utils';
 export default createFeatureConfig({
     name: Feature.EnableTenantSettingPalettes,
     state: {
-        development: false,
-        production: false,
+        development: true,
+        production: true,
     },
 });

src/server/components/features/features-list/NewDefaultPalette.ts

@@ -4,7 +4,7 @@ import {createFeatureConfig} from '../utils';
 export default createFeatureConfig({
     name: Feature.NewDefaultPalette,
     state: {
-        development: false,
-        production: false,
+        development: true,
+        production: true,
     },
 });

src/server/components/layout/opensource-layout-config.ts

@@ -1,6 +1,12 @@
 import type {RenderParams} from '@gravity-ui/app-layout';
 
-import type {AppEnvironment, AppInstallation, DLGlobalData, DLUser} from '../../../shared';
+import type {
+    AppEnvironment,
+    AppInstallation,
+    DLGlobalData,
+    DLUser,
+    TenantSettings,
+} from '../../../shared';
 import {FALLBACK_LANGUAGES, Feature, Language, USER_SETTINGS_KEY} from '../../../shared';
 import type {AppLayoutSettings, GetLayoutConfig} from '../../types/app-layout';
 import {addTranslationsScript} from '../../utils/language';
@@ -71,6 +77,10 @@ export const getOpensourceLayoutConfig: GetLayoutConfig = async (args) => {
     // applying new favicon from rebranding
     const faviconUrl = isRebrandingEnabled ? '/os-favicon.ico' : config.faviconUrl;
 
+    const tenantSettings: TenantSettings = {
+        defaultColorPaletteId: res.locals.tenantDefaultColorPaletteId,
+    };
+
     const DL: DLGlobalData = {
         user,
         userSettings,
@@ -96,6 +106,7 @@ export const getOpensourceLayoutConfig: GetLayoutConfig = async (args) => {
         docsUrl: config.docsUrl,
         orderedAuthRoles: config.orderedAuthRoles,
         authSignupDisabled: req.ctx.config.authSignupDisabled,
+        tenantSettings,
         ...appLayoutSettings.DL,
     };
     const renderConfig: RenderParams<{DL: DLGlobalData}> = {

src/server/middlewares/tenant-settings.ts

@@ -0,0 +1,44 @@
+import type {NextFunction, Request, Response} from '@gravity-ui/expresskit';
+import {REQUEST_ID_PARAM_NAME} from '@gravity-ui/nodekit';
+
+import {onFail} from '../callbacks';
+import {registry} from '../registry';
+import type {DatalensGatewaySchemas} from '../types/gateway';
+
+export function getTenantSettingsMiddleware() {
+    async function resolveTenantSettings(req: Request, res: Response, next: NextFunction) {
+        const {ctx} = req;
+
+        const requestId = req.ctx.get(REQUEST_ID_PARAM_NAME);
+        const currentTenantId = 'common';
+
+        const {gatewayApi} = registry.getGatewayApi<DatalensGatewaySchemas>();
+        const {getAuthArgsUSPrivate} = registry.common.auth.getAll();
+        const authArgsUSPrivate = getAuthArgsUSPrivate(req, res);
+
+        const tenantDetailsResponce = await gatewayApi.usPrivate._getTenantDetails({
+            ctx,
+            headers: req.headers,
+            requestId: requestId ?? '',
+            authArgs: authArgsUSPrivate,
+            args: {tenantId: currentTenantId},
+        });
+        const resolvedTenant = tenantDetailsResponce.responseData;
+        res.locals.tenantDefaultColorPaletteId = resolvedTenant.settings?.defaultColorPaletteId;
+
+        next();
+    }
+
+    return function resolveTenantSettingsMiddleware(
+        req: Request,
+        res: Response,
+        next: NextFunction,
+    ) {
+        resolveTenantSettings(req, res, next)
+            .catch((error) => {
+                req.ctx.logError('TENANT_RESOLVED_FAILED', error);
+                onFail(req, res);
+            })
+            .catch((error) => next(error));
+    };
+}

src/server/modes/charts/plugins/datalens/js/helpers/colors/index.ts

@@ -23,6 +23,7 @@ export const getChartColorsConfig = ({
     const fallbackColors = selectServerPalette({
         palette: colorsConfig.palette,
         availablePalettes,
+        customColorPalettes: loadedColorPalettes,
         defaultColorPaletteId,
     });
 

src/server/modes/charts/plugins/datalens/preparers/pie/gravity-charts.ts

@@ -56,7 +56,7 @@ export function prepareD3Pie(args: PrepareFunctionArgs) {
                     return {
                         ...item,
                         value: item.y,
-                        color: String(item.color),
+                        color: item.color,
                         formattedValue: getFormattedValue(String(item.y), {
                             ...measure,
                             data_type: idToDataType[measure.guid],

src/server/modes/opensource/routes.ts

@@ -12,6 +12,7 @@ import {getZitadelRoutes} from '../../components/zitadel/routes';
 import {ping} from '../../controllers/ping';
 import {workbooksTransferController} from '../../controllers/workbook-transfer';
 import {getConnectorIconsMiddleware} from '../../middlewares';
+import {getTenantSettingsMiddleware} from '../../middlewares/tenant-settings';
 import type {ExtendedAppRouteDescription} from '../../types/controllers';
 import {getConfiguredRoute} from '../../utils/routes';
 import {applyPluginRoutes} from '../charts/init-charts-engine';
@@ -119,6 +120,7 @@ function getDataLensRoutes({
                     authArgs: getAuthArgs(req, res),
                 }),
             }),
+            getTenantSettingsMiddleware(),
         ],
         ui: true,
     };

src/shared/schema/us-private/actions/index.ts

@@ -1,5 +1,7 @@
 import {entriesActions} from './entries';
+import {tenantActions} from './tenant';
 
 export const actions = {
     ...entriesActions,
+    ...tenantActions,
 };