Merge branch 'devel' into dbeaver/pro#7080/refactor-grid-api

Author: mr-anton-t

webapp/packages/plugin-connections/src/ConnectionForm/Options/Options.tsx

@@ -36,6 +36,7 @@ import {
   useAuthenticationAction,
   useAutoLoad,
   Text,
+  Placeholder,
 } from '@cloudbeaver/core-blocks';
 import {
   ConnectionInfoAuthPropertiesResource,
@@ -62,6 +63,7 @@ import { ParametersForm } from './ParametersForm.js';
 import { ProviderPropertiesForm } from './ProviderPropertiesForm.js';
 import { getConnectionFormOptionsPart } from './getConnectionFormOptionsPart.js';
 import type { IConnectionFormProps } from '../IConnectionFormState.js';
+import { ConnectionFormService } from '../ConnectionFormService.js';
 
 const PROFILE_AUTH_MODEL_ID = 'profile';
 
@@ -100,6 +102,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
   const connectionInfoOriginResource = useResource(Options, ConnectionInfoOriginResource, optionsPart.connectionKey);
   const connectionInfoAuthPropertiesResource = useResource(Options, ConnectionInfoAuthPropertiesResource, optionsPart.connectionKey);
   const configurationTypeLabel = translate('connections_connection_configuration');
+  const connectionFormService = useService(ConnectionFormService);
 
   //@TODO it's here until the profile implementation in the CloudBeaver
   const readonly = formState.isDisabled || formState.isReadOnly || connectionInfoAuthResource.data?.authModel === PROFILE_AUTH_MODEL_ID;
@@ -342,6 +345,7 @@ export const Options: TabContainerPanelComponent<IConnectionFormProps> = observe
               )}
             </Group>
           )}
+          <Placeholder container={connectionFormService.providerPropertiesContainer} formState={formState} />
           {driver?.providerProperties && <ProviderPropertiesForm formState={formState} properties={driver.providerProperties} readonly={readonly} />}
 
           <AdvancedPropertiesForm config={optionsPart.state} disabled={formState.isDisabled} readonly={readonly} />

webapp/packages/plugin-connections/src/ConnectionForm/Options/ProviderPropertiesForm.tsx

@@ -13,16 +13,13 @@ import {
   Group,
   GroupTitle,
   ObjectPropertyInfoForm,
-  Placeholder,
   useObjectPropertyCategories,
   useTranslate,
 } from '@cloudbeaver/core-blocks';
 import { type DriverPropertyInfoFragment, getObjectPropertyType } from '@cloudbeaver/core-sdk';
 import type { IFormState } from '@cloudbeaver/core-ui';
 import type { IConnectionFormState } from '../IConnectionFormState.js';
 import { getConnectionFormOptionsPart } from './getConnectionFormOptionsPart.js';
-import { useService } from '@cloudbeaver/core-di';
-import { ConnectionFormService } from '../ConnectionFormService.js';
 
 type DriverPropertyInfo = DriverPropertyInfoFragment;
 
@@ -37,7 +34,6 @@ export const ProviderPropertiesForm = observer<Props>(function ProviderPropertie
   const config = getConnectionFormOptionsPart(formState).state;
   const disabled = formState.isDisabled;
   const supportedProperties = properties.filter(property => property.supportedConfigurationTypes?.some(type => type === config.configurationType));
-  const connectionFormService = useService(ConnectionFormService);
 
   const { categories, isUncategorizedExists } = useObjectPropertyCategories(supportedProperties);
 
@@ -50,7 +46,6 @@ export const ProviderPropertiesForm = observer<Props>(function ProviderPropertie
 
   return (
     <Group form gap>
-      <Placeholder container={connectionFormService.providerPropertiesContainer} formState={formState} />
       {isUncategorizedExists && (
         <>
           <GroupTitle>{translate('ui_settings')}</GroupTitle>