Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { useIsOffline } from "../../composables/useIsOffline";
import Tiptap from "../ui/Tiptap.vue";
import TiptapEditor from "../tiptap/TiptapEditor.vue";
import LazyAccordion from "./LazyAccordion.vue";

defineProps<{
Expand All @@ -23,7 +23,7 @@ const title = "Points d’amélioration";
<p :id="`criterum-comment-field-${id}`" class="fr-label fr-sr-only">
{{ title }}
</p>
<Tiptap
<TiptapEditor
:model-value="comment"
:labelled-by="`criterum-comment-field-${id}`"
:disabled="isOffline"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { useIsOffline } from "../../composables/useIsOffline";
import Tiptap from "../ui/Tiptap.vue";
import TiptapEditor from "../tiptap/TiptapEditor.vue";
import LazyAccordion from "./LazyAccordion.vue";

defineProps<{ id: string; comment: string | null }>();
Expand All @@ -20,7 +20,7 @@ const title = "Commentaire";
<p :id="`criterum-comment-field-${id}`" class="fr-label fr-sr-only">
{{ title }}
</p>
<Tiptap
<TiptapEditor
:model-value="comment"
:labelled-by="`criterum-comment-field-${id}`"
:disabled="isOffline"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { useIsOffline } from "../../composables/useIsOffline";
import { FileErrorMessage } from "../../enums";
import { AuditFile, CriterionResultUserImpact } from "../../types";
import { formatUserImpact } from "../../utils";
import TiptapEditor from "../tiptap/TiptapEditor.vue";
import FileUpload from "../ui/FileUpload.vue";
import { RadioColor } from "../ui/Radio.vue";
import RadioGroup from "../ui/RadioGroup.vue";
import Tiptap from "../ui/Tiptap.vue";
import LazyAccordion from "./LazyAccordion.vue";

export interface Props {
Expand Down Expand Up @@ -73,7 +73,7 @@ function onFileRequestFinished() {
}

const lazyAccordionRef = ref<InstanceType<typeof LazyAccordion>>();
const commentEditorRef = ref<InstanceType<typeof Tiptap>>();
const commentEditorRef = ref<InstanceType<typeof TiptapEditor>>();

let hasJustBeenSetAsNotCompliant = false;

Expand Down Expand Up @@ -107,7 +107,7 @@ const title = "Erreur et recommandation";
<p :id="`criterum-comment-field-${id}`" class="fr-label fr-sr-only">
{{ title }}
</p>
<Tiptap
<TiptapEditor
ref="commentEditorRef"
class="fr-mb-4w"
:model-value="comment"
Expand Down
4 changes: 2 additions & 2 deletions confiture-web-app/src/components/audit/NotesModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import { FileErrorMessage } from "../../enums";
import { useAuditStore } from "../../store/audit";
import { AuditFile, StoreName } from "../../types";
import { handleFileDeleteError, handleFileUploadError } from "../../utils";
import TiptapEditor from "../tiptap/TiptapEditor.vue";
import DsfrModal from "../ui/DsfrModal.vue";
import FileUpload from "../ui/FileUpload.vue";
import Tiptap from "../ui/Tiptap.vue";
import SaveIndicator from "./SaveIndicator.vue";

defineProps<{
Expand Down Expand Up @@ -105,7 +105,7 @@ function handleDeleteFile(file: AuditFile) {
<p id="audit-notes" class="fr-label">
Remarques et recommandations générales
</p>
<Tiptap
<TiptapEditor
v-model="notes"
class="fr-mb-4w"
labelled-by="audit-notes"
Expand Down
13 changes: 7 additions & 6 deletions confiture-web-app/src/components/report/ReportErrorCriterium.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
getUploadUrl,
isTiptapDocumentEmpty
} from "../../utils";
import Tiptap from "../ui/Tiptap.vue";
import TiptapRenderer from "../tiptap/TiptapRenderer.vue";

defineProps<{
error: ReportCriteriumResult;
Expand Down Expand Up @@ -63,11 +63,12 @@ function getCriteriumTitle(topicNumber: number, criteriumNumber: number) {
</ul>

<!-- Error -->
<Tiptap
v-if="!isTiptapDocumentEmpty(error.notCompliantComment)"
:class="{ 'fr-mb-3w': chunk(error.exampleImages, 2).length }"
:model-value="error.notCompliantComment"
:editable="false"
<TiptapRenderer
v-if="
error.notCompliantComment &&
!isTiptapDocumentEmpty(error.notCompliantComment)
"
:document="error.notCompliantComment"
/>

<p v-else>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { marked } from "marked";
import rgaa from "../../criteres.json";
import { CriteriumResultStatus } from "../../types";
import { formatStatus, isTiptapDocumentEmpty } from "../../utils";
import Tiptap from "../ui/Tiptap.vue";
import TiptapRenderer from "../tiptap/TiptapRenderer.vue";

defineProps<{
topic: number;
Expand Down Expand Up @@ -46,10 +46,9 @@ function getCriteriumTitle(topicNumber: number, criteriumNumber: number) {
{{ formatStatus(status) }}
</p>

<Tiptap
v-if="!isTiptapDocumentEmpty(comment)"
:model-value="comment"
:editable="false"
<TiptapRenderer
v-if="comment && !isTiptapDocumentEmpty(comment)"
:document="comment"
/>
</div>
</template>
10 changes: 5 additions & 5 deletions confiture-web-app/src/components/report/ReportNotes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { computed } from "vue";

import { useReportStore } from "../../store";
import { isTiptapDocumentEmpty } from "../../utils";
import TiptapRenderer from "../tiptap/TiptapRenderer.vue";
import FileUpload from "../ui/FileUpload.vue";
import Tiptap from "../ui/Tiptap.vue";

const report = useReportStore();

Expand All @@ -13,11 +13,11 @@ const files = computed(() => report.data?.notesFiles);

<template>
<h2 class="fr-sr-only">Notes</h2>
<Tiptap
v-if="!isTiptapDocumentEmpty(report.data?.notes)"
:model-value="report.data?.notes"
:editable="false"
<TiptapRenderer
v-if="report.data?.notes && !isTiptapDocumentEmpty(report.data?.notes)"
:document="report.data?.notes"
/>

<h3 v-if="files?.length" class="fr-text--sm">Pièces jointes</h3>
<FileUpload
v-if="files"
Expand Down
Loading