Merge branch 'main' of github.com:datalens-tech/datalens-ui into CHAR…

…TS-10787-dashkit-update

.github/workflows/e2e_tests_report.yml

@@ -14,19 +14,13 @@ jobs:
       (github.event.workflow_run.conclusion == 'success' || github.event.workflow_run.conclusion == 'failure')
     runs-on: ubuntu-latest
     permissions:
-      contents: write
-      pages: write
+      contents: read
       pull-requests: write
     steps:
-      - name: Checkout GitHub Pages Branch
+      - name: Checkout main
         uses: actions/checkout@v2
         with:
-          ref: gh-pages
-      - name: Set Git User
-        # see: https://github.com/actions/checkout/issues/13#issuecomment-724415212
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          ref: main
       - name: Download Artifacts
         uses: dawidd6/action-download-artifact@v6
         with:
@@ -36,37 +30,24 @@ jobs:
         run: |
           echo "HTML_REPORT_URL_PATH=$(cat playwright-report/report-link)" >> "$GITHUB_ENV"
           echo "REPORT_PR_NUMBER=$(cat playwright-report/report-pr)" >> "$GITHUB_ENV"
-      - name: Move report to commit folder
-        run: mkdir -p ${{ env.HTML_REPORT_URL_PATH }} && mv playwright-report/report ${{ env.HTML_REPORT_URL_PATH }}/report
-      - name: Push HTML Report
+      - name: Upload HTML Report
         timeout-minutes: 3
-        # commit report, then try push-rebase-loop until it's able to merge the HTML report to the gh-pages branch
-        # this is necessary when this job is running at least twice at the same time (e.g. through two pushes at the same time)
-        run: |
-          git add .
-          git commit -m "workflow: add HTML report for ${{ env.HTML_REPORT_URL_PATH }}"
-
-          while true; do
-            git pull --rebase
-            if [ $? -ne 0 ]; then
-              echo "Failed to rebase. Please review manually."
-              exit 1
-            fi
-
-            git push
-            if [ $? -eq 0 ]; then
-              echo "Successfully pushed HTML report to repo."
-              exit 0
-            fi
-          done
+        uses: shallwefootball/s3-upload-action@master
+        with:
+          aws_key_id: ${{ secrets.E2E_REPORT_S3_ACCESS_KEY }}
+          aws_secret_access_key: ${{ secrets.E2E_REPORT_S3_SECRET_KEY}}
+          aws_bucket: ${{ vars.E2E_REPORT_S3_BUCKET }}
+          endpoint: ${{ vars.E2E_REPORT_S3_ENDPOINT }}
+          source_dir: playwright-report/report
+          destination_dir: ${{ env.HTML_REPORT_URL_PATH }}/report
       - name: Output Report URL as Worfklow Annotation
         run: |
-          FULL_HTML_REPORT_URL=https://datalens-tech.github.io/datalens-ui/${{ env.HTML_REPORT_URL_PATH }}/report
-
+          FULL_HTML_REPORT_URL=https://${{ vars.E2E_REPORT_S3_BUCKET }}.${{ vars.E2E_REPORT_HTML_ENDPOINT }}/${{ env.HTML_REPORT_URL_PATH }}/report
+          echo "FULL_HTML_REPORT_URL=${FULL_HTML_REPORT_URL}" >> "$GITHUB_ENV"
           echo "::notice title=📋 Published Playwright Test Report::$FULL_HTML_REPORT_URL"
       - name: Create Comment
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           header: e2e-report
           number: ${{ env.REPORT_PR_NUMBER }}
-          message: '[E2E Report](https://datalens-tech.github.io/datalens-ui/${{ env.HTML_REPORT_URL_PATH }}/report) is ready.'
+          message: '[E2E Report](${{ env.FULL_HTML_REPORT_URL }}) is ready.'

package.json

@@ -60,7 +60,7 @@
     "@diplodoc/transform": "^4.20.0",
     "@gravity-ui/app-layout": "^2.1.0",
     "@gravity-ui/browserslist-config": "^4.3.0",
-    "@gravity-ui/chartkit": "^5.19.0",
+    "@gravity-ui/chartkit": "^5.19.1",
     "@gravity-ui/dashkit": "^8.23.0",
     "@gravity-ui/date-utils": "^2.5.6",
     "@gravity-ui/expresskit": "^2.1.0",
@@ -70,7 +70,7 @@
     "@node-rs/crc32": "^1.7.2",
     "ajv": "^8.12.0",
     "axios": "^1.7.7",
-    "axios-retry": "^3.2.0",
+    "axios-retry": "^3.9.1",
     "clipboard-copy": "^3.2.0",
     "cookie-session": "^2.1.0",
     "d3": "^7.8.5",
@@ -122,7 +122,7 @@
     "@gravity-ui/stylelint-config": "^4.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",
     "@gravity-ui/ui-logger": "^1.1.0",
-    "@gravity-ui/uikit": "^6.37.0",
+    "@gravity-ui/uikit": "^6.39.0",
     "@jest/types": "^29.6.3",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@playwright/test": "^1.48.2",

src/@types/nodekit.d.ts

@@ -89,6 +89,7 @@ export interface SharedAppConfig {
     redis: RedisConfig | null;
     apiPrefix: string;
     preloadList?: string[];
+    releaseVersion?: string;
 }
 
 export interface SharedAppDynamicConfig {

src/i18n-keysets/component.aside-header.view/en.json

@@ -1,6 +1,7 @@
 {
   "label_about": "About",
   "label_account": "Account",
+  "label_app-version": "Version",
   "label_collections": "Collections and workbooks",
   "label_docs": "Documentation",
   "label_github": "GitHub",

src/i18n-keysets/component.aside-header.view/ru.json

@@ -1,6 +1,7 @@
 {
   "label_about": "О сервисе",
   "label_account": "Учётная запись",
+  "label_app-version": "Версия",
   "label_collections": "Коллекции и воркбуки",
   "label_docs": "Документация",
   "label_github": "GitHub",

src/i18n-keysets/dash.extended-settings-dialog.edit/en.json

@@ -0,0 +1,21 @@
+{
+  "button_back": "Back",
+  "button_cancel": "Cancel",
+  "button_save": "Save",
+  "context_apply-button": "This option enables a button for applying selectors",
+  "context_reset-button": "This option enables a button for resetting selectors",
+  "context_update-controls-on-change": "Once you enable this option, the dependent selectors will have influence on each other before you click Apply.",
+  "label_apply-button-checkbox": "Apply button",
+  "label_autoheight-checkbox": "Autoheight",
+  "label_field-validation": "Invalid width value",
+  "label_group-name": "Name",
+  "label_group-parameters": "Group parameters",
+  "label_note": "Selectors whose width does not fit completely inside the widget that unites a group of selectors will be moved to the next line",
+  "label_reset-button-checkbox": "Reset button",
+  "label_selectors-representation": "Selectors representation order and width",
+  "label_title": "Settings for selectors group",
+  "label_update-controls-on-change": "Auto-updating dependent selectors",
+  "value_auto": "Auto",
+  "value_percent": "%",
+  "value_pixels": "px"
+}

src/i18n-keysets/dash.extended-settings-dialog.edit/ru.json

@@ -0,0 +1,21 @@
+{
+  "button_back": "Назад",
+  "button_cancel": "Отмена",
+  "button_save": "Сохранить",
+  "context_apply-button": "Опция включает кнопку для применения селекторов",
+  "context_reset-button": "Опция включает кнопку для сброса селекторов",
+  "context_update-controls-on-change": "При включении опции зависимые селекторы будут влиять друг на друга до нажатия кнопки «Применить».",
+  "label_apply-button-checkbox": "Кнопка «‎Применить»‎",
+  "label_autoheight-checkbox": "Автовысота",
+  "label_field-validation": "Некорректное значение ширины",
+  "label_group-name": "Название",
+  "label_group-parameters": "Параметры группы",
+  "label_note": "Селекторы, которые по ширине не помещаются в виджет, объединяющий группу селекторов, будут перенесены на следующую строку",
+  "label_reset-button-checkbox": "Кнопка «‎Сбросить»",
+  "label_selectors-representation": "Порядок отображения и ширина селекторов",
+  "label_title": "Настройки группы селекторов",
+  "label_update-controls-on-change": "Автообновление зависимых селекторов",
+  "value_auto": "Авто",
+  "value_percent": "%",
+  "value_pixels": "px"
+}

src/i18n-keysets/dash.group-controls-dialog.edit/en.json

@@ -1,22 +1,19 @@
 {
-  "button_add-selector": "Add",
+  "button_add-selector": "Add selector",
   "button_cancel": "Cancel",
+  "button_extended-settings": "Extended settings",
   "button_paste-selector": "Paste",
   "button_save": "Save",
-  "button_selectors-placement": "Selector placement",
-  "context_apply-button": "This option enables a button for applying selectors",
-  "context_reset-button": "This option enables a button for resetting selectors",
-  "context_update-controls-on-change": "Once you enable this option, the dependent selectors will have influence on each other before you click Apply.",
-  "label_apply-button-checkbox": "Apply button",
-  "label_autoheight-checkbox": "Autoheight",
   "label_copy-invalid-control": "Failed to copy selector: some fields did not pass validation",
+  "label_data": "Data",
   "label_default-tab": "Selector {{index}}",
-  "label_reset-button-checkbox": "Reset button",
+  "label_filtration": "Filtration",
+  "label_representation": "Representation",
   "label_selector-settings": "Selector settings",
   "label_selectors-list": "Selectors",
   "label_source": "Source",
   "label_title-placement": "Title placement",
-  "label_update-controls-on-change": "Auto-updating dependent selectors",
+  "value_title-hidden": "Hidden",
   "value_title-placement-left": "Left",
   "value_title-placement-top": "Top"
 }

src/i18n-keysets/dash.group-controls-dialog.edit/ru.json

@@ -1,22 +1,19 @@
 {
-  "button_add-selector": "Добавить",
+  "button_add-selector": "Добавить селектор",
   "button_cancel": "Отменить",
+  "button_extended-settings": "Расширенные настройки",
   "button_paste-selector": "Вставить",
   "button_save": "Сохранить",
-  "button_selectors-placement": "Размещение селекторов",
-  "context_apply-button": "Опция включает кнопку для применения селекторов",
-  "context_reset-button": "Опция включает кнопку для сброса селекторов",
-  "context_update-controls-on-change": "При включении опции зависимые селекторы будут влиять друг на друга до нажатия кнопки «Применить».",
-  "label_apply-button-checkbox": "Кнопка «‎Применить»‎",
-  "label_autoheight-checkbox": "Автовысота",
   "label_copy-invalid-control": "Не удалось скопировать селектор: некоторые его поля заполнены некорректно",
+  "label_data": "Данные",
   "label_default-tab": "Селектор {{index}}",
-  "label_reset-button-checkbox": "Кнопка «‎Сбросить»",
+  "label_filtration": "Фильтрация",
+  "label_representation": "Отображение",
   "label_selector-settings": "Настройки селектора",
   "label_selectors-list": "Селекторы",
   "label_source": "Источник",
   "label_title-placement": "Размещение заголовка",
-  "label_update-controls-on-change": "Автообновление зависимых селекторов",
+  "value_title-hidden": "Скрыт",
   "value_title-placement-left": "Слева",
   "value_title-placement-top": "Сверху"
 }