@quesmed/types 2.3.4 → 2.4.0

package/dist/cjs/resolvers/mutation/restricted/marksheet.d.ts

@@ -2,7 +2,7 @@ import { ApolloCache, ApolloClient } from '@apollo/client';
 import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../..';
 import { Id } from '../../../models';
 import { graphqlNormalize, RestrictedData } from '../../types';
-import { EMarksheetAction, EMarksheetState, IMarksheet, IMarksheetMark, IMarksheetMarkJSONB } from './../../../models/Marksheet';
+import { EMarksheetAction, EMarksheetState, IMarksheet, IMarksheetMark } from './../../../models/Marksheet';
 import { IUser, IUserFlaggedQuestion } from './../../../models/User';
 export interface IPreBuildMarksheet {
     unseen: number;
@@ -39,9 +39,9 @@ export interface IReBuildMarksheetVar {
     marksheetId: number;
 }
 export declare type IReBuildMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'reBuildMarksheet'>;
-export interface IMarksheetInput {
+export interface ISaveMarksheetInput {
     marksheetId: Id;
-    questionId: Id;
+    markId: Id;
     choiceId?: Id;
     mark?: string;
     timeTaken: number;
@@ -51,9 +51,9 @@ export interface IMarksheetInput {
  */
 export declare const SAVE_MARKSHEET: import("@apollo/client").DocumentNode;
 export declare const updateMarksheets: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<ISaveMarksheetsData>, options: ApolloUpdateOptions) => void;
-export declare const optimisticSaveMarksheets: (marksheet: IMarksheet, marksheetInput: IMarksheetInput, questionIndex: number) => ISaveMarksheetsData;
+export declare const optimisticSaveMarksheets: (marksheet: IMarksheet, marksheetInput: ISaveMarksheetInput, questionIndex: number) => ISaveMarksheetsData;
 export interface ISaveMarksheetsVar {
-    marksheetInput: IMarksheetInput[];
+    marksheetInput: ISaveMarksheetInput[];
 }
 export declare type ISaveMarksheetsData = RestrictedData<(graphqlNormalize & IMarksheet)[], 'saveMarksheets'>;
 /**
@@ -105,18 +105,6 @@ export interface IPreStartMarksheetDataInfo {
     builderConfig?: IBuildConfigData;
     preBuildData?: IPreBuildMarksheet;
 }
-export interface IMarkDataInfo {
-    markId?: Id;
-    markIndex?: number;
-    questionChoiceId?: Id;
-    updatedAt?: Date;
-    questionId?: Id;
-    prevQuestionId?: Id;
-    timeTaken?: number;
-    mark?: IMarksheetMarkJSONB;
-    isAnswered?: boolean;
-    striked?: number[];
-}
 export interface IBuildConfigData {
     numberOfQuestions?: number;
     difficulty?: number[];
@@ -126,16 +114,14 @@ export interface IBuildConfigData {
     secondsPerQuestion?: number;
     isTest?: boolean;
 }
-export interface IQbankInfoInput {
-    marksheetData?: IMarksheetDataInfo;
-    preStartData?: IPreStartMarksheetDataInfo;
-    markData?: IMarkDataInfo;
-    action?: EMarksheetAction;
+export interface IModifyMarksheetVarInput {
     marksheetId: Id;
+    state?: EMarksheetState;
+    preStartData?: IPreStartMarksheetDataInfo;
+    action: EMarksheetAction;
 }
-export declare type IModifyMarksheetVarInput = Omit<IQbankInfoInput, 'markData'>;
 export interface IModifyMarksheetVar {
-    input: Omit<IQbankInfoInput, 'markData'>;
+    input: IModifyMarksheetVarInput;
 }
 export declare type IModifyMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'modifyMarksheet'>;
 export declare const optimisticModifyMarksheetBuilderConfig: (marksheetId: number, builderConfig: IBuildConfigData, client?: ApolloClient<any> | undefined) => {
@@ -203,7 +189,19 @@ export declare const MODIFY_MARKSHEET_STATE_FRAGMENT: import("@apollo/client").D
 /**
  * modifyMarksheetMark
  */
-export declare type IModifyMarksheetMarkVarInput = Required<Pick<IQbankInfoInput, 'action' | 'markData' | 'marksheetId'>>;
+export interface IModifyMarksheetMarkVarInput {
+    marksheetId: Id;
+    markId: Id;
+    newMarkId?: Id;
+    questionChoiceId?: Id;
+    mark?: string;
+    timeTaken?: number;
+    striked?: number[];
+    action: EMarksheetAction;
+}
+export interface IModifyMarksheetMarkVarInput {
+    input: IModifyMarksheetMarkVarInput;
+}
 export interface IModifyMarksheetMarkVar {
     input: IModifyMarksheetMarkVarInput;
 }

package/dist/cjs/resolvers/mutation/restricted/marksheet.js

@@ -573,9 +573,9 @@ exports.BUILD_QUESTION_MARKSHEET = (0, client_1.gql) `
   }
 `;
 exports.BUILD_MARKSHEET = (0, client_1.gql) `
-  mutation BuildMarksheet($buildMarksheet: BuildMarksheetInput!) {
+  mutation BuildMarksheet($input: BuildMarksheetInput!) {
     restricted {
-      buildMarksheet(buildMarksheet: $buildMarksheet) {
+      buildMarksheet(input: $input) {
         id
         createdAt
         startedAt
@@ -1724,9 +1724,9 @@ exports.RE_BUILD_MARKSHEET = (0, client_1.gql) `
  * saveMarksheets
  */
 exports.SAVE_MARKSHEET = (0, client_1.gql) `
-  mutation SaveMarksheet($marksheetInput: [MarksheetInput!]!) {
+  mutation SaveMarksheet($input: [SaveMarksheetInput!]!) {
     restricted {
-      saveMarksheets(marksheetInput: $marksheetInput) {
+      saveMarksheets(input: $input) {
         id
         createdAt
         solo

package/dist/cjs/resolvers/mutation/restricted/mockTest.d.ts

@@ -34,6 +34,7 @@ export declare const optimisticToggleFlaggedQuestion: (mark: IMarksheetMark, fla
     };
 };
 export interface IToggleFlaggedMarkVar {
+    marksheetId: Id;
     markId: Id;
     isFlagged: boolean;
 }

package/dist/cjs/resolvers/mutation/restricted/mockTest.js

@@ -12,9 +12,17 @@ exports.BUILD_MOCK_TEST_MARKSHEET = (0, client_1.gql) `
   }
 `;
 exports.TOGGLE_FLAGGED_MARK = (0, client_1.gql) `
-  mutation ToggleFlaggedMark($markId: Int!, $isFlagged: Boolean!) {
+  mutation ToggleFlaggedMark(
+    $marksheetId: Int!
+    $markId: Int!
+    $isFlagged: Boolean!
+  ) {
     restricted {
-      toggleFlaggedMark(markId: $markId, isFlagged: $isFlagged) {
+      toggleFlaggedMark(
+        marksheetId: $marksheetId
+        markId: $markId
+        isFlagged: $isFlagged
+      ) {
         id
         flagged
       }

package/dist/cjs/resolvers/mutation/restricted/todo.d.ts

@@ -15,7 +15,7 @@ export interface IBuildTodoVar {
 export declare type IBuildTodoData = RestrictedData<graphqlNormalize & ITodo, 'buildTodo'>;
 export interface ITodoInput {
     todoId: number;
-    cardId: number;
+    markId: number;
     score: number;
     timeTaken: number;
 }

package/dist/cjs/resolvers/mutation/sample.d.ts

@@ -1,4 +1,4 @@
 import { ApolloClient } from '@apollo/client';
-import { IMarksheetInput, ITodoInput } from './restricted';
-export declare const saveSampleMarksheets: (client: ApolloClient<any>, marksheetInput: IMarksheetInput, questionIndex: number) => void;
+import { ISaveMarksheetInput, ITodoInput } from './restricted';
+export declare const saveSampleMarksheets: (client: ApolloClient<any>, marksheetInput: ISaveMarksheetInput, questionIndex: number) => void;
 export declare const saveSampleTodoMark: (client: ApolloClient<any>, todoInput: ITodoInput, markId: number) => void;

package/dist/cjs/resolvers/subscription/marksheet.d.ts

@@ -55,14 +55,14 @@ export interface IOnMarksheetMarkChangeVar {
     marksheetId: Id;
 }
 export interface IMarksheetMarkData {
-    action?: EMarksheetAction;
-    isAnswered?: boolean;
-    mark?: IMarksheetMarkJSONB;
+    action: EMarksheetAction;
+    marksheetId: Id;
     markId?: Id;
+    newMarkId?: Id;
     markIndex?: number;
-    marksheetId: Id;
     questionChoiceId?: Id;
-    questionId?: Id;
+    mark?: IMarksheetMarkJSONB;
+    isAnswered?: boolean;
     timeTaken?: number;
     updatedAt?: Date;
     user: IUser;

package/dist/cjs/resolvers/subscription/marksheet.js

@@ -61,21 +61,21 @@ exports.ON_MARKSHEET_MARK_CHANGE_KEY = 'ON_MARKSHEET_CHANGE_KEY';
 exports.ON_MARKSHEET_MARK_CHANGE = (0, client_1.gql) `
   subscription OnMarksheetMarkChange($marksheetId: Int!) {
     onMarksheetMarkChange(marksheetId: $marksheetId) {
-      markId
-      updatedAt
+      action
       marksheetId
-      questionId
-      striked
+      markId
+      newMarkId
       markIndex
-      mark
       questionChoiceId
+      mark
       isAnswered
       timeTaken
-      action
+      updatedAt
       user {
         id
         displayName
       }
+      striked
     }
   }
 `;

package/dist/mjs/resolvers/mutation/restricted/marksheet.d.ts

@@ -2,7 +2,7 @@ import { ApolloCache, ApolloClient } from '@apollo/client';
 import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../..';
 import { Id } from '../../../models';
 import { graphqlNormalize, RestrictedData } from '../../types';
-import { EMarksheetAction, EMarksheetState, IMarksheet, IMarksheetMark, IMarksheetMarkJSONB } from './../../../models/Marksheet';
+import { EMarksheetAction, EMarksheetState, IMarksheet, IMarksheetMark } from './../../../models/Marksheet';
 import { IUser, IUserFlaggedQuestion } from './../../../models/User';
 export interface IPreBuildMarksheet {
     unseen: number;
@@ -39,9 +39,9 @@ export interface IReBuildMarksheetVar {
     marksheetId: number;
 }
 export declare type IReBuildMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'reBuildMarksheet'>;
-export interface IMarksheetInput {
+export interface ISaveMarksheetInput {
     marksheetId: Id;
-    questionId: Id;
+    markId: Id;
     choiceId?: Id;
     mark?: string;
     timeTaken: number;
@@ -51,9 +51,9 @@ export interface IMarksheetInput {
  */
 export declare const SAVE_MARKSHEET: import("@apollo/client").DocumentNode;
 export declare const updateMarksheets: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<ISaveMarksheetsData>, options: ApolloUpdateOptions) => void;
-export declare const optimisticSaveMarksheets: (marksheet: IMarksheet, marksheetInput: IMarksheetInput, questionIndex: number) => ISaveMarksheetsData;
+export declare const optimisticSaveMarksheets: (marksheet: IMarksheet, marksheetInput: ISaveMarksheetInput, questionIndex: number) => ISaveMarksheetsData;
 export interface ISaveMarksheetsVar {
-    marksheetInput: IMarksheetInput[];
+    marksheetInput: ISaveMarksheetInput[];
 }
 export declare type ISaveMarksheetsData = RestrictedData<(graphqlNormalize & IMarksheet)[], 'saveMarksheets'>;
 /**
@@ -105,18 +105,6 @@ export interface IPreStartMarksheetDataInfo {
     builderConfig?: IBuildConfigData;
     preBuildData?: IPreBuildMarksheet;
 }
-export interface IMarkDataInfo {
-    markId?: Id;
-    markIndex?: number;
-    questionChoiceId?: Id;
-    updatedAt?: Date;
-    questionId?: Id;
-    prevQuestionId?: Id;
-    timeTaken?: number;
-    mark?: IMarksheetMarkJSONB;
-    isAnswered?: boolean;
-    striked?: number[];
-}
 export interface IBuildConfigData {
     numberOfQuestions?: number;
     difficulty?: number[];
@@ -126,16 +114,14 @@ export interface IBuildConfigData {
     secondsPerQuestion?: number;
     isTest?: boolean;
 }
-export interface IQbankInfoInput {
-    marksheetData?: IMarksheetDataInfo;
-    preStartData?: IPreStartMarksheetDataInfo;
-    markData?: IMarkDataInfo;
-    action?: EMarksheetAction;
+export interface IModifyMarksheetVarInput {
     marksheetId: Id;
+    state?: EMarksheetState;
+    preStartData?: IPreStartMarksheetDataInfo;
+    action: EMarksheetAction;
 }
-export declare type IModifyMarksheetVarInput = Omit<IQbankInfoInput, 'markData'>;
 export interface IModifyMarksheetVar {
-    input: Omit<IQbankInfoInput, 'markData'>;
+    input: IModifyMarksheetVarInput;
 }
 export declare type IModifyMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'modifyMarksheet'>;
 export declare const optimisticModifyMarksheetBuilderConfig: (marksheetId: number, builderConfig: IBuildConfigData, client?: ApolloClient<any> | undefined) => {
@@ -203,7 +189,19 @@ export declare const MODIFY_MARKSHEET_STATE_FRAGMENT: import("@apollo/client").D
 /**
  * modifyMarksheetMark
  */
-export declare type IModifyMarksheetMarkVarInput = Required<Pick<IQbankInfoInput, 'action' | 'markData' | 'marksheetId'>>;
+export interface IModifyMarksheetMarkVarInput {
+    marksheetId: Id;
+    markId: Id;
+    newMarkId?: Id;
+    questionChoiceId?: Id;
+    mark?: string;
+    timeTaken?: number;
+    striked?: number[];
+    action: EMarksheetAction;
+}
+export interface IModifyMarksheetMarkVarInput {
+    input: IModifyMarksheetMarkVarInput;
+}
 export interface IModifyMarksheetMarkVar {
     input: IModifyMarksheetMarkVarInput;
 }

package/dist/mjs/resolvers/mutation/restricted/marksheet.js

@@ -570,9 +570,9 @@ export const BUILD_QUESTION_MARKSHEET = gql `
   }
 `;
 export const BUILD_MARKSHEET = gql `
-  mutation BuildMarksheet($buildMarksheet: BuildMarksheetInput!) {
+  mutation BuildMarksheet($input: BuildMarksheetInput!) {
     restricted {
-      buildMarksheet(buildMarksheet: $buildMarksheet) {
+      buildMarksheet(input: $input) {
         id
         createdAt
         startedAt
@@ -1721,9 +1721,9 @@ export const RE_BUILD_MARKSHEET = gql `
  * saveMarksheets
  */
 export const SAVE_MARKSHEET = gql `
-  mutation SaveMarksheet($marksheetInput: [MarksheetInput!]!) {
+  mutation SaveMarksheet($input: [SaveMarksheetInput!]!) {
     restricted {
-      saveMarksheets(marksheetInput: $marksheetInput) {
+      saveMarksheets(input: $input) {
         id
         createdAt
         solo

package/dist/mjs/resolvers/mutation/restricted/mockTest.d.ts

@@ -34,6 +34,7 @@ export declare const optimisticToggleFlaggedQuestion: (mark: IMarksheetMark, fla
     };
 };
 export interface IToggleFlaggedMarkVar {
+    marksheetId: Id;
     markId: Id;
     isFlagged: boolean;
 }

package/dist/mjs/resolvers/mutation/restricted/mockTest.js

@@ -9,9 +9,17 @@ export const BUILD_MOCK_TEST_MARKSHEET = gql `
   }
 `;
 export const TOGGLE_FLAGGED_MARK = gql `
-  mutation ToggleFlaggedMark($markId: Int!, $isFlagged: Boolean!) {
+  mutation ToggleFlaggedMark(
+    $marksheetId: Int!
+    $markId: Int!
+    $isFlagged: Boolean!
+  ) {
     restricted {
-      toggleFlaggedMark(markId: $markId, isFlagged: $isFlagged) {
+      toggleFlaggedMark(
+        marksheetId: $marksheetId
+        markId: $markId
+        isFlagged: $isFlagged
+      ) {
         id
         flagged
       }

package/dist/mjs/resolvers/mutation/restricted/todo.d.ts

@@ -15,7 +15,7 @@ export interface IBuildTodoVar {
 export declare type IBuildTodoData = RestrictedData<graphqlNormalize & ITodo, 'buildTodo'>;
 export interface ITodoInput {
     todoId: number;
-    cardId: number;
+    markId: number;
     score: number;
     timeTaken: number;
 }

package/dist/mjs/resolvers/mutation/sample.d.ts

@@ -1,4 +1,4 @@
 import { ApolloClient } from '@apollo/client';
-import { IMarksheetInput, ITodoInput } from './restricted';
-export declare const saveSampleMarksheets: (client: ApolloClient<any>, marksheetInput: IMarksheetInput, questionIndex: number) => void;
+import { ISaveMarksheetInput, ITodoInput } from './restricted';
+export declare const saveSampleMarksheets: (client: ApolloClient<any>, marksheetInput: ISaveMarksheetInput, questionIndex: number) => void;
 export declare const saveSampleTodoMark: (client: ApolloClient<any>, todoInput: ITodoInput, markId: number) => void;

package/dist/mjs/resolvers/subscription/marksheet.d.ts

@@ -55,14 +55,14 @@ export interface IOnMarksheetMarkChangeVar {
     marksheetId: Id;
 }
 export interface IMarksheetMarkData {
-    action?: EMarksheetAction;
-    isAnswered?: boolean;
-    mark?: IMarksheetMarkJSONB;
+    action: EMarksheetAction;
+    marksheetId: Id;
     markId?: Id;
+    newMarkId?: Id;
     markIndex?: number;
-    marksheetId: Id;
     questionChoiceId?: Id;
-    questionId?: Id;
+    mark?: IMarksheetMarkJSONB;
+    isAnswered?: boolean;
     timeTaken?: number;
     updatedAt?: Date;
     user: IUser;

package/dist/mjs/resolvers/subscription/marksheet.js

@@ -58,21 +58,21 @@ export const ON_MARKSHEET_MARK_CHANGE_KEY = 'ON_MARKSHEET_CHANGE_KEY';
 export const ON_MARKSHEET_MARK_CHANGE = gql `
   subscription OnMarksheetMarkChange($marksheetId: Int!) {
     onMarksheetMarkChange(marksheetId: $marksheetId) {
-      markId
-      updatedAt
+      action
       marksheetId
-      questionId
-      striked
+      markId
+      newMarkId
       markIndex
-      mark
       questionChoiceId
+      mark
       isAnswered
       timeTaken
-      action
+      updatedAt
       user {
         id
         displayName
       }
+      striked
     }
   }
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "Typescript types for Quesmed",
   "keywords": [
     "quesmed",