ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Add delete mutation, flesh out update mutation for highlights

This commit is contained in:
Ramon Wenger 2024-01-25 12:11:04 +01:00
parent f7d083e66a
commit f2c9ec04b8
13 changed files with 302 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/__generated__/gql.ts generated
View File

@ -13,12 +13,15 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
* Therefore it is highly recommended to use the babel or swc plugin for production.
*/
const documents = {
"\n fragment HighlightParts on HighlightNode {\n id\n contentIndex\n paragraphIndex\n selectionLength\n contentUuid\n startPosition\n text\n color\n }\n": types.HighlightPartsFragmentDoc,
"\n fragment HighlightParts on HighlightNode {\n id\n contentIndex\n paragraphIndex\n selectionLength\n contentUuid\n startPosition\n note {\n text\n }\n color\n contentBlock {\n id\n }\n }\n": types.HighlightPartsFragmentDoc,
"\n fragment ContentBlockHighlightsFragment on ContentBlockNode {\n id\n __typename\n highlights {\n ...HighlightParts\n }\n }\n": types.ContentBlockHighlightsFragmentFragmentDoc,
"\n mutation AddHighlight($input: AddHighlightInput!) {\n addHighlight(input: $input) {\n __typename\n highlight {\n ...HighlightParts\n }\n }\n }\n ": types.AddHighlightDocument,
"\n query LanguageQuery {\n me {\n language @client\n }\n }\n ": types.LanguageQueryDocument,
"\n mutation SetLanguage($language: String!) {\n setLanguage(language: $language) @client {\n language\n }\n }\n ": types.SetLanguageDocument,
"\n query ReadOnlyQuery {\n me {\n readOnly\n selectedClass {\n readOnly\n }\n }\n }\n ": types.ReadOnlyQueryDocument,
"\n mutation UpdateHighlight($input: UpdateHighlightInput!) {\n updateHighlight(input: $input) {\n highlight {\n ...HighlightParts\n }\n }\n }\n ": types.UpdateHighlightDocument,
"\n mutation DeleteHighlight($input: DeleteHighlightInput!) {\n deleteHighlight(input: $input) {\n success\n }\n }\n ": types.DeleteHighlightDocument,
"\n fragment ContentBlockHighlightsWithIdOnlyFragment on ContentBlockNode {\n highlights {\n id\n }\n }\n ": types.ContentBlockHighlightsWithIdOnlyFragmentFragmentDoc,
"\n fragment ModuleLevelFragment on ModuleLevelNode {\n name\n id\n filterAttributeType\n }\n": types.ModuleLevelFragmentFragmentDoc,
"\n query ModuleFilterQuery {\n moduleLevels {\n ...ModuleLevelFragment\n }\n moduleCategories {\n name\n id\n filterAttributeType\n }\n me {\n language @client\n }\n }\n ": types.ModuleFilterQueryDocument,
"\n mutation UpdateLastModuleLevelMutation($input: UpdateLastModuleLevelInput!) {\n updateLastModuleLevel(input: $input) {\n clientMutationId\n user {\n username\n id\n lastModuleLevel {\n ...ModuleLevelFragment\n }\n }\n }\n }\n ": types.UpdateLastModuleLevelMutationDocument,
@ -53,7 +56,7 @@ export function graphql(source: string): unknown;
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(source: "\n fragment HighlightParts on HighlightNode {\n id\n contentIndex\n paragraphIndex\n selectionLength\n contentUuid\n startPosition\n text\n color\n }\n"): (typeof documents)["\n fragment HighlightParts on HighlightNode {\n id\n contentIndex\n paragraphIndex\n selectionLength\n contentUuid\n startPosition\n text\n color\n }\n"];
export function graphql(source: "\n fragment HighlightParts on HighlightNode {\n id\n contentIndex\n paragraphIndex\n selectionLength\n contentUuid\n startPosition\n note {\n text\n }\n color\n contentBlock {\n id\n }\n }\n"): (typeof documents)["\n fragment HighlightParts on HighlightNode {\n id\n contentIndex\n paragraphIndex\n selectionLength\n contentUuid\n startPosition\n note {\n text\n }\n color\n contentBlock {\n id\n }\n }\n"];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
@ -74,6 +77,18 @@ export function graphql(source: "\n mutation SetLanguage($language: String!)
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(source: "\n query ReadOnlyQuery {\n me {\n readOnly\n selectedClass {\n readOnly\n }\n }\n }\n "): (typeof documents)["\n query ReadOnlyQuery {\n me {\n readOnly\n selectedClass {\n readOnly\n }\n }\n }\n "];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(source: "\n mutation UpdateHighlight($input: UpdateHighlightInput!) {\n updateHighlight(input: $input) {\n highlight {\n ...HighlightParts\n }\n }\n }\n "): (typeof documents)["\n mutation UpdateHighlight($input: UpdateHighlightInput!) {\n updateHighlight(input: $input) {\n highlight {\n ...HighlightParts\n }\n }\n }\n "];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(source: "\n mutation DeleteHighlight($input: DeleteHighlightInput!) {\n deleteHighlight(input: $input) {\n success\n }\n }\n "): (typeof documents)["\n mutation DeleteHighlight($input: DeleteHighlightInput!) {\n deleteHighlight(input: $input) {\n success\n }\n }\n "];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function graphql(source: "\n fragment ContentBlockHighlightsWithIdOnlyFragment on ContentBlockNode {\n highlights {\n id\n }\n }\n "): (typeof documents)["\n fragment ContentBlockHighlightsWithIdOnlyFragment on ContentBlockNode {\n highlights {\n id\n }\n }\n "];
/**
* The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/

77
client/src/__generated__/graphql.ts generated
View File

@ -70,7 +70,7 @@ export type AddContentBlockPayload = {
export type AddHighlightArgument = {
color: Scalars['String']['input'];
contentBlockId: Scalars['String']['input'];
contentBlock: Scalars['String']['input'];
contentIndex: Scalars['Int']['input'];
contentUuid: Scalars['UUID']['input'];
paragraphIndex: Scalars['Int']['input'];
@ -560,6 +560,17 @@ export type DeleteContentBlockPayload = {
success?: Maybe<Scalars['Boolean']['output']>;
};
export type DeleteHighlightInput = {
clientMutationId?: InputMaybe<Scalars['String']['input']>;
id: Scalars['ID']['input'];
};
export type DeleteHighlightPayload = {
__typename?: 'DeleteHighlightPayload';
clientMutationId?: Maybe<Scalars['String']['output']>;
success: Scalars['Boolean']['output'];
};
export type DeleteObjectiveInput = {
clientMutationId?: InputMaybe<Scalars['String']['input']>;
id: Scalars['ID']['input'];
@ -720,10 +731,10 @@ export type HighlightNode = Node & {
contentUuid: Scalars['UUID']['output'];
/** The ID of the object */
id: Scalars['ID']['output'];
note: NoteNode;
paragraphIndex: Scalars['Int']['output'];
selectionLength: Scalars['Int']['output'];
startPosition: Scalars['Int']['output'];
text: Scalars['String']['output'];
user: PrivateUserNode;
};
@ -1044,6 +1055,7 @@ export type Mutation = {
createSnapshot?: Maybe<CreateSnapshotPayload>;
createTeam?: Maybe<CreateTeamPayload>;
deleteContentBlock?: Maybe<DeleteContentBlockPayload>;
deleteHighlight?: Maybe<DeleteHighlightPayload>;
deleteObjective?: Maybe<DeleteObjectivePayload>;
deleteProject?: Maybe<DeleteProjectPayload>;
deleteProjectEntry?: Maybe<DeleteProjectEntryPayload>;
@ -1066,6 +1078,7 @@ export type Mutation = {
updateChapterBookmark?: Maybe<UpdateChapterBookmarkPayload>;
updateChapterVisibility?: Maybe<UpdateChapterVisibilityPayload>;
updateContentBookmark?: Maybe<UpdateContentBookmarkPayload>;
updateHighlight?: Maybe<UpdateHighlightPayload>;
updateInstrumentBookmark?: Maybe<UpdateInstrumentBookmarkPayload>;
updateLastModule?: Maybe<UpdateLastModulePayload>;
updateLastModuleLevel?: Maybe<UpdateLastModuleLevelPayload>;
@ -1176,6 +1189,11 @@ export type MutationDeleteContentBlockArgs = {
};
export type MutationDeleteHighlightArgs = {
input: DeleteHighlightInput;
};
export type MutationDeleteObjectiveArgs = {
input: DeleteObjectiveInput;
};
@ -1276,6 +1294,11 @@ export type MutationUpdateContentBookmarkArgs = {
};
export type MutationUpdateHighlightArgs = {
input: UpdateHighlightInput;
};
export type MutationUpdateInstrumentBookmarkArgs = {
input: UpdateInstrumentBookmarkInput;
};
@ -1414,6 +1437,7 @@ export type NoteNode = Node & {
__typename?: 'NoteNode';
chapterbookmark?: Maybe<ChapterBookmarkNode>;
contentblockbookmark?: Maybe<ContentBlockBookmarkNode>;
highlight?: Maybe<HighlightNode>;
/** The ID of the object */
id: Scalars['ID']['output'];
instrumentbookmark?: Maybe<InstrumentBookmarkNode>;
@ -1625,7 +1649,6 @@ export type Query = {
chapter?: Maybe<ChapterNode>;
chapters?: Maybe<ChapterNodeConnection>;
contentBlock?: Maybe<ContentBlockNode>;
highlight?: Maybe<HighlightNode>;
instrument?: Maybe<InstrumentNode>;
instrumentCategories?: Maybe<Array<Maybe<InstrumentCategoryNode>>>;
instrumentTypes?: Maybe<Array<Maybe<InstrumentTypeNode>>>;
@ -1705,11 +1728,6 @@ export type QueryContentBlockArgs = {
};
export type QueryHighlightArgs = {
id: Scalars['ID']['input'];
};
export type QueryInstrumentArgs = {
id?: InputMaybe<Scalars['ID']['input']>;
slug?: InputMaybe<Scalars['String']['input']>;
@ -2324,6 +2342,19 @@ export type UpdateError = {
field?: Maybe<Scalars['String']['output']>;
};
export type UpdateHighlightInput = {
clientMutationId?: InputMaybe<Scalars['String']['input']>;
color?: InputMaybe<Scalars['String']['input']>;
id: Scalars['ID']['input'];
note?: InputMaybe<Scalars['String']['input']>;
};
export type UpdateHighlightPayload = {
__typename?: 'UpdateHighlightPayload';
clientMutationId?: Maybe<Scalars['String']['output']>;
highlight?: Maybe<HighlightNode>;
};
export type UpdateInstrumentBookmarkInput = {
bookmarked: Scalars['Boolean']['input'];
clientMutationId?: InputMaybe<Scalars['String']['input']>;
@ -2629,7 +2660,7 @@ export type UserGroupBlockVisibility = {
schoolClassId: Scalars['ID']['input'];
};
export type HighlightPartsFragment = { __typename?: 'HighlightNode', id: string, contentIndex: number, paragraphIndex: number, selectionLength: number, contentUuid: any, startPosition: number, text: string, color: string } & { ' $fragmentName'?: 'HighlightPartsFragment' };
export type HighlightPartsFragment = { __typename?: 'HighlightNode', id: string, contentIndex: number, paragraphIndex: number, selectionLength: number, contentUuid: any, startPosition: number, color: string, note: { __typename?: 'NoteNode', text: string }, contentBlock: { __typename?: 'ContentBlockNode', id: string } } & { ' $fragmentName'?: 'HighlightPartsFragment' };
export type ContentBlockHighlightsFragmentFragment = { __typename: 'ContentBlockNode', id: string, highlights?: Array<(
{ __typename?: 'HighlightNode' }
@ -2663,6 +2694,25 @@ export type ReadOnlyQueryQueryVariables = Exact<{ [key: string]: never; }>;
export type ReadOnlyQueryQuery = { __typename?: 'Query', me?: { __typename?: 'PrivateUserNode', readOnly?: boolean | null, selectedClass?: { __typename?: 'SchoolClassNode', readOnly?: boolean | null } | null } | null };
export type UpdateHighlightMutationVariables = Exact<{
input: UpdateHighlightInput;
}>;
export type UpdateHighlightMutation = { __typename?: 'Mutation', updateHighlight?: { __typename?: 'UpdateHighlightPayload', highlight?: (
{ __typename?: 'HighlightNode' }
& { ' $fragmentRefs'?: { 'HighlightPartsFragment': HighlightPartsFragment } }
) | null } | null };
export type DeleteHighlightMutationVariables = Exact<{
input: DeleteHighlightInput;
}>;
export type DeleteHighlightMutation = { __typename?: 'Mutation', deleteHighlight?: { __typename?: 'DeleteHighlightPayload', success: boolean } | null };
export type ContentBlockHighlightsWithIdOnlyFragmentFragment = { __typename?: 'ContentBlockNode', highlights?: Array<{ __typename?: 'HighlightNode', id: string } | null> | null } & { ' $fragmentName'?: 'ContentBlockHighlightsWithIdOnlyFragmentFragment' };
export type ModuleLevelFragmentFragment = { __typename?: 'ModuleLevelNode', name: string, id: string, filterAttributeType: BooksModuleLevelFilterAttributeTypeChoices } & { ' $fragmentName'?: 'ModuleLevelFragmentFragment' };
export type ModuleFilterQueryQueryVariables = Exact<{ [key: string]: never; }>;
@ -2753,16 +2803,19 @@ export type ModuleSolutionsQueryVariables = Exact<{
export type ModuleSolutionsQuery = { __typename?: 'Query', module?: { __typename?: 'ModuleNode', solutionsEnabled?: boolean | null, slug: string } | null };
export const HighlightPartsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"color"}}]}}]} as unknown as DocumentNode<HighlightPartsFragment, unknown>;
export const ContentBlockHighlightsFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ContentBlockHighlightsFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"Field","name":{"kind":"Name","value":"highlights"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"color"}}]}}]} as unknown as DocumentNode<ContentBlockHighlightsFragmentFragment, unknown>;
export const HighlightPartsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"contentBlock"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<HighlightPartsFragment, unknown>;
export const ContentBlockHighlightsFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ContentBlockHighlightsFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"Field","name":{"kind":"Name","value":"highlights"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"contentBlock"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<ContentBlockHighlightsFragmentFragment, unknown>;
export const ContentBlockHighlightsWithIdOnlyFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ContentBlockHighlightsWithIdOnlyFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"highlights"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<ContentBlockHighlightsWithIdOnlyFragmentFragment, unknown>;
export const ModuleLevelFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModuleLevelFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleLevelNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"filterAttributeType"}}]}}]} as unknown as DocumentNode<ModuleLevelFragmentFragment, unknown>;
export const SnapshotListItemFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SnapshotListItem"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SnapshotNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"shared"}}]}}]} as unknown as DocumentNode<SnapshotListItemFragment, unknown>;
export const SnapshotTitleFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SnapshotTitleFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SnapshotNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]} as unknown as DocumentNode<SnapshotTitleFragmentFragment, unknown>;
export const SnapshotDetailsFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SnapshotDetailsFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"SnapshotNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"shared"}},{"kind":"Field","name":{"kind":"Name","value":"created"}},{"kind":"Field","name":{"kind":"Name","value":"creator"}},{"kind":"Field","name":{"kind":"Name","value":"mine"}}]}}]} as unknown as DocumentNode<SnapshotDetailsFragmentFragment, unknown>;
export const AddHighlightDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AddHighlight"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AddHighlightInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"addHighlight"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"Field","name":{"kind":"Name","value":"highlight"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"color"}}]}}]} as unknown as DocumentNode<AddHighlightMutation, AddHighlightMutationVariables>;
export const AddHighlightDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AddHighlight"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AddHighlightInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"addHighlight"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"Field","name":{"kind":"Name","value":"highlight"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"contentBlock"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<AddHighlightMutation, AddHighlightMutationVariables>;
export const LanguageQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"LanguageQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"me"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"language"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"client"}}]}]}}]}}]} as unknown as DocumentNode<LanguageQueryQuery, LanguageQueryQueryVariables>;
export const SetLanguageDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetLanguage"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"language"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setLanguage"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"language"},"value":{"kind":"Variable","name":{"kind":"Name","value":"language"}}}],"directives":[{"kind":"Directive","name":{"kind":"Name","value":"client"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"language"}}]}}]}}]} as unknown as DocumentNode<SetLanguageMutation, SetLanguageMutationVariables>;
export const ReadOnlyQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ReadOnlyQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"me"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"readOnly"}},{"kind":"Field","name":{"kind":"Name","value":"selectedClass"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"readOnly"}}]}}]}}]}}]} as unknown as DocumentNode<ReadOnlyQueryQuery, ReadOnlyQueryQueryVariables>;
export const UpdateHighlightDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateHighlight"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateHighlightInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateHighlight"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"highlight"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"contentBlock"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<UpdateHighlightMutation, UpdateHighlightMutationVariables>;
export const DeleteHighlightDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteHighlight"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteHighlightInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteHighlight"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}}]}}]} as unknown as DocumentNode<DeleteHighlightMutation, DeleteHighlightMutationVariables>;
export const ModuleFilterQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModuleFilterQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"moduleLevels"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModuleLevelFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"moduleCategories"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"filterAttributeType"}}]}},{"kind":"Field","name":{"kind":"Name","value":"me"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"language"},"directives":[{"kind":"Directive","name":{"kind":"Name","value":"client"}}]}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModuleLevelFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleLevelNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"filterAttributeType"}}]}}]} as unknown as DocumentNode<ModuleFilterQueryQuery, ModuleFilterQueryQueryVariables>;
export const UpdateLastModuleLevelMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateLastModuleLevelMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateLastModuleLevelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateLastModuleLevel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"clientMutationId"}},{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"lastModuleLevel"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ModuleLevelFragment"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ModuleLevelFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleLevelNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"filterAttributeType"}}]}}]} as unknown as DocumentNode<UpdateLastModuleLevelMutationMutation, UpdateLastModuleLevelMutationMutationVariables>;
export const ModuleTitleQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ModuleTitleQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"module"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}}]} as unknown as DocumentNode<ModuleTitleQueryQuery, ModuleTitleQueryQueryVariables>;

80
client/src/components/content-blocks/ContentComponent.vue
View File

@ -152,7 +152,7 @@ const paragraphs = computed(() =>
);
watch(
() => filteredHighlights.value.length,
() => filteredHighlights.value.map((h) => h.color),
() => {
for (const paragraph of paragraphs.value) {
const instance = new Mark(paragraph);
@ -201,8 +201,8 @@ const bookmarkContent = (bookmarked: boolean) => {
const { mutate: doUpdateHighlight } = useMutation(
graphql(`
mutation UpdateHighlight($color: String!) {
updateHighlight(color: $color) {
mutation UpdateHighlight($input: UpdateHighlightInput!) {
updateHighlight(input: $input) {
highlight {
...HighlightParts
}
@ -211,6 +211,16 @@ const { mutate: doUpdateHighlight } = useMutation(
`)
);
const { mutate: doDeleteHighlight } = useMutation(
graphql(`
mutation DeleteHighlight($input: DeleteHighlightInput!) {
deleteHighlight(input: $input) {
success
}
}
`)
);
const markHighlights = () => {
for (const highlight of filteredHighlights.value) {
const element = paragraphs.value[highlight.paragraphIndex];
@ -225,21 +235,79 @@ const markHighlights = () => {
className: `highlight highlight--${highlight.color}`,
each: (newMark: HTMLElement) => {
newMark.dataset.id = highlight.id;
console.log(newMark);
newMark.addEventListener('click', () => {
console.log('clicked');
if (contentComponentDiv.value) {
popover.show({
wrapper: contentComponentDiv.value,
offsetTop: 0,
onChooseColor: (color: string) => {
doUpdateHighlight({
input: {
color: color,
id: highlight.id,
},
});
},
onDelete: () => {
console.log(`deleting ${highlight.id}`);
doDeleteHighlight(
{
input: {
id: highlight.id,
},
},
{
update: (
cache,
{
data: {
deleteHighlight: { success },
},
}
) => {
if (success) {
const fragment = graphql(`
fragment ContentBlockHighlightsWithIdOnlyFragment on ContentBlockNode {
highlights {
id
}
}
`);
const id = cache.identify({
__typename: 'ContentBlockNode',
id: highlight.contentBlock.id,
});
const contentBlock = cache.readFragment({
fragment,
id,
});
const data = {
...contentBlock,
highlights: contentBlock.highlights.filter((h) => h.id !== highlight.id),
};
cache.writeFragment({
fragment,
id,
data,
});
}
},
}
);
},
});
}
highlightSidebar.open(highlight);
highlightSidebar.open({
highlight,
onUpdateText: (text: string) => {
doUpdateHighlight({
input: {
note: text,
id: highlight.id,
},
});
},
});
});
},
});

4
client/src/components/highlights/HighlightPopover.vue
View File

@ -23,7 +23,7 @@
<section class="highlight-popover__section">
<trash-icon
class="highlight-popover__icon"
@click="$emit('close')"
@click="$emit('delete')"
/>
</section>
</div>
@ -60,6 +60,7 @@ defineProps<Props>();
box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.25) inset;
background-color: white;
border-radius: 50%;
cursor: pointer;
&--yellow {
background-color: var(--mark-alpha);
@ -94,6 +95,7 @@ defineProps<Props>();
&__icon {
width: 40px;
height: 40px;
cursor: pointer;
}
}
</style>

19
client/src/components/highlights/HighlightSidebar.vue
View File

@ -23,8 +23,13 @@
class="borderless-textarea"
placeholder="Notiz erfassen..."
v-auto-grow
v-model="note"
></textarea>
<a class="button button--primary">Speichern</a>
<a
class="button button--primary"
@click="$emit('update-text', note)"
>Speichern</a
>
</div>
</div>
</div>
@ -32,19 +37,25 @@
<script setup lang="ts">
import { HighlightNode } from '@/__generated__/graphql';
import { defineAsyncComponent, ref } from 'vue';
import { defineAsyncComponent, onMounted, ref } from 'vue';
export interface Props {
highlight: HighlightNode;
}
const emits = defineEmits(['close']);
const emits = defineEmits(['close', 'update-text']);
const close = () => emits('close');
defineProps<Props>();
const note = ref('');
const props = defineProps<Props>();
const highlightMark = ref<HTMLElement | null>(null);
const Cross = defineAsyncComponent(() => import('@/components/icons/CrossIcon.vue'));
onMounted(() => {
note.value = props.highlight.note?.text || '';
});
</script>
<style scoped lang="postcss">

2
client/src/graphql/gql/fragments/contentBlockParts.gql
View File

@ -5,7 +5,7 @@ fragment ContentBlockParts on ContentBlockNode {
userCreated
mine
highlights {
...HighlightParts
...HighlightLegacyParts
}
instrumentCategory {
id

10
client/src/graphql/gql/fragments/highlightParts.gql
View File

@ -1,10 +1,16 @@
fragment HighlightParts on HighlightNode {
fragment HighlightLegacyParts on HighlightNode {
id
contentIndex
paragraphIndex
selectionLength
contentUuid
startPosition
text
color
note {
text
}
text
contentBlock {
id
}
}

3
client/src/helpers/highlight-sidebar.ts
View File

@ -17,7 +17,7 @@ interface Instance {
const previous = ref<Instance | null>(null);
export default {
open(highlight: HighlightNode) {
open({ highlight, onUpdateText }: Options) {
// close previous instance
if (previous.value) {
previous.value.cleanUp();
@ -37,6 +37,7 @@ export default {
onClose() {
cleanUp();
},
onUpdateText,
});
previous.value = {

8
client/src/helpers/popover.ts
View File

@ -7,10 +7,12 @@ interface Options {
wrapper: HTMLElement;
offsetTop: number;
onChooseColor: (color: string) => void;
// we don't use the id as a param here, because the calling component knows already which entity it is
onDelete: () => void;
}
export default {
show({ wrapper, offsetTop, onChooseColor }: Options) {
show({ wrapper, offsetTop, onChooseColor, onDelete }: Options) {
const mountEl = document.createElement('div');
wrapper.appendChild(mountEl);
@ -45,6 +47,10 @@ export default {
cleanUp();
_reject();
},
onDelete() {
onDelete();
cleanUp();
},
onChooseColor,
});

20
server/notes/migrations/0006_highlight_note.py Normal file
View File

@ -0,0 +1,20 @@
# Generated by Django 4.2.8 on 2024-01-25 10:37
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
("notes", "0005_highlight"),
]
operations = [
migrations.AddField(
model_name="highlight",
name="note",
field=models.OneToOneField(
null=True, on_delete=django.db.models.deletion.SET_NULL, to="notes.note"
),
),
]

1
server/notes/models.py
View File

@ -65,4 +65,5 @@ class Highlight(models.Model):
start_position = models.IntegerField()
selection_length = models.IntegerField()
text = models.TextField()
note = models.OneToOneField(Note, null=True, on_delete=models.SET_NULL)
color = models.CharField(max_length=50)

62
server/notes/mutations.py
View File

@ -208,7 +208,66 @@ class UpdateInstrumentBookmark(relay.ClientIDMutation):
class UpdateHighlight(relay.ClientIDMutation):
class Input:
color = graphene.Argument(graphene.String)
color = graphene.String()
note = graphene.String()
id = graphene.ID(required=True)
highlight = graphene.Field(HighlightNode)
@classmethod
def mutate_and_get_payload(cls, root, info, **kwargs):
user = info.context.user
color = kwargs.get("color")
note = kwargs.get("note")
id = kwargs.get("id")
highlight = get_object(Highlight, id)
if highlight is None:
raise Exception("Highlight not found")
if highlight.user != user:
raise PermissionError
if note is None and color is None:
return cls(highlight=highlight)
if color is not None:
highlight.color = color
if note is not None:
if highlight.note is None:
highlight.note = Note.objects.create(text=note)
else:
highlight.note.text = note
highlight.save()
return cls(highlight=highlight)
class DeleteHighlight(relay.ClientIDMutation):
class Input:
id = graphene.ID(required=True)
success = graphene.Boolean(required=True)
@classmethod
def mutate_and_get_payload(cls, root, info, **kwargs):
user = info.context.user
id = kwargs.get("id")
highlight = get_object(Highlight, id)
if highlight is None:
raise Exception("Highlight not found")
if highlight.user != user:
raise PermissionError
highlight.delete()
return cls(success=True)
class AddHighlight(relay.ClientIDMutation):
@ -255,6 +314,7 @@ class AddHighlight(relay.ClientIDMutation):
class NoteMutations:
add_note = AddNote.Field()
add_highlight = AddHighlight.Field()
delete_highlight = DeleteHighlight.Field()
update_highlight = UpdateHighlight.Field()
update_note = UpdateNote.Field()
update_content_bookmark = UpdateContentBookmark.Field()

28
server/schema.graphql
View File

@ -531,6 +531,7 @@ type NoteNode implements Node {
modulebookmark: ModuleBookmarkNode
chapterbookmark: ChapterBookmarkNode
instrumentbookmark: InstrumentBookmarkNode
highlight: HighlightNode
pk: Int
}
@ -628,6 +629,7 @@ type HighlightNode implements Node {
startPosition: Int!
selectionLength: Int!
text: String!
note: NoteNode
color: String!
}
@ -1036,6 +1038,8 @@ type Mutation {
spellCheck(input: SpellCheckInput!): SpellCheckPayload
addNote(input: AddNoteInput!): AddNotePayload
addHighlight(input: AddHighlightInput!): AddHighlightPayload
deleteHighlight(input: DeleteHighlightInput!): DeleteHighlightPayload
updateHighlight(input: UpdateHighlightInput!): UpdateHighlightPayload
updateNote(input: UpdateNoteInput!): UpdateNotePayload
updateContentBookmark(input: UpdateContentBookmarkInput!): UpdateContentBookmarkPayload
updateChapterBookmark(input: UpdateChapterBookmarkInput!): UpdateChapterBookmarkPayload
@ -1146,7 +1150,7 @@ input AddHighlightInput {
}
input AddHighlightArgument {
contentBlockId: String!
contentBlock: String!
contentIndex: Int!
contentUuid: UUID!
paragraphIndex: Int!
@ -1156,6 +1160,28 @@ input AddHighlightArgument {
color: String!
}
type DeleteHighlightPayload {
success: Boolean!
clientMutationId: String
}
input DeleteHighlightInput {
id: ID!
clientMutationId: String
}
type UpdateHighlightPayload {
highlight: HighlightNode
clientMutationId: String
}
input UpdateHighlightInput {
color: String
note: String
id: ID!
clientMutationId: String
}
type UpdateNotePayload {
note: NoteNode
clientMutationId: String