@quesmed/types-rn 2.6.234 → 2.6.236

package/models/Blog.d.ts

@@ -15,7 +15,8 @@ export declare enum EBlogTags {
     MLA_CSPA = "MLA_CPSA",
     MRCP_VIDEO = "MRCP_Video",
     PLAB1 = "PLAB1",
-    PLAB2 = "PLAB2"
+    PLAB2 = "PLAB2",
+    UCAT = "UCAT"
 }
 export interface IBlogTag {
     id: Id;

package/models/Blog.js

@@ -18,4 +18,5 @@ var EBlogTags;
     EBlogTags["MRCP_VIDEO"] = "MRCP_Video";
     EBlogTags["PLAB1"] = "PLAB1";
     EBlogTags["PLAB2"] = "PLAB2";
+    EBlogTags["UCAT"] = "UCAT";
 })(EBlogTags = exports.EBlogTags || (exports.EBlogTags = {}));

package/models/Question.d.ts

@@ -204,7 +204,7 @@ export interface IQuestionRanking extends IQuestion {
 }
 export interface IQuestionSjtTwoAnswer extends IQuestion {
     answer: [string, string];
-    sjtTwoAnswer: [string, string];
+    sbaAnswer: [string, string];
 }
 export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeAnswer[];

package/package.json

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

package/resolvers/fragments/index.d.ts

@@ -2,13 +2,11 @@ export * from './blog';
 export * from './chapter';
 export * from './concept';
 export * from './highlight';
-export * from './job';
 export * from './marksheet';
 export * from './mockTest';
 export * from './osce';
 export * from './picture';
 export * from './question';
-export * from './record';
 export * from './topic';
 export * from './user';
 export * from './video';

package/resolvers/fragments/index.js

@@ -18,13 +18,11 @@ __exportStar(require("./blog"), exports);
 __exportStar(require("./chapter"), exports);
 __exportStar(require("./concept"), exports);
 __exportStar(require("./highlight"), exports);
-__exportStar(require("./job"), exports);
 __exportStar(require("./marksheet"), exports);
 __exportStar(require("./mockTest"), exports);
 __exportStar(require("./osce"), exports);
 __exportStar(require("./picture"), exports);
 __exportStar(require("./question"), exports);
-__exportStar(require("./record"), exports);
 __exportStar(require("./topic"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./video"), exports);

package/resolvers/mutation/admin/index.d.ts

@@ -1,11 +1,7 @@
 export * from './ai';
 export * from './algoliaSync';
-export * from './assets';
 export * from './chapter';
 export * from './content';
 export * from './database';
-export * from './job';
 export * from './notification';
-export * from './question';
-export * from './record';
 export * from './token';

package/resolvers/mutation/admin/index.js

@@ -16,12 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ai"), exports);
 __exportStar(require("./algoliaSync"), exports);
-__exportStar(require("./assets"), exports);
 __exportStar(require("./chapter"), exports);
 __exportStar(require("./content"), exports);
 __exportStar(require("./database"), exports);
-__exportStar(require("./job"), exports);
 __exportStar(require("./notification"), exports);
-__exportStar(require("./question"), exports);
-__exportStar(require("./record"), exports);
 __exportStar(require("./token"), exports);

package/resolvers/mutation/restricted/marksheet.js

@@ -81,10 +81,39 @@ exports.SAVE_MARKSHEET = (0, client_1.gql) `
           flagged
           mark
         }
+        sections {
+          entitlementId
+          marks {
+            isAnswered
+            isInDailyStack
+            result
+            score
+            id
+            marksheetId
+            questionChoiceId
+            timeTaken
+            flagged
+            mark
+          }
+        }
       }
     }
   }
 `;
+function getMarksFromMarksheet(marksheets, marksheetId) {
+    const marksheet = marksheets.find((m) => Number(m.id) === Number(marksheetId));
+    if (!marksheet)
+        return [];
+    // Case 1: direct marks
+    if (Array.isArray(marksheet.marks) && marksheet.marks.length > 0) {
+        return marksheet.marks;
+    }
+    // Case 2: nested sections → flatten marks
+    if (Array.isArray(marksheet.sections)) {
+        return marksheet.sections.flatMap((section) => section.marks || []);
+    }
+    return [];
+}
 const updateMarksheets = (cache, result, options) => {
     const { saveMarksheets } = result?.data?.restricted || {};
     const { variables } = options || {};
@@ -95,7 +124,7 @@ const updateMarksheets = (cache, result, options) => {
         const { input } = variables;
         for (let i = 0; i < input.length; i++) {
             const inputData = input[i];
-            const savedMarks = saveMarksheets.find((m) => Number(m.id) === Number(inputData.marksheetId))?.marks;
+            const savedMarks = getMarksFromMarksheet(saveMarksheets, inputData.marksheetId);
             const savedData = savedMarks?.find((m) => m.id === inputData.markId);
             cache.writeFragment({
                 id: cache.identify({
@@ -121,43 +150,68 @@ const updateMarksheets = (cache, result, options) => {
 exports.updateMarksheets = updateMarksheets;
 const optimisticSaveMarksheets = (marksheet, marksheetInput, questionIndex) => {
     const { timeTaken, choiceId, mark, marksheetId, markId } = marksheetInput;
-    const { marks = [], ...rest } = marksheet || {};
-    const currentMark = marks.find((m) => Number(m.id) === Number(markId));
-    if (!currentMark) {
+    const { marks = [], sections = [], ...rest } = marksheet || {};
+    const updateMarksArray = (marksArr) => {
+        const currentMark = marksArr.find((m) => Number(m.id) === Number(markId));
+        if (!currentMark)
+            return marksArr;
+        const { psaSectionId, choices, typeId } = currentMark.question;
+        const { answerField } = (0, utils_1.getQuestionInfo)(typeId, psaSectionId);
+        const answer = currentMark.question[answerField];
+        const { result, score } = (0, utils_1.evaluateMark)({
+            mark: mark || '',
+            answer,
+            psaSectionId,
+            questionTypeId: typeId,
+            choices,
+        });
+        const updatedMark = {
+            ...marksArr[questionIndex],
+            marksheetId,
+            timeTaken,
+            questionChoiceId: choiceId ?? null,
+            isAnswered: true,
+            mark: mark || null,
+            result,
+            score,
+        };
+        return [
+            ...marksArr.slice(0, questionIndex),
+            updatedMark,
+            ...marksArr.slice(questionIndex + 1),
+        ];
+    };
+    // Case 1: marks
+    if (marks.length > 0) {
         return {
             restricted: {
-                saveMarksheets: [{ ...rest, marks }],
+                saveMarksheets: [{ ...rest, marks: updateMarksArray(marks), sections }],
             },
         };
     }
-    const { psaSectionId, choices, typeId } = currentMark.question;
-    const { answerField } = (0, utils_1.getQuestionInfo)(typeId, psaSectionId);
-    const answer = currentMark.question[answerField];
-    const { result, score } = (0, utils_1.evaluateMark)({
-        mark: mark || '',
-        answer,
-        psaSectionId,
-        questionTypeId: typeId,
-        choices,
-    });
-    const updatedMark = {
-        ...marks[questionIndex],
-        marksheetId,
-        timeTaken,
-        questionChoiceId: choiceId ?? null,
-        isAnswered: true,
-        mark: mark || null,
-        result,
-        score,
-    };
-    const updatedMarks = [
-        ...marks.slice(0, questionIndex),
-        updatedMark,
-        ...marks.slice(questionIndex + 1),
-    ];
+    // Case 2: sections
+    if (sections.length > 0) {
+        const updatedSections = sections.map((section) => {
+            if (!Array.isArray(section.marks))
+                return section;
+            const hasMark = section.marks.some((m) => Number(m.id) === Number(markId));
+            if (!hasMark)
+                return section;
+            return {
+                ...section,
+                marks: updateMarksArray(section.marks),
+            };
+        });
+        return {
+            restricted: {
+                saveMarksheets: [{ ...rest, sections: updatedSections, marks }],
+            },
+        };
+    }
+    // fallback
     return {
         restricted: {
-            saveMarksheets: [{ ...rest, marks: updatedMarks }],
+            saveMarksheets: [{ ...rest, marks, sections }],
         },
     };
 };

package/resolvers/mutation/restricted/questionDiscussion.js

@@ -46,7 +46,7 @@ const getQuestionTypeName = (typeId) => {
         [models_1.EQuestionType.DECISION_MAKING_SBA]: 'QuestionSBA',
         [models_1.EQuestionType.DECISION_MAKING_YES_NO]: 'QuestionMultiA',
         [models_1.EQuestionType.SJT_SINGLE_CHOICE]: 'QuestionSBA',
-        [models_1.EQuestionType.SJT_TWO_ANSWERS]: 'QuestionSelect3',
+        [models_1.EQuestionType.SJT_TWO_ANSWERS]: 'QuestionSBA',
     };
     return mappedObj[typeId] ?? 'QuestionSBA';
 };

package/resolvers/mutation/restricted/users.d.ts

@@ -63,6 +63,7 @@ export type IRenewTokenData = RestrictedData<string, 'renewToken'>;
 export declare const TOC_ACCEPT: import("@apollo/client").DocumentNode;
 export type ITocAcceptVar = null;
 export type ITocAcceptData = RestrictedData<string, 'tocAccept'>;
+export declare const updateCacheOnTocAccept: (userId: Id) => (cache: ApolloCache<any>, _result: ApolloUpdateResultRestricted<ITocAcceptData>, _options?: ApolloUpdateOptions<ITocAcceptVar>) => void;
 export type ICompletedCardsData = Pick<IUser, 'completedCards' | 'completedCardsCount'>;
 export type IUpsertUserConceptStatusVar = {
     conceptIds: Id[];

package/resolvers/mutation/restricted/users.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimisticVideoLearningStatus = exports.updateCacheOnVideoLearningStatusUpdate = exports.UPSERT_USER_VIDEO_STATUS = exports.optimisticStationLearningStatus = exports.updateCacheOnStationLearningStatusUpdate = exports.UPSERT_USER_STATION_STATUS = exports.optimisticConceptLearningStatus = exports.updateCacheOnConceptLearningStatusUpdate = exports.UPSERT_USER_CONCEPT_STATUS = exports.TOC_ACCEPT = exports.RENEW_TOKEN = exports.updateCacheOnUpdateUserSettings = exports.optimisticUpdateUserSettings = exports.optimisticAddProductFeedback = exports.ADD_PRODUCT_FEEDBACK = exports.UPDATE_USER_SETTINGS = exports.UPDATE_USER = exports.DELETE_USER = exports.RESET_CATEGORY_PROGRESS = exports.RESET_PROGRESS = exports.LOGOUT_USER = void 0;
+exports.optimisticVideoLearningStatus = exports.updateCacheOnVideoLearningStatusUpdate = exports.UPSERT_USER_VIDEO_STATUS = exports.optimisticStationLearningStatus = exports.updateCacheOnStationLearningStatusUpdate = exports.UPSERT_USER_STATION_STATUS = exports.optimisticConceptLearningStatus = exports.updateCacheOnConceptLearningStatusUpdate = exports.UPSERT_USER_CONCEPT_STATUS = exports.updateCacheOnTocAccept = exports.TOC_ACCEPT = exports.RENEW_TOKEN = exports.updateCacheOnUpdateUserSettings = exports.optimisticUpdateUserSettings = exports.optimisticAddProductFeedback = exports.ADD_PRODUCT_FEEDBACK = exports.UPDATE_USER_SETTINGS = exports.UPDATE_USER = exports.DELETE_USER = exports.RESET_CATEGORY_PROGRESS = exports.RESET_PROGRESS = exports.LOGOUT_USER = void 0;
 const client_1 = require("@apollo/client");
 const models_1 = require("../../../models");
 const utils_1 = require("../../../utils");
@@ -159,6 +159,25 @@ exports.TOC_ACCEPT = (0, client_1.gql) `
     }
   }
 `;
+const TOC_ACCEPTED_FRAGMENT = (0, client_1.gql) `
+  fragment TocAcceptedFragment on User {
+    tocAccepted
+  }
+`;
+const updateCacheOnTocAccept = (userId) => (cache, _result, _options) => {
+    if (!userId) {
+        return;
+    }
+    cache.writeFragment({
+        id: cache.identify({ id: userId, __typename: 'User' }),
+        data: {
+            tocAccepted: true,
+        },
+        fragment: TOC_ACCEPTED_FRAGMENT,
+        fragmentName: 'TocAcceptedFragment',
+    });
+};
+exports.updateCacheOnTocAccept = updateCacheOnTocAccept;
 exports.UPSERT_USER_CONCEPT_STATUS = (0, client_1.gql) `
   mutation UpsertUserConceptStatus($conceptIds: [Int!]!, $status: Int!) {
     restricted {

package/resolvers/query/admin/index.d.ts

@@ -2,5 +2,3 @@ export * from './chapter';
 export * from './dashboard';
 export * from './database';
 export * from './getUserToken';
-export * from './job';
-export * from './record';

package/resolvers/query/admin/index.js

@@ -18,5 +18,3 @@ __exportStar(require("./chapter"), exports);
 __exportStar(require("./dashboard"), exports);
 __exportStar(require("./database"), exports);
 __exportStar(require("./getUserToken"), exports);
-__exportStar(require("./job"), exports);
-__exportStar(require("./record"), exports);

package/resolvers/query/restricted/marksheet.d.ts

@@ -32,8 +32,14 @@ export interface IMarksheetsVar {
         order?: ESortOrder;
         lastId?: number;
         solo?: boolean;
+        mockTestId?: number;
     };
 }
+export type IMarksheetList = RestrictedData<graphqlNormalize & {
+    results: IMarksheet[];
+    total: number;
+}, 'marksheetList'>;
+export declare const MARKSHEET_LIST: import("@apollo/client").DocumentNode;
 export type IMarksheetsData = RestrictedData<{
     results: (graphqlNormalize & IMarksheet)[];
     total: number;

package/resolvers/query/restricted/marksheet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PRE_BUILD_MARKSHEET = exports.HEARTBEAT_QBANK = exports.MARKSHEET_FEEDBACK = exports.FLAGGED_QUESTIONS_MARKSHEET = exports.FLAGGED_QUESTIONS = exports.LATEST_PAST_SESSION_ID = exports.LATEST_PAST_MARKSHEET_ID = exports.MARKSHEETS_TRACKER = exports.MARKSHEETS = exports.MARKSHEETS_WINDOW = exports.MARKSHEET = void 0;
+exports.PRE_BUILD_MARKSHEET = exports.HEARTBEAT_QBANK = exports.MARKSHEET_FEEDBACK = exports.FLAGGED_QUESTIONS_MARKSHEET = exports.FLAGGED_QUESTIONS = exports.LATEST_PAST_SESSION_ID = exports.LATEST_PAST_MARKSHEET_ID = exports.MARKSHEETS_TRACKER = exports.MARKSHEETS = exports.MARKSHEET_LIST = exports.MARKSHEETS_WINDOW = exports.MARKSHEET = void 0;
 const client_1 = require("@apollo/client");
 const marksheet_1 = require("../../fragments/marksheet");
 exports.MARKSHEET = (0, client_1.gql) `
@@ -48,6 +48,27 @@ exports.MARKSHEETS_WINDOW = (0, client_1.gql) `
     }
   }
 `;
+exports.MARKSHEET_LIST = (0, client_1.gql) `
+  ${marksheet_1.MARKSHEET_STATS_FIELDS}
+  query MarksheetList($options: MarksheetOptions!) {
+    restricted {
+      marksheetList(options: $options) {
+        results {
+          id
+          endedAt
+          stats {
+            ...MarksheetStatsFields
+          }
+          isTestMarksheet
+          solo
+          completed
+          updatedAt
+        }
+        total
+      }
+    }
+  }
+`;
 exports.MARKSHEETS = (0, client_1.gql) `
   ${marksheet_1.MARKSHEET_STATS_FIELDS}
   query Marksheets($filter: MarksheetFilterInput!) {

package/utils/evaluateMark.js

@@ -81,7 +81,7 @@ function getQuestionInfo(questionType, psaSectionId) {
         case models_1.EQuestionType.SJT_SINGLE_CHOICE:
             return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.SJT_TWO_ANSWERS:
-            return { maxScore: 1, answerField: 'rankingAnswer' };
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         default:
             return { maxScore: 1, answerField: 'answer' };
     }

package/resolvers/fragments/job.d.ts

@@ -1,10 +0,0 @@
-export declare const JOB_STATUS_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_META_DATA_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_FIELDS_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_CHAT_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_HISTORY_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_MEMBER_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_ASSETS_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const LIST_JOB_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const LIMITED_JOB_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const FULL_JOB_FRAGMENT: import("@apollo/client").DocumentNode;

package/resolvers/fragments/job.js

@@ -1,191 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FULL_JOB_FRAGMENT = exports.LIMITED_JOB_FRAGMENT = exports.LIST_JOB_FRAGMENT = exports.JOB_ASSETS_FRAGMENT = exports.JOB_MEMBER_FRAGMENT = exports.JOB_HISTORY_FRAGMENT = exports.JOB_CHAT_FRAGMENT = exports.JOB_FIELDS_FRAGMENT = exports.JOB_META_DATA_FRAGMENT = exports.JOB_STATUS_FRAGMENT = void 0;
-const client_1 = require("@apollo/client");
-const record_1 = require("./record");
-exports.JOB_STATUS_FRAGMENT = (0, client_1.gql) `
-  fragment JobStatus on Job {
-    status
-  }
-`;
-exports.JOB_META_DATA_FRAGMENT = (0, client_1.gql) `
-  fragment JobMetaData on JobMetaData {
-    question {
-      typeId
-      conceptId
-      entitlementIds
-    }
-    mockTest {
-      mockTestId
-      typeId
-      isNew
-      title
-      passingMark
-    }
-    chapter {
-      topicId
-      entitlementIds
-      # topicTypeId
-    }
-  }
-`;
-exports.JOB_FIELDS_FRAGMENT = (0, client_1.gql) `
-  ${exports.JOB_META_DATA_FRAGMENT}
-  fragment JobFields on Job {
-    name
-    description
-    type
-    productId
-    priority
-    totalRecords
-    dueDate
-    metadata {
-      ...JobMetaData
-    }
-  }
-`;
-exports.JOB_CHAT_FRAGMENT = (0, client_1.gql) `
-  ${record_1.JOB_USER_FRAGMENT}
-  fragment JobChat on JobChat {
-    id
-    jobId
-    message
-    createdAt
-    updatedAt
-    user {
-      ...JobUser
-    }
-  }
-`;
-exports.JOB_HISTORY_FRAGMENT = (0, client_1.gql) `
-  ${record_1.JOB_USER_FRAGMENT}
-  fragment JobHistory on JobHistory {
-    id
-    createdAt
-    updatedAt
-    type
-    action
-    data
-    description
-    jobId
-    recordId
-    user {
-      ...JobUser
-    }
-  }
-`;
-exports.JOB_MEMBER_FRAGMENT = (0, client_1.gql) `
-  ${record_1.JOB_USER_FRAGMENT}
-  fragment JobMember on JobMember {
-    id
-    createdAt
-    jobId
-    role
-    user {
-      ...JobUser
-    }
-  }
-`;
-exports.JOB_ASSETS_FRAGMENT = (0, client_1.gql) `
-  ${record_1.JOB_USER_FRAGMENT}
-  fragment JobAssets on JobAsset {
-    id
-    jobId
-    recordId
-    index
-    type
-    choiceLabel
-    createdAt
-    picture {
-      id
-      thumbhash
-      name
-      caption
-      path
-      path512
-      path256
-    }
-  }
-`;
-exports.LIST_JOB_FRAGMENT = (0, client_1.gql) `
-  ${exports.JOB_FIELDS_FRAGMENT}
-  ${exports.JOB_STATUS_FRAGMENT}
-  ${record_1.JOB_USER_FRAGMENT}
-  ${exports.JOB_MEMBER_FRAGMENT}
-  fragment Job on Job {
-    id
-    trial
-    updatedAt
-    createdAt
-    recordCount
-    publishedCount
-    resolvedCount
-    remarkCount
-    memberCount
-    assetCount
-    chatCount
-    createdByUser {
-      ...JobUser
-    }
-    members {
-      ...JobMember
-    }
-    ...JobFields
-    ...JobStatus
-  }
-`;
-exports.LIMITED_JOB_FRAGMENT = (0, client_1.gql) `
-  ${exports.LIST_JOB_FRAGMENT}
-  ${exports.JOB_MEMBER_FRAGMENT}
-  ${exports.JOB_ASSETS_FRAGMENT}
-  ${exports.JOB_HISTORY_FRAGMENT}
-  fragment LimitedJob on Job {
-    ...Job
-    members {
-      ...JobMember
-    }
-    assets {
-      ...JobAssets
-    }
-    history {
-      ...JobHistory
-    }
-  }
-`;
-exports.FULL_JOB_FRAGMENT = (0, client_1.gql) `
-  ${exports.JOB_FIELDS_FRAGMENT}
-  ${exports.JOB_STATUS_FRAGMENT}
-  ${record_1.JOB_RECORD_FRAGMENT}
-  ${record_1.JOB_REMARK_FRAGMENT}
-  ${exports.JOB_MEMBER_FRAGMENT}
-  fragment DetailedJob on Job {
-    id
-    updatedAt
-    createdAt
-    trial
-    recordCount
-    setCount
-    publishedCount
-    resolvedCount
-    remarkCount
-    memberCount
-    chatCount
-    createdByUser {
-      ...JobUser
-    }
-    assets {
-      ...JobAssets
-    }
-    records {
-      ...JobRecord
-    }
-    remarks {
-      ...JobRemark
-    }
-    members {
-      ...JobMember
-    }
-    ...JobFields
-    ...JobStatus
-  }
-`;

package/resolvers/fragments/record.d.ts

@@ -1,10 +0,0 @@
-export declare const JOB_USER_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_REMARK_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_ASSET_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_RECORD_CHOICE_SUMMARY_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_RECORD_QUESTION_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_RECORD_CHAPTER_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_RECORD_STATION_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_RECORD_MOCK_TEST_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_RECORD_STATUS_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_RECORD_FRAGMENT: import("@apollo/client").DocumentNode;