Merge remote-tracking branch 'origin/devel' into devel

This commit is contained in:
Serge Rider
2020-09-10 15:36:10 +03:00
73 changed files with 118 additions and 92 deletions
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+1 -1
View File
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+1 -1
View File
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -6
View File
@@ -4,11 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": [
"src/**/*",
"src/types.d.ts"
]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -3
View File
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
// "@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
+1
View File
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
+2 -4
View File
@@ -6,7 +6,5 @@
"exclude": [
"node_modules"
],
"include": [
"src/**/*"
]
}
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -16,6 +16,7 @@ import { useStyles, composes } from '@cloudbeaver/core-theming';
import { CreateUser } from './CreateUser';
import { UsersAdministrationController } from './UsersAdministrationController';
import { UsersAdministrationNavigationService } from './UsersAdministrationNavigationService';
import { UsersTable } from './UsersTable/UsersTable';
const styles = composes(
@@ -61,6 +62,10 @@ export const UsersAdministration = observer(function UsersAdministration({
}: AdministrationItemContentProps) {
const controller = useController(UsersAdministrationController);
if (sub?.name === UsersAdministrationNavigationService.AddItemName) {
controller.create();
}
return styled(useStyles(styles))(
<layout-grid as="div">
<layout-grid-inner as="div">
@@ -51,6 +51,10 @@ export class UsersAdministrationController {
) { }
create = () => {
if (this.creatingUser) {
return;
}
this.creatingUser = {
userId: '',
grantedRoles: [],
@@ -32,7 +32,6 @@ export class UsersAdministrationService extends Bootstrap {
sub: [
{
name: UsersAdministrationNavigationService.AddItemName,
onActivate: this.onCreateActivate.bind(this),
},
],
getContentComponent: () => UsersAdministration,
@@ -43,13 +42,6 @@ export class UsersAdministrationService extends Bootstrap {
load(): void | Promise<void> { }
private onCreateActivate() {
if (!Array.from(this.usersResource.data.values())
.some(user => this.usersResource.isNew(user.userId))) {
this.usersResource.addNew();
}
}
private async loadUsers() {
try {
await this.usersResource.loadAll();
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -4,8 +4,7 @@
"outDir": "lib"
},
"exclude": [
"node_modules",
"@cloudbeaver/**"
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -8,8 +8,11 @@
import { observer } from 'mobx-react';
import { useCallback } from 'react';
import styled, { css } from 'reshadow';
import { ListItem } from '@cloudbeaver/core-blocks';
import {
ListItem, ListItemIcon, StaticImage, ListItemName, ListItemDescription
} from '@cloudbeaver/core-blocks';
import { DataTransferProcessorInfo } from '@cloudbeaver/core-sdk';
type ProcessorItemProps = {
@@ -17,10 +20,25 @@ type ProcessorItemProps = {
onSelect(processorId: string): void;
}
const styles = css`
StaticImage {
box-sizing: border-box;
width: 24px;
max-height: 24px;
}
`;
export const ProcessorItem = observer(function ProcessorItem({
processor,
onSelect,
}: ProcessorItemProps) {
const select = useCallback(() => onSelect(processor.id), [processor]);
return <ListItem icon={processor.icon} name={processor.name} description={processor.description} onClick={select}/>;
return styled(styles)(
<ListItem onClick={select}>
<ListItemIcon><StaticImage icon={processor.icon}/></ListItemIcon>
<ListItemName>{processor.name}</ListItemName>
<ListItemDescription title={processor.description}>{processor.description}</ListItemDescription>
</ListItem>
);
});
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -9,13 +9,13 @@
import {
NavNodeManagerService,
INodeNavigationData,
IContextProvider,
ITab,
NavigationType,
NodeManagerUtils,
} from '@cloudbeaver/core-app';
import { injectable } from '@cloudbeaver/core-di';
import { NotificationService } from '@cloudbeaver/core-events';
import { IContextProvider } from '@cloudbeaver/core-executor';
import {
DBObjectPageService, ObjectPage, ObjectViewerTabService, IObjectViewerTabState
} from '@cloudbeaver/plugin-object-viewer';
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -7,11 +7,12 @@
*/
import {
EObjectFeature, NavNodeManagerService, IContextProvider, INodeNavigationData
EObjectFeature, NavNodeManagerService, INodeNavigationData
} from '@cloudbeaver/core-app';
import { ITab } from '@cloudbeaver/core-blocks';
import { injectable } from '@cloudbeaver/core-di';
import { NotificationService } from '@cloudbeaver/core-events';
import { IContextProvider } from '@cloudbeaver/core-executor';
import { ObjectViewerTabService } from '@cloudbeaver/plugin-object-viewer';
import { ddlViewer } from './DdlViewer/DdlViewer';
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -7,10 +7,11 @@
*/
import {
NavNodeManagerService, ITab, IContextProvider, INodeNavigationData
NavNodeManagerService, ITab, INodeNavigationData
} from '@cloudbeaver/core-app';
import { injectable } from '@cloudbeaver/core-di';
import { NotificationService } from '@cloudbeaver/core-events';
import { IContextProvider } from '@cloudbeaver/core-executor';
import { IObjectViewerTabState } from '../IObjectViewerTabState';
import { DBObjectPageService } from '../ObjectPage/DBObjectPageService';
@@ -9,7 +9,6 @@
import {
NavigationTabsService,
INodeNavigationData,
IContextProvider,
ITab,
TabHandler,
NavigationType,
@@ -22,6 +21,7 @@ import {
import { connectionProvider, ConnectionInfoResource } from '@cloudbeaver/core-connections';
import { injectable } from '@cloudbeaver/core-di';
import { NotificationService } from '@cloudbeaver/core-events';
import { IContextProvider } from '@cloudbeaver/core-executor';
import { ResourceKey, resourceKeyList, isResourceKeyList } from '@cloudbeaver/core-sdk';
import { IObjectViewerTabContext } from './IObjectViewerTabContext';
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.plugin.config",
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
@@ -6,6 +6,7 @@
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "lib/index.js",
"types": "src/index.ts",
"scripts": {
"prebuild": "rimraf lib/*",
"build": "webpack --config ../../configs/webpack.product.config",
@@ -6,5 +6,5 @@
"exclude": [
"node_modules"
],
"include": ["src/**/*"]
"include": ["src"]
}
-4
View File
@@ -8,7 +8,6 @@
"lib"
],
"compilerOptions": {
"baseUrl": ".",
"allowUnreachableCode": false,
"allowSyntheticDefaultImports": true,
"allowJs": true,
@@ -37,9 +36,6 @@
"strict": true,
"skipLibCheck": true,
"strictNullChecks": true,
"paths": {
"@cloudbeaver/*": ["./node_modules/@cloudbeaver/*/src"]
},
"types": [
"reflect-metadata",
"node"