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

Dash fixed header redesign #1863

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Dash fixed header redesign #1863

wants to merge 3 commits into from

Conversation

DaryaLari
Copy link
Contributor

No description provided.

@DaryaLari DaryaLari force-pushed the CHARTS-10604 branch 2 times, most recently from 415fcbe to 4d117be Compare November 29, 2024 15:11
@DaryaLari DaryaLari requested a review from flops November 29, 2024 15:12
@robot-charts
Copy link
Collaborator

i18n-check
Please merge the Pull Request with the changes from Weblate into your branch.

Copy link

github-actions bot commented Nov 29, 2024

📦 Statoscope quick diff with main-branch:

⏱ Build time: -4.5 sec (-2.35%)

⚖️ Initial size: 0.26 kb (0.01%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

Copy link

github-actions bot commented Nov 29, 2024

E2E Report is ready.

@DaryaLari DaryaLari marked this pull request as draft November 29, 2024 15:30
@DaryaLari DaryaLari marked this pull request as ready for review November 29, 2024 16:14
@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)
dash.main.view (en)
sql (ru)
sql (en)
wizard (ru)
wizard (en)

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)
dash.main.view (en)
sql (ru)
sql (en)
wizard (ru)
wizard (en)

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

1 similar comment
@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)
dash.main.view (en)
sql (ru)
sql (en)
wizard (ru)
wizard (en)

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)
dash.main.view (en)

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

1 similar comment
@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.main.view (ru)
dash.main.view (en)

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

DaryaLari pushed a commit that referenced this pull request Dec 3, 2024
DaryaLari pushed a commit that referenced this pull request Dec 3, 2024
@DaryaLari DaryaLari changed the title Tests on fixed header Dash fixed header redesign Dec 3, 2024
DaryaLari pushed a commit that referenced this pull request Dec 5, 2024
DaryaLari pushed a commit that referenced this pull request Dec 5, 2024
@DaryaLari DaryaLari force-pushed the CHARTS-10604 branch 2 times, most recently from 7a34595 to 7e3cc93 Compare December 5, 2024 10:48
@robot-charts
Copy link
Collaborator

i18n-check
Please merge the Pull Request with the changes from Weblate into your branch.

DaryaLari pushed a commit that referenced this pull request Dec 9, 2024
@DaryaLari DaryaLari force-pushed the CHARTS-10604 branch 3 times, most recently from da90cc0 to 3197626 Compare December 9, 2024 12:02
Redesign dash fixed header

Return type import

Hide pin button with only first fixed header group

Refactor fixed header

Redesign dash fixed header

Redesign dash fixed header (#1848)

Update dumps

Refactor fixed header

Fix lint

Refactor fixed header

Fix lint error

Redesign dash fixed header

Update dumps

Return type import

Refactor fixed header

Fix
Update dumps
@datalens-weblate-robot
Copy link
Contributor

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch.
warning: skipped previously applied commit b918acdc6
warning: skipped previously applied commit 967a66cf7
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/34)
Auto-merging src/ui/units/dash/containers/Body/Body.tsx
CONFLICT (content): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx
Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss
CONFLICT (content): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss
Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx
CONFLICT (content): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx
error: could not apply 08c3a9fbb... Redesign dash fixed header
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 08c3a9fbb... Redesign dash fixed header
 (1)

Resolve conflicts according to instructions

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants