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

Upload files to s3 by presigned url #2022

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

Conversation

korvin89
Copy link
Contributor

No description provided.

@datalens-weblate-robot
Copy link
Contributor

i18n-check

The following components have not been translated

connections.file.view (ru)
connections.file.view (en)

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

Copy link

github-actions bot commented Jan 17, 2025

📦 Statoscope quick diff with main-branch:

⏱ Build time: -4.7 sec (-2.51%)

⚖️ Initial size: 0.46 kb (0.01%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

Copy link

github-actions bot commented Jan 17, 2025

E2E Report is ready.

@korvin89 korvin89 force-pushed the CHARTS-10766-file-presigned-url branch from 5469ac6 to 0614dbe Compare January 20, 2025 10:29
@datalens-weblate-robot
Copy link
Contributor

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch.
Rebasing (1/2)
Auto-merging api/server/charts-engine.ts
CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging src/server/components/charts-engine/components/chart-validator.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts
Auto-merging src/server/modes/charts/init-charts-engine.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/init-charts-engine.ts
Auto-merging src/server/modes/charts/plugins/dash-api.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dash-api.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/helpers/backgroundColor.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/helpers/backgroundColor.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-x/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-x/highcharts.ts
Auto-merging src/shared/schema/mix/actions/entries.ts
CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/entries.ts
Auto-merging src/shared/schema/mix/helpers/entries.ts
CONFLICT (add/add): Merge conflict in src/shared/schema/mix/helpers/entries.ts
Auto-merging src/shared/types/dash.ts
CONFLICT (add/add): Merge conflict in src/shared/types/dash.ts
Auto-merging src/ui/components/DashKit/plugins/Title/AnchorLink/AnchorLink.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Title/AnchorLink/AnchorLink.tsx
Auto-merging src/ui/components/DashKit/plugins/Title/Title.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Title/Title.scss
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox-runtime.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox-runtime.ts
Auto-merging src/ui/units/dash/store/reducers/dash.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dash.js
error: could not apply 9b9a179b... Upload files to s3 by presigned url
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 9b9a179b... Upload files to s3 by presigned url
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10766-file-presigned-url
  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-10766-file-presigned-url-2022/chartkit-2022/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10766-file-presigned-url
  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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants