Remove EnableDLRebranding flag usage

src/i18n-keysets/auth.sign-in/en.json

@@ -5,6 +5,5 @@
   "label_login-placeholder": "Username",
   "label_password-placeholder": "Password",
   "label_sign-up-hint": "Don't have an account?",
-  "label_sing-up-link": "Sign up",
-  "title_product": "DataLens"
+  "label_sing-up-link": "Sign up"
 }

src/i18n-keysets/auth.sign-in/ru.json

@@ -5,6 +5,5 @@
   "label_login-placeholder": "Логин",
   "label_password-placeholder": "Пароль",
   "label_sign-up-hint": "У вас ещё нет учётной записи?",
-  "label_sing-up-link": "Зарегистрироваться",
-  "title_product": "DataLens"
+  "label_sing-up-link": "Зарегистрироваться"
 }

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

@@ -7,7 +7,7 @@ import type {
     DLUser,
     TenantSettings,
 } from '../../../shared';
-import {FALLBACK_LANGUAGES, Feature, Language, USER_SETTINGS_KEY} from '../../../shared';
+import {FALLBACK_LANGUAGES, Language, USER_SETTINGS_KEY} from '../../../shared';
 import type {AppLayoutSettings, GetLayoutConfig} from '../../types/app-layout';
 import {addTranslationsScript} from '../../utils/language';
 import {getUserInfo} from '../zitadel/utils';
@@ -72,11 +72,6 @@ export const getOpensourceLayoutConfig: GetLayoutConfig = async (args) => {
         };
     }
 
-    const isRebrandingEnabled = req.ctx.get('isEnabledServerFeature')(Feature.EnableDLRebranding);
-
-    // applying new favicon from rebranding
-    const faviconUrl = isRebrandingEnabled ? '/os-favicon.ico' : config.faviconUrl;
-
     const tenantSettings: TenantSettings = {
         defaultColorPaletteId: res.locals.tenantDefaultColorPaletteId,
     };
@@ -115,7 +110,7 @@ export const getOpensourceLayoutConfig: GetLayoutConfig = async (args) => {
         lang,
         icon: {
             type: 'image/ico',
-            href: faviconUrl,
+            href: '/os-favicon.ico',
             sizes: '32x32',
         },
         inlineScripts: ['window.DL = window.__DATA__.DL', ...chartkitInlineScripts],

src/ui/components/AsideHeaderAdapter/AsideHeaderAdapter.tsx

@@ -29,9 +29,8 @@ import {Settings as SettingsPanel} from './Settings/Settings';
 import {DIALOG_RELEASE_VERSION} from './VersionDialog/VersionDialog';
 import {ASIDE_HEADER_LOGO_ICON_SIZE} from './constants';
 
-import defaultLogoIcon from '../../assets/icons/logo.svg';
 import iconCollection from '../../assets/icons/mono-collection.svg';
-import rebrandingLogoIcon from '../../assets/icons/os-logo.svg';
+import defaultLogoIcon from '../../assets/icons/os-logo.svg';
 
 import './AsideHeaderAdapter.scss';
 
@@ -222,8 +221,6 @@ export const AsideHeaderAdapter = ({
         setCurrentPopup(null);
     }, []);
 
-    const isRebrandingEnabled = isEnabledFeature(Feature.EnableDLRebranding);
-
     const renderFooter = () => {
         return (
             <React.Fragment>
@@ -328,14 +325,12 @@ export const AsideHeaderAdapter = ({
         );
     };
 
-    const defaultLogo = isRebrandingEnabled ? rebrandingLogoIcon : defaultLogoIcon;
-
     return (
         <AsideHeader
             compact={isCompact}
             logo={{
                 text: () => <LogoText {...logoTextProps} />,
-                icon: logoIcon ?? defaultLogo,
+                icon: logoIcon ?? defaultLogoIcon,
                 iconSize: ASIDE_HEADER_LOGO_ICON_SIZE,
                 iconClassName: b('logo-icon'),
                 className: b('logo'),

src/ui/components/AsideHeaderAdapter/LogoText/LogoText.scss

@@ -2,10 +2,6 @@
 
 .aside-header-logo-text {
     &__title {
-        @include text-body-2;
-    }
-
-    &__title_rebranding {
         @include text-subheader-2;
     }
 

src/ui/components/AsideHeaderAdapter/LogoText/LogoText.tsx

@@ -1,9 +1,7 @@
 import React from 'react';
 
 import block from 'bem-cn-lite';
-import {Feature} from 'shared/types';
-import {PRODUCT_NAME, REBRANDING_PRODUCT_NAME} from 'ui/constants';
-import {isEnabledFeature} from 'ui/utils/isEnabledFeature';
+import {REBRANDING_PRODUCT_NAME} from 'ui/constants';
 
 import './LogoText.scss';
 
@@ -17,15 +15,12 @@ export type LogoTextProps = {
 
 export const LogoText = React.forwardRef<HTMLDivElement, LogoTextProps>(
     ({installationInfo, productName, installationInfoClassName}, ref) => {
-        const isRebrandingEnabled = isEnabledFeature(Feature.EnableDLRebranding);
-        const showInstallation = isRebrandingEnabled && installationInfo;
-        const defaultProductName = isRebrandingEnabled ? REBRANDING_PRODUCT_NAME : PRODUCT_NAME;
+        const showInstallation = installationInfo;
+        const defaultProductName = REBRANDING_PRODUCT_NAME;
 
         return (
             <div className={b()}>
-                <div className={b('title', {rebranding: isRebrandingEnabled})}>
-                    {productName || defaultProductName}
-                </div>
+                <div className={b('title')}>{productName || defaultProductName}</div>
                 {showInstallation && (
                     <div ref={ref} className={b('installation-info', installationInfoClassName)}>
                         {installationInfo}

src/ui/components/Illustration/getIllustrationStore.ts

@@ -1,28 +1,30 @@
 export const getIllustrationStore = () => ({
     light: {
-        notFound: () => import('assets/images/illustration/light/404.svg'),
-        notFoundError: () => import('assets/images/illustration/light/404.svg'),
-        noAccess: () => import('assets/images/illustration/light/403.svg'),
-        error: () => import('assets/images/illustration/light/500.svg'),
-        identity: () => import('assets/images/illustration/light/identity.svg'),
-        project: () => import('assets/images/illustration/light/project.svg'),
-        template: () => import('assets/images/illustration/light/template.svg'),
-        emptyDirectory: () => import('assets/images/illustration/light/folder.svg'),
-        successOperation: () => import('assets/images/illustration/light/success_operation.svg'),
-        badRequest: () => import('assets/images/illustration/light/bad_request.svg'),
-        noAccounts: () => import('assets/images/illustration/light/404.svg'),
+        notFound: () => import('assets/images/new-illustrations/light/nothing_found.svg'),
+        notFoundError: () => import('assets/images/new-illustrations/light/404.svg'),
+        noAccess: () => import('assets/images/new-illustrations/light/403.svg'),
+        error: () => import('assets/images/new-illustrations/light/500.svg'),
+        identity: () => import('assets/images/new-illustrations/light/no_permission.svg'),
+        project: () => import('assets/images/new-illustrations/light/project.svg'),
+        template: () => import('assets/images/new-illustrations/light/empty_state.svg'),
+        emptyDirectory: () => import('assets/images/new-illustrations/light/empty_directory.svg'),
+        successOperation: () =>
+            import('assets/images/new-illustrations/light/success_operation.svg'),
+        badRequest: () => import('assets/images/new-illustrations/light/bad_request.svg'),
+        noAccounts: () => import('assets/images/new-illustrations/light/no_accounts.svg'),
     },
     dark: {
-        notFound: () => import('assets/images/illustration/dark/404.svg'),
-        notFoundError: () => import('assets/images/illustration/dark/404.svg'),
-        noAccess: () => import('assets/images/illustration/dark/403.svg'),
-        error: () => import('assets/images/illustration/dark/500.svg'),
-        identity: () => import('assets/images/illustration/dark/identity.svg'),
-        project: () => import('assets/images/illustration/dark/project.svg'),
-        template: () => import('assets/images/illustration/dark/template.svg'),
-        emptyDirectory: () => import('assets/images/illustration/dark/folder.svg'),
-        successOperation: () => import('assets/images/illustration/dark/success_operation.svg'),
-        badRequest: () => import('assets/images/illustration/light/bad_request.svg'),
-        noAccounts: () => import('assets/images/illustration/dark/404.svg'),
+        notFound: () => import('assets/images/new-illustrations/dark/nothing_found.svg'),
+        notFoundError: () => import('assets/images/new-illustrations/dark/404.svg'),
+        noAccess: () => import('assets/images/new-illustrations/dark/403.svg'),
+        error: () => import('assets/images/new-illustrations/dark/500.svg'),
+        identity: () => import('assets/images/new-illustrations/dark/no_permission.svg'),
+        project: () => import('assets/images/new-illustrations/dark/project.svg'),
+        template: () => import('assets/images/new-illustrations/dark/empty_state.svg'),
+        emptyDirectory: () => import('assets/images/new-illustrations/dark/empty_directory.svg'),
+        successOperation: () =>
+            import('assets/images/new-illustrations/dark/success_operation.svg'),
+        badRequest: () => import('assets/images/new-illustrations/dark/bad_request.svg'),
+        noAccounts: () => import('assets/images/new-illustrations/dark/no_accounts.svg'),
     },
 });

src/ui/components/Illustration/getRebrandingIllustrationStore.ts

@@ -1,3 +1,4 @@
+// TODO: remove CHARTS-11919
 export const getRebrandingIllustrationStore = () => ({
     light: {
         notFound: () => import('assets/images/new-illustrations/light/nothing_found.svg'),

src/ui/components/MobileHeader/MobileHeader.scss

@@ -11,7 +11,7 @@
         height: 0;
     }
 
-    &__logo_rebranding {
+    &__logo {
         flex: 1;
     }
 
@@ -25,13 +25,10 @@
     }
 
     &__logo-icon {
+        height: auto;
+        width: auto;
+        padding-left: var(--g-spacing-2);
         color: var(--g-color-base-brand);
-
-        &_rebranding {
-            height: auto;
-            width: auto;
-            padding-left: var(--g-spacing-2);
-        }
     }
 
     &__user-avatar {

src/ui/components/MobileHeader/MobileHeaderComponent/MobileHeaderComponent.tsx

@@ -5,11 +5,8 @@ import {MobileHeader, getMobileHeaderCustomEvent} from '@gravity-ui/navigation';
 import {mergeRefs} from '@gravity-ui/uikit';
 import block from 'bem-cn-lite';
 import {I18n} from 'i18n';
-import {Feature} from 'shared/types';
 import {LogoText} from 'ui/components/AsideHeaderAdapter/LogoText/LogoText';
-import {PRODUCT_NAME} from 'ui/constants';
 import type {MobileHeaderComponentProps} from 'ui/registry/units/common/types/components/MobileHeaderComponent';
-import {isEnabledFeature} from 'ui/utils/isEnabledFeature';
 import {useScrollableContainerContext} from 'ui/utils/scrollableContainerContext';
 
 import {DL} from '../../../constants/common';
@@ -19,9 +16,8 @@ import {MOBILE_HEADER_LOGO_ICON_SIZE} from '../constants';
 import {BurgerMenuFooter} from './BurgerMenuFooter/BurgerMenuFooter';
 import {UserPanel} from './UserPanel/UserPanel';
 
-import defaultLogoIcon from 'ui/assets/icons/logo.svg';
 import iconCollection from 'ui/assets/icons/mono-collection.svg';
-import rebrandingLogoIcon from 'ui/assets/icons/os-logo.svg';
+import defaultLogoIcon from 'ui/assets/icons/os-logo.svg';
 
 import '../MobileHeader.scss';
 
@@ -73,12 +69,6 @@ export const MobileHeaderComponent = ({
           ]
         : undefined;
 
-    const defaultLogo = isEnabledFeature(Feature.EnableDLRebranding)
-        ? rebrandingLogoIcon
-        : defaultLogoIcon;
-
-    const isRebrandingEnabled = isEnabledFeature(Feature.EnableDLRebranding);
-
     const {scrollableContainerRef} = useScrollableContainerContext();
 
     const contentRef = React.useRef<HTMLDivElement>();
@@ -98,11 +88,11 @@ export const MobileHeaderComponent = ({
         <MobileHeader
             ref={setupRefs}
             logo={{
-                icon: logoIcon ?? defaultLogo,
-                text: isRebrandingEnabled ? () => <LogoText {...logoTextProps} /> : PRODUCT_NAME,
-                iconClassName: b('logo-icon', {rebranding: isRebrandingEnabled}),
-                className: b('logo', {rebranding: isRebrandingEnabled}),
-                iconSize: isRebrandingEnabled ? MOBILE_HEADER_LOGO_ICON_SIZE : undefined,
+                icon: logoIcon ?? defaultLogoIcon,
+                text: () => <LogoText {...logoTextProps} />,
+                iconClassName: b('logo-icon'),
+                className: b('logo'),
+                iconSize: MOBILE_HEADER_LOGO_ICON_SIZE,
             }}
             burgerMenu={{items: menuItems, renderFooter: () => <BurgerMenuFooter />}}
             contentClassName={CONTENT_CLASSNAME}

src/ui/entries/dl-main.tsx

@@ -28,19 +28,13 @@ import 'ui/styles/variables.scss';
 import 'ui/styles/split-pane-resizer.scss';
 import 'ui/styles/theme.scss';
 import 'ui/styles/rebranding-theme.scss';
-import {isEnabledFeature} from 'ui/utils/isEnabledFeature';
-import {Feature} from 'shared';
 import {ScrollableContainerContextProvider} from 'ui/utils/scrollableContainerContext';
 
 const Content = () => {
     const userTheme = useSelector(selectTheme);
     const theme = getOverridedTheme(userTheme);
     const themeSettings = useSelector(selectThemeSettings);
 
-    if (isEnabledFeature(Feature.EnableDLRebranding)) {
-        Utils.addBodyClass('dl-root', 'dl-root_rebranding');
-    }
-
     Utils.addBodyClass('dl-root_new-palette');
 
     return (

src/ui/registry/units/auth/types/components/Signin.ts

@@ -1,3 +1 @@
-import type {IconData} from '@gravity-ui/uikit';
-
-export type SigninProps = {alternativeAuthOptions?: React.ReactNode; logoIcon?: IconData};
+export type SigninProps = {alternativeAuthOptions?: React.ReactNode};

src/ui/registry/units/common/register.tsx

@@ -1,12 +1,11 @@
-import {Feature, extractEntryId, isEntryId} from 'shared';
+import {extractEntryId, isEntryId} from 'shared';
 import {getEntryScopesWithRevisionsList} from 'ui/components/RevisionsPanel/utils';
 import {DL} from 'ui/constants';
 import {getAdditionalChartkitErrorContent} from 'ui/libs/DatalensChartkit/Error/getAdditionalChartkitErrorContent';
 import {getIsCompact, updateIsCompact} from 'ui/store/utils/asideHeader';
 import {getLoginById} from 'ui/units/auth/components/LoginById/utils';
 import {resolveUsersByIds} from 'ui/units/auth/store/actions/usersByIds';
 import {getRestrictedParamNames} from 'ui/utils/getRestrictedParamNames';
-import {isEnabledFeature} from 'ui/utils/isEnabledFeature';
 import {setEntryKey} from 'ui/utils/setEntryKey';
 
 import {formatNumber} from '../../../../shared/modules/format-units/formatUnit';
@@ -18,7 +17,6 @@ import {getAdditionalEntryDialoguesMap} from '../../../components/EntryDialogues
 import {getEntryName} from '../../../components/EntryTitle/utils';
 import {Illustration} from '../../../components/Illustration/Illustration';
 import {getIllustrationStore} from '../../../components/Illustration/getIllustrationStore';
-import {getRebrandingIllustrationStore} from '../../../components/Illustration/getRebrandingIllustrationStore';
 import {MarkdownControl} from '../../../components/MarkdownControl/MarkdownControl';
 import {MobileHeaderComponent} from '../../../components/MobileHeader/MobileHeaderComponent/MobileHeaderComponent';
 import {
@@ -55,8 +53,6 @@ import {registry} from '../../index';
 import {EXAMPLE_FUNCTION} from './constants/functions';
 
 export const registerCommonPlugins = () => {
-    const isRebrandingEnabled = isEnabledFeature(Feature.EnableDLRebranding);
-
     registry.common.components.registerMany({
         MobileHeaderComponent,
         PlaceholderIllustrationImage: Illustration,
@@ -74,9 +70,7 @@ export const registerCommonPlugins = () => {
         getEntryMenuConfig,
         getMenuGroupConfig,
         getIconDataById,
-        getIllustrationStore: isRebrandingEnabled
-            ? getRebrandingIllustrationStore
-            : getIllustrationStore,
+        getIllustrationStore,
         getIsCompact,
         updateIsCompact,
         getPlaceSelectParameters,