Sammy/t refactor services use generated code (#194)
* refactor: use generated queries for Companies * refactor: remove useQuery from service, use generated code * refactor: rename to ts file instead of tsx * bugfix: use generatd queries, and fix non existing id in workspace member query
This commit is contained in:
@ -9,15 +9,15 @@ export interface User {
|
||||
id: string;
|
||||
email?: string;
|
||||
displayName?: string;
|
||||
workspaceMember?: WorkspaceMember;
|
||||
workspaceMember?: WorkspaceMember | null;
|
||||
}
|
||||
|
||||
export type GraphqlQueryUser = {
|
||||
id: string;
|
||||
email?: string;
|
||||
displayName?: string;
|
||||
workspaceMember?: GraphqlQueryWorkspaceMember;
|
||||
__typename: string;
|
||||
workspaceMember?: GraphqlQueryWorkspaceMember | null;
|
||||
__typename?: string;
|
||||
};
|
||||
|
||||
export type GraphqlMutationUser = {
|
||||
@ -25,7 +25,7 @@ export type GraphqlMutationUser = {
|
||||
email?: string;
|
||||
displayName?: string;
|
||||
workspaceMemberId?: string;
|
||||
__typename: string;
|
||||
__typename?: string;
|
||||
};
|
||||
|
||||
export const mapToUser = (user: GraphqlQueryUser): User => ({
|
||||
|
||||
@ -12,13 +12,13 @@ export interface WorkspaceMember {
|
||||
export type GraphqlQueryWorkspaceMember = {
|
||||
id: string;
|
||||
workspace: GraphqlQueryWorkspace;
|
||||
__typename: string;
|
||||
__typename?: string;
|
||||
};
|
||||
|
||||
export type GraphqlMutationWorkspaceMember = {
|
||||
id: string;
|
||||
workspace_id: string;
|
||||
__typename: string;
|
||||
__typename?: string;
|
||||
};
|
||||
|
||||
export const mapToWorkspaceMember = (
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { gql, QueryResult, useQuery } from '@apollo/client';
|
||||
import { gql } from '@apollo/client';
|
||||
|
||||
import { GraphqlQueryUser } from '../interfaces/user.interface';
|
||||
import { useGetCurrentUserQuery as generatedUseGetCurrentUserQuery } from '~/generated/graphql';
|
||||
|
||||
export const GET_CURRENT_USER = gql`
|
||||
query GetCurrentUser($uuid: String) {
|
||||
@ -9,6 +9,7 @@ export const GET_CURRENT_USER = gql`
|
||||
email
|
||||
displayName
|
||||
workspaceMember {
|
||||
id
|
||||
workspace {
|
||||
id
|
||||
domainName
|
||||
@ -20,10 +21,8 @@ export const GET_CURRENT_USER = gql`
|
||||
}
|
||||
`;
|
||||
|
||||
export function useGetCurrentUserQuery(userId: string | null): QueryResult<{
|
||||
users: GraphqlQueryUser[];
|
||||
}> {
|
||||
return useQuery<{ users: GraphqlQueryUser[] }>(GET_CURRENT_USER, {
|
||||
export function useGetCurrentUserQuery(userId: string | null) {
|
||||
return generatedUseGetCurrentUserQuery({
|
||||
variables: {
|
||||
uuid: userId,
|
||||
},
|
||||
Reference in New Issue
Block a user