-
{children}
diff --git a/webapp/packages/plugin-ai-chat/src/locales/en.ts b/webapp/packages/plugin-ai-chat/src/locales/en.ts
index 5b148391a2..4dc15459e3 100644
--- a/webapp/packages/plugin-ai-chat/src/locales/en.ts
+++ b/webapp/packages/plugin-ai-chat/src/locales/en.ts
@@ -44,6 +44,8 @@ export default [
['plugin_ai_chat_conversation_history_date_group_last_7_days', 'Last 7 days'],
['plugin_ai_chat_conversation_history_date_group_over_week_ago', 'Over a week ago'],
+ ['plugin_ai_chat_conversation_cancel_failed', 'Failed to cancel the conversation'],
+
['plugin_ai_chat_scope_change', 'Configure AI context'],
['plugin_ai_chat_scope_change_fail', 'Failed to change context'],
['plugin_ai_chat_profile_group', 'Active configuration'],
diff --git a/webapp/packages/plugin-ai-chat/src/locales/it.ts b/webapp/packages/plugin-ai-chat/src/locales/it.ts
index 609e6e8907..546bca837b 100644
--- a/webapp/packages/plugin-ai-chat/src/locales/it.ts
+++ b/webapp/packages/plugin-ai-chat/src/locales/it.ts
@@ -44,6 +44,8 @@ export default [
['plugin_ai_chat_conversation_history_date_group_last_7_days', 'Last 7 days'],
['plugin_ai_chat_conversation_history_date_group_over_week_ago', 'Over a week ago'],
+ ['plugin_ai_chat_conversation_cancel_failed', 'Impossibile annullare la conversazione'],
+
['plugin_ai_chat_scope_change', 'Configure AI context'],
['plugin_ai_chat_scope_change_fail', 'Failed to change context'],
['plugin_ai_chat_profile_group', 'Active configuration'],
diff --git a/webapp/packages/plugin-ai-chat/src/locales/ru.ts b/webapp/packages/plugin-ai-chat/src/locales/ru.ts
index 4cbbbc3f43..e3cbb52884 100644
--- a/webapp/packages/plugin-ai-chat/src/locales/ru.ts
+++ b/webapp/packages/plugin-ai-chat/src/locales/ru.ts
@@ -44,6 +44,8 @@ export default [
['plugin_ai_chat_conversation_history_date_group_last_7_days', 'Последние 7 дней'],
['plugin_ai_chat_conversation_history_date_group_over_week_ago', 'Более недели назад'],
+ ['plugin_ai_chat_conversation_cancel_failed', 'Не удалось отменить разговор'],
+
['plugin_ai_chat_scope_change', 'Настроить AI контекст'],
['plugin_ai_chat_scope_change_fail', 'Не удалось изменить контекст'],
['plugin_ai_chat_profile_group', 'Активная конфигурация'],
diff --git a/webapp/packages/plugin-ai-chat/src/locales/zh.ts b/webapp/packages/plugin-ai-chat/src/locales/zh.ts
index a7d0b2c7cc..6fa2ea9c49 100644
--- a/webapp/packages/plugin-ai-chat/src/locales/zh.ts
+++ b/webapp/packages/plugin-ai-chat/src/locales/zh.ts
@@ -44,6 +44,8 @@ export default [
['plugin_ai_chat_conversation_history_date_group_last_7_days', 'Last 7 days'],
['plugin_ai_chat_conversation_history_date_group_over_week_ago', 'Over a week ago'],
+ ['plugin_ai_chat_conversation_cancel_failed', '无法取消对话'],
+
['plugin_ai_chat_scope_change', 'Configure AI context'],
['plugin_ai_chat_scope_change_fail', 'Failed to change context'],
['plugin_ai_chat_profile_group', 'Active configuration'],
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx
index a8bfb12a41..8840a687fb 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/Info/UserFormInfoCredentials.tsx
@@ -5,13 +5,16 @@
* Licensed under the Apache License, Version 2.0.
* you may not use this file except in compliance with the License.
*/
+
import { observer } from 'mobx-react-lite';
+import { useState } from 'react';
import { AUTH_PROVIDER_LOCAL_ID, AuthProvidersResource, isLocalUser, UsersResource } from '@cloudbeaver/core-authentication';
import {
Container,
GroupTitle,
InputField,
+ useExecutor,
useFormCustomInputValidation,
usePasswordValidation,
useResource,
@@ -39,6 +42,8 @@ export const UserFormInfoCredentials = observer
(function UserFormInfoCred
const authProvidersResource = useResource(UserFormInfoCredentials, AuthProvidersResource, null);
const passwordValidationRef = usePasswordValidation();
+ const [repeatedPassword, setRepeatedPassword] = useState('');
+
let local = authProvidersResource.resource.isEnabled(AUTH_PROVIDER_LOCAL_ID);
if (!local) {
@@ -66,6 +71,15 @@ export const UserFormInfoCredentials = observer(function UserFormInfoCred
return null;
});
+ useExecutor({
+ executor: formState.submitTask,
+ handlers: [
+ function handleSubmit(data) {
+ setRepeatedPassword('');
+ },
+ ],
+ });
+
return (
{translate('authentication_user_credentials')}
@@ -102,13 +116,14 @@ export const UserFormInfoCredentials = observer(function UserFormInfoCred
setRepeatedPassword(v)}
>
{translate('authentication_user_password_repeat')}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
index 1d4c373e2a..eae553f07f 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersAdministrationService.ts
@@ -1,6 +1,6 @@
/*
* CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
*
* Licensed under the Apache License, Version 2.0.
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dial
import { CreateTeamService } from './Teams/TeamsTable/CreateTeamService.js';
import { EUsersAdministrationSub, UsersAdministrationNavigationService } from './UsersAdministrationNavigationService.js';
import { CreateUserService } from './UsersTable/CreateUserService.js';
+import type { IUserFilters } from './UsersTable/Filters/useUsersTableFilters.js';
const UserCredentialsList = React.lazy(async () => {
const { UserCredentialsList } = await import('./UsersTable/UserCredentialsList.js');
@@ -33,15 +34,25 @@ const UsersAdministration = React.lazy(async () => {
return { default: UsersAdministration };
});
+const UsersTableFilterButton = React.lazy(async () => {
+ const { UsersTableFilterButton } = await import('./UsersTable/Filters/UsersTableFilterButton.js');
+ return { default: UsersTableFilterButton };
+});
+
export interface IUserDetailsInfoProps {
user: AdminUser;
}
+export interface IUsersActionButtonProps {
+ filters: IUserFilters;
+}
+
@injectable(() => [AdministrationItemService, CreateUserService, TeamsResource, CreateTeamService, UsersResource, CommonDialogService])
export class UsersAdministrationService extends Bootstrap {
readonly tabsContainer: TabsContainer;
readonly userDetailsInfoPlaceholder: PlaceholderContainer;
readonly informationPlaceholder: PlaceholderContainer;
+ readonly actionButtonsPlaceholder: PlaceholderContainer;
administrationItem!: IAdministrationItem;
constructor(
@@ -56,6 +67,7 @@ export class UsersAdministrationService extends Bootstrap {
this.userDetailsInfoPlaceholder = new PlaceholderContainer();
this.tabsContainer = new TabsContainer('Access Control');
this.informationPlaceholder = new PlaceholderContainer();
+ this.actionButtonsPlaceholder = new PlaceholderContainer();
}
override register(): void {
@@ -83,6 +95,7 @@ export class UsersAdministrationService extends Bootstrap {
getDrawerComponent: () => UsersDrawerItem,
});
this.userDetailsInfoPlaceholder.add(UserCredentialsList, 0);
+ this.actionButtonsPlaceholder.add(UsersTableFilterButton, 0);
}
private async handleDeactivate(sub: EUsersAdministrationSub) {
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/FiltersActionButton.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/FiltersActionButton.tsx
new file mode 100644
index 0000000000..129f013b98
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/FiltersActionButton.tsx
@@ -0,0 +1,29 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+
+import { clsx, IconButton, type IconButtonProps } from '@dbeaver/ui-kit';
+
+const BUTTON_BOX_CLASS_NAME = clsx(
+ 'theme-form-element-radius theme-background-surface theme-text-on-surface theme theme-border-color-background',
+ 'tw:flex tw:items-center tw:justify-center tw:box-border tw:h-8 tw:border-2',
+);
+
+const BUTTON_CLASS_NAME = 'tw:relative! tw:box-border! tw:bg-inherit! tw:cursor-pointer! tw:w-[28px]! tw:h-full! tw:p-1! tw:hover:opacity-80!';
+
+export interface IFiltersActionButtonProps extends IconButtonProps {
+ active?: boolean;
+}
+
+export const FiltersActionButton = observer(function FiltersActionButton({ active, className, size = 'small', ...rest }) {
+ return (
+
+
+
+ );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilterButton.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilterButton.tsx
new file mode 100644
index 0000000000..c47fd02c09
--- /dev/null
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilterButton.tsx
@@ -0,0 +1,32 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { observer } from 'mobx-react-lite';
+import { useContext } from 'react';
+
+import { IconOrImage, useTranslate } from '@cloudbeaver/core-blocks';
+
+import type { IUsersActionButtonProps } from '../../UsersAdministrationService.js';
+import { FiltersActionButton } from './FiltersActionButton.js';
+import { UsersTableFiltersOpenContext } from './UsersTableFiltersOpenContext.js';
+
+export const UsersTableFilterButton = observer(function UsersTableFilterButton() {
+ const translate = useTranslate();
+ const openContext = useContext(UsersTableFiltersOpenContext);
+
+ if (!openContext) {
+ throw new Error('UsersTableFilterButton must be rendered within UsersTableFiltersOpenContext');
+ }
+
+ const label = translate('authentication_administration_users_filters_filter_label');
+
+ return (
+
+
+
+ );
+});
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.module.css b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.module.css
index 220e53fea6..45b82c0f3a 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.module.css
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.module.css
@@ -1,11 +1,3 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
-
.filterContainer {
display: flex;
gap: 12px;
@@ -16,31 +8,7 @@
}
.actions {
- composes: theme-form-element-radius theme-background-surface theme-text-on-surface theme theme-border-color-background from global;
- box-sizing: border-box;
- border: 2px solid;
- height: 32px;
-}
-
-.button {
- position: relative;
- box-sizing: border-box;
- background: inherit;
- cursor: pointer;
- width: 28px;
- height: 100%;
- padding: 4px;
-
- &:hover {
- opacity: 0.8;
- }
-}
-
-.buttonActive {
- background: var(--theme-secondary);
-}
-
-.iconOrImage {
- width: 100%;
- height: 100%;
+ display: flex;
+ align-items: center;
+ gap: 8px;
}
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
index e60c33e2f6..3aeca27f1e 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/Filters/UsersTableFilters.tsx
@@ -6,14 +6,16 @@
* you may not use this file except in compliance with the License.
*/
import { observer } from 'mobx-react-lite';
-import { useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
-import { Filter, Group, IconOrImage, Loader, s, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { Filter, Group, Loader, Placeholder, s, useS, useTranslate } from '@cloudbeaver/core-blocks';
+import { useService } from '@cloudbeaver/core-di';
+import { UsersAdministrationService } from '../../UsersAdministrationService.js';
import styles from './UsersTableFilters.module.css';
import { UsersTableFiltersDetails } from './UsersTableFiltersDetails.js';
+import { UsersTableFiltersOpenContext } from './UsersTableFiltersOpenContext.js';
import { type IUserFilters } from './useUsersTableFilters.js';
-import { IconButton } from '@dbeaver/ui-kit';
interface Props {
filters: IUserFilters;
@@ -22,8 +24,11 @@ interface Props {
export const UsersTableFilters = observer(function UsersTableFilters({ filters }) {
const translate = useTranslate();
const style = useS(styles);
+ const usersAdministrationService = useService(UsersAdministrationService);
const [open, setOpen] = useState(false);
+ const onToggle = useCallback(() => setOpen(open => !open), []);
+ const openContext = useMemo(() => ({ open, onToggle }), [open, onToggle]);
return (
@@ -35,14 +40,9 @@ export const UsersTableFilters = observer(function UsersTableFilters({ fi
onChange={filters.setSearch}
/>
-
setOpen(!open)}
- >
-
-
+
+
+