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.

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

Separate action selector buttons for group selector #755

Merged
merged 17 commits into from
Mar 14, 2024

Conversation

mournfulCoroner
Copy link
Contributor

@mournfulCoroner mournfulCoroner commented Mar 12, 2024

Related to datalens-tech/datalens#89

  • Add separate buttons for "Selector" and "Selector (JS)"
  • Fix tests for GroupControls flag

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)

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

Copy link
Contributor

github-actions bot commented Mar 12, 2024

📦 Statoscope quick diff with main-branch:

⏱ Build time: -15.0 sec (-8.85%)

⚖️ Initial size: 6.53 kb (0.28%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

Copy link
Contributor

github-actions bot commented Mar 12, 2024

E2E Report is ready.

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)

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

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)

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

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)

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

@mournfulCoroner mournfulCoroner force-pushed the CHARTS-9205-Separate-action-selector-buttons branch from 6cdd68f to ed2db90 Compare March 12, 2024 14:01
@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch.
Rebasing (1/1)
Auto-merging tests/page-objects/dashboard/DashboardPage.ts
CONFLICT (content): Merge conflict in tests/page-objects/dashboard/DashboardPage.ts
error: could not apply 6cdd68f5... Fix fillSelectorSettingsDialogFields
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 6cdd68f5... Fix fillSelectorSettingsDialogFields
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-9205-Separate-action-selector-buttons
  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-9205-separate-action-selector-buttons-755/chartkit-755/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-9205-Separate-action-selector-buttons
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch.
Rebasing (1/1)
Auto-merging tests/page-objects/dashboard/DashboardPage.ts
CONFLICT (content): Merge conflict in tests/page-objects/dashboard/DashboardPage.ts
error: could not apply 6cdd68f5... Fix fillSelectorSettingsDialogFields
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 6cdd68f5... Fix fillSelectorSettingsDialogFields
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-9205-Separate-action-selector-buttons
  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-9205-separate-action-selector-buttons-755/chartkit-755/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-9205-Separate-action-selector-buttons
  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/1)
Auto-merging tests/page-objects/dashboard/DashboardPage.ts
CONFLICT (content): Merge conflict in tests/page-objects/dashboard/DashboardPage.ts
error: could not apply 6cdd68f5... Fix fillSelectorSettingsDialogFields
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 6cdd68f5... Fix fillSelectorSettingsDialogFields
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-9205-Separate-action-selector-buttons
  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-9205-separate-action-selector-buttons-755/chartkit-755/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-9205-Separate-action-selector-buttons
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)

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

…ector-buttons' into CHARTS-9205-Separate-action-selector-buttons
@mournfulCoroner mournfulCoroner force-pushed the CHARTS-9205-Separate-action-selector-buttons branch from da21166 to f7ee9bb Compare March 12, 2024 18:03
@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)

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

Currently translated at 100.0% (10 of 10 strings)

Translation: DataLens/dash.main.view__755
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-9205-separate-action-selector-buttons-755/dash-main-view-755/ru/

Co-authored-by: Darya Tikhonova <tihonova-d@yandex-team.ru>
@mournfulCoroner mournfulCoroner merged commit b86808f into main Mar 14, 2024
8 checks passed
@mournfulCoroner mournfulCoroner deleted the CHARTS-9205-Separate-action-selector-buttons branch March 14, 2024 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants