diff --git a/webapp/graphql.config.ts b/webapp/graphql.config.ts new file mode 100644 index 0000000000..b88be98f96 --- /dev/null +++ b/webapp/graphql.config.ts @@ -0,0 +1,8 @@ +import type { IGraphQLConfig } from 'graphql-config'; + +const config: IGraphQLConfig = { + schema: ['../server/bundles/*/schema/**/*.graphqls'], + documents: './packages/*/src/**/*.gql', +}; + +export default config; diff --git a/webapp/packages/core-sdk/codegen.ts b/webapp/packages/core-sdk/codegen.ts new file mode 100644 index 0000000000..0533a03aef --- /dev/null +++ b/webapp/packages/core-sdk/codegen.ts @@ -0,0 +1,39 @@ +import type { CodegenConfig } from '@graphql-codegen/cli'; + +const config: CodegenConfig = { + schema: '../../../server/bundles/*/schema/**/*.graphqls', + documents: './src/**/*.gql', + generates: { + './src/sdk.ts': { + plugins: [{ add: { content: '/* eslint-disable */' } }, 'typescript', 'typescript-operations', 'typescript-graphql-request'], + }, + }, + config: { + skipTypename: true, + documentMode: 'string', + useTypeImports: true, + avoidOptionals: { + field: false, + inputValue: false, + object: false, + }, + maybeValue: 'T', // T | null' + declarationKind: { + union: 'type', + type: 'interface', + input: 'interface', + scalar: 'interface', + arguments: 'interface', + }, + scalars: { + Object: 'any', + JSON: '{ [key: string]: any }', + DateTime: 'any', + }, + }, + hooks: { + afterAllFileWrite: ['prettier --write'], + }, +}; + +export default config; diff --git a/webapp/packages/core-sdk/codegen.yml b/webapp/packages/core-sdk/codegen.yml deleted file mode 100644 index 15708ee6c1..0000000000 --- a/webapp/packages/core-sdk/codegen.yml +++ /dev/null @@ -1,43 +0,0 @@ -schema: - - ../../../server/bundles/io.cloudbeaver.server/schema/schema.graphqls - - ../../../server/bundles/io.cloudbeaver.server/schema/service.core.graphqls - - ../../../server/bundles/io.cloudbeaver.server/schema/service.events.graphqls - - ../../../server/bundles/io.cloudbeaver.server/schema/service.navigator.graphqls - - ../../../server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls - - ../../../server/bundles/io.cloudbeaver.service.metadata/schema/service.metadata.graphqls - - ../../../server/bundles/io.cloudbeaver.service.data.transfer/schema/service.data.transfer.graphqls - - ../../../server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls - - ../../../server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls - - ../../../server/bundles/io.cloudbeaver.service.rm/schema/service.rm.graphqls -documents: - - ./src/**/*.gql -generates: - src/sdk.ts: - plugins: - - add: - content: '/* eslint-disable */' - - typescript - - typescript-operations - - typescript-graphql-request - config: - skipTypename: true - documentMode: 'string' - useTypeImports: true - avoidOptionals: - field: false - inputValue: false - object: false - maybeValue: T # T | null - declarationKind: - union: type - type: interface - input: interface - scalar: interface - arguments: interface - scalars: - Object: any - JSON: '{ [key: string]: any }' - DateTime: any -hooks: - afterAllFileWrite: - - prettier ./src/sdk.ts -write diff --git a/webapp/packages/core-sdk/graphql.config.yml b/webapp/packages/core-sdk/graphql.config.yml deleted file mode 100644 index 96fea40a0a..0000000000 --- a/webapp/packages/core-sdk/graphql.config.yml +++ /dev/null @@ -1,42 +0,0 @@ -schema: - - ../../../server/bundles/io.cloudbeaver.server/schema/schema.graphqls - - ../../../server/bundles/io.cloudbeaver.server/schema/service.core.graphqls - - ../../../server/bundles/io.cloudbeaver.server/schema/service.navigator.graphqls - - ../../../server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls - - ../../../server/bundles/io.cloudbeaver.service.metadata/schema/service.metadata.graphqls - - ../../../server/bundles/io.cloudbeaver.service.data.transfer/schema/service.data.transfer.graphqls - - ../../../server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls - - ../../../server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls - - ../../../server/bundles/io.cloudbeaver.service.rm/schema/service.rm.graphqls -documents: - - ./src/**/*.gql -generates: - src/sdk.ts: - plugins: - - add: - content: '/* eslint-disable */' - - typescript - - typescript-operations - - typescript-graphql-request - config: - skipTypename: true - documentMode : 'string' - useTypeImports: true - avoidOptionals: - field: false - inputValue: false - object: false - maybeValue: T # T | null - declarationKind: - union: type - type: interface - input: interface - scalar: interface - arguments: interface - scalars: - Object: any - JSON: "{ [key: string]: any }" - DateTime: any -hooks: - afterAllFileWrite: - - eslint --fix diff --git a/webapp/packages/core-sdk/package.json b/webapp/packages/core-sdk/package.json index c393ac63dc..ff1db55202 100644 --- a/webapp/packages/core-sdk/package.json +++ b/webapp/packages/core-sdk/package.json @@ -20,11 +20,11 @@ }, "dependencies": { "@cloudbeaver/core-di": "~0.1.0", - "@cloudbeaver/core-utils": "~0.1.0", "@cloudbeaver/core-executor": "~0.1.0", - "graphql-request": "~6.1.0", + "@cloudbeaver/core-utils": "~0.1.0", + "axios": "~1.4.0", "graphql": "~16.x.x", - "axios": "~1.4.0" + "graphql-request": "~6.1.0" }, "devDependencies": { "@graphql-codegen/add": "~5.0.0", diff --git a/webapp/packages/core-sdk/src/sdk.ts b/webapp/packages/core-sdk/src/sdk.ts index 384bf367b6..92c07dc753 100644 --- a/webapp/packages/core-sdk/src/sdk.ts +++ b/webapp/packages/core-sdk/src/sdk.ts @@ -163,6 +163,7 @@ export interface AuthProviderInfo { label: Scalars['String']; private: Scalars['Boolean']; requiredFeatures: Array; + supportProvisioning: Scalars['Boolean']; trusted: Scalars['Boolean']; } diff --git a/webapp/packages/prettier-config/package.json b/webapp/packages/prettier-config/package.json index 6e49cc809c..452b2cc8fd 100644 --- a/webapp/packages/prettier-config/package.json +++ b/webapp/packages/prettier-config/package.json @@ -6,7 +6,6 @@ "main": "index.json", "devDependencies": { "@trivago/prettier-plugin-sort-imports": "^4.1.1", - "prettier": "^2.8.8", - "reshadow": "^0.0.1" + "prettier": "^2.8.8" } }