feat(System): new regexp shortname [YTFRONT-4386]

ytsaurus · Oct 16, 2024 · e5409f6 · e5409f6
1 parent a7462da
commit e5409f6
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 4 deletions.
diff --git a/packages/custom-ytsaurus-ui.example/src/server/configs/common.ts b/packages/custom-ytsaurus-ui.example/src/server/configs/common.ts
@@ -21,6 +21,7 @@ const cfg: Partial<CustomAppConfig> = {
         reHashFromNodeVersion: '[^~]+~(?<hash>[^+]+)',
 
         reShortNameFromAddress: '(?<shortname>.*)(\\.[^.]+)(\\.yt\\.my\\.domain)',
+        reShortNameSystemPage: '(?<shortname>.*)(\\.[^.]+)(\\.yt\\.my\\.domain)',
         reShortNameFromTabletNodeAddress: '(?<shortname>[^-]+-[^-]+).*',
 
         reUnipikaAllowTaggedSources: [

diff --git a/packages/ui/src/server/configs/e2e/local.ts b/packages/ui/src/server/configs/e2e/local.ts
@@ -40,6 +40,7 @@ const e2eConfig: Partial<AppConfig> = {
         },
 
         reShortNameFromAddress: '(?<shortname>^(loca)).*(?<suffix>:\\d\\d\\d)',
+        reShortNameSystemPage: '(?<shortname>^(local))',
         reShortNameFromTabletNodeAddress: '(?<shortname>^(local))[^:]+(?<suffix>:\\d\\d)',
 
         reUnipikaAllowTaggedSources: ['^https://yastatic\\.net/'],

diff --git a/packages/ui/src/shared/ui-settings.ts b/packages/ui/src/shared/ui-settings.ts
@@ -135,6 +135,12 @@ export interface UISettings {
      */
     reShortNameFromTabletNodeAddress?: string;
 
+    /**
+     * Allows you to override the behavior of  'reShortNameSystemPage ` for masters / providers / schedulers / agents.
+     * @example reShortNameSystemPage: '(?<shortname>.*)((\\.msk\\.my-domain\\.ru)|(\\.vla\\.my-domain\\.net))'
+     */
+    reShortNameSystemPage?: string;
+
     /**
      * Allows to define array of regexps for allowed urls of TaggedType of unipika to display media-content (audio/video/images).
      * If there are no matched items in the array the TaggedType-item will be displayed as a json-object.

diff --git a/packages/ui/src/ui/pages/system/Masters/MasterGroup.js b/packages/ui/src/ui/pages/system/Masters/MasterGroup.js
@@ -20,7 +20,7 @@ import map_ from 'lodash/map';
 
 import './MasterGroup.scss';
 import {ChangeMaintenanceButton} from './ChangeMaintenanceButton';
-import {calcShortNameByRegExp} from '../../../containers/Host/Host';
+import {makeShortSystemAddress} from '../helpers/makeShortSystemAddress';
 
 const b = block('master-group');
 
@@ -107,7 +107,7 @@ class Instance extends Component {
                 <div className={b('host')}>
                     <Tooltip content={addressWithoutPort}>
                         <div className={b('host-name')}>
-                            {calcShortNameByRegExp(addressWithoutPort) || addressWithoutPort}
+                            {makeShortSystemAddress(addressWithoutPort) || addressWithoutPort}
                         </div>
                     </Tooltip>
                     <Flex gap={1}>

diff --git a/packages/ui/src/ui/pages/system/SchedulersAndAgents/Scheduler/Scheduler.tsx b/packages/ui/src/ui/pages/system/SchedulersAndAgents/Scheduler/Scheduler.tsx
@@ -10,7 +10,7 @@ import NodeQuad from '../../NodeQuad/NodeQuad';
 
 import '../Schedulers.scss';
 import {ChangeMaintenanceButton} from '../../Masters/ChangeMaintenanceButton';
-import {calcShortNameByRegExp} from '../../../../containers/Host/Host';
+import {makeShortSystemAddress} from '../../helpers/makeShortSystemAddress';
 
 const b = block('system');
 
@@ -47,7 +47,7 @@ export default function Scheduler({host, state, maintenanceMessage, type}: Sched
             <div title={address} className={b('scheduler-host')}>
                 <Tooltip content={address}>
                     <div className={b('scheduler-host-address')}>
-                        {calcShortNameByRegExp(address) || address}
+                        {makeShortSystemAddress(address) || address}
                     </div>
                 </Tooltip>
                 <div className={b('scheduler-host-btn')}>

diff --git a/packages/ui/src/ui/pages/system/helpers/makeShortSystemAddress.ts b/packages/ui/src/ui/pages/system/helpers/makeShortSystemAddress.ts
@@ -0,0 +1,9 @@
+import {makeRegexpFromSettings} from '../../../../shared/utils';
+import {uiSettings} from '../../../config/ui-settings';
+
+const reShortNameSystemPage = makeRegexpFromSettings(uiSettings.reShortNameSystemPage);
+
+export const makeShortSystemAddress = (address: string): string | undefined => {
+    const res = reShortNameSystemPage?.exec(address);
+    return res?.groups?.shortname;
+};
diff --git a/packages/ui/tests/e2e/pages/system.spec.ts b/packages/ui/tests/e2e/pages/system.spec.ts
@@ -0,0 +1,20 @@
+import {expect, test} from '@playwright/test';
+import {makeClusterUrl} from '../../utils';
+
+test('System: check short name', async ({page}) => {
+    const url = makeClusterUrl(`system/general`);
+    await page.goto(url);
+
+    await page.waitForSelector('.system');
+    await page.evaluate(() => {
+        const allMastersContainer = document.querySelector('.system-master__all-masters');
+        if (!allMastersContainer) {
+            const button = document.querySelector<HTMLSpanElement>('.collapsible-section__title');
+            if (button) button.click();
+        }
+    });
+
+    const mastersNameElements = await page.$$('.master-group__host-name');
+    const firstMasterName = await mastersNameElements[0].innerText();
+    expect(firstMasterName).toEqual('local');
+});