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

Mass actions for datasets (Aggregations and change type) #1492

Merged
merged 56 commits into from
Sep 20, 2024
Merged

Mass actions for datasets (Aggregations and change type) #1492

merged 56 commits into from
Sep 20, 2024

Conversation

stpavlenko
Copy link
Contributor

No description provided.

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dataset.dataset-editor.modify (ru)
dataset.dataset-editor.modify (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 Sep 9, 2024 •
edited
Loading

📦 Statoscope quick diff with main-branch:

⏱ Build time: 3.7 sec (2.06%)

⚖️ Initial size: 0.93 kb (0.02%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 9, 2024 •
edited
Loading

E2E Report is ready.

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dataset.dataset-editor.modify (ru)
dataset.dataset-editor.modify (en)

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

@robot-charts
Copy link
Collaborator

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

@stpavlenko stpavlenko requested review from flops and korvin89 September 9, 2024 16:28
Stepan Pavlenko and others added 4 commits September 10, 2024 11:30
Merge branch 'main' of github.com:datalens-tech/datalens-ui into CHAR…
5d43316 
…TS-9840-mass-actions-datasets
Removed export
aa4fcf3
@weblate
Translated using Weblate (English)
ca6d47d 
Currently translated at 92.9% (92 of 99 strings)

Translation: DataLens/dataset.dataset-editor.modify__1492
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-9840-mass-actions-datasets-1492/dataset-dataset-editor-modify-1492/en/
@weblate
Translated using Weblate (English)
35efbd0 
Currently translated at 91.0% (92 of 101 strings)

Translation: DataLens/dataset.dataset-editor.modify__1492
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-9840-mass-actions-datasets-1492/dataset-dataset-editor-modify-1492/en/
@robot-charts
Copy link
Collaborator

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

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dataset.dataset-editor.modify (ru)
dataset.dataset-editor.modify (en)

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

@datalens-tech datalens-tech deleted a comment from robot-charts Sep 16, 2024
Gravity addon and others added 2 commits September 17, 2024 08:23
@weblate
Translated using Weblate (English)
d2f1e5d 
Currently translated at 91.0% (92 of 101 strings)

Translation: DataLens/dataset.dataset-editor.modify__1492
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-9840-mass-actions-datasets-1492/dataset-dataset-editor-modify-1492/en/
@weblate
Translated using Weblate (English)
089be00 
Currently translated at 100.0% (101 of 101 strings)

Translation: DataLens/dataset.dataset-editor.modify__1492
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-9840-mass-actions-datasets-1492/dataset-dataset-editor-modify-1492/en/
@WeblateGravity WeblateGravity mentioned this pull request Sep 17, 2024
Merged
@WeblateGravity
Translations update from Weblate Gravity for PR #1492 (#1544)
9bc5071 
Co-authored-by: Gravity addon <[email protected]>
Co-authored-by: Matthew Casserly <[email protected]>
@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/2)
Auto-merging src/i18n-keysets/dataset.dataset-editor.modify/en.json
CONFLICT (content): Merge conflict in src/i18n-keysets/dataset.dataset-editor.modify/en.json
error: could not apply d2f1e5d82... Translated using Weblate (English)
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 d2f1e5d82... Translated using Weblate (English)
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-9840-mass-actions-datasets
  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-9840-mass-actions-datasets-1492/chartkit-1492/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-9840-mass-actions-datasets
  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/2)
Auto-merging src/i18n-keysets/dataset.dataset-editor.modify/en.json
CONFLICT (content): Merge conflict in src/i18n-keysets/dataset.dataset-editor.modify/en.json
error: could not apply d2f1e5d82... Translated using Weblate (English)
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 d2f1e5d82... Translated using Weblate (English)
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-9840-mass-actions-datasets
  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-9840-mass-actions-datasets-1492/chartkit-1492/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-9840-mass-actions-datasets
  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

dataset.dataset-editor.modify (ru)
dataset.dataset-editor.modify (en)

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

@WeblateGravity WeblateGravity mentioned this pull request Sep 17, 2024
Merged
korvin89
korvin89 reviewed Sep 19, 2024
View reviewed changes
src/ui/store/actions/openDialogTypes.ts Outdated Show resolved Hide resolved
src/ui/units/datasets/components/DatasetTable/DatasetTable.tsx Outdated Show resolved Hide resolved
src/ui/units/datasets/components/DatasetTable/DatasetTable.tsx Outdated Show resolved Hide resolved
src/ui/utils/getTypeSelectOptions.tsx Show resolved Hide resolved
...ponents/BatchActionPanel/components/DialogChangeDatasetFields/DialogChangeDatasetFields.scss Outdated Show resolved Hide resolved
...mponents/BatchActionPanel/components/DialogChangeDatasetFields/DialogChangeDatasetFields.tsx Outdated Show resolved Hide resolved
...mponents/BatchActionPanel/components/DialogChangeDatasetFields/DialogChangeDatasetFields.tsx Outdated Show resolved Hide resolved
...mponents/BatchActionPanel/components/DialogChangeDatasetFields/DialogChangeDatasetFields.tsx Outdated Show resolved Hide resolved
src/ui/utils/helpers.ts Show resolved Hide resolved
@stpavlenko stpavlenko requested a review from korvin89 September 20, 2024 10:45
@stpavlenko stpavlenko merged commit 7c4929b into main Sep 20, 2024
8 checks passed
@stpavlenko stpavlenko deleted the CHARTS-9840-mass-actions-datasets branch September 20, 2024 15:27
@flops flops changed the title Mass actions datasets Mass actions for datasets (Aggregations and change type) Sep 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@korvin89 korvin89 korvin89 approved these changes

@flops flops Awaiting requested review from flops

Assignees
No one assigned
Labels
changelog component/datasets type/feat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@stpavlenko @robot-charts @korvin89 @flops @dtikhonova @WeblateGravity