Update Grafana 11.3.0 and dependencies (#532)

* Update Grafana 11.3.0 and dependencies * Add dependency * Update README.md
VolkovLabs · Oct 26, 2024 · c7ce598 · c7ce598
1 parent 3e6085d
commit c7ce598
Show file tree

Hide file tree

Showing 6 changed files with 1,573 additions and 1,231 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -9,7 +9,7 @@ on:
       - main
 
 jobs:
-  tests:
+  dev:
     runs-on: ubuntu-latest
 
     steps:
@@ -18,8 +18,8 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
-          cache: 'npm'
+          node-version: "20"
+          cache: "npm"
 
       - name: Install dependencies
         run: npm install
@@ -42,3 +42,37 @@ jobs:
           name: playwright-report
           path: playwright-report/
           retention-days: 30
+
+  dependency:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build
+        run: npm run build
+
+      - name: Start Grafana
+        run: docker compose --profile dependency up -d
+
+      - name: Run e2e tests
+        run: npm run test:e2e:docker
+
+      - name: Stop Grafana
+        run: docker compose down
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: playwright-report-dependency
+          path: playwright-report/
+          retention-days: 30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,15 @@
 # Change Log
 
-## 4.8.0 (IN PROGRESS)
+## 4.8.0 (2024-10-25)
 
 ### Features / Enhancements
 
 - Added Date Form element (#520)
 - Update refresh for dashboard scene (#522)
 - Updated Text area, Code editor elements to escape multi-lines (#520)
-- Update refresh for dashboard scene using useDashboardRefresh hook (#528)
+- Updated refresh for dashboard scene using useDashboardRefresh hook (#528)
+- Added Handling Data Source Request Errors (#530)
+- Updated Grafana 11.3.0 and dependencies (#531)
 
 ## 4.7.0 (2024-10-08)
 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![Forms](https://raw.githubusercontent.com/volkovlabs/business-forms/main/src/img/panel.png)
 
-![Grafana](https://img.shields.io/badge/Grafana-11.2-orange)
+![Grafana](https://img.shields.io/badge/Grafana-11.3-orange)
 [![YouTube](https://img.shields.io/badge/YouTube-Playlist-red)](https://www.youtube.com/playlist?list=PLPow72ygztmRXSNBxyw0sFnnvNRY_CsSA)
 ![CI](https://github.com/volkovlabs/business-forms/workflows/CI/badge.svg)
 ![E2E](https://github.com/volkovlabs/business-forms/workflows/E2E/badge.svg)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     profiles:
       - dev
       - main
+      - dependency
 
   grafana:
     image: ghcr.io/volkovlabs/app:latest
@@ -34,6 +35,7 @@ services:
     profiles:
       - dev
       - main
+      - dependency
 
   server-pg:
     build:
@@ -50,6 +52,7 @@ services:
     profiles:
       - dev
       - main
+      - dependency
 
   grafana-main:
     image: grafana/grafana:main
@@ -59,13 +62,26 @@ services:
       - GF_DEFAULT_APP_MODE=development
       - GF_USERS_DEFAULT_THEME=light
       - GF_INSTALL_PLUGINS=marcusolsson-static-datasource,marcusolsson-json-datasource,volkovlabs-variable-panel, volkovlabs-image-panel
-      # - GF_FEATURE_TOGGLES_ENABLE=dashboardScene
     volumes:
       - ./dist:/var/lib/grafana/plugins/volkovlabs-form-panel
       - ./provisioning:/etc/grafana/provisioning
     profiles:
       - main
 
+  grafana-dep:
+    image: grafana/grafana:10.0.0
+    ports:
+      - 3000:3000/tcp
+    environment:
+      - GF_DEFAULT_APP_MODE=development
+      - GF_USERS_DEFAULT_THEME=light
+      - GF_INSTALL_PLUGINS=marcusolsson-static-datasource,marcusolsson-json-datasource,volkovlabs-variable-panel, volkovlabs-image-panel
+    volumes:
+      - ./dist:/var/lib/grafana/plugins/volkovlabs-form-panel
+      - ./provisioning:/etc/grafana/provisioning
+    profiles:
+      - dependency
+
   test:
     build:
       context: .