Merge branch 'devel' into CB-5701-federated-list-focus

.github/workflows/backend-build.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Clone Deps Repositories
         uses: dbeaver/github-actions/clone-repositories@devel
         with:
-          project_deps_path: './cloudbeaver/project.deps'
+          project_deps_path: "./cloudbeaver/project.deps"
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -34,9 +34,9 @@ jobs:
         shell: bash
         working-directory: ./cloudbeaver/deploy
 
-      - name: Archive build artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: backend-build-artifacts
-          path: cloudbeaver/deploy/cloudbeaver
-          if-no-files-found: error
+      # - name: Archive build artifacts
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: backend-build-artifacts
+      #     path: cloudbeaver/deploy/cloudbeaver
+      #     if-no-files-found: error

.github/workflows/frontend-build.yml

@@ -62,15 +62,15 @@ jobs:
         run: yarn clear
 
       - run: yarn install --immutable
-      
+
       - run: yarn bundle
         working-directory: ./webapp/packages/product-default
 
       - run: yarn test
 
-      - name: Archive build artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: frontend-build-artifacts
-          path: webapp/packages/product-default/lib
-          if-no-files-found: error
+      # - name: Archive build artifacts
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: frontend-build-artifacts
+      #     path: webapp/packages/product-default/lib
+      #     if-no-files-found: error

deploy/build.bat

@@ -41,22 +41,35 @@ copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.js
 
 move drivers cloudbeaver >NUL
 
-echo Build static content
+echo "Build static content"
 
-cd ..\
+mkdir .\cloudbeaver\web
 
-cd ..\cloudbeaver\webapp
+cd ..\webapp
 
 call yarn
-call yarn lerna bootstrap
-call yarn lerna run bundle --no-bail --stream --scope=@cloudbeaver/product-default &::-- -- --env source-map
+cd .\packages\product-default
+call yarn run bundle
+
+if %ERRORLEVEL% neq 0 (
+    echo 'Application build failed'
+    exit /b %ERRORLEVEL%
+)
+
+cd ..\..\
+call yarn test
+
+if %ERRORLEVEL% neq 0 (
+    echo 'Frontend tests failed'
+    exit /b %ERRORLEVEL%
+)
 
 cd ..\deploy
 
-echo Copy static content
+echo "Copy static content"
 
 xcopy /E /Q ..\webapp\packages\product-default\lib cloudbeaver\web >NUL
 
-echo Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server.
+echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
 
 pause

server/bundles/io.cloudbeaver.service.ldap.auth/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Vendor: Cloudbeaver LDAP
+Bundle-Name: Cloudbeaver Web Service - LDAP
 Bundle-Vendor: DBeaver Corp
 Bundle-SymbolicName: io.cloudbeaver.service.ldap.auth;singleton:=true
 Bundle-Version: 1.0.0.qualifier

server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Vendor: Cloudbeaver Web Service - Security
+Bundle-Name: Cloudbeaver Web Service - Security
 Bundle-Vendor: DBeaver Corp
 Bundle-SymbolicName: io.cloudbeaver.service.security;singleton:=true
 Bundle-Version: 1.0.64.qualifier

webapp/packages/core-cli/configs/jest.config.js

@@ -13,7 +13,14 @@ module.exports = {
   testEnvironment: require.resolve('../tests/test.environment.js'),
   rootDir: path.resolve('.'),
   moduleFileExtensions: ['js', 'jsx', 'json'],
-  testMatch: ['<rootDir>/packages/*/dist/**/?(*.)+(spec|test).js?(x)', '<rootDir>/dist/**/?(*.)+(spec|test).js?(x)'],
+  testMatch: [
+    // unix
+    '<rootDir>/packages/*/dist/**/?(*.)+(spec|test).js?(x)',
+    '<rootDir>/dist/**/?(*.)+(spec|test).js?(x)',
+    // windows
+    '<rootDir>\\packages\\*\\dist\\**?(*.)+(spec|test).js?(x)',
+    '<rootDir>\\dist\\**?(*.)+(spec|test).js?(x)',
+  ],
   transformIgnorePatterns: [
     '\\.pnp\\.[^\\/]+$',
     'node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)',