Add undo/redo feature for wizard (datalens-tech#751)

* CHARTS-9301: add redo/undo feature for wizard * Fix icons * Fix passing targetState fields by link * Move history to global store * Revert reset wizard store change, add reset history * Move versioning to diffs * Add feature flag * Fix import * Fix import * Fix jest config * Fix resetting edit history * Fix ql tabs styles * Fix diffs with functions * Fix ignore path list * PR fixes * Fix compatibility between ql and wizard update * Fix new state passing * Fix colors dialog onApply * Fix PR issues * Fix dialog shapes * Add correct qa attributes * Add e2e tests * Add titles * Move jdp to utils * Revert dialog changes * Correct handle of addEditHistoryPoint * Move keys * Add skip for tests while not in production * Translations update from Weblate Gravity for PR datalens-tech#751 (datalens-tech#801) * Translated using Weblate (Russian) Currently translated at 100.0% (7 of 7 strings) Translation: DataLens/component.action-panel.view__751 Translate-URL: https://weblate.gravity-ui.com/projects/datalens/apanchuk-charts-9301-751/component-action-panel-view-751/ru/ * Translated using Weblate (English) Currently translated at 100.0% (7 of 7 strings) Translation: DataLens/component.action-panel.view__751 Translate-URL: https://weblate.gravity-ui.com/projects/datalens/apanchuk-charts-9301-751/component-action-panel-view-751/en/ --------- Co-authored-by: Darya Tikhonova <[email protected]> Co-authored-by: Matthew Casserly <[email protected]> * Fix old keys --------- Co-authored-by: WeblateGravity <[email protected]> Co-authored-by: Darya Tikhonova <[email protected]> Co-authored-by: Matthew Casserly <[email protected]>
Flunt1k · Mar 22, 2024 · 681eb00 · 681eb00
1 parent a19f1cd
commit 681eb00
Show file tree

Hide file tree

Showing 30 changed files with 823 additions and 39 deletions.
diff --git a/jest/mappers/ignore-node-modules-mapper.ts b/jest/mappers/ignore-node-modules-mapper.ts
@@ -7,6 +7,7 @@ const IGNORE_NODE_MODULES_LIST = [
     'dnd-core',
     'monaco-editor',
     'tinygesture',
+    'jsondiffpatch',
 ];
 
 export const getIgnoredNodeModulesRegexp = () => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -81,6 +81,7 @@
     "js-sha1": "^0.6.0",
     "js-yaml": "^4.1.0",
     "json-fn": "^1.1.1",
+    "jsondiffpatch": "^0.6.0",
     "jsonwebtoken": "^9.0.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",

diff --git a/src/i18n-keysets/component.action-panel.view/en.json b/src/i18n-keysets/component.action-panel.view/en.json
@@ -1,7 +1,8 @@
 {
   "button_open-navigation": "Open navigation",
+  "button_redo": "Restore",
   "button_switch-public": "Public access",
-  "label_breadcrumb-new": "new {{scope}}",
-  "label_history-changes": "History changes",
-  "label_history-changes-date-limit": "You can view history for the past three months"
+  "button_undo": "Undo",
+  "label_history-changes": "Change history",
+  "label_history-changes-date-limit": "You can view the history for the past three months"
 }
diff --git a/src/i18n-keysets/component.action-panel.view/ru.json b/src/i18n-keysets/component.action-panel.view/ru.json
@@ -1,7 +1,8 @@
 {
   "button_open-navigation": "Открыть навигацию",
+  "button_redo": "Восстановить",
   "button_switch-public": "Публичный доступ",
-  "label_breadcrumb-new": "new {{scope}}",
+  "button_undo": "Отменить",
   "label_history-changes": "История изменений",
   "label_history-changes-date-limit": "Доступна история за последние три месяца"
 }
diff --git a/src/server/components/features/features-list/EnableEditHistory.ts b/src/server/components/features/features-list/EnableEditHistory.ts
@@ -0,0 +1,10 @@
+import {Feature} from '../../../../shared';
+import {createFeatureConfig} from '../utils';
+
+export default createFeatureConfig({
+    name: Feature.EnableEditHistory,
+    state: {
+        development: true,
+        production: false,
+    },
+});
diff --git a/src/shared/constants/qa/wizard.ts b/src/shared/constants/qa/wizard.ts
@@ -1,6 +1,8 @@
 export const enum WizardPageQa {
     SectionPreview = 'preview-chartkit',
     VisualizationSelectPopup = 'visualization-select-popup',
+    UndoButton = 'undo-btn',
+    RedoButton = 'redo-btn',
 }
 
 export const enum SectionDatasetQA {

diff --git a/src/shared/types/feature.ts b/src/shared/types/feature.ts
@@ -14,6 +14,7 @@ export enum Feature {
     EnableCustomMonitoring = 'EnableCustomMonitoring',
     ShowActionPanelTreeSelect = 'ShowActionPanelTreeSelect',
     EnableDashChartStat = 'EnableDashChartStat',
+    EnableEditHistory = 'EnableEditHistory',
     EnableShareWidget = 'EnableShareWidget',
     EnableAutocreateDataset = 'EnableAutocreateDataset',
     ShowCreateEntryWithMenu = 'ShowCreateEntryWithMenu',

diff --git a/src/ui/components/ActionPanel/components/ChartSaveControls/ChartSaveControl.tsx b/src/ui/components/ActionPanel/components/ChartSaveControls/ChartSaveControl.tsx
@@ -95,11 +95,12 @@ export const ChartSaveControls: React.FC<ChartSaveControlProps> = (
             ...items,
         ];
     }, [
+        isNewChart,
+        isLocked,
         isCurrentRevisionActual,
-        onSaveAndPublishClick,
         onSaveAsDraftClick,
+        onSaveAndPublishClick,
         onSaveAsNewClick,
-        isNewChart,
     ]);
 
     const allDropdownItems = React.useMemo(

diff --git a/src/ui/components/ActionPanel/components/ChartSaveControls/types.ts b/src/ui/components/ActionPanel/components/ChartSaveControls/types.ts
@@ -14,4 +14,7 @@ export type AdditionalButtonTemplate = {
     hidden?: boolean;
     loading?: boolean;
     view?: ButtonView;
+    disabled?: boolean;
+    qa?: string;
+    title?: string;
 };
diff --git a/src/ui/components/ActionPanel/components/ChartSaveControls/useAdditionalItems.tsx b/src/ui/components/ActionPanel/components/ChartSaveControls/useAdditionalItems.tsx
@@ -22,11 +22,14 @@ export const useAdditionalItems = (args: UseAdditionalItemsArgs) => {
             }
             return (
                 <Button
+                    disabled={itemProps.disabled || false}
+                    qa={itemProps.qa}
                     key={itemProps.key}
                     className={itemProps.className}
                     view={itemProps.view || 'flat'}
                     size="m"
                     loading={itemProps.loading}
+                    title={itemProps.title}
                     onClick={() => itemProps.action()}
                 >
                     {itemProps.icon && <Icon {...itemProps.icon} />}

diff --git a/src/ui/index.ts b/src/ui/index.ts
@@ -17,6 +17,7 @@ import type {QLState} from 'units/ql/store/typings';
 import type {WizardGlobalState} from 'units/wizard/reducers';
 import type {WorkbooksState} from 'units/workbooks/store/reducers';
 
+import {EditHistoryState} from './store/reducers/editHistory';
 import {CollectionsNavigationState} from './units/collections-navigation/store/reducers';
 
 export {default as ActionPanel} from './components/ActionPanel/ActionPanel';
@@ -69,4 +70,5 @@ export type DatalensGlobalState = {
     colorPaletteEditor: ColorPaletteEditorState;
     migrationToWorkbook: MigrationToWorkbookState;
     copyEntriesToWorkbook: CopyEntriesToWorkbookState;
+    editHistory: EditHistoryState;
 };