mirror of
https://github.com/dbeaver/cloudbeaver.git
synced 2026-10-29 19:19:39 +08:00
fix(core-authentication): CB-341 types
This commit is contained in:
@@ -9,10 +9,10 @@
|
||||
import styled, { css } from 'reshadow';
|
||||
|
||||
import { Translate } from '@cloudbeaver/core-localization';
|
||||
import { AdminUserInfo } from '@cloudbeaver/core-sdk';
|
||||
import { useStyles, composes } from '@cloudbeaver/core-theming';
|
||||
|
||||
import { UserForm } from './UserForm/UserForm';
|
||||
import { CreatingUser } from './UsersAdministrationController';
|
||||
|
||||
const styles = composes(
|
||||
css`
|
||||
@@ -59,7 +59,7 @@ const styles = composes(
|
||||
);
|
||||
|
||||
interface Props {
|
||||
user: AdminUserInfo;
|
||||
user: CreatingUser;
|
||||
onCancel: () => void;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -21,9 +21,9 @@ import {
|
||||
} from '@cloudbeaver/core-blocks';
|
||||
import { useController } from '@cloudbeaver/core-di';
|
||||
import { useTranslate } from '@cloudbeaver/core-localization';
|
||||
import { AdminUserInfo } from '@cloudbeaver/core-sdk';
|
||||
import { useStyles, composes } from '@cloudbeaver/core-theming';
|
||||
|
||||
import { CreatingUser } from '../UsersAdministrationController';
|
||||
import { GrantedConnections } from './GrantedConnections';
|
||||
import { UserFormController } from './UserFormController';
|
||||
|
||||
@@ -103,7 +103,7 @@ const styles = composes(
|
||||
);
|
||||
|
||||
interface Props {
|
||||
user: AdminUserInfo;
|
||||
user: CreatingUser;
|
||||
editing?: boolean;
|
||||
onCancel: () => void;
|
||||
}
|
||||
|
||||
+5
-3
@@ -15,9 +15,11 @@ import { CommonDialogService } from '@cloudbeaver/core-dialogs';
|
||||
import { NotificationService } from '@cloudbeaver/core-events';
|
||||
import { ErrorDetailsDialog } from '@cloudbeaver/core-notifications';
|
||||
import {
|
||||
GQLErrorCatcher, AdminUserInfo, AdminConnectionGrantInfo, AdminSubjectType
|
||||
GQLErrorCatcher, AdminConnectionGrantInfo, AdminSubjectType
|
||||
} from '@cloudbeaver/core-sdk';
|
||||
|
||||
import { CreatingUser } from '../UsersAdministrationController';
|
||||
|
||||
@injectable()
|
||||
export class UserFormController implements IInitializableController, IDestructibleController {
|
||||
readonly selectedConnections = observable<string, boolean>(new Map());
|
||||
@@ -39,7 +41,7 @@ export class UserFormController implements IInitializableController, IDestructib
|
||||
return Array.from(this.rolesManagerService.roles.data.values());
|
||||
}
|
||||
|
||||
user!: AdminUserInfo;
|
||||
user!: CreatingUser;
|
||||
|
||||
readonly error = new GQLErrorCatcher();
|
||||
private isDistructed = false;
|
||||
@@ -57,7 +59,7 @@ export class UserFormController implements IInitializableController, IDestructib
|
||||
private dbDriverResource: DBDriverResource
|
||||
) { }
|
||||
|
||||
init(user: AdminUserInfo, editing: boolean, collapse: () => void) {
|
||||
init(user: CreatingUser, editing: boolean, collapse: () => void) {
|
||||
this.user = user;
|
||||
this.editing = editing;
|
||||
this.collapse = collapse;
|
||||
|
||||
+4
-2
@@ -17,6 +17,8 @@ import { GQLErrorCatcher, resourceKeyList, AdminUserInfo } from '@cloudbeaver/co
|
||||
|
||||
import { UsersAdministrationNavigationService } from './UsersAdministrationNavigationService';
|
||||
|
||||
export type CreatingUser = Omit<AdminUserInfo, 'origin'>;
|
||||
|
||||
@injectable()
|
||||
export class UsersAdministrationController {
|
||||
@observable isDeleting = false;
|
||||
@@ -37,7 +39,7 @@ export class UsersAdministrationController {
|
||||
});
|
||||
}
|
||||
|
||||
@observable creatingUser: AdminUserInfo | null = null;
|
||||
@observable creatingUser: CreatingUser | null = null;
|
||||
|
||||
get isLoading() {
|
||||
return this.usersResource.isLoading() || this.isDeleting;
|
||||
@@ -61,7 +63,7 @@ export class UsersAdministrationController {
|
||||
grantedConnections: [],
|
||||
configurationParameters: {},
|
||||
metaParameters: {},
|
||||
} as AdminUserInfo;
|
||||
};
|
||||
this.usersAdministrationNavigationService.navToAdd();
|
||||
};
|
||||
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
import { observer } from 'mobx-react';
|
||||
import styled, { css } from 'reshadow';
|
||||
|
||||
import { AdminUser } from '@cloudbeaver/core-authentication';
|
||||
import {
|
||||
TableItem, TableColumnValue, TableItemSelect, TableItemExpand
|
||||
} from '@cloudbeaver/core-blocks';
|
||||
import { AdminUserInfo } from '@cloudbeaver/core-sdk';
|
||||
import { useStyles } from '@cloudbeaver/core-theming';
|
||||
|
||||
import { UserEdit } from './UserEdit';
|
||||
@@ -24,7 +24,7 @@ const styles = css`
|
||||
`;
|
||||
|
||||
interface Props {
|
||||
user: AdminUserInfo;
|
||||
user: AdminUser;
|
||||
}
|
||||
|
||||
export const User = observer(function User({ user }: Props) {
|
||||
|
||||
+2
-2
@@ -9,11 +9,11 @@
|
||||
import { observer } from 'mobx-react';
|
||||
import styled, { css, use } from 'reshadow';
|
||||
|
||||
import { AdminUser } from '@cloudbeaver/core-authentication';
|
||||
import {
|
||||
Table, TableHeader, TableColumnHeader, TableBody
|
||||
} from '@cloudbeaver/core-blocks';
|
||||
import { useTranslate } from '@cloudbeaver/core-localization';
|
||||
import { AdminUserInfo } from '@cloudbeaver/core-sdk';
|
||||
import { useStyles } from '@cloudbeaver/core-theming';
|
||||
|
||||
import { User } from './User';
|
||||
@@ -28,7 +28,7 @@ const styles = css`
|
||||
`;
|
||||
|
||||
interface Props {
|
||||
users: AdminUserInfo[];
|
||||
users: AdminUser[];
|
||||
selectedItems: Map<string, boolean>;
|
||||
expandedItems: Map<string, boolean>;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user