chore: fix pre-commit prettier linting and add json linting (#484)

artemmufazalov · web-flow · commit 1c5adab2782b · 2023-07-25T11:07:24.000+03:00
diff --git a/.eslintrc b/.eslintrc
@@ -1,12 +1,9 @@
 {
-    "extends": ["@gravity-ui/eslint-config", "prettier"],
+    "extends": ["@gravity-ui/eslint-config", "@gravity-ui/eslint-config/prettier"],
     "root": true,
     "overrides": [
         {
-            "files": [
-                "config-overrides.js",
-                "commitlint.config.js"
-            ],
+            "files": ["config-overrides.js", "commitlint.config.js"],
             "env": {
                 "node": true
             }
diff --git a/package.json b/package.json
@@ -64,6 +64,9 @@
     ],
     "*.{js,jsx,ts,tsx}": [
       "eslint --fix --quiet"
+    ],
+    "*.{json}": [
+      "prettier --write"
     ]
   },
   "jest": {
diff --git a/src/components/QueryResultTable/Cell/Cell.tsx b/src/components/QueryResultTable/Cell/Cell.tsx
@@ -11,16 +11,16 @@ interface CellProps {
 }
 
 export const Cell = React.memo(function Cell(props: CellProps) {
-    const {
-        className,
-        value,
-    } = props;
+    const {className, value} = props;
 
     const dispatch = useDispatch();
 
-    useEffect(() => () => {
-        dispatch(hideTooltip());
-    }, [dispatch]);
+    useEffect(
+        () => () => {
+            dispatch(hideTooltip());
+        },
+        [dispatch],
+    );
 
     return (
         <span
@@ -29,5 +29,5 @@ export const Cell = React.memo(function Cell(props: CellProps) {
         >
             {value}
         </span>
-    )
+    );
 });
diff --git a/src/components/QueryResultTable/i18n/en.json b/src/components/QueryResultTable/i18n/en.json
@@ -1,3 +1,3 @@
 {
-    "empty": "Table is empty"
+  "empty": "Table is empty"
 }
diff --git a/src/components/QueryResultTable/i18n/ru.json b/src/components/QueryResultTable/i18n/ru.json
@@ -1,3 +1,3 @@
 {
-    "empty": "Таблица пустая"
+  "empty": "Таблица пустая"
 }
diff --git a/src/components/ShortyString/ShortyString.tsx b/src/components/ShortyString/ShortyString.tsx
@@ -33,18 +33,15 @@ export default function ShortyString({
     const [expanded, setExpanded] = React.useState(false);
 
     const toggleLabelAction = expanded ? collapseLabel : expandLabel;
-    const toggleLabelSymbolsCount = displayLength && !expanded
-        ? i18n('chars_count', {count: value.length})
-        : '';
+    const toggleLabelSymbolsCount =
+        displayLength && !expanded ? i18n('chars_count', {count: value.length}) : '';
     const toggleLabel = toggleLabelAction + toggleLabelSymbolsCount;
 
     // showing toogle button with a label that is longer than the hidden part is pointless,
     // hence compare to limit + length in the not-strict mode
     const hasToggle = value.length > limit + (strict ? 0 : toggleLabel.length);
 
-    const text = expanded || !hasToggle
-        ? value
-        : value.slice(0, limit - 4) + '\u00a0...';
+    const text = expanded || !hasToggle ? value : value.slice(0, limit - 4) + '\u00a0...';
 
     return (
         <div className={block()}>
diff --git a/src/components/ShortyString/i18n/en.json b/src/components/ShortyString/i18n/en.json
@@ -1,10 +1,10 @@
 {
-    "default_collapse_label": "Show less",
-    "default_expand_label": "Show more",
-    "chars_count": [
-        " ({{count}} symbol)",
-        " ({{count}} symbols)",
-        " ({{count}} symbols)",
-        " ({{count}} symbols)"
-    ]
+  "default_collapse_label": "Show less",
+  "default_expand_label": "Show more",
+  "chars_count": [
+    " ({{count}} symbol)",
+    " ({{count}} symbols)",
+    " ({{count}} symbols)",
+    " ({{count}} symbols)"
+  ]
 }
diff --git a/src/components/ShortyString/i18n/ru.json b/src/components/ShortyString/i18n/ru.json
@@ -1,10 +1,10 @@
 {
-    "default_collapse_label": "Показать меньше",
-    "default_expand_label": "Показать ещё",
-    "chars_count": [
-        " ({{count}} символ)",
-        " ({{count}} символа)",
-        " ({{count}} символов)",
-        " ({{count}} символов)"
-    ]
+  "default_collapse_label": "Показать меньше",
+  "default_expand_label": "Показать ещё",
+  "chars_count": [
+    " ({{count}} символ)",
+    " ({{count}} символа)",
+    " ({{count}} символов)",
+    " ({{count}} символов)"
+  ]
 }
diff --git a/src/components/SpeedMultiMeter/i18n/index.ts b/src/components/SpeedMultiMeter/i18n/index.ts
@@ -9,5 +9,3 @@ i18n.registerKeyset(Lang.En, COMPONENT, en);
 i18n.registerKeyset(Lang.Ru, COMPONENT, ru);
 
 export default i18n.keyset(COMPONENT);
-
-
diff --git a/src/components/Stack/Stack.tsx b/src/components/Stack/Stack.tsx
@@ -13,23 +13,23 @@ const b = cn('stack');
 
 export const Stack: React.FC<StackProps> = ({children, className}) => (
     <div className={b(null, className)}>
-        {
-            React.Children.map(children, (child, index) => {
-                if (!React.isValidElement(child)) {
-                    return null;
-                }
+        {React.Children.map(children, (child, index) => {
+            if (!React.isValidElement(child)) {
+                return null;
+            }
 
-                return (
-                    <div
-                        className={b('layer')}
-                        style={{
+            return (
+                <div
+                    className={b('layer')}
+                    style={
+                        {
                             [LAYER_CSS_VAR]: index,
-                        } as React.CSSProperties}
-                    >
-                        {child}
-                    </div>
-                );
-            })
-        }
+                        } as React.CSSProperties
+                    }
+                >
+                    {child}
+                </div>
+            );
+        })}
     </div>
 );
diff --git a/src/components/TableSkeleton/TableSkeleton.tsx b/src/components/TableSkeleton/TableSkeleton.tsx
@@ -1,6 +1,6 @@
-import { FC } from 'react';
+import {FC} from 'react';
 import block from 'bem-cn-lite';
-import { Skeleton } from '@gravity-ui/uikit';
+import {Skeleton} from '@gravity-ui/uikit';
 
 import './TableSkeleton.scss';
 
@@ -11,7 +11,7 @@ interface TableSkeletonProps {
     rows?: number;
 }
 
-export const TableSkeleton: FC<TableSkeletonProps> = ({ rows = 2, className }) => (
+export const TableSkeleton: FC<TableSkeletonProps> = ({rows = 2, className}) => (
     <div className={b(null, className)}>
         <div className={b('row')}>
             <Skeleton className={b('col-1')} />
diff --git a/src/containers/Cluster/ClusterInfo/ClusterInfo.tsx b/src/containers/Cluster/ClusterInfo/ClusterInfo.tsx
@@ -18,7 +18,11 @@ import type {TClusterInfo} from '../../../types/api/cluster';
 import {backend, customBackend} from '../../../store';
 import {formatStorageValues} from '../../../utils';
 import {useSetting, useTypedSelector} from '../../../utils/hooks';
-import {CLUSTER_DEFAULT_TITLE, CLUSTER_INFO_HIDDEN_KEY, DEVELOPER_UI_TITLE} from '../../../utils/constants';
+import {
+    CLUSTER_DEFAULT_TITLE,
+    CLUSTER_INFO_HIDDEN_KEY,
+    DEVELOPER_UI_TITLE,
+} from '../../../utils/constants';
 
 import {VersionsBar} from '../VersionsBar/VersionsBar';
 import {ClusterInfoSkeleton} from '../ClusterInfoSkeleton/ClusterInfoSkeleton';
diff --git a/src/containers/Node/NodeStructure/PDiskTitleBadge.tsx b/src/containers/Node/NodeStructure/PDiskTitleBadge.tsx
@@ -12,14 +12,8 @@ interface PDiskTitleBadgeProps {
 export function PDiskTitleBadge({label, value, className}: PDiskTitleBadgeProps) {
     return (
         <span className={b('pdisk-title-item', className)}>
-            {label && (
-                <span className={b('pdisk-title-item-label')}>
-                    {label}:
-                </span>
-            )}
-            <span className={b('pdisk-title-item-value')}>
-                {value}
-            </span>
+            {label && <span className={b('pdisk-title-item-label')}>{label}:</span>}
+            <span className={b('pdisk-title-item-value')}>{value}</span>
         </span>
     );
 }
diff --git a/src/containers/Storage/EmptyFilter/i18n/en.json b/src/containers/Storage/EmptyFilter/i18n/en.json
@@ -1,4 +1,4 @@
 {
-    "default_message": "Everything is fine!",
-    "default_button_label": "Show All"
+  "default_message": "Everything is fine!",
+  "default_button_label": "Show All"
 }
diff --git a/src/containers/Storage/EmptyFilter/i18n/ru.json b/src/containers/Storage/EmptyFilter/i18n/ru.json
@@ -1,4 +1,4 @@
 {
-    "default_message": "Всё в порядке!",
-    "default_button_label": "Показать все"
+  "default_message": "Всё в порядке!",
+  "default_button_label": "Показать все"
 }
diff --git a/src/containers/Storage/StorageGroups/i18n/en.json b/src/containers/Storage/StorageGroups/i18n/en.json
@@ -1,7 +1,7 @@
 {
-    "empty.default": "No such groups",
-    "empty.out_of_space": "No groups with out of space errors",
-    "empty.degraded": "No degraded groups",
-    "show_all": "Show all groups",
-    "encrypted": "Encrypted group"
+  "empty.default": "No such groups",
+  "empty.out_of_space": "No groups with out of space errors",
+  "empty.degraded": "No degraded groups",
+  "show_all": "Show all groups",
+  "encrypted": "Encrypted group"
 }
diff --git a/src/containers/Storage/StorageGroups/i18n/ru.json b/src/containers/Storage/StorageGroups/i18n/ru.json
@@ -1,7 +1,7 @@
 {
-    "empty.default": "Нет групп",
-    "empty.out_of_space": "Нет групп, в которых кончается место",
-    "empty.degraded": "Нет деградировавших групп",
-    "show_all": "Показать все группы",
-    "encrypted": "Зашифрованная группа"
+  "empty.default": "Нет групп",
+  "empty.out_of_space": "Нет групп, в которых кончается место",
+  "empty.degraded": "Нет деградировавших групп",
+  "show_all": "Показать все группы",
+  "encrypted": "Зашифрованная группа"
 }
diff --git a/src/containers/Storage/UsageFilter/i18n/en.json b/src/containers/Storage/UsageFilter/i18n/en.json
@@ -1,10 +1,5 @@
 {
-    "label": "Usage:",
-    "default_value": "Any",
-    "groups_count": [
-        "{{count}} group",
-        "{{count}} groups",
-        "{{count}} groups",
-        "No groups"
-    ]
+  "label": "Usage:",
+  "default_value": "Any",
+  "groups_count": ["{{count}} group", "{{count}} groups", "{{count}} groups", "No groups"]
 }
diff --git a/src/containers/Storage/UsageFilter/i18n/ru.json b/src/containers/Storage/UsageFilter/i18n/ru.json
@@ -1,10 +1,5 @@
 {
-    "label": "Использование:",
-    "default_value": "Любое",
-    "groups_count": [
-        "{{count}} группа",
-        "{{count}} группы",
-        "{{count}} групп",
-        "Нет групп"
-    ]
+  "label": "Использование:",
+  "default_value": "Любое",
+  "groups_count": ["{{count}} группа", "{{count}} группы", "{{count}} групп", "Нет групп"]
 }
diff --git a/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx b/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
@@ -288,7 +288,10 @@ export function ObjectSummary({
                     </Button>
                 )}
                 {currentSchemaPath && (
-                    <CopyToClipboard text={currentSchemaPath} title={i18n('summary.copySchemaPath')} />
+                    <CopyToClipboard
+                        text={currentSchemaPath}
+                        title={i18n('summary.copySchemaPath')}
+                    />
                 )}
                 <PaneVisibilityToggleButtons
                     onCollapse={onCollapseInfoHandler}
diff --git a/src/containers/Tenant/i18n/ru.json b/src/containers/Tenant/i18n/ru.json
@@ -1,9 +1,8 @@
 {
-    "acl.owner": "Владелец",
-    "acl.empty": "Нет данных об Acl",
+  "acl.owner": "Владелец",
+  "acl.empty": "Нет данных об Acl",
 
-    "summary.navigation": "Навигация",
-    "summary.showPreview": "Показать превью",
-    "summary.copySchemaPath": "Скопировать путь"
-  
+  "summary.navigation": "Навигация",
+  "summary.showPreview": "Показать превью",
+  "summary.copySchemaPath": "Скопировать путь"
 }
diff --git a/src/containers/Tenant/utils/schemaActions.ts b/src/containers/Tenant/utils/schemaActions.ts
@@ -4,10 +4,7 @@ import type {NavigationTreeNodeType, NavigationTreeProps} from 'ydb-ui-component
 import {changeUserInput} from '../../../store/reducers/executeQuery';
 import {setShowPreview} from '../../../store/reducers/schema/schema';
 import {setQueryTab, setTenantPage} from '../../../store/reducers/tenant/tenant';
-import {
-    TENANT_QUERY_TABS_ID,
-    TENANT_PAGES_IDS,
-} from '../../../store/reducers/tenant/constants';
+import {TENANT_QUERY_TABS_ID, TENANT_PAGES_IDS} from '../../../store/reducers/tenant/constants';
 import createToast from '../../../utils/createToast';
 
 const createTableTemplate = (path: string) => {
diff --git a/src/store/index.js b/src/store/index.js
@@ -32,6 +32,6 @@ function configureStore(aRootReducer = rootReducer, singleClusterMode = true) {
 export const webVersion = window.web_version;
 export const customBackend = window.custom_backend;
 
-export * from "./reducers"
+export * from './reducers';
 
 export default configureStore;
diff --git a/src/types/api/cluster.ts b/src/types/api/cluster.ts
@@ -31,7 +31,7 @@ export interface TClusterInfo {
     Tenants?: string;
     /** uint64 */
     Tablets?: string;
-    
+
     Balancer?: string; // additional
     Solomon?: string; // additional
 }
diff --git a/src/types/api/storage.ts b/src/types/api/storage.ts
@@ -3,7 +3,7 @@ import {TVDiskStateInfo} from './vdisk';
 
 /**
  * endpoint: /viewer/json/storage
- * 
+ *
  * source: https://github.com/ydb-platform/ydb/blob/main/ydb/core/viewer/protos/viewer.proto
  */
 export interface TStorageInfo {
diff --git a/src/types/assets.d.ts b/src/types/assets.d.ts
@@ -8,5 +8,4 @@ declare module '*.jpg';
 declare module '*.jpeg';
 declare module '*.ico';
 
-declare type SVGIconData =
-    import('@gravity-ui/uikit/build/esm/components/Icon/types').SVGIconData;
+declare type SVGIconData = import('@gravity-ui/uikit/build/esm/components/Icon/types').SVGIconData;
diff --git a/src/utils/tests/providers.tsx b/src/utils/tests/providers.tsx
@@ -1,7 +1,7 @@
 import React, {PropsWithChildren} from 'react';
-import {Provider} from 'react-redux'
-import {render} from '@testing-library/react'
-import type {RenderOptions} from '@testing-library/react'
+import {Provider} from 'react-redux';
+import {render} from '@testing-library/react';
+import type {RenderOptions} from '@testing-library/react';
 
 import configureStore from '../../store';
 
@@ -14,16 +14,13 @@ interface ExtendedRenderOptions extends Omit<RenderOptions, 'queries'> {
 
 export const renderWithStore = (
     ui: React.ReactElement,
-    {
-        storeConfiguration = configureStore(),
-        ...renderOptions
-    }: ExtendedRenderOptions = {}
+    {storeConfiguration = configureStore(), ...renderOptions}: ExtendedRenderOptions = {},
 ) => {
     const {store} = storeConfiguration;
 
     function Wrapper({children}: PropsWithChildren<{}>) {
-        return <Provider store={store}>{children}</Provider>
+        return <Provider store={store}>{children}</Provider>;
     }
 
-    return {store, ...render(ui, {wrapper: Wrapper, ...renderOptions})}
+    return {store, ...render(ui, {wrapper: Wrapper, ...renderOptions})};
 };

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,9 @@`
`1`	`1`	`{`
`2`		`- "extends": ["@gravity-ui/eslint-config", "prettier"],`
	`2`	`+ "extends": ["@gravity-ui/eslint-config", "@gravity-ui/eslint-config/prettier"],`
`3`	`3`	`"root": true,`
`4`	`4`	`"overrides": [`
`5`	`5`	`{`
`6`		`- "files": [`
`7`		`- "config-overrides.js",`
`8`		`- "commitlint.config.js"`
`9`		`- ],`
	`6`	`+ "files": ["config-overrides.js", "commitlint.config.js"],`
`10`	`7`	`"env": {`
`11`	`8`	`"node": true`
`12`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "empty": "Table is empty"`
	`2`	`+ "empty": "Table is empty"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "empty": "Таблица пустая"`
	`2`	`+ "empty": "Таблица пустая"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "default_message": "Everything is fine!",`
`3`		`- "default_button_label": "Show All"`
	`2`	`+ "default_message": "Everything is fine!",`
	`3`	`+ "default_button_label": "Show All"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "default_message": "Всё в порядке!",`
`3`		`- "default_button_label": "Показать все"`
	`2`	`+ "default_message": "Всё в порядке!",`
	`3`	`+ "default_button_label": "Показать все"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`		`- "empty.default": "No such groups",`
`3`		`- "empty.out_of_space": "No groups with out of space errors",`
`4`		`- "empty.degraded": "No degraded groups",`
`5`		`- "show_all": "Show all groups",`
`6`		`- "encrypted": "Encrypted group"`
	`2`	`+ "empty.default": "No such groups",`
	`3`	`+ "empty.out_of_space": "No groups with out of space errors",`
	`4`	`+ "empty.degraded": "No degraded groups",`
	`5`	`+ "show_all": "Show all groups",`
	`6`	`+ "encrypted": "Encrypted group"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`		`- "empty.default": "Нет групп",`
`3`		`- "empty.out_of_space": "Нет групп, в которых кончается место",`
`4`		`- "empty.degraded": "Нет деградировавших групп",`
`5`		`- "show_all": "Показать все группы",`
`6`		`- "encrypted": "Зашифрованная группа"`
	`2`	`+ "empty.default": "Нет групп",`
	`3`	`+ "empty.out_of_space": "Нет групп, в которых кончается место",`
	`4`	`+ "empty.degraded": "Нет деградировавших групп",`
	`5`	`+ "show_all": "Показать все группы",`
	`6`	`+ "encrypted": "Зашифрованная группа"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,5 @@`
`1`	`1`	`{`
`2`		`- "label": "Usage:",`
`3`		`- "default_value": "Any",`
`4`		`- "groups_count": [`
`5`		`- "{{count}} group",`
`6`		`- "{{count}} groups",`
`7`		`- "{{count}} groups",`
`8`		`- "No groups"`
`9`		`- ]`
	`2`	`+ "label": "Usage:",`
	`3`	`+ "default_value": "Any",`
	`4`	`+ "groups_count": ["{{count}} group", "{{count}} groups", "{{count}} groups", "No groups"]`
`10`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,5 @@`
`1`	`1`	`{`
`2`		`- "label": "Использование:",`
`3`		`- "default_value": "Любое",`
`4`		`- "groups_count": [`
`5`		`- "{{count}} группа",`
`6`		`- "{{count}} группы",`
`7`		`- "{{count}} групп",`
`8`		`- "Нет групп"`
`9`		`- ]`
	`2`	`+ "label": "Использование:",`
	`3`	`+ "default_value": "Любое",`
	`4`	`+ "groups_count": ["{{count}} группа", "{{count}} группы", "{{count}} групп", "Нет групп"]`
`10`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`{`
`2`		`- "acl.owner": "Владелец",`
`3`		`- "acl.empty": "Нет данных об Acl",`
	`2`	`+ "acl.owner": "Владелец",`
	`3`	`+ "acl.empty": "Нет данных об Acl",`
`4`	`4`
`5`		`- "summary.navigation": "Навигация",`
`6`		`- "summary.showPreview": "Показать превью",`
`7`		`- "summary.copySchemaPath": "Скопировать путь"`
`8`		`-`
	`5`	`+ "summary.navigation": "Навигация",`
	`6`	`+ "summary.showPreview": "Показать превью",`
	`7`	`+ "summary.copySchemaPath": "Скопировать путь"`
`9`	`8`	`}`