Merge branch 'devel' into CB-5437-flex-component

dbeaver · Aug 6, 2024 · 5cf6f92 · 5cf6f92
2 parents 80d1583 + 6ca587a
commit 5cf6f92
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...les/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java b/...les/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
@@ -104,7 +104,9 @@ public Integer getOrdinalPosition() {
 
     @Property
     public String getFullyQualifiedName() {
-        return object instanceof DBPQualifiedObject ? ((DBPQualifiedObject) object).getFullyQualifiedName(DBPEvaluationContext.UI) : getName();
+        return object instanceof DBPQualifiedObject
+            ? ((DBPQualifiedObject) object).getFullyQualifiedName(DBPEvaluationContext.UI)
+            : getName();
     }
 
     @Property
@@ -151,7 +153,7 @@ public String[] getFeatures() {
         return features.toArray(new String[0]);
     }
 
-    private static void getObjectFeatures(DBSObject object, List<String> features) {
+    private void getObjectFeatures(DBSObject object, List<String> features) {
         boolean isDiagramSupported = true;
         if (object instanceof DBPScriptObject) features.add(OBJECT_FEATURE_SCRIPT);
         if (object instanceof DBPScriptObjectExt) features.add(OBJECT_FEATURE_SCRIPT_EXTENDED);
@@ -181,7 +183,7 @@ private static void getObjectFeatures(DBSObject object, List<String> features) {
             features.add(OBJECT_FEATURE_OBJECT_CONTAINER);
             try {
                 Class<? extends DBSObject> childType = objectContainer.getPrimaryChildType(null);
-                Collection<? extends DBSObject> childrenCollection = objectContainer.getChildren(null);
+                Collection<? extends DBSObject> childrenCollection = objectContainer.getChildren(session.getProgressMonitor());
                 if (DBSTable.class.isAssignableFrom(childType) && childrenCollection != null) {
                     features.add(OBJECT_FEATURE_ENTITY_CONTAINER);
                 }

diff --git a/webapp/packages/core-blocks/src/FormControls/useForm.ts b/webapp/packages/core-blocks/src/FormControls/useForm.ts
@@ -89,11 +89,13 @@ export function useForm(options?: IOptions): IFormContext {
       async submit(event) {
         if (this.parent) {
           await this.parent.submit(event);
+          this.ref?.reset();
         } else {
           event?.preventDefault();
 
           if (this.validate()) {
             await this.onSubmit.execute(event);
+            this.ref?.reset();
           }
         }
       },