Add d3 template to editor

[korvin89]

No description provided.

[robot-charts]

i18n-check

The following components have not been translated

editor.templates.view (ru)

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

[github-actions]

📦 Statoscope quick diff with main-branch:

⏱ Build time: -6.4 sec (-4.02%)

⚖️ Initial size: 6.63 kb (0.28%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

[github-actions]

E2E Report is ready.

[robot-charts]

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch.

Rebasing (1/1)
Auto-merging Dockerfile
CONFLICT (add/add): Merge conflict in Dockerfile
Auto-merging deploy/nginx/nginx.conf
CONFLICT (add/add): Merge conflict in deploy/nginx/nginx.conf
Auto-merging deploy/nginx/sites-enabled/app.conf
CONFLICT (add/add): Merge conflict in deploy/nginx/sites-enabled/app.conf
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/markdown.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/markdown.ts
Auto-merging src/server/components/charts-engine/controllers/charts.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-y/__tests__/bar-y.test.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-y/__tests__/bar-y.test.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-y/prepare-bar-y-data.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-y/prepare-bar-y-data.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/pie/prepare-pie-data.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/pie/prepare-pie-data.ts
Auto-merging src/shared/constants/url.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/url.ts
Auto-merging src/shared/endpoints/constants/opensource.ts
CONFLICT (add/add): Merge conflict in src/shared/endpoints/constants/opensource.ts
Auto-merging src/shared/modules/typed-query-api/mappers/parameters.ts
CONFLICT (add/add): Merge conflict in src/shared/modules/typed-query-api/mappers/parameters.ts
Auto-merging src/ui/components/Select/wrappers/SelectFeatured.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Select/wrappers/SelectFeatured.tsx
Auto-merging src/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/common.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts
Auto-merging src/ui/registry/units/chart/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/chart/functions-map.ts
Auto-merging src/ui/units/connections/store/actions/yadoc/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/actions/yadoc/utils.ts
Auto-merging src/ui/units/connections/store/reducers/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/reducers/index.ts
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Control2.scss
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Control2.scss
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Control2.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Control2.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/ConnectionSettings.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/ConnectionSettings.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/QueryTypeControl/components/EditLabelControl/EditLabelControl.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/CommonSettingsSection/ConnectionSettings/components/QueryTypeControl/components/EditLabelControl/EditLabelControl.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/DynamicValueSelect.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/DynamicValueSelect.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/types.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Control2/Sections/ValueSelector/ListValueControl/ValueSelector/types.ts
Auto-merging src/ui/units/dash/store/actions/controls/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/controls/helpers.ts
Auto-merging src/ui/units/dash/store/actions/controls/types.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/controls/types.ts
Auto-merging src/ui/units/editor/constants/common.ts
CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts
Auto-merging src/ui/units/editor/constants/templates/d3-chart.ts
CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/templates/d3-chart.ts
Auto-merging src/ui/units/editor/store/reducers/editor/helper.js
CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js
Auto-merging src/ui/units/ql/containers/PaneMain/ScreenEditor/ScreenEditor.scss
CONFLICT (add/add): Merge conflict in src/ui/units/ql/containers/PaneMain/ScreenEditor/ScreenEditor.scss
Auto-merging tests/docker-compose.e2e.yml
CONFLICT (add/add): Merge conflict in tests/docker-compose.e2e.yml
error: could not apply 4c637d67... Move empty template type to regestry
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 4c637d67... Move empty template type to regestry
 (1)

Resolve conflicts according to instructions

1. Switch to the current branch associated with this pull request.

git checkout CHARTS-9329-d3-template

2. 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-9329-d-3-template-789/chartkit-789/
git -c http.sslVerify=false remote update weblate

3. Merge Weblate changes:

git merge weblate/CHARTS-9329-d3-template

4. Resolve conflicts:

edit ...
git add ...
git commit

5. Push changes to upstream repository, Weblate will fetch merge from there:

git push origin

[korvin89]

Related datalens-tech/datalens#94