Merge branch 'devel' into dbeaver/pro#3077-refactor-rcp

dbeaver · Sep 5, 2024 · 6bdcf4a · 6bdcf4a
2 parents a15d5e2 + 6af5a32
commit 6bdcf4a
Show file tree

Hide file tree

Showing 5 changed files with 720 additions and 782 deletions.
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
@@ -795,6 +795,10 @@ public Object convertInputCellValue(DBCSession session, DBDAttributeBinding upda
                     cellRawValue,
                     false,
                     true);
+                //FIXME: fix array editing for nosql databases
+                if (realCellValue == null && cellRawValue != null && updateAttribute.getDataKind() == DBPDataKind.ARRAY) {
+                    throw new DBCException("Array update is not supported");
+                }
             } catch (DBCException e) {
                 //checks if this function is used only for script generation
                 if (justGenerateScript) {
@@ -1140,7 +1144,8 @@ private static DBCExecutionPurpose resolveQueryPurpose(DBDDataFilter filter) {
         return filter.hasFilters() ? DBCExecutionPurpose.USER_FILTERED : DBCExecutionPurpose.USER;
     }
 
-    private Object setCellRowValue(Object cellRow, WebSession webSession, DBCSession dbcSession, DBDAttributeBinding allAttributes, boolean withoutExecution) {
+    private Object setCellRowValue(Object cellRow, WebSession webSession, DBCSession dbcSession, DBDAttributeBinding allAttributes, boolean withoutExecution)
+        throws DBException {
         if (cellRow instanceof Map<?, ?>) {
             Map<String, Object> variables = (Map<String, Object>) cellRow;
             if (variables.get(FILE_ID) != null) {
@@ -1153,14 +1158,10 @@ private Object setCellRowValue(Object cellRow, WebSession webSession, DBCSession
                     var file = Files.newInputStream(path);
                     return convertInputCellValue(dbcSession, allAttributes, file, withoutExecution);
                 } catch (IOException | DBCException e) {
-                    return new DBException(e.getMessage());
+                    throw new DBException(e.getMessage());
                 }
             }
         }
-        try {
-            return convertInputCellValue(dbcSession, allAttributes, cellRow, withoutExecution);
-        } catch (DBCException e) {
-            return new DBException(e.getMessage());
-        }
+        return convertInputCellValue(dbcSession, allAttributes, cellRow, withoutExecution);
     }
 }
diff --git a/webapp/packages/core-cli/configs/jest.config.js b/webapp/packages/core-cli/configs/jest.config.js
@@ -23,7 +23,7 @@ module.exports = {
   moduleNameMapper: {
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': require.resolve('./__mocks__/fileMock.js'),
     '\\.(css|scss|less)$': require.resolve('./__mocks__/styleMock.js'),
-    '^dexie$': require.resolve('dexie'),
+    // '^dexie$': require.resolve('dexie'),
   },
   // passWithNoTests: true,
   setupFiles: [require.resolve('fake-indexeddb/auto'), require.resolve('../tests/setup.js')],

diff --git a/webapp/packages/core-cli/configs/webpack.config.js b/webapp/packages/core-cli/configs/webpack.config.js
@@ -160,6 +160,11 @@ module.exports = (env, argv) => {
       removeAvailableModules: false,
       removeEmptyChunks: false,
       splitChunks: {
+        /*  this impacts how many chunks are created,
+            we need to keep less then 30 requests for js files for initial page load (with no editors)
+            we can reduce this number when we will split chunks properly
+        */
+        minSize: 128 * 1024,
         cacheGroups: {
           styles: {
             name: 'styles',

diff --git a/webapp/packages/core-cli/configs/webpack.product.config.js b/webapp/packages/core-cli/configs/webpack.product.config.js
@@ -38,8 +38,13 @@ module.exports = (env, argv) => {
 
       minimizer: [
         new EsbuildPlugin({
-            target: 'es2022',
+            include: /.*?\/(core|plugin|main|sso|packages)-.*/,
+            target: 'es2023',
             keepNames: true,
+        }),
+        new EsbuildPlugin({
+            exclude: /.*?\/(core|plugin|main|sso|packages)-.*/,
+            target: 'es2023',
             css: true,
         }),
     ],