From 2448228e605b65b39df3a81aa3f6640ac0703faa Mon Sep 17 00:00:00 2001 From: Wroud Date: Mon, 2 Nov 2020 16:57:08 +0300 Subject: [PATCH] chore(core-sdk): CB-341 CB-342 add origin for Connection/User --- .../authentication/users/createUser.gql | 6 +- .../authentication/users/getUsersList.gql | 6 +- .../src/queries/fragments/AdminConnection.gql | 4 + .../src/queries/fragments/AdminUserInfo.gql | 8 ++ .../queries/fragments/ObjectOriginInfo.gql | 6 ++ webapp/packages/core-sdk/src/sdk.ts | 73 +++++++++++++++---- 6 files changed, 79 insertions(+), 24 deletions(-) create mode 100644 webapp/packages/core-sdk/src/queries/fragments/AdminUserInfo.gql create mode 100644 webapp/packages/core-sdk/src/queries/fragments/ObjectOriginInfo.gql diff --git a/webapp/packages/core-sdk/src/queries/authentication/users/createUser.gql b/webapp/packages/core-sdk/src/queries/authentication/users/createUser.gql index 9ab9dc119d..3fe88322d8 100644 --- a/webapp/packages/core-sdk/src/queries/authentication/users/createUser.gql +++ b/webapp/packages/core-sdk/src/queries/authentication/users/createUser.gql @@ -1,9 +1,5 @@ query createUser($userId: ID!) { user: createUser(userId: $userId) { - userId - - #metaParameters - #configurationParameters - grantedRoles + ...AdminUserInfo } } \ No newline at end of file diff --git a/webapp/packages/core-sdk/src/queries/authentication/users/getUsersList.gql b/webapp/packages/core-sdk/src/queries/authentication/users/getUsersList.gql index d4375ca038..2d5f112820 100644 --- a/webapp/packages/core-sdk/src/queries/authentication/users/getUsersList.gql +++ b/webapp/packages/core-sdk/src/queries/authentication/users/getUsersList.gql @@ -1,9 +1,5 @@ query getUsersList($userId: ID) { users: listUsers(userId: $userId) { - userId - - #metaParameters - #configurationParameters - grantedRoles + ...AdminUserInfo } } \ No newline at end of file diff --git a/webapp/packages/core-sdk/src/queries/fragments/AdminConnection.gql b/webapp/packages/core-sdk/src/queries/fragments/AdminConnection.gql index de19608ad2..b9ccd1c77f 100644 --- a/webapp/packages/core-sdk/src/queries/fragments/AdminConnection.gql +++ b/webapp/packages/core-sdk/src/queries/fragments/AdminConnection.gql @@ -17,6 +17,10 @@ fragment AdminConnection on ConnectionInfo { features + origin { + ...ObjectOriginInfo + } + authNeeded authModel authProperties { diff --git a/webapp/packages/core-sdk/src/queries/fragments/AdminUserInfo.gql b/webapp/packages/core-sdk/src/queries/fragments/AdminUserInfo.gql new file mode 100644 index 0000000000..b6b0ac7eb5 --- /dev/null +++ b/webapp/packages/core-sdk/src/queries/fragments/AdminUserInfo.gql @@ -0,0 +1,8 @@ +fragment AdminUserInfo on AdminUserInfo { + userId + grantedRoles + + origin { + ...ObjectOriginInfo + } +} \ No newline at end of file diff --git a/webapp/packages/core-sdk/src/queries/fragments/ObjectOriginInfo.gql b/webapp/packages/core-sdk/src/queries/fragments/ObjectOriginInfo.gql new file mode 100644 index 0000000000..5c9206247c --- /dev/null +++ b/webapp/packages/core-sdk/src/queries/fragments/ObjectOriginInfo.gql @@ -0,0 +1,6 @@ +fragment ObjectOriginInfo on ObjectOrigin { + type + subType + displayName + icon +} \ No newline at end of file diff --git a/webapp/packages/core-sdk/src/sdk.ts b/webapp/packages/core-sdk/src/sdk.ts index a98b0e6208..2c2bb8bcd0 100644 --- a/webapp/packages/core-sdk/src/sdk.ts +++ b/webapp/packages/core-sdk/src/sdk.ts @@ -529,11 +529,13 @@ export interface ConnectionInfo { connected: Scalars['Boolean']; provided: Scalars['Boolean']; readOnly: Scalars['Boolean']; + useUrl: Scalars['Boolean']; saveCredentials: Scalars['Boolean']; connectTime?: Maybe; connectionError?: Maybe; serverVersion?: Maybe; clientVersion?: Maybe; + origin: ObjectOrigin; authNeeded: Scalars['Boolean']; authModel?: Maybe; authProperties: ObjectPropertyInfo[]; @@ -542,6 +544,15 @@ export interface ConnectionInfo { supportedDataFormats: ResultDataFormat[]; } +export interface ObjectOrigin { + type: Scalars['ID']; + subType?: Maybe; + displayName: Scalars['String']; + icon?: Maybe; + configuration?: Maybe; + details?: Maybe; +} + export interface ConnectionConfig { connectionId?: Maybe; name?: Maybe; @@ -600,10 +611,17 @@ export interface ObjectDescriptor { } export interface ObjectPropertyFilter { - ids?: Maybe>>; - features?: Maybe>>; - categories?: Maybe>>; - dataTypes?: Maybe>>; + ids?: Maybe>; + features?: Maybe>; + categories?: Maybe>; + dataTypes?: Maybe>; +} + +export interface ObjectDetails { + id?: Maybe; + displayName?: Maybe; + description?: Maybe; + value?: Maybe; } export interface DatabaseObjectInfo { @@ -765,6 +783,7 @@ export interface AdminUserInfo { configurationParameters: Scalars['Object']; grantedRoles: Array; grantedConnections: AdminConnectionGrantInfo[]; + origin: ObjectOrigin; } export interface AdminRoleInfo { @@ -822,6 +841,7 @@ export interface UserAuthInfo { authProvider: Scalars['String']; loginTime: Scalars['DateTime']; message?: Maybe; + origin: ObjectOrigin; } export interface DataTransferProcessorInfo { @@ -879,7 +899,7 @@ export type CreateUserQueryVariables = Exact<{ userId: Scalars['ID']; }>; -export interface CreateUserQuery { user: Pick } +export interface CreateUserQuery { user: AdminUserInfoFragment } export type DeleteUserQueryVariables = Exact<{ userId: Scalars['ID']; @@ -909,7 +929,7 @@ export type GetUsersListQueryVariables = Exact<{ userId?: Maybe; }>; -export interface GetUsersListQuery { users: Array>> } +export interface GetUsersListQuery { users: Array> } export type GrantUserRoleQueryVariables = Exact<{ userId: Scalars['ID']; @@ -1133,7 +1153,12 @@ export interface NavGetStructContainersQuery { navGetStructContainers: { catalog export type AdminConnectionFragment = ( Pick - & { authProperties: Array> } + & { origin: ObjectOriginInfoFragment; authProperties: Array> } +); + +export type AdminUserInfoFragment = ( + Pick + & { origin: ObjectOriginInfoFragment } ); export type NavNodeInfoFragment = ( @@ -1143,6 +1168,8 @@ export type NavNodeInfoFragment = ( export type NavNodePropertiesFragment = Pick; +export type ObjectOriginInfoFragment = Pick; + export type SessionStateFragment = Pick; export type UserConnectionFragment = Pick; @@ -1404,6 +1431,14 @@ export type SqlResultCloseMutationVariables = Exact<{ export interface SqlResultCloseMutation { result: Mutation['sqlResultClose'] } +export const ObjectOriginInfoFragmentDoc = ` + fragment ObjectOriginInfo on ObjectOrigin { + type + subType + displayName + icon +} + `; export const AdminConnectionFragmentDoc = ` fragment AdminConnection on ConnectionInfo { id @@ -1420,6 +1455,9 @@ export const AdminConnectionFragmentDoc = ` url properties features + origin { + ...ObjectOriginInfo + } authNeeded authModel authProperties { @@ -1430,7 +1468,16 @@ export const AdminConnectionFragmentDoc = ` features supportedDataFormats } - `; + ${ObjectOriginInfoFragmentDoc}`; +export const AdminUserInfoFragmentDoc = ` + fragment AdminUserInfo on AdminUserInfo { + userId + grantedRoles + origin { + ...ObjectOriginInfo + } +} + ${ObjectOriginInfoFragmentDoc}`; export const NavNodeInfoFragmentDoc = ` fragment NavNodeInfo on NavigatorNodeInfo { id @@ -1548,11 +1595,10 @@ export const GetSessionUserDocument = ` export const CreateUserDocument = ` query createUser($userId: ID!) { user: createUser(userId: $userId) { - userId - grantedRoles + ...AdminUserInfo } } - `; + ${AdminUserInfoFragmentDoc}`; export const DeleteUserDocument = ` query deleteUser($userId: ID!) { deleteUser(userId: $userId) @@ -1589,11 +1635,10 @@ export const GetUserGrantedConnectionsDocument = ` export const GetUsersListDocument = ` query getUsersList($userId: ID) { users: listUsers(userId: $userId) { - userId - grantedRoles + ...AdminUserInfo } } - `; + ${AdminUserInfoFragmentDoc}`; export const GrantUserRoleDocument = ` query grantUserRole($userId: ID!, $roleId: ID!) { grantUserRole(userId: $userId, roleId: $roleId)