From 3a3cf9e0fe95870adb426124ed8fdd21486269d8 Mon Sep 17 00:00:00 2001 From: Daniel <50702276+daniboygg@users.noreply.github.com> Date: Mon, 25 Mar 2024 19:17:32 +0100 Subject: [PATCH] Gh 3795 editor filemanager (#5273) * Editor: Use constants to represent options for tiny editor * Editor: Use new base editor component in pages * Editor: Use new base editor in course intro * Adapt Form to vue 3 setup script for consistency * Editor: Use new vase editor in documents * Editor: Use new vase editor in messages * Editor: Use new vase editor in message reply * Editor: use new base editor in group discusssions * Editor: use new base editor in group discusssion topics * Editor: use new base editor in terms and condition edition * Editor: remove duplicated editor * Clean code and format with prettier * Editor: Use new base editor component in pages --- .../components/basecomponents/BaseEditor.vue | 52 ---- .../basecomponents/BaseTinyEditor.vue | 293 ++++++++++++------ .../basecomponents/TinyEditorOptions.js | 6 + assets/vue/components/ctoolintro/Form.vue | 180 +++-------- .../components/documents/FormNewDocument.vue | 37 +-- assets/vue/components/page/Form.vue | 104 ++----- .../usergroup/GroupDiscussionTopics.vue | 4 +- .../components/usergroup/GroupDiscussions.vue | 4 +- assets/vue/views/message/MessageCreate.vue | 23 +- assets/vue/views/message/MessageReply.vue | 23 +- assets/vue/views/page/EditorDemo.vue | 7 +- assets/vue/views/terms/TermsEdit.vue | 26 +- 12 files changed, 317 insertions(+), 442 deletions(-) delete mode 100644 assets/vue/components/basecomponents/BaseEditor.vue create mode 100644 assets/vue/components/basecomponents/TinyEditorOptions.js diff --git a/assets/vue/components/basecomponents/BaseEditor.vue b/assets/vue/components/basecomponents/BaseEditor.vue deleted file mode 100644 index 1c7bb6ba7a..0000000000 --- a/assets/vue/components/basecomponents/BaseEditor.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - diff --git a/assets/vue/components/basecomponents/BaseTinyEditor.vue b/assets/vue/components/basecomponents/BaseTinyEditor.vue index 1a87a0a8c0..a12a820d2e 100644 --- a/assets/vue/components/basecomponents/BaseTinyEditor.vue +++ b/assets/vue/components/basecomponents/BaseTinyEditor.vue @@ -1,6 +1,11 @@ diff --git a/assets/vue/components/basecomponents/TinyEditorOptions.js b/assets/vue/components/basecomponents/TinyEditorOptions.js new file mode 100644 index 0000000000..7718346f5c --- /dev/null +++ b/assets/vue/components/basecomponents/TinyEditorOptions.js @@ -0,0 +1,6 @@ +// option to show dialog to upload to personal files in Chamilo +export const TINYEDITOR_MODE_PERSONAL_FILES = "personal_files" +// ?? +export const TINYEDITOR_MODE_DOCUMENTS = "documents" + +export const TINYEDITOR_MODES = [TINYEDITOR_MODE_PERSONAL_FILES, TINYEDITOR_MODE_DOCUMENTS] diff --git a/assets/vue/components/ctoolintro/Form.vue b/assets/vue/components/ctoolintro/Form.vue index bc0e7618bf..0d13892eed 100644 --- a/assets/vue/components/ctoolintro/Form.vue +++ b/assets/vue/components/ctoolintro/Form.vue @@ -1,27 +1,8 @@ - diff --git a/assets/vue/components/documents/FormNewDocument.vue b/assets/vue/components/documents/FormNewDocument.vue index 878c4b8297..99d6058d69 100644 --- a/assets/vue/components/documents/FormNewDocument.vue +++ b/assets/vue/components/documents/FormNewDocument.vue @@ -10,34 +10,16 @@
-
@@ -56,10 +38,11 @@ import { required } from "@vuelidate/validators"; import { ref } from "vue"; import { usePlatformConfig } from "../../store/platformConfig"; import BaseInputTextWithVuelidate from "../basecomponents/BaseInputTextWithVuelidate.vue" +import BaseTinyEditor from "../basecomponents/BaseTinyEditor.vue" export default { name: "DocumentsForm", - components: { BaseInputTextWithVuelidate }, + components: { BaseTinyEditor, BaseInputTextWithVuelidate }, props: { values: { type: Object, diff --git a/assets/vue/components/page/Form.vue b/assets/vue/components/page/Form.vue index a81a182fea..e27593bdb4 100644 --- a/assets/vue/components/page/Form.vue +++ b/assets/vue/components/page/Form.vue @@ -40,44 +40,9 @@ />
-
@@ -95,35 +60,33 @@ diff --git a/assets/vue/components/usergroup/GroupDiscussionTopics.vue b/assets/vue/components/usergroup/GroupDiscussionTopics.vue index 117970da77..60713cf4d2 100644 --- a/assets/vue/components/usergroup/GroupDiscussionTopics.vue +++ b/assets/vue/components/usergroup/GroupDiscussionTopics.vue @@ -27,7 +27,7 @@
- + @@ -43,8 +43,8 @@ import MessageItem from "./MessageItem.vue" import BaseButton from "../basecomponents/BaseButton.vue" import { useI18n } from "vue-i18n" import BaseInputText from "../basecomponents/BaseInputText.vue" -import BaseEditor from "../basecomponents/BaseEditor.vue" import BaseFileUploadMultiple from "../basecomponents/BaseFileUploadMultiple.vue" +import BaseTinyEditor from "../basecomponents/BaseTinyEditor.vue" const router = useRouter() const route = useRoute() diff --git a/assets/vue/components/usergroup/GroupDiscussions.vue b/assets/vue/components/usergroup/GroupDiscussions.vue index 4d124456de..27706380e8 100644 --- a/assets/vue/components/usergroup/GroupDiscussions.vue +++ b/assets/vue/components/usergroup/GroupDiscussions.vue @@ -34,7 +34,7 @@
- + @@ -50,8 +50,8 @@ import { useFormatDate } from "../../composables/formatDate" import { useSocialInfo } from "../../composables/useSocialInfo" import BaseButton from "../basecomponents/BaseButton.vue" import BaseInputText from "../basecomponents/BaseInputText.vue" -import BaseEditor from "../basecomponents/BaseEditor.vue" import BaseFileUploadMultiple from "../basecomponents/BaseFileUploadMultiple.vue" +import BaseTinyEditor from "../basecomponents/BaseTinyEditor.vue" const route = useRoute() const discussions = ref([]) diff --git a/assets/vue/views/message/MessageCreate.vue b/assets/vue/views/message/MessageCreate.vue index 07edce993e..847b4ce82a 100644 --- a/assets/vue/views/message/MessageCreate.vue +++ b/assets/vue/views/message/MessageCreate.vue @@ -33,27 +33,7 @@ />
- +
- +
diff --git a/assets/vue/views/terms/TermsEdit.vue b/assets/vue/views/terms/TermsEdit.vue index cbb530f503..d8a7b06348 100644 --- a/assets/vue/views/terms/TermsEdit.vue +++ b/assets/vue/views/terms/TermsEdit.vue @@ -24,16 +24,12 @@
- - - - + :help-text="t('Why do we collect this data?')" + />
- - +
@@ -81,10 +79,10 @@ import Message from "primevue/message" import BaseDropdown from "../../components/basecomponents/BaseDropdown.vue" import BaseRadioButtons from "../../components/basecomponents/BaseRadioButtons.vue" import BaseInputText from "../../components/basecomponents/BaseInputText.vue" -import BaseEditor from "../../components/basecomponents/BaseEditor.vue" import { useI18n } from "vue-i18n" import languageService from "../../services/languageService" import legalService from "../../services/legalService" +import BaseTinyEditor from "../../components/basecomponents/BaseTinyEditor.vue" const { t } = useI18n() @@ -169,7 +167,7 @@ function getFieldComponent(type) { const componentMap = { text: BaseInputText, select: BaseDropdown, - editor: BaseEditor, + editor: BaseTinyEditor, // Add more mappings as needed } return componentMap[type] || 'div'