From 23b70441b8cf3862c57f971c84438991c5c66a80 Mon Sep 17 00:00:00 2001 From: sergeyteleshev Date: Tue, 6 Aug 2024 14:53:52 +0200 Subject: [PATCH 1/2] CB-4618 Profile, changing password - after a successful change red borders appear (#2820) * CB-4618 removes red border after form submission * Revert "CB-4618 removes red border after form submission" This reverts commit 703da4eea900e6084e8dec2179931b5912e68a3e. * CB-4618 removes red border after form submission in useForm hook --------- Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com> --- webapp/packages/core-blocks/src/FormControls/useForm.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/packages/core-blocks/src/FormControls/useForm.ts b/webapp/packages/core-blocks/src/FormControls/useForm.ts index 0466701ef0..6a534d06f0 100644 --- 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(); } } }, From 6ca587a5b09cd59ce595b2fb58c04885f6803540 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Tue, 6 Aug 2024 16:24:44 +0300 Subject: [PATCH 2/2] CB-5447 npe fix (#2819) Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com> Co-authored-by: Ainur <59531286+yagudin10@users.noreply.github.com> --- .../service/navigator/WebDatabaseObjectInfo.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java index b97c43810c..7d251b5755 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java +++ b/server/bundles/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 features) { + private void getObjectFeatures(DBSObject object, List 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 features) { features.add(OBJECT_FEATURE_OBJECT_CONTAINER); try { Class childType = objectContainer.getPrimaryChildType(null); - Collection childrenCollection = objectContainer.getChildren(null); + Collection childrenCollection = objectContainer.getChildren(session.getProgressMonitor()); if (DBSTable.class.isAssignableFrom(childType) && childrenCollection != null) { features.add(OBJECT_FEATURE_ENTITY_CONTAINER); }