github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-21 17:26:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: remove redundant note detail props

Browse source 
Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
This commit is contained in:
Tilman Vatteroth 2023-05-15 21:29:28 +02:00
parent cdfcd325a1
commit 77f858bff8
13 changed files with 12 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commons/src/title-extraction/generate-note-title.spec.ts
View file

@ -16,8 +16,6 @@ const testFrontmatter: NoteFrontmatter = {
lang: 'en',
dir: NoteTextDirection.LTR,
newlinesAreBreaks: true,
GA: '',
disqus: '',
license: '',
type: NoteType.DOCUMENT,
opengraph: {},

2
commons/src/title-extraction/types/frontmatter.ts
View file

@ -27,8 +27,6 @@ export interface NoteFrontmatter {
lang: Iso6391Language
dir: NoteTextDirection
newlinesAreBreaks: boolean
GA: string
disqus: string
license: string
type: NoteType
opengraph: OpenGraph

2
frontend/src/components/editor-page/editor-pane/hooks/image-upload-from-renderer/use-on-image-upload-from-renderer.ts
View file

@ -45,7 +45,7 @@ export const useOnImageUploadFromRenderer = (): void => {
const file = new File([blob], fileName, { type: blob.type })
const { cursorSelection, alt, title } = Optional.ofNullable(lineIndex)
.flatMap((actualLineIndex) => {
const lineOffset = getGlobalState().noteDetails.frontmatterRendererInfo.lineOffset
const lineOffset = getGlobalState().noteDetails.startOfContentLineOffset
return findPlaceholderInMarkdownContent(actualLineIndex + lineOffset, placeholderIndexInLine)
})
.orElse({} as ExtractResult)

3
frontend/src/components/editor-page/renderer-pane/hooks/use-on-scroll-with-line-offset.ts
View file

@ -21,8 +21,7 @@ export const useOnScrollWithLineOffset = (onScroll: ScrollCallback | undefined):
} else {
return (scrollState: ScrollState) => {
onScroll({
firstLineInView:
scrollState.firstLineInView + getGlobalState().noteDetails.frontmatterRendererInfo.lineOffset,
firstLineInView: scrollState.firstLineInView + getGlobalState().noteDetails.startOfContentLineOffset,
scrolledPercentage: scrollState.scrolledPercentage
})
}

2
frontend/src/components/editor-page/renderer-pane/hooks/use-scroll-state-without-line-offset.ts
View file

@ -14,7 +14,7 @@ import { useMemo } from 'react'
* @return the adjusted scroll state without the line offset
*/
export const useScrollStateWithoutLineOffset = (scrollState: ScrollState | undefined): ScrollState | undefined => {
const lineOffset = useApplicationState((state) => state.noteDetails.frontmatterRendererInfo.lineOffset)
const lineOffset = useApplicationState((state) => state.noteDetails.startOfContentLineOffset)
return useMemo(() => {
return scrollState === undefined
? undefined

2
frontend/src/extensions/essential-app-extensions/task-list/set-checkbox-in-editor.tsx
View file

@ -32,7 +32,7 @@ export const useSetCheckboxInEditor = () => {
return useCallback(
({ lineInMarkdown, newCheckedState }: TaskCheckedEventPayload): void => {
changeEditorContent?.(({ markdownContent }) => {
const correctedLineIndex = lineInMarkdown + store.getState().noteDetails.frontmatterRendererInfo.lineOffset
const correctedLineIndex = lineInMarkdown + store.getState().noteDetails.startOfContentLineOffset
const edits = findCheckBox(markdownContent, correctedLineIndex)
.map(([startIndex, endIndex]) => createCheckboxContentEdit(startIndex, endIndex, newCheckedState))
.orElse([])

2
frontend/src/hooks/common/use-trimmed-note-markdown-content-without-frontmatter.ts
View file

@ -18,7 +18,7 @@ export const useTrimmedNoteMarkdownContentWithoutFrontmatter = (): string[] => {
lines: state.noteDetails.markdownContent.lines,
content: state.noteDetails.markdownContent.plain
}))
const lineOffset = useApplicationState((state) => state.noteDetails.frontmatterRendererInfo.lineOffset)
const lineOffset = useApplicationState((state) => state.noteDetails.startOfContentLineOffset)
const trimmedLines = useMemo(() => {
if (markdownContent.content.length > maxLength) {

16
frontend/src/redux/note-details/build-state-from-updated-markdown-content.ts
View file

@ -60,10 +60,10 @@ const buildStateFromMarkdownContentAndLines = (
lines: markdownContentLines,
lineStartIndexes
},
startOfContentLineOffset: 0,
rawFrontmatter: '',
title: generateNoteTitle(initialState.frontmatter, state.firstHeading),
frontmatter: initialState.frontmatter,
frontmatterRendererInfo: initialState.frontmatterRendererInfo
frontmatter: initialState.frontmatter
}
}
}
@ -88,11 +88,7 @@ const buildStateFromFrontmatterUpdate = (
rawFrontmatter: frontmatterExtraction.rawText,
frontmatter: frontmatter,
title: generateNoteTitle(frontmatter, state.firstHeading),
frontmatterRendererInfo: {
lineOffset: frontmatterExtraction.lineOffset,
frontmatterInvalid: false,
slideOptions: frontmatter.slideOptions
}
startOfContentLineOffset: frontmatterExtraction.lineOffset
}
} catch (e) {
return {
@ -100,11 +96,7 @@ const buildStateFromFrontmatterUpdate = (
title: generateNoteTitle(initialState.frontmatter, state.firstHeading),
rawFrontmatter: frontmatterExtraction.rawText,
frontmatter: initialState.frontmatter,
frontmatterRendererInfo: {
lineOffset: frontmatterExtraction.lineOffset,
frontmatterInvalid: true,
slideOptions: initialState.frontmatterRendererInfo.slideOptions
}
startOfContentLineOffset: frontmatterExtraction.lineOffset
}
}
}

8
frontend/src/redux/note-details/initial-state.ts
View file

@ -25,11 +25,7 @@ export const initialState: NoteDetails = {
},
selection: { from: 0 },
rawFrontmatter: '',
frontmatterRendererInfo: {
frontmatterInvalid: false,
lineOffset: 0,
slideOptions: initialSlideOptions
},
startOfContentLineOffset: 0,
id: '',
createdAt: 0,
updatedAt: 0,
@ -52,8 +48,6 @@ export const initialState: NoteDetails = {
lang: 'en',
dir: NoteTextDirection.LTR,
newlinesAreBreaks: true,
GA: '',
disqus: '',
license: '',
type: NoteType.DOCUMENT,
opengraph: {},

2
frontend/src/redux/note-details/raw-note-frontmatter-parser/parser.ts
View file

@ -39,8 +39,6 @@ const parseRawNoteFrontmatter = (rawData: RawNoteFrontmatter): NoteFrontmatter =
description: rawData.description ?? initialState.frontmatter.description,
robots: rawData.robots ?? initialState.frontmatter.robots,
newlinesAreBreaks: parseBoolean(rawData.breaks) ?? initialState.frontmatter.newlinesAreBreaks,
GA: rawData.GA ?? initialState.frontmatter.GA,
disqus: rawData.disqus ?? initialState.frontmatter.disqus,
lang: parseLanguage(rawData),
type: parseNoteType(rawData),
dir: parseTextDirection(rawData),

2
frontend/src/redux/note-details/raw-note-frontmatter-parser/types.d.ts vendored
View file

@ -12,8 +12,6 @@ export interface RawNoteFrontmatter {
lang: string | undefined
dir: string | undefined
breaks: boolean | undefined
GA: string | undefined
disqus: string | undefined
license: string | undefined
type: string | undefined
slideOptions: { [key: string]: string } | null

9
frontend/src/redux/note-details/reducers/build-state-from-set-note-data-from-server.spec.ts
View file

@ -5,7 +5,6 @@
*/
import type { Note } from '../../../api/notes/types'
import * as buildStateFromUpdatedMarkdownContentModule from '../build-state-from-updated-markdown-content'
import { initialSlideOptions } from '../initial-state'
import type { NoteDetails } from '../types/note-details'
import { buildStateFromServerDto } from './build-state-from-set-note-data-from-server'
import { NoteTextDirection, NoteType } from '@hedgedoc/commons'
@ -88,8 +87,6 @@ describe('build state from set note data from server', () => {
license: '',
dir: NoteTextDirection.LTR,
newlinesAreBreaks: true,
GA: '',
disqus: '',
type: NoteType.DOCUMENT,
opengraph: {},
slideOptions: {
@ -100,11 +97,7 @@ describe('build state from set note data from server', () => {
slideNumber: false
}
},
frontmatterRendererInfo: {
frontmatterInvalid: false,
lineOffset: 0,
slideOptions: initialSlideOptions
},
startOfContentLineOffset: 0,
title: 'title',
selection: { from: 0 },
markdownContent: {

9
frontend/src/redux/note-details/types/note-details.ts
View file

@ -5,7 +5,6 @@
*/
import type { NoteMetadata } from '../../../api/notes/types'
import type { CursorSelection } from '../../../components/editor-page/editor-pane/tool-bar/formatters/types/cursor-selection'
import type { SlideOptions } from '@hedgedoc/commons'
import type { NoteFrontmatter } from '@hedgedoc/commons'
type UnnecessaryNoteAttributes = 'updatedAt' | 'createdAt' | 'tags' | 'description'
@ -25,11 +24,5 @@ export interface NoteDetails extends Omit<NoteMetadata, UnnecessaryNoteAttribute
firstHeading?: string
rawFrontmatter: string
frontmatter: NoteFrontmatter
frontmatterRendererInfo: RendererFrontmatterInfo
}
export interface RendererFrontmatterInfo {
lineOffset: number
frontmatterInvalid: boolean
slideOptions: SlideOptions
startOfContentLineOffset: number
}