Merge branch 'devel' into CB-4913-fix-site-link

dbeaver · Mar 27, 2024 · ff176ab · ff176ab
2 parents 1af3e01 + a6a01c2
commit ff176ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.m.css b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.m.css
@@ -7,11 +7,7 @@
  */
 
 .filter {
-  margin: 0 24px 12px 24px;
-}
-
-.list {
-  overflow: auto;
+  margin: 0 24px 4px 24px;
 }
 
 .cell {
@@ -24,7 +20,3 @@
   width: 100%;
   height: 100%;
 }
-
-.center {
-  margin: auto;
-}
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthProviderForm/ConfigurationsList.tsx
@@ -110,7 +110,7 @@ export const ConfigurationsList = observer<Props>(function ConfigurationsList({
     return (
       <Container className={className} center>
         <Loader state={authTaskState} message="authentication_authorizing" hideException>
-          <div className={s(style, { center: true })}>
+          <Container keepSize center>
             {providerDisabled ? (
               <TextPlaceholder>
                 {translate('plugin_authentication_authentication_method_disabled')}
@@ -121,24 +121,26 @@ export const ConfigurationsList = observer<Props>(function ConfigurationsList({
                 <Translate token="authentication_login" />
               </Button>
             )}
-          </div>
+          </Container>
         </Loader>
       </Container>
     );
   }
 
   return (
-    <Container className={className} center>
+    <Container className={className} noWrap vertical>
       {configurations.length >= 10 && (
-        <Filter
-          className={s(style, { filter: true })}
-          placeholder={translate('authentication_identity_provider_search_placeholder')}
-          value={search}
-          max
-          onChange={setSearch}
-        />
+        <Container keepSize>
+          <Filter
+            className={s(style, { filter: true })}
+            placeholder={translate('authentication_identity_provider_search_placeholder')}
+            value={search}
+            max
+            onChange={setSearch}
+          />
+        </Container>
       )}
-      <div className={s(style, { list: true })}>
+      <Container overflow>
         {filteredConfigurations.map(({ provider, configuration }) => {
           const icon = configuration.iconURL || provider.icon;
           const title = `${configuration.displayName}\n${configuration.description || ''}`;
@@ -154,7 +156,7 @@ export const ConfigurationsList = observer<Props>(function ConfigurationsList({
             </Link>
           );
         })}
-      </div>
+      </Container>
       <Loader state={authTaskState} message="authentication_authorizing" overlay hideException />
     </Container>
   );