Refactor & redesign selectors edit dialog #1964

DaryaLari · 2024-12-19T15:05:45Z

No description provided.

datalens-weblate-robot · 2024-12-19T15:09:59Z

i18n-check

The following components have not been translated

dash.group-controls-dialog.edit (ru)
dash.group-controls-dialog.edit (en)

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

github-actions · 2024-12-19T15:11:58Z

📦 Statoscope quick diff with main-branch:

⏱ Build time: -1.9 sec (-0.99%)

⚖️ Initial size: 0.36 kb (0.01%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

github-actions · 2024-12-19T15:25:31Z

E2E Report is ready.

datalens-weblate-robot · 2024-12-19T16:20:18Z

i18n-check

The following components have not been translated

dash.group-controls-dialog.edit (ru)
dash.group-controls-dialog.edit (en)

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

datalens-weblate-robot · 2024-12-19T21:02:26Z

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch.

warning: skipped previously applied commit 493d3ddd
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging src/i18n-keysets/dash.widget-dialog.edit/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.widget-dialog.edit/en.json
Auto-merging src/i18n-keysets/dash.widget-dialog.edit/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.widget-dialog.edit/ru.json
Auto-merging src/shared/constants/qa/control.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/qa/control.ts
Auto-merging src/shared/types/dash.ts
CONFLICT (add/add): Merge conflict in src/shared/types/dash.ts
Auto-merging src/ui/components/ControlComponents/Sections/AppearanceSection/Rows/TitlePlacementRow/TitlePlacementRow.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/ControlComponents/Sections/AppearanceSection/Rows/TitlePlacementRow/TitlePlacementRow.tsx
Auto-merging src/ui/components/DashKit/plugins/Widget/types.ts
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Widget/types.ts
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.scss
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.tsx
Auto-merging src/ui/components/DialogExtendedSettings/DialogExtendedSettings.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogExtendedSettings/DialogExtendedSettings.tsx
Auto-merging src/ui/components/DialogGroupControl/GroupControlSidebar/GroupControlSidebar.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogGroupControl/GroupControlSidebar/GroupControlSidebar.tsx
Auto-merging src/ui/components/MarkdownHelpPopover/MarkdownHelpPopover.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/MarkdownHelpPopover/MarkdownHelpPopover.tsx
Auto-merging src/ui/components/TabMenu/TabMenu.scss
CONFLICT (add/add): Merge conflict in src/ui/components/TabMenu/TabMenu.scss
Auto-merging src/ui/components/Widgets/Chart/ChartWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/ChartWidget.scss
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/WidgetFooter.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/WidgetFooter.tsx
Auto-merging src/ui/components/Widgets/Chart/components/WidgetHeader.scss
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/WidgetHeader.scss
Auto-merging src/ui/components/Widgets/Chart/components/WidgetHeader.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/WidgetHeader.tsx
Auto-merging src/ui/store/reducers/controlDialog.ts
CONFLICT (add/add): Merge conflict in src/ui/store/reducers/controlDialog.ts
Auto-merging src/ui/store/typings/controlDialog.ts
CONFLICT (add/add): Merge conflict in src/ui/store/typings/controlDialog.ts
Auto-merging src/ui/store/utils/controlDialog.ts
CONFLICT (add/add): Merge conflict in src/ui/store/utils/controlDialog.ts
Auto-merging tests/opensource-suites/dash/selectors/groupBaseActions.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/selectors/groupBaseActions.test.ts
Auto-merging tests/opensource-suites/dash/selectors/groupButtonActions.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/selectors/groupButtonActions.test.ts
Auto-merging tests/opensource-suites/dash/selectors/selectorsLabels.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/selectors/selectorsLabels.test.ts
Auto-merging tests/page-objects/common/DialogControlPO/AppearanceTitle.ts
CONFLICT (add/add): Merge conflict in tests/page-objects/common/DialogControlPO/AppearanceTitle.ts
Auto-merging tests/page-objects/common/abstract/RadioGroupElementPO.ts
CONFLICT (add/add): Merge conflict in tests/page-objects/common/abstract/RadioGroupElementPO.ts
Auto-merging tests/page-objects/dashboard/ControlActions.ts
CONFLICT (add/add): Merge conflict in tests/page-objects/dashboard/ControlActions.ts
Auto-merging tests/page-objects/dashboard/DashboardPage.ts
CONFLICT (add/add): Merge conflict in tests/page-objects/dashboard/DashboardPage.ts
Auto-merging tests/suites/dash/selectors/selectorsLabels.test.ts
CONFLICT (add/add): Merge conflict in tests/suites/dash/selectors/selectorsLabels.test.ts
error: could not apply e8645a5c... Refactor & redesign selectors edit dialog
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 e8645a5c... Refactor & redesign selectors edit dialog
 (1)

Resolve conflicts according to instructions

Switch to the current branch associated with this pull request.

git checkout CHARTS-10844

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-10844-1964/chartkit-1964/
git -c http.sslVerify=false remote update weblate

Merge Weblate changes:

git merge weblate/CHARTS-10844

Resolve conflicts:

edit ...
git add ...
git commit

Push changes to upstream repository, Weblate will fetch merge from there:

git push origin

datalens-weblate-robot · 2024-12-19T21:26:10Z

i18n-check

The following components have not been translated

dash.group-controls-dialog.edit (ru)
dash.group-controls-dialog.edit (en)

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

datalens-weblate-robot · 2024-12-20T08:37:37Z

i18n-check

The following components have not been translated

dash.group-controls-dialog.edit (ru)
dash.group-controls-dialog.edit (en)

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

datalens-weblate-robot · 2024-12-20T09:02:19Z

i18n-check

The following components have not been translated

dash.group-controls-dialog.edit (ru)
dash.group-controls-dialog.edit (en)

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

datalens-weblate-robot · 2024-12-20T14:05:51Z

i18n-check

The following components have not been translated

dash.group-controls-dialog.edit (ru)
dash.group-controls-dialog.edit (en)

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

datalens-weblate-robot · 2024-12-20T14:15:09Z

i18n-check

The following components have not been translated

dash.extended-settings-dialog.edit (ru)
dash.extended-settings-dialog.edit (en)
dash.group-controls-dialog.edit (ru)
dash.group-controls-dialog.edit (en)

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

datalens-weblate-robot · 2024-12-23T11:01:33Z

i18n-check

The following components have not been translated

dash.extended-settings-dialog.edit (ru)
dash.extended-settings-dialog.edit (en)
dash.group-controls-dialog.edit (ru)
dash.group-controls-dialog.edit (en)

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

Refactor & redesign selectors edit dialog

e8645a5

Fix tests & data storing

493d3dd

DaryaLari added 2 commits December 19, 2024 19:22

Refactor & redesign selectors edit dialog

40236cb

Fix tests & data storing

585a0a4

DaryaLari added changelog type/feat component/dashboards labels Dec 19, 2024

DaryaLari force-pushed the CHARTS-10844 branch 2 times, most recently from 2c5ebfe to f8b6cb6 Compare December 19, 2024 20:24

fix tests

e585717

DaryaLari force-pushed the CHARTS-10844 branch from f8b6cb6 to e585717 Compare December 19, 2024 21:01

datalens-tech deleted a comment from datalens-weblate-robot Dec 19, 2024

Merge remote-tracking branch 'weblate/CHARTS-10844' into CHARTS-10844

3e159e6

DaryaLari force-pushed the CHARTS-10844 branch from 519c47c to 3e159e6 Compare December 20, 2024 08:36

DaryaLari added 3 commits December 20, 2024 11:59

Refactor & redesign selectors edit dialog

e81d0f6

Fix tests & data storing

c24dd47

fix tests

e758fe2

Merge remote-tracking branch 'weblate/CHARTS-10844' into CHARTS-10844

6ce181a

DaryaLari force-pushed the CHARTS-10844 branch from dd496df to 6ce181a Compare December 20, 2024 14:04

Add translations

db6e58b

DaryaLari requested a review from flops December 20, 2024 15:03

flops previously approved these changes Dec 23, 2024

View reviewed changes

DaryaLari requested a review from Marginy605 December 23, 2024 14:36

DaryaLari dismissed flops’s stale review via 78a51e6 December 23, 2024 16:49

fix autoheight checkbox position

ad8b0dc

DaryaLari force-pushed the CHARTS-10844 branch from 78a51e6 to ad8b0dc Compare December 23, 2024 19:01

DaryaLari added 4 commits December 23, 2024 22:01

Merge branch 'main' into CHARTS-10844

de88028

fix update controls checkbox position

611de76

fix add btn naming with paste & rows spacing

0127fce

Decrease sidebar paddings

dc119db

datalens-tech deleted a comment from datalens-weblate-robot Dec 24, 2024

DaryaLari added 2 commits December 24, 2024 16:26

fix spaces

bdf5aed

align checkboxes with radiobuttons

8fb40b0

DaryaLari requested a review from mournfulCoroner December 24, 2024 15:53

mournfulCoroner approved these changes Dec 24, 2024

View reviewed changes

DaryaLari merged commit aae92da into main Dec 25, 2024
9 checks passed

DaryaLari deleted the CHARTS-10844 branch December 25, 2024 06:39

kuzmadom pushed a commit that referenced this pull request Dec 26, 2024

Refactor & redesign selectors edit dialog (#1964)

b024bf3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor & redesign selectors edit dialog #1964

Refactor & redesign selectors edit dialog #1964

DaryaLari commented Dec 19, 2024

datalens-weblate-robot commented Dec 19, 2024

github-actions bot commented Dec 19, 2024 •

edited

Loading

github-actions bot commented Dec 19, 2024 •

edited

Loading

datalens-weblate-robot commented Dec 19, 2024

datalens-weblate-robot commented Dec 19, 2024

datalens-weblate-robot commented Dec 19, 2024

datalens-weblate-robot commented Dec 20, 2024

datalens-weblate-robot commented Dec 20, 2024

datalens-weblate-robot commented Dec 20, 2024

datalens-weblate-robot commented Dec 20, 2024

datalens-weblate-robot commented Dec 23, 2024

Refactor & redesign selectors edit dialog #1964

Refactor & redesign selectors edit dialog #1964

Conversation

DaryaLari commented Dec 19, 2024

datalens-weblate-robot commented Dec 19, 2024

github-actions bot commented Dec 19, 2024 • edited Loading

github-actions bot commented Dec 19, 2024 • edited Loading

datalens-weblate-robot commented Dec 19, 2024

datalens-weblate-robot commented Dec 19, 2024

datalens-weblate-robot commented Dec 19, 2024

datalens-weblate-robot commented Dec 20, 2024

datalens-weblate-robot commented Dec 20, 2024

datalens-weblate-robot commented Dec 20, 2024

datalens-weblate-robot commented Dec 20, 2024

datalens-weblate-robot commented Dec 23, 2024

github-actions bot commented Dec 19, 2024 •

edited

Loading

github-actions bot commented Dec 19, 2024 •

edited

Loading