From 88605d91c0660d6e2f18cd519810ed8114c6bc15 Mon Sep 17 00:00:00 2001
From: Stepan Pavlenko <stpavlenko@yandex-team.ru>
Date: Wed, 4 Sep 2024 16:05:22 +0300
Subject: [PATCH 1/5] Update ShareButton props

---
 src/ui/units/dash/components/ShareButton/ShareButton.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/ui/units/dash/components/ShareButton/ShareButton.tsx b/src/ui/units/dash/components/ShareButton/ShareButton.tsx
index f30a725a31..d21994ccee 100644
--- a/src/ui/units/dash/components/ShareButton/ShareButton.tsx
+++ b/src/ui/units/dash/components/ShareButton/ShareButton.tsx
@@ -22,7 +22,6 @@ interface DialogSharePropsForShareButton extends Omit<DialogShareProps, 'onClose
 
 export const ShareButton = ({
     enablePopover,
-    entityId,
     popoverText,
     popoverTitle,
     iconSize = 18,
@@ -30,7 +29,6 @@ export const ShareButton = ({
     dialogShareProps,
 }: {
     enablePopover?: boolean;
-    entityId?: string;
     popoverText?: string;
     popoverTitle?: string;
     iconSize?: number;
@@ -51,10 +49,6 @@ export const ShareButton = ({
 
     const initDialogShareProps: DialogShareProps = {propsData: {}, onClose: handleCloseDialogShare};
 
-    if (entityId) {
-        initDialogShareProps.propsData.id = entityId;
-    }
-
     if (Utils.isEnabledFeature(Feature.EnableEmbedsInDialogShare)) {
         initDialogShareProps.initialParams = {
             [COMMON_URL_OPTIONS.NO_CONTROLS]: 1,
@@ -77,7 +71,7 @@ export const ShareButton = ({
                     copyIcon={Code}
                     customIcon={ArrowShapeTurnUpRight}
                     iconSize={iconSize}
-                    withCopyLink={Boolean(entityId)}
+                    withCopyLink={Boolean(dialogShareProps?.propsData.id)}
                     className={popoverClassName}
                     renderCopy={({icon}) => (
                         <Button

From f3972a6a7be3f2d1b86c416cc11c4a8411643993 Mon Sep 17 00:00:00 2001
From: Stepan Pavlenko <stpavlenko@yandex-team.ru>
Date: Wed, 4 Sep 2024 16:08:24 +0300
Subject: [PATCH 2/5] Remove check in ShareButton

---
 src/ui/units/dash/components/ShareButton/ShareButton.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ui/units/dash/components/ShareButton/ShareButton.tsx b/src/ui/units/dash/components/ShareButton/ShareButton.tsx
index d21994ccee..9f30431b0d 100644
--- a/src/ui/units/dash/components/ShareButton/ShareButton.tsx
+++ b/src/ui/units/dash/components/ShareButton/ShareButton.tsx
@@ -106,8 +106,9 @@ export const ShareButton = ({
     return (
         <React.Fragment>
             {getContent()}
-            {(dialogShareProps?.propsData.id || initDialogShareProps.propsData.id) &&
-                showDialogShare && <DialogShare {...initDialogShareProps} {...dialogShareProps} />}
+            {dialogShareProps?.propsData.id && showDialogShare && (
+                <DialogShare {...initDialogShareProps} {...dialogShareProps} />
+            )}
         </React.Fragment>
     );
 };

From 669852281ae685d77df999df9ab9849451bf2950 Mon Sep 17 00:00:00 2001
From: Stepan Pavlenko <stpavlenko@yandex-team.ru>
Date: Wed, 18 Sep 2024 16:20:43 +0300
Subject: [PATCH 3/5] Add pivot inline sort

---
 src/i18n-keysets/wizard/en.json               |  1 +
 src/i18n-keysets/wizard/ru.json               |  1 +
 .../preparers/backend-pivot-table/index.ts    |  4 ++-
 src/shared/types/config/wizard/v11.ts         |  1 +
 src/shared/types/wizard/index.ts              |  1 +
 src/ui/constants/visualizations/index.ts      |  4 +++
 .../components/Dialogs/Settings/Settings.tsx  | 32 ++++++++++++++++++-
 7 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/i18n-keysets/wizard/en.json b/src/i18n-keysets/wizard/en.json
index c2dccec5f9..c005f20b5a 100644
--- a/src/i18n-keysets/wizard/en.json
+++ b/src/i18n-keysets/wizard/en.json
@@ -226,6 +226,7 @@
   "label_percent": "Percentage",
   "label_pink-gray-green": "Lilac-Gray-Green",
   "label_pivot-fallback": "Old pivot tables",
+  "label_pivot-inline-sort": "Sorting by lines",
   "label_pivot-measure-sort": "Sorting by indicator affects only the query to the source, but not the pivot table.",
   "label_pivot-table-title-dialog-column-settings": "Column and row width",
   "label_pixels-shortname": "px",
diff --git a/src/i18n-keysets/wizard/ru.json b/src/i18n-keysets/wizard/ru.json
index 4e3900e3bb..da2af2ab4f 100644
--- a/src/i18n-keysets/wizard/ru.json
+++ b/src/i18n-keysets/wizard/ru.json
@@ -226,6 +226,7 @@
   "label_percent": "В процентах",
   "label_pink-gray-green": "Сиреневый-Серый-Салатовый",
   "label_pivot-fallback": "Cтарые сводные таблицы",
+  "label_pivot-inline-sort": "Сортировка по строкам",
   "label_pivot-measure-sort": "Сортировка по показателю влияет только на запрос в источник, но не на сводную таблицу.",
   "label_pivot-table-title-dialog-column-settings": "Ширина столбцов и строк",
   "label_pixels-shortname": "px",
diff --git a/src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/index.ts b/src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/index.ts
index 8905e90b04..afaf4f1494 100644
--- a/src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/index.ts
+++ b/src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/index.ts
@@ -150,7 +150,9 @@ const backendPivotTablePreparer = (args: PrepareFunctionArgs): BackendPivotTable
 
     const pivotTotals = getPivotTableSubTotals({rowsFields, columnsFields});
     const sortSettings: PivotTableSortSettings = {
-        isSortByRowAllowed: isSortByRoleAllowed(pivotStructure, pivotTotals, 'pivot_row'),
+        isSortByRowAllowed:
+            isSortByRoleAllowed(pivotStructure, pivotTotals, 'pivot_row') &&
+            args.shared.extraSettings?.pivotInlineSort === 'on',
         isSortByColumnAllowed: isSortByRoleAllowed(pivotStructure, pivotTotals, 'pivot_column'),
         ...backendSortMeta,
     };
diff --git a/src/shared/types/config/wizard/v11.ts b/src/shared/types/config/wizard/v11.ts
index b3f2bd7e58..00917394b2 100644
--- a/src/shared/types/config/wizard/v11.ts
+++ b/src/shared/types/config/wizard/v11.ts
@@ -60,6 +60,7 @@ export interface V11CommonSharedExtraSettings {
     navigatorSeriesName?: string;
     totals?: 'on' | 'off';
     pivotFallback?: 'on' | 'off';
+    pivotInlineSort?: 'on' | 'off';
     overlap?: 'on' | 'off';
     feed?: string;
     navigatorSettings?: V11NavigatorSettings;
diff --git a/src/shared/types/wizard/index.ts b/src/shared/types/wizard/index.ts
index cecb40155c..7c8c75701e 100644
--- a/src/shared/types/wizard/index.ts
+++ b/src/shared/types/wizard/index.ts
@@ -101,6 +101,7 @@ export interface CommonSharedExtraSettings {
     tooltipSum?: 'on' | 'off';
     limit?: number;
     pagination?: 'on' | 'off';
+    pivotInlineSort?: 'on' | 'off';
     // For old charts, navigatorMode was specified in the body of extraSettings
     navigatorMode?: string;
     navigatorSeriesName?: string;
diff --git a/src/ui/constants/visualizations/index.ts b/src/ui/constants/visualizations/index.ts
index 4ae451d021..87b78e718d 100644
--- a/src/ui/constants/visualizations/index.ts
+++ b/src/ui/constants/visualizations/index.ts
@@ -157,6 +157,10 @@ export const CHART_SETTINGS = {
         ON: 'on',
         OFF: 'off',
     },
+    PIVOT_INLINE_SORT: {
+        ON: 'on',
+        OFF: 'off',
+    },
 };
 
 export const VISUALIZATION_IDS = {
diff --git a/src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx b/src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
index 9e05641275..ba9377e85f 100644
--- a/src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
+++ b/src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
@@ -71,6 +71,7 @@ const BASE_SETTINGS_KEYS: SettingsKeys[] = [
     'feed',
     'pivotFallback',
     'navigatorSettings',
+    'pivotInlineSort',
 ];
 
 const QL_SETTINGS_KEYS: SettingsKeys[] = [...BASE_SETTINGS_KEYS, 'qlAutoExecuteChart'];
@@ -162,6 +163,8 @@ interface State {
     navigatorSeries: string[];
     d3Fallback: string;
     qlAutoExecuteChart?: string;
+    isPivotTable: boolean;
+    pivotInlineSort: string;
 }
 
 export const DIALOG_CHART_SETTINGS = Symbol('DIALOG_CHART_SETTINGS');
@@ -208,6 +211,7 @@ class DialogSettings extends React.PureComponent<InnerProps, State> {
             feed = '',
             pivotFallback = 'off',
             qlAutoExecuteChart,
+            pivotInlineSort = CHART_SETTINGS.PIVOT_INLINE_SORT.ON,
         } = extraSettings;
 
         const navigatorSettings = this.prepareNavigatorSettings(visualization, extraSettings);
@@ -249,7 +253,8 @@ class DialogSettings extends React.PureComponent<InnerProps, State> {
 
         this.state = {
             valid: true,
-
+            isPivotTable,
+            pivotInlineSort,
             titleMode,
             indicatorTitleMode,
             qlAutoExecuteChart: getQlAutoExecuteChartValue(qlAutoExecuteChart, props.chartType),
@@ -481,6 +486,12 @@ class DialogSettings extends React.PureComponent<InnerProps, State> {
         });
     };
 
+    handlePivotInlineSortUpdate = (value: string) => {
+        this.setState({
+            pivotInlineSort: value,
+        });
+    };
+
     getXPlaceholderItemDataType() {
         const {visualization} = this.props;
         const placeholders = visualization.placeholders || [];
@@ -863,6 +874,24 @@ class DialogSettings extends React.PureComponent<InnerProps, State> {
         );
     }
 
+    renderInlineSortSwitch() {
+        const {isPivotTable, pivotInlineSort, pivotFallback} = this.state;
+
+        if (!isPivotTable || pivotFallback === 'on') {
+            return null;
+        }
+
+        return (
+            <SettingSwitcher
+                currentValue={pivotInlineSort}
+                checkedValue={CHART_SETTINGS.PIVOT_INLINE_SORT.ON}
+                uncheckedValue={CHART_SETTINGS.PIVOT_INLINE_SORT.OFF}
+                onChange={this.handlePivotInlineSortUpdate}
+                title={i18n('wizard', 'label_pivot-inline-sort')}
+            />
+        );
+    }
+
     renderModalBody() {
         const {navigatorSettings} = this.state;
         const {isPreviewLoading} = this.props;
@@ -887,6 +916,7 @@ class DialogSettings extends React.PureComponent<InnerProps, State> {
                 {this.renderNavigator()}
                 {this.renderD3Switch()}
                 {this.renderQlAutoExecutionChart()}
+                {this.renderInlineSortSwitch()}
             </div>
         );
     }

From 4118747a8c1f17825a3f7523e8027ac47dc23b17 Mon Sep 17 00:00:00 2001
From: Stepan Pavlenko <stpavlenko@yandex-team.ru>
Date: Wed, 18 Sep 2024 17:00:33 +0300
Subject: [PATCH 4/5] Fix not configured pivots sorting

---
 .../plugins/datalens/preparers/backend-pivot-table/index.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/index.ts b/src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/index.ts
index afaf4f1494..3bff447e89 100644
--- a/src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/index.ts
+++ b/src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/index.ts
@@ -147,12 +147,12 @@ const backendPivotTablePreparer = (args: PrepareFunctionArgs): BackendPivotTable
     });
 
     const isPaginatorEnabled = args.shared.extraSettings?.pagination === 'on';
+    const isInlineSortEnabled = !(args.shared.extraSettings?.pivotInlineSort === 'off');
 
     const pivotTotals = getPivotTableSubTotals({rowsFields, columnsFields});
     const sortSettings: PivotTableSortSettings = {
         isSortByRowAllowed:
-            isSortByRoleAllowed(pivotStructure, pivotTotals, 'pivot_row') &&
-            args.shared.extraSettings?.pivotInlineSort === 'on',
+            isSortByRoleAllowed(pivotStructure, pivotTotals, 'pivot_row') && isInlineSortEnabled,
         isSortByColumnAllowed: isSortByRoleAllowed(pivotStructure, pivotTotals, 'pivot_column'),
         ...backendSortMeta,
     };

From 3ef041efc7784f8d61ebb85ebdd7f76bf464759c Mon Sep 17 00:00:00 2001
From: WeblateGravity <150622038+WeblateGravity@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:32:04 +0300
Subject: [PATCH 5/5] Translations update from Weblate Gravity for PR #1557
 (#1575)

Co-authored-by: Matthew Casserly <matveymc@yandex-team.ru>
---
 src/i18n-keysets/wizard/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n-keysets/wizard/en.json b/src/i18n-keysets/wizard/en.json
index c005f20b5a..2b4ee71c7b 100644
--- a/src/i18n-keysets/wizard/en.json
+++ b/src/i18n-keysets/wizard/en.json
@@ -226,7 +226,7 @@
   "label_percent": "Percentage",
   "label_pink-gray-green": "Lilac-Gray-Green",
   "label_pivot-fallback": "Old pivot tables",
-  "label_pivot-inline-sort": "Sorting by lines",
+  "label_pivot-inline-sort": "Sort by lines",
   "label_pivot-measure-sort": "Sorting by indicator affects only the query to the source, but not the pivot table.",
   "label_pivot-table-title-dialog-column-settings": "Column and row width",
   "label_pixels-shortname": "px",