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

WIP: Charts 9786 no create permissions dialog #1932

Closed
wants to merge 3 commits into from
Closed

WIP: Charts 9786 no create permissions dialog #1932

wants to merge 3 commits into from

Conversation

sjorobekov
Copy link
Contributor

No description provided.

@datalens-weblate-robot
Copy link
Contributor

i18n-check

The following components have not been translated

component.dialog-collection-no-create-permission.view (ru)
component.dialog-collection-no-create-permission.view (en)
component.dialog-info.view (ru)
component.dialog-info.view (en)

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

1 similar comment
@datalens-weblate-robot
Copy link
Contributor

i18n-check

The following components have not been translated

component.dialog-collection-no-create-permission.view (ru)
component.dialog-collection-no-create-permission.view (en)
component.dialog-info.view (ru)
component.dialog-info.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 Dec 12, 2024 •
edited
Loading

📦 Statoscope quick diff with main-branch:

⏱ Build time: -1.6 sec (-0.86%)

⚖️ Initial size: 0.61 kb (0.02%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

@sjorobekov sjorobekov force-pushed the CHARTS-9786_no_create_permissions_dialog branch from 702b4c0 to d2b2e3f Compare December 12, 2024 09:34
@datalens-weblate-robot
Copy link
Contributor

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/1)
Auto-merging src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/CollectionNoCreatePermissionDialog.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/CollectionNoCreatePermissionDialog.tsx
Auto-merging src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/index.ts
CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/index.ts
Auto-merging src/ui/components/CollectionsStructure/index.ts
CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/index.ts
Auto-merging src/ui/components/DialogInfo/index.ts
CONFLICT (add/add): Merge conflict in src/ui/components/DialogInfo/index.ts
Auto-merging src/ui/store/actions/openDialogTypes.ts
CONFLICT (add/add): Merge conflict in src/ui/store/actions/openDialogTypes.ts
Auto-merging src/ui/units/collections/components/CollectionActions/CollectionActions.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionActions/CollectionActions.tsx
Auto-merging src/ui/units/collections/components/CollectionPage/CollectionPage.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionPage/CollectionPage.tsx
Auto-merging src/ui/units/collections/components/CollectionPage/hooks/useLayout.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionPage/hooks/useLayout.tsx
error: could not apply 702b4c0e3... Merge branch 'main' into CHARTS-9786_no_create_permissions_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 702b4c0e3... Merge branch 'main' into CHARTS-9786_no_create_permissions_dialog
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-9786_no_create_permissions_dialog
  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-9786-no-create-permissions-dialog-1932/chartkit-1932/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-9786_no_create_permissions_dialog
  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
@datalens-weblate-robot
Copy link
Contributor

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/1)
Auto-merging src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/CollectionNoCreatePermissionDialog.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/CollectionNoCreatePermissionDialog.tsx
Auto-merging src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/index.ts
CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/index.ts
Auto-merging src/ui/components/CollectionsStructure/index.ts
CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/index.ts
Auto-merging src/ui/components/DialogInfo/index.ts
CONFLICT (add/add): Merge conflict in src/ui/components/DialogInfo/index.ts
Auto-merging src/ui/store/actions/openDialogTypes.ts
CONFLICT (add/add): Merge conflict in src/ui/store/actions/openDialogTypes.ts
Auto-merging src/ui/units/collections/components/CollectionActions/CollectionActions.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionActions/CollectionActions.tsx
Auto-merging src/ui/units/collections/components/CollectionPage/CollectionPage.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionPage/CollectionPage.tsx
Auto-merging src/ui/units/collections/components/CollectionPage/hooks/useLayout.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionPage/hooks/useLayout.tsx
error: could not apply 702b4c0e3... Merge branch 'main' into CHARTS-9786_no_create_permissions_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 702b4c0e3... Merge branch 'main' into CHARTS-9786_no_create_permissions_dialog
 (1)

Resolve conflicts according to instructions

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

@github-actions GitHub Actions
Copy link

E2E Report is ready.

@sjorobekov sjorobekov closed this Dec 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
changelog component/general type/deps
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sjorobekov @datalens-weblate-robot