@quesmed/types-rn 2.6.54 → 2.6.56

package/models/Chapter.d.ts

@@ -1,4 +1,5 @@
 import { IFile } from './File';
+import { IHighlightNode } from './Highlight';
 import { IPicture } from './Picture';
 import { ETopicType } from './Topic';
 import { Id } from './Type';
@@ -13,4 +14,5 @@ export interface IChapter {
     pictures?: IPicture[];
     files?: IFile[];
     userNote: null | IUserChapterNote;
+    highlights?: IHighlightNode[];
 }

package/models/Highlight.d.ts

@@ -0,0 +1,29 @@
+import { IChapter } from './Chapter';
+import { IQuestion } from './Question';
+import { Id } from './Type';
+import { IUser } from './User';
+export interface IHighlightNode {
+    start: number;
+    end: number;
+    text: string;
+    color?: string;
+    part?: string;
+    tag?: string;
+}
+export interface IHighlight {
+    id: Id;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+    deletedAt: number | Date;
+    userId?: Id;
+    user?: IUser;
+    highlights?: IHighlightNode[];
+}
+export interface IQuestionHighlight extends IHighlight {
+    questionId?: Id;
+    question?: IQuestion;
+}
+export interface IChapterHighlight extends IHighlight {
+    chapterId?: Id;
+    chapter?: IChapter;
+}

package/models/Highlight.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/Question.d.ts

@@ -1,6 +1,7 @@
 import { IConcept } from './Concept';
 import { ICondition } from './Condition';
 import { EDifficultyType } from './Difficulty';
+import { IHighlightNode } from './Highlight';
 import { IPicture } from './Picture';
 import { IPresentation } from './Presentation';
 import { ITopic } from './Topic';
@@ -90,26 +91,7 @@ export interface IQuestion {
     dislikes?: number;
     isLikedByMe?: EQuestionLike;
     comments?: IQuestionComment[];
-    highlights?: Array<IHighlight>;
-}
-export interface IHighlight {
-    start: number;
-    end: number;
-    text: string;
-    color?: string;
-    part?: string;
-    tag?: string;
-}
-export interface IQuestionHighlights {
-    id: Id;
-    createdAt: number | Date;
-    updatedAt: number | Date;
-    deletedAt: number | Date;
-    userId?: Id;
-    questionId?: Id;
-    user?: IUser;
-    question?: IQuestion;
-    highlights?: Array<IHighlight>;
+    highlights?: IHighlightNode[];
 }
 export interface IQuestionChoice {
     id: Id;

package/models/User.d.ts

@@ -1,17 +1,17 @@
 import { ExtractKeysWithPattern } from '../resolvers/types';
 import { ICard } from './Card';
+import { IChapter } from './Chapter';
 import { IConcept } from './Concept';
 import { IMarksheet } from './Marksheet';
 import { INotification } from './Notification';
 import { IOsceStation } from './OsceStation';
 import { EProductType } from './Product';
-import { IQuestion, IQuestionHighlights } from './Question';
+import { IQuestion } from './Question';
 import { ISubscription } from './Subscription';
 import { ITodo } from './Todo';
 import { Id } from './Type';
 import { IUniversity } from './University';
 import { IVideo } from './Video';
-import { IChapter } from './Chapter';
 export type IUserSubsriptionDates = keyof ExtractKeysWithPattern<IPayload, 'EndDate'>;
 export declare enum IAccessLevel {
     SUBSCRIBER = "subscriber",
@@ -142,7 +142,6 @@ export interface IUser {
     radiologyInterviewSubscriptionEndDate: number | Date | null;
     plab1SubscriptionEndDate: number | Date | null;
     plab2SubscriptionEndDate: number | Date | null;
-    questionHighlights?: IQuestionHighlights[];
 }
 export declare function currentClassYear(createdAtUnix: number, classYear: IClassYear, compareUnix?: number): IClassYear;
 export declare function currentClassGroup(createdAtUnix: number, classYear: IClassYear): EClassYearGroup;

package/models/index.d.ts

@@ -8,6 +8,7 @@ export * from './Condition';
 export * from './Difficulty';
 export * from './Feedback';
 export * from './File';
+export * from './Highlight';
 export * from './Marksheet';
 export * from './MockTest';
 export * from './Notification';

package/models/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./Condition"), exports);
 __exportStar(require("./Difficulty"), exports);
 __exportStar(require("./Feedback"), exports);
 __exportStar(require("./File"), exports);
+__exportStar(require("./Highlight"), exports);
 __exportStar(require("./Marksheet"), exports);
 __exportStar(require("./MockTest"), exports);
 __exportStar(require("./Notification"), exports);

package/package.json

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

package/resolvers/fragments/chapter.d.ts

@@ -1,2 +1,3 @@
 export declare const CHAPTER_FIELDS: import("@apollo/client").DocumentNode;
 export declare const UPSERT_CHAPTER_NOTE_FRAGMENT: import("@apollo/client").DocumentNode;
+export declare const CHAPTER_WITH_HIGHLIGHT_FIELDS: import("@apollo/client").DocumentNode;

package/resolvers/fragments/chapter.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UPSERT_CHAPTER_NOTE_FRAGMENT = exports.CHAPTER_FIELDS = void 0;
+exports.CHAPTER_WITH_HIGHLIGHT_FIELDS = exports.UPSERT_CHAPTER_NOTE_FRAGMENT = exports.CHAPTER_FIELDS = void 0;
 const client_1 = require("@apollo/client");
 const picture_1 = require("./picture");
+const highlight_1 = require("./highlight");
 exports.CHAPTER_FIELDS = (0, client_1.gql) `
   ${picture_1.PICTURE_FIELDS}
+  ${highlight_1.HIGHLIGHT_FIELDS}
   fragment ChapterFields on Chapter {
     id
     explanation
@@ -12,6 +14,9 @@ exports.CHAPTER_FIELDS = (0, client_1.gql) `
     pictures {
       ...PictureFields
     }
+    highlights {
+      ...HighlightFields
+    }
     userNote {
       id
       userId
@@ -28,6 +33,7 @@ exports.CHAPTER_FIELDS = (0, client_1.gql) `
     }
   }
 `;
+// used in cache updator
 exports.UPSERT_CHAPTER_NOTE_FRAGMENT = (0, client_1.gql) `
   fragment UpsertChapterNoteFragment on Chapter {
     userNote {
@@ -39,3 +45,16 @@ exports.UPSERT_CHAPTER_NOTE_FRAGMENT = (0, client_1.gql) `
     }
   }
 `;
+// used in cache updator
+exports.CHAPTER_WITH_HIGHLIGHT_FIELDS = (0, client_1.gql) `
+  fragment ChapterWithHighlightFields on Chapter {
+    highlights {
+      start
+      end
+      text
+      part
+      tag
+      color
+    }
+  }
+`;

package/resolvers/fragments/highlight.d.ts

@@ -0,0 +1 @@
+export declare const HIGHLIGHT_FIELDS: import("@apollo/client").DocumentNode;

package/resolvers/fragments/highlight.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HIGHLIGHT_FIELDS = void 0;
+const client_1 = require("@apollo/client");
+exports.HIGHLIGHT_FIELDS = (0, client_1.gql) `
+  fragment HighlightFields on HighlightNode {
+    start
+    end
+    text
+    part
+    tag
+    color
+  }
+`;

package/resolvers/fragments/index.d.ts

@@ -1,6 +1,7 @@
 export * from './blog';
 export * from './chapter';
 export * from './concept';
+export * from './highlight';
 export * from './marksheet';
 export * from './mockTest';
 export * from './osce';

package/resolvers/fragments/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./blog"), exports);
 __exportStar(require("./chapter"), exports);
 __exportStar(require("./concept"), exports);
+__exportStar(require("./highlight"), exports);
 __exportStar(require("./marksheet"), exports);
 __exportStar(require("./mockTest"), exports);
 __exportStar(require("./osce"), exports);

package/resolvers/fragments/question.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QUESTION_WITH_COMMENT_FIELDS = exports.QUESTION_WITH_HIGHLIGHT_FIELDS = exports.QUESTION_FIELDS = exports.QUESTION_CATEGORY_FIELDS = exports.QUESTION_COMMENT_FIELDS = void 0;
 const client_1 = require("@apollo/client");
 const concept_1 = require("./concept");
+const highlight_1 = require("./highlight");
 const picture_1 = require("./picture");
 exports.QUESTION_COMMENT_FIELDS = (0, client_1.gql) `
   fragment QuestionCommentFields on QuestionComment {
@@ -98,6 +99,7 @@ exports.QUESTION_CATEGORY_FIELDS = (0, client_1.gql) `
   }
 `;
 exports.QUESTION_FIELDS = (0, client_1.gql) `
+  ${highlight_1.HIGHLIGHT_FIELDS}
   ${exports.QUESTION_CATEGORY_FIELDS}
   ${exports.QUESTION_COMMENT_FIELDS}
   ${concept_1.CONCEPT_FIELDS}
@@ -115,12 +117,7 @@ exports.QUESTION_FIELDS = (0, client_1.gql) `
     typeId
     psaSectionId
     highlights {
-      start
-      end
-      text
-      part
-      tag
-      color
+      ...HighlightFields
     }
     choices {
       id

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

@@ -1,7 +1,10 @@
 import { ApolloCache } from '@apollo/client';
-import { IUserChapterNote } from '../../../models';
+import { IChapterHighlight, IHighlightNode, IUserChapterNote, Id } from '../../../models';
 import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../../apollo';
-import { RestrictedData } from '../../types';
+import { RestrictedData, graphqlNormalize } from '../../types';
+/**
+ * upsertChapterNote
+ */
 export declare const UPSERT_CHAPTER_NOTE: import("@apollo/client").DocumentNode;
 export interface IUpsertChapterNoteVar {
     chapterId: number;
@@ -23,3 +26,16 @@ export declare const optimisticUpsertChapterNote: (data: IUpsertChapterNoteVar &
         };
     };
 };
+/**
+ * addChapterHighlight
+ */
+export interface IAddChapterHighlightVar {
+    marksheetId?: number;
+    input: {
+        chapterId: Id;
+        highlights: IHighlightNode[];
+    }[];
+}
+export type IAddChapterHighlightData = RestrictedData<(graphqlNormalize & IChapterHighlight)[], 'addChapterHighlight'>;
+export declare const ADD_CHAPTER_HIGHLIGHT: import("@apollo/client").DocumentNode;
+export declare const updateChapterHighlights: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IAddChapterHighlightData>, options: ApolloUpdateOptions<IAddChapterHighlightVar>) => void;

package/resolvers/mutation/restricted/chapter.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optimisticUpsertChapterNote = exports.updateCacheOnUpsertChapterNote = exports.UPSERT_CHAPTER_NOTE = void 0;
+exports.updateChapterHighlights = exports.ADD_CHAPTER_HIGHLIGHT = exports.optimisticUpsertChapterNote = exports.updateCacheOnUpsertChapterNote = exports.UPSERT_CHAPTER_NOTE = void 0;
 const client_1 = require("@apollo/client");
 const fragments_1 = require("../../fragments");
+/**
+ * upsertChapterNote
+ */
 exports.UPSERT_CHAPTER_NOTE = (0, client_1.gql) `
   mutation UpsertChapterNote($chapterId: Int!, $note: String!) {
     restricted {
@@ -48,3 +51,46 @@ const optimisticUpsertChapterNote = (data) => {
     };
 };
 exports.optimisticUpsertChapterNote = optimisticUpsertChapterNote;
+exports.ADD_CHAPTER_HIGHLIGHT = (0, client_1.gql) `
+  ${fragments_1.HIGHLIGHT_FIELDS}
+  mutation AddChapterHighlight(
+    $input: [AddChapterHighlightInput!]!
+    $marksheetId: Int
+  ) {
+    restricted {
+      addChapterHighlight(input: $input, marksheetId: $marksheetId) {
+        id
+        chapterId
+        userId
+        highlights {
+          ...HighlightFields
+        }
+      }
+    }
+  }
+`;
+const updateChapterHighlights = (cache, result, options) => {
+    const { addChapterHighlight } = result?.data?.restricted ?? {};
+    const { variables } = options || {};
+    if (!variables || !addChapterHighlight) {
+        return;
+    }
+    try {
+        for (const { chapterId, highlights } of variables.input) {
+            cache.writeFragment({
+                id: cache.identify({
+                    id: chapterId,
+                    __typename: 'Chapter',
+                }),
+                data: {
+                    highlights,
+                },
+                fragment: fragments_1.CHAPTER_WITH_HIGHLIGHT_FIELDS,
+            });
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+};
+exports.updateChapterHighlights = updateChapterHighlights;

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

@@ -1,6 +1,6 @@
 import { ApolloCache } from '@apollo/client';
 import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../..';
-import { EQuestionLike, EQuestionType, IAccessLevel, IHighlight, IQuestion, IQuestionComment, IQuestionHighlights, Id } from '../../../models';
+import { EQuestionLike, EQuestionType, IAccessLevel, IHighlightNode, IQuestion, IQuestionComment, IQuestionHighlight, Id } from '../../../models';
 import { RestrictedData, graphqlNormalize } from '../../types';
 interface LikeData {
     likes?: number;
@@ -53,12 +53,13 @@ export type IQuestionCommentRemoveData = RestrictedData<graphqlNormalize & IQues
  * addQuestionHighlight
  */
 export interface IAddQuestionHighlightVar {
+    marksheetId?: number;
     input: {
         questionId: Id;
-        highlights: IHighlight[];
+        highlights: IHighlightNode[];
     }[];
 }
-export type IAddQuestionHighlightData = RestrictedData<(graphqlNormalize & IQuestionHighlights)[], 'addQuestionHighlight'>;
+export type IAddQuestionHighlightData = RestrictedData<(graphqlNormalize & IQuestionHighlight)[], 'addQuestionHighlight'>;
 export declare const ADD_QUESTION_HIGHLIGHT: import("@apollo/client").DocumentNode;
-export declare const updateQuestionHighlights: (typeId: EQuestionType) => (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IAddQuestionHighlightData>, options: ApolloUpdateOptions) => void;
+export declare const updateQuestionHighlights: (typeId: EQuestionType) => (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IAddQuestionHighlightData>, options: ApolloUpdateOptions<IAddQuestionHighlightVar>) => void;
 export {};

package/resolvers/mutation/restricted/questionDiscussion.js

@@ -336,19 +336,18 @@ const optimisticQuestionCommentRemove = (comments, input, parentId) => {
 };
 exports.optimisticQuestionCommentRemove = optimisticQuestionCommentRemove;
 exports.ADD_QUESTION_HIGHLIGHT = (0, client_1.gql) `
-  mutation AddHighlight($input: [AddQuestionHighlightInput!]!) {
+  ${fragments_1.HIGHLIGHT_FIELDS}
+  mutation AddQuestionHighlight(
+    $input: [AddQuestionHighlightInput!]!
+    $marksheetId: Int
+  ) {
     restricted {
-      addQuestionHighlight(input: $input) {
+      addQuestionHighlight(input: $input, marksheetId: $marksheetId) {
         id
         questionId
         userId
         highlights {
-          start
-          end
-          text
-          part
-          tag
-          color
+          ...HighlightFields
         }
       }
     }
@@ -360,20 +359,19 @@ const updateQuestionHighlights = (typeId) => (cache, result, options) => {
     if (!variables || !addQuestionHighlight) {
         return;
     }
-    const { input } = variables;
     try {
-        input.forEach(({ questionId }) => {
+        for (const { questionId, highlights } of variables.input) {
             cache.writeFragment({
                 id: cache.identify({
                     id: questionId,
                     __typename: (0, exports.getQuestionTypeName)(typeId),
                 }),
                 data: {
-                    highlights: addQuestionHighlight[0].highlights,
+                    highlights,
                 },
                 fragment: fragments_1.QUESTION_WITH_HIGHLIGHT_FIELDS,
             });
-        });
+        }
     }
     catch (error) {
         console.error(error);