Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add entity copy success toaster #1810

Merged
merged 15 commits into from
Nov 15, 2024
Merged

Add entity copy success toaster #1810

merged 15 commits into from
Nov 15, 2024

Conversation

DaryaLari
Copy link
Contributor

No description provided.

@DaryaLari DaryaLari marked this pull request as ready for review November 14, 2024 13:35
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 14, 2024 •
edited
Loading

📦 Statoscope quick diff with main-branch:

⏱ Build time: 1.2 sec (0.63%)

⚖️ Initial size: 0.07 kb (0%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

@flops flops closed this Nov 14, 2024
@flops flops reopened this Nov 14, 2024
@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

component.entry-context-menu.view (ru)
component.entry-context-menu.view (en)

Wait for the reviewers to check your changes in Weblate and try running github action again.

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 14, 2024 •
edited
Loading

E2E Report is ready.

dtikhonova and others added 2 commits November 14, 2024 14:57
@dtikhonova @weblate
Translated using Weblate (Russian)
f06f9be 
Currently translated at 100.0% (14 of 14 strings)

Translation: DataLens/component.entry-context-menu.view__1810
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-10129-1810/component-entry-context-menu-view-1810/ru/
@weblate
Translated using Weblate (English)
60bf625 
Currently translated at 92.8% (13 of 14 strings)

Translation: DataLens/component.entry-context-menu.view__1810
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-10129-1810/component-entry-context-menu-view-1810/en/
@WeblateGravity WeblateGravity mentioned this pull request Nov 14, 2024
Merged
DaryaLari pushed a commit that referenced this pull request Nov 14, 2024
@WeblateGravity @dtikhonova
Translations update from Weblate Gravity for PR #1810 (#1813)
80a0c67 
Co-authored-by: Darya Tikhonova <[email protected]>
Co-authored-by: Gravity addon <[email protected]>
DaryaLari pushed a commit that referenced this pull request Nov 14, 2024
@WeblateGravity @dtikhonova @DaryaLari
Translations update from Weblate Gravity for PR #1810 (#1813)
84b17f8 
Co-authored-by: Darya Tikhonova <[email protected]>
Co-authored-by: Gravity addon <[email protected]>
@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/3)
Auto-merging src/i18n-keysets/component.entry-context-menu.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/en.json
Auto-merging src/i18n-keysets/component.entry-context-menu.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/ru.json
Auto-merging src/server/components/charts-engine/components/chart-validator.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts
Auto-merging src/shared/constants/entry.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts
Auto-merging src/shared/constants/qa/editor.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts
Auto-merging src/shared/types/feature.ts
CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts
Auto-merging src/shared/types/widget.ts
CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts
Auto-merging src/ui/units/dash/modules/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts
Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts
CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts
error: could not apply f022023b4... Add entity copy success toaster
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f022023b4... Add entity copy success toaster
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10129
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10129-1810/chartkit-1810/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10129
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

1 similar comment
@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/3)
Auto-merging src/i18n-keysets/component.entry-context-menu.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/en.json
Auto-merging src/i18n-keysets/component.entry-context-menu.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/ru.json
Auto-merging src/server/components/charts-engine/components/chart-validator.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts
Auto-merging src/shared/constants/entry.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts
Auto-merging src/shared/constants/qa/editor.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts
Auto-merging src/shared/types/feature.ts
CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts
Auto-merging src/shared/types/widget.ts
CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts
Auto-merging src/ui/units/dash/modules/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts
Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts
CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts
error: could not apply f022023b4... Add entity copy success toaster
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f022023b4... Add entity copy success toaster
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10129
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10129-1810/chartkit-1810/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10129
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

DaryaLari and others added 3 commits November 14, 2024 18:22
@DaryaLari
Add entity copy success toaster
70c3cb5
@dtikhonova @DaryaLari
Translated using Weblate (Russian)
06e65dc 
Currently translated at 100.0% (14 of 14 strings)

Translation: DataLens/component.entry-context-menu.view__1810
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-10129-1810/component-entry-context-menu-view-1810/ru/
@DaryaLari
Translated using Weblate (English)
d2909a4 
Currently translated at 92.8% (13 of 14 strings)

Translation: DataLens/component.entry-context-menu.view__1810
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-10129-1810/component-entry-context-menu-view-1810/en/
@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
warning: skipped previously applied commit f06f9beb4
warning: skipped previously applied commit 60bf6250c
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging .github/workflows/i18n-check.yml
CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml
Auto-merging src/i18n-keysets/component.entry-context-menu.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/en.json
Auto-merging src/i18n-keysets/component.entry-context-menu.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/ru.json
Auto-merging src/server/components/charts-engine/components/chart-validator.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts
Auto-merging src/shared/constants/entry.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts
Auto-merging src/shared/constants/qa/editor.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts
Auto-merging src/shared/types/feature.ts
CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts
Auto-merging src/shared/types/widget.ts
CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts
Auto-merging src/ui/units/dash/modules/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts
Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts
CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts
error: could not apply f022023b4... Add entity copy success toaster
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f022023b4... Add entity copy success toaster
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10129
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10129-1810/chartkit-1810/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10129
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@DaryaLari DaryaLari requested a review from flops November 15, 2024 10:23
flops
flops requested changes Nov 15, 2024
View reviewed changes
src/ui/units/dash/containers/Body/Body.tsx Outdated Show resolved Hide resolved
src/ui/units/dash/containers/Body/Body.tsx Outdated Show resolved Hide resolved
DaryaLari and others added 7 commits November 15, 2024 14:30
@DaryaLari
Add entity copy success toaster
5c64cc5
@dtikhonova @DaryaLari
Translated using Weblate (Russian)
e9cec9d 
Currently translated at 100.0% (14 of 14 strings)

Translation: DataLens/component.entry-context-menu.view__1810
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-10129-1810/component-entry-context-menu-view-1810/ru/
@DaryaLari
Translated using Weblate (English)
121588d 
Currently translated at 92.8% (13 of 14 strings)

Translation: DataLens/component.entry-context-menu.view__1810
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-10129-1810/component-entry-context-menu-view-1810/en/
@DaryaLari
Add entity copy success toaster
ed38c87
@dtikhonova @DaryaLari
Translated using Weblate (Russian)
9a6aefd 
Currently translated at 100.0% (14 of 14 strings)

Translation: DataLens/component.entry-context-menu.view__1810
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-10129-1810/component-entry-context-menu-view-1810/ru/
@DaryaLari
Translated using Weblate (English)
fc841eb 
Currently translated at 92.8% (13 of 14 strings)

Translation: DataLens/component.entry-context-menu.view__1810
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-10129-1810/component-entry-context-menu-view-1810/en/
@DaryaLari
fix toaster usage & dashkit context memoization
67efc02
@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
warning: skipped previously applied commit 70c3cb549
warning: skipped previously applied commit 06e65dce8
warning: skipped previously applied commit d2909a47c
warning: skipped previously applied commit f06f9beb4
warning: skipped previously applied commit 60bf6250c
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging .github/workflows/i18n-check.yml
CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml
Auto-merging src/i18n-keysets/component.entry-context-menu.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/en.json
Auto-merging src/i18n-keysets/component.entry-context-menu.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/ru.json
Auto-merging src/server/components/charts-engine/components/chart-validator.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts
Auto-merging src/server/components/charts-engine/components/storage/types.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts
Auto-merging src/server/components/charts-engine/controllers/embeds.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts
Auto-merging src/server/configs/opensource/common.ts
CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts
Auto-merging src/shared/constants/entry.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts
Auto-merging src/shared/constants/qa/editor.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts
Auto-merging src/shared/schema/us/types/embeds.ts
CONFLICT (add/add): Merge conflict in src/shared/schema/us/types/embeds.ts
Auto-merging src/shared/types/charts.ts
CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts
Auto-merging src/shared/types/common.ts
CONFLICT (add/add): Merge conflict in src/shared/types/common.ts
Auto-merging src/shared/types/feature.ts
CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts
Auto-merging src/shared/types/widget.ts
CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts
Auto-merging src/ui/components/Widgets/Chart/ChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/ChartWidget.tsx
Auto-merging src/ui/components/Widgets/Chart/components/Header.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/Header.tsx
Auto-merging src/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/common.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/wizard.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/wizard.js
Auto-merging src/ui/libs/DatalensChartkit/modules/export/export.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/export/export.js
Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts
Auto-merging src/ui/registry/units/chart/types/functions/getChartkitMenuByType.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/chart/types/functions/getChartkitMenuByType.ts
Auto-merging src/ui/units/dash/containers/Body/Body.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Control2.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Control2.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/AppearanceSection/Rows/HintRow/HintRow.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/AppearanceSection/Rows/HintRow/HintRow.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/AppearanceSection/Rows/InnerTitleRow/InnerTitleRow.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/AppearanceSection/Rows/InnerTitleRow/InnerTitleRow.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/AppearanceSection/Rows/TitlePlacementRow/TitlePlacementRow.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/AppearanceSection/Rows/TitlePlacementRow/TitlePlacementRow.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/AppearanceSection/Rows/TitleRow/TitleRow.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/AppearanceSection/Rows/TitleRow/TitleRow.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/CommonSettingsSection.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/CommonSettingsSection.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/ConnectionSettings.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/ConnectionSettings.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/ConnectionSelector/ConnectionSelector.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/ConnectionSelector/ConnectionSelector.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/QueryTypeControl/QueryTypeControl.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/QueryTypeControl/QueryTypeControl.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/QueryTypeControl/components/EditLabelControl/EditLabelControl.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/QueryTypeControl/components/EditLabelControl/EditLabelControl.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/QueryTypeControl/components/EditQueryControl/EditQueryControl.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/QueryTypeControl/components/EditQueryControl/EditQueryControl.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/DatasetSelector/DatasetSelector.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/DatasetSelector/DatasetSelector.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ExternalSelectorSettings/ExternalSelectorSettings.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ExternalSelectorSettings/ExternalSelectorSettings.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/InputTypeSelector/InputTypeSelector.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/InputTypeSelector/InputTypeSelector.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ParameterNameInput/ParameterNameInput.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ParameterNameInput/ParameterNameInput.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/OperationSelector/OperationSelector.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/OperationSelector/OperationSelector.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ParametersSection/ParametersSection.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ParametersSection/ParametersSection.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/Acceptable/Acceptable.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/Acceptable/Acceptable.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ListValueControl.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ListValueControl.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/MultiselectableCheckbox.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/MultiselectableCheckbox.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/DynamicValueSelect.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/DynamicValueSelect.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/StaticValueSelect.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/StaticValueSelect.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/hooks.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/hooks.ts
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/RequiredValueCheckbox/RequiredValueCheckbox.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/RequiredValueCheckbox/RequiredValueCheckbox.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ValueSelector.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ValueSelector.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/SelectorTypeSelect/SelectorTypeSelect.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/SelectorTypeSelect/SelectorTypeSelect.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/DialogEditQuery/DialogEditQuery.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/DialogEditQuery/DialogEditQuery.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/GroupControl/ControlsPlacementDialog/ControlsPlacementDialog.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/GroupControl/ControlsPlacementDialog/ControlsPlacementDialog.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/GroupControl/GroupControl.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/GroupControl/GroupControl.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/GroupControl/GroupControlBody/GroupControlBody.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/GroupControl/GroupControlBody/GroupControlBody.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/GroupControl/GroupControlSidebar/GroupControlSidebar.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/GroupControl/GroupControlSidebar/GroupControlSidebar.tsx
Auto-merging src/ui/units/dash/modules/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts
Auto-merging src/ui/units/dash/store/actions/controls/actions.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/controls/actions.ts
Auto-merging src/ui/units/dash/store/actions/dashTyped.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/dashTyped.ts
Auto-merging src/ui/units/dash/store/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/index.ts
Auto-merging src/ui/units/dash/store/reducers/dash.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dash.js
Auto-merging src/ui/units/dash/store/reducers/dashTypedReducer.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dashTypedReducer.ts
Auto-merging src/ui/units/dash/store/selectors/dashTypedSelectors.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/selectors/dashTypedSelectors.ts
Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts
CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts
error: could not apply f022023b4... Add entity copy success toaster
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply f022023b4... Add entity copy success toaster
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10129
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10129-1810/chartkit-1810/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10129
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@DaryaLari DaryaLari requested a review from flops November 15, 2024 11:43
@DaryaLari DaryaLari merged commit 91c5a2b into main Nov 15, 2024
9 checks passed
@DaryaLari DaryaLari deleted the CHARTS-10129 branch November 15, 2024 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flops flops flops approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DaryaLari @robot-charts @flops @dtikhonova