From d0d83121ac0e422dc48eacbda34665ae19366255 Mon Sep 17 00:00:00 2001 From: Samuel Gfeller Date: Sat, 18 Feb 2023 08:41:39 +0100 Subject: [PATCH] Fixed notes duplications after changes on newly created notes [SLE-188][SLE-164] --- config/defaults.php | 2 +- .../authentication/password-reset-main.js | 2 +- .../password-strength-checker.js | 2 +- .../client/create/client-create-main.js | 10 +++++----- .../client/create/client-create-modal.html.js | 8 ++++---- .../list/client-list-content-placeholder.js | 2 +- .../assets/client/list/client-list-loading.js | 12 +++++------ public/assets/client/list/client-list-main.js | 4 ++-- .../list/client-list-profile-card.html.js | 6 +++--- .../client/note/client-read-create-note.js | 8 ++++---- .../client/note/client-read-delete-note.js | 6 +++--- .../client-read-note-event-listener-setup.js | 18 ++++++++--------- .../client-read-note-loading-placeholder.js | 2 +- .../client/note/client-read-note-loading.js | 12 +++++------ .../note/client-read-save-existing-note.js | 6 +++--- .../note/client-read-template-note.html.js | 2 +- public/assets/client/read/client-read-main.js | 20 +++++++++---------- .../read/client-read-save-dropdown-change.js | 4 ++-- .../update/client-update-contenteditable.js | 8 ++++---- .../read/update/client-update-dropdown.js | 4 ++-- public/assets/dashboard/dashboard-main.js | 10 +++++----- .../general/ajax/ajax-util/fail-handler.js | 4 ++-- public/assets/general/ajax/fetch-data.js | 4 ++-- .../general/ajax/submit-delete-request.js | 4 ++-- .../ajax/submit-field-change-with-flash.js | 6 +++--- .../assets/general/ajax/submit-update-data.js | 4 ++-- .../open-link-on-html-element.js | 2 +- public/assets/general/general-js/default.js | 8 ++++---- .../contenteditable/contenteditable-main.js | 2 +- .../page-component/modal/dropdown-request.js | 4 ++-- .../modal/modal-submit-request.js | 8 ++++---- .../assets/general/template/template-util.js | 2 +- public/assets/user/create/user-create-main.js | 8 ++++---- .../user/create/user-create-modal.html.js | 10 +++++----- .../user/list/user-list-card-dom-appending.js | 2 +- .../assets/user/list/user-list-card.html.js | 4 ++-- .../list/user-list-content-placeholder.js | 2 +- public/assets/user/list/user-list-loading.js | 12 +++++------ public/assets/user/list/user-list-main.js | 2 +- public/assets/user/profile.js | 4 ++-- .../user/read/user-activity/activity-main.js | 6 +++--- .../assets/user/read/user-read-update-main.js | 16 +++++++-------- .../user/read/user-update-contenteditable.js | 6 +++--- .../user/update/change-password-modal.html.js | 4 ++-- 44 files changed, 135 insertions(+), 137 deletions(-) diff --git a/config/defaults.php b/config/defaults.php index 450d1edc..75c099ec 100644 --- a/config/defaults.php +++ b/config/defaults.php @@ -29,7 +29,7 @@ $settings['deployment'] = [ // Version `null` or string. If JsImportVersionAdder is enabled, `null` removes all query param versions from js imports // $settings['deployment']['version'] = random_int(0, 100); - 'version' => '0.1.0', + 'version' => '0.2.1', 'assetsPath' => __DIR__ . '/../public/assets', ]; diff --git a/public/assets/authentication/password-reset-main.js b/public/assets/authentication/password-reset-main.js index 9d24ee28..2435924a 100644 --- a/public/assets/authentication/password-reset-main.js +++ b/public/assets/authentication/password-reset-main.js @@ -1,3 +1,3 @@ -import {addPasswordStrengthCheck} from "./password-strength-checker.js?v=0.1.0"; +import {addPasswordStrengthCheck} from "./password-strength-checker.js?v=0.2.1"; addPasswordStrengthCheck() \ No newline at end of file diff --git a/public/assets/authentication/password-strength-checker.js b/public/assets/authentication/password-strength-checker.js index 98e9f4eb..cf9bfc45 100644 --- a/public/assets/authentication/password-strength-checker.js +++ b/public/assets/authentication/password-strength-checker.js @@ -1,5 +1,5 @@ // Init vars -import {handleFail} from "../general/ajax/ajax-util/fail-handler.js?v=0.1.0"; +import {handleFail} from "../general/ajax/ajax-util/fail-handler.js?v=0.2.1"; let password1Input, password2Inp; diff --git a/public/assets/client/create/client-create-main.js b/public/assets/client/create/client-create-main.js index 073d42e4..edc5a87b 100644 --- a/public/assets/client/create/client-create-main.js +++ b/public/assets/client/create/client-create-main.js @@ -1,8 +1,8 @@ -import {displayClientCreateModal} from "./client-create-modal.html.js?v=0.1.0"; -import {submitModalForm} from "../../general/page-component/modal/modal-submit-request.js?v=0.1.0"; -import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.1.0"; -import {displayValidationErrorMessage} from "../../general/validation/form-validation.js?v=0.1.0"; -import {fetchAndLoadClients} from "../list/client-list-loading.js?v=0.1.0"; +import {displayClientCreateModal} from "./client-create-modal.html.js?v=0.2.1"; +import {submitModalForm} from "../../general/page-component/modal/modal-submit-request.js?v=0.2.1"; +import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.2.1"; +import {displayValidationErrorMessage} from "../../general/validation/form-validation.js?v=0.2.1"; +import {fetchAndLoadClients} from "../list/client-list-loading.js?v=0.2.1"; // Init event listeners if button is present document.getElementById('create-client-btn')?.addEventListener('click', displayClientCreateModal); diff --git a/public/assets/client/create/client-create-modal.html.js b/public/assets/client/create/client-create-modal.html.js index 82773cd9..9e41b4ba 100644 --- a/public/assets/client/create/client-create-modal.html.js +++ b/public/assets/client/create/client-create-modal.html.js @@ -1,7 +1,7 @@ -import {createModal} from "../../general/page-component/modal/modal.js?v=0.1.0"; -import {requestDropdownOptions} from "../../general/page-component/modal/dropdown-request.js?v=0.1.0"; -import {getDropdownAsHtmlOptions, getRadioButtonsAsHtml} from "../../general/template/template-util.js?v=0.1.0"; -import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.1.0"; +import {createModal} from "../../general/page-component/modal/modal.js?v=0.2.1"; +import {requestDropdownOptions} from "../../general/page-component/modal/dropdown-request.js?v=0.2.1"; +import {getDropdownAsHtmlOptions, getRadioButtonsAsHtml} from "../../general/template/template-util.js?v=0.2.1"; +import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.2.1"; /** * Create and display modal box to create a new client diff --git a/public/assets/client/list/client-list-content-placeholder.js b/public/assets/client/list/client-list-content-placeholder.js index a22455ab..e3b63535 100644 --- a/public/assets/client/list/client-list-content-placeholder.js +++ b/public/assets/client/list/client-list-content-placeholder.js @@ -1,4 +1,4 @@ -import {getClientProfileCardLoadingPlaceholderHtml} from "./client-list-profile-card.html.js?v=0.1.0"; +import {getClientProfileCardLoadingPlaceholderHtml} from "./client-list-profile-card.html.js?v=0.2.1"; /** * Display client content placeholders diff --git a/public/assets/client/list/client-list-loading.js b/public/assets/client/list/client-list-loading.js index 686b1626..d8fcce68 100644 --- a/public/assets/client/list/client-list-loading.js +++ b/public/assets/client/list/client-list-loading.js @@ -1,17 +1,17 @@ -import {getClientProfileCardHtml} from "./client-list-profile-card.html.js?v=0.1.0"; +import {getClientProfileCardHtml} from "./client-list-profile-card.html.js?v=0.2.1"; import { displayClientProfileCardLoadingPlaceholder, removeClientCardContentPlaceholder -} from "./client-list-content-placeholder.js?v=0.1.0"; -import {fetchData} from "../../general/ajax/fetch-data.js?v=0.1.0"; +} from "./client-list-content-placeholder.js?v=0.2.1"; +import {fetchData} from "../../general/ajax/fetch-data.js?v=0.2.1"; import { disableMouseWheelClickScrolling, openLinkOnHtmlElement -} from "../../general/event-handler/open-link-on-html-element.js?v=0.1.0"; +} from "../../general/event-handler/open-link-on-html-element.js?v=0.2.1"; import { triggerClickOnHtmlElementEnterKeypress -} from "../../general/event-handler/trigger-click-on-enter-keypress.js?v=0.1.0"; -import {submitFieldChangeWithFlash} from "../../general/ajax/submit-field-change-with-flash.js?v=0.1.0"; +} from "../../general/event-handler/trigger-click-on-enter-keypress.js?v=0.2.1"; +import {submitFieldChangeWithFlash} from "../../general/ajax/submit-field-change-with-flash.js?v=0.2.1"; // When searching clients a request is made on each keyup and we want to show only the final result to the user, // not a flickering between content placeholders, the result of the first typed key, then the second and so on. diff --git a/public/assets/client/list/client-list-main.js b/public/assets/client/list/client-list-main.js index a87c4947..d53c23cb 100644 --- a/public/assets/client/list/client-list-main.js +++ b/public/assets/client/list/client-list-main.js @@ -1,5 +1,5 @@ -import {fetchAndLoadClients, fetchAndLoadClientsEventHandler} from "./client-list-loading.js?v=0.1.0"; -import {initFilterChipEventListeners} from "../../general/page-component/filter-chip/filter-chip.js?v=0.1.0"; +import {fetchAndLoadClients, fetchAndLoadClientsEventHandler} from "./client-list-loading.js?v=0.2.1"; +import {initFilterChipEventListeners} from "../../general/page-component/filter-chip/filter-chip.js?v=0.2.1"; // Load clients at page startup fetchAndLoadClients(); diff --git a/public/assets/client/list/client-list-profile-card.html.js b/public/assets/client/list/client-list-profile-card.html.js index eabeac78..153d9df3 100644 --- a/public/assets/client/list/client-list-profile-card.html.js +++ b/public/assets/client/list/client-list-profile-card.html.js @@ -1,6 +1,6 @@ -import {getAvatarPath} from "../util/client-template-util.js?v=0.1.0"; -import {escapeHtml} from "../../general/general-js/functions.js?v=0.1.0"; -import {getDropdownAsHtmlOptions} from "../../general/template/template-util.js?v=0.1.0"; +import {getAvatarPath} from "../util/client-template-util.js?v=0.2.1"; +import {escapeHtml} from "../../general/general-js/functions.js?v=0.2.1"; +import {getDropdownAsHtmlOptions} from "../../general/template/template-util.js?v=0.2.1"; /** * HTML code for client profile card diff --git a/public/assets/client/note/client-read-create-note.js b/public/assets/client/note/client-read-create-note.js index b2a31ea2..7a790502 100644 --- a/public/assets/client/note/client-read-create-note.js +++ b/public/assets/client/note/client-read-create-note.js @@ -1,13 +1,13 @@ -import {basePath} from "../../general/general-js/config.js?v=0.1.0"; +import {basePath} from "../../general/general-js/config.js?v=0.2.1"; import { addDeleteNoteBtnEventListener, addHideNoteBtnEventListener, addTextareaInputEventListener, hideCheckmarkLoader, toggleReadOnlyAndBtnAboveNote -} from "./client-read-note-event-listener-setup.js?v=0.1.0"; -import {handleFail, removeValidationErrorMessages} from "../../general/ajax/ajax-util/fail-handler.js?v=0.1.0"; -import {initAutoResizingTextareas} from "../../general/page-component/textarea/auto-resizing-textarea.js?v=0.1.0"; +} from "./client-read-note-event-listener-setup.js?v=0.2.1"; +import {handleFail, removeValidationErrorMessages} from "../../general/ajax/ajax-util/fail-handler.js?v=0.2.1"; +import {initAutoResizingTextareas} from "../../general/page-component/textarea/auto-resizing-textarea.js?v=0.2.1"; let noteCreationHideCheckMarkTimeout = []; diff --git a/public/assets/client/note/client-read-delete-note.js b/public/assets/client/note/client-read-delete-note.js index 7193da57..9c41a077 100644 --- a/public/assets/client/note/client-read-delete-note.js +++ b/public/assets/client/note/client-read-delete-note.js @@ -4,9 +4,9 @@ * @param noteId * @param noteContainer */ -import {basePath} from "../../general/general-js/config.js?v=0.1.0"; -import {hideCheckmarkLoader} from "./client-read-note-event-listener-setup.js?v=0.1.0"; -import {handleFail} from "../../general/ajax/ajax-util/fail-handler.js?v=0.1.0"; +import {basePath} from "../../general/general-js/config.js?v=0.2.1"; +import {hideCheckmarkLoader} from "./client-read-note-event-listener-setup.js?v=0.2.1"; +import {handleFail} from "../../general/ajax/ajax-util/fail-handler.js?v=0.2.1"; /** * Make delete request to db diff --git a/public/assets/client/note/client-read-note-event-listener-setup.js b/public/assets/client/note/client-read-note-event-listener-setup.js index a2b805f1..c8074d7b 100644 --- a/public/assets/client/note/client-read-note-event-listener-setup.js +++ b/public/assets/client/note/client-read-note-event-listener-setup.js @@ -1,8 +1,8 @@ -import {disableHideCheckMarkTimeoutOnUpdate, saveNoteChangeToDb} from "./client-read-save-existing-note.js?v=0.1.0"; -import {disableHideCheckMarkTimeoutOnCreation, insertNewNoteToDb} from "./client-read-create-note.js?v=0.1.0"; -import {deleteNoteRequestToDb} from "./client-read-delete-note.js?v=0.1.0"; -import {createAlertModal} from "../../general/page-component/modal/alert-modal.js?v=0.1.0"; -import {submitUpdate} from "../../general/ajax/submit-update-data.js?v=0.1.0"; +import {disableHideCheckMarkTimeoutOnUpdate, saveNoteChangeToDb} from "./client-read-save-existing-note.js?v=0.2.1"; +import {disableHideCheckMarkTimeoutOnCreation, insertNewNoteToDb} from "./client-read-create-note.js?v=0.2.1"; +import {deleteNoteRequestToDb} from "./client-read-delete-note.js?v=0.2.1"; +import {createAlertModal} from "../../general/page-component/modal/alert-modal.js?v=0.2.1"; +import {submitUpdate} from "../../general/ajax/submit-update-data.js?v=0.2.1"; // To display the checkmark loader only when the user expects that his content is saved we have to know if he/she is @@ -46,7 +46,6 @@ export function initNotesEventListeners() { let textareaInputPauseTimeoutId; export function addTextareaInputEventListener(textarea) { - let noteId = textarea.dataset.noteId; // Remove focus when ctrl + enter is pressed textarea.addEventListener('keypress', function (e) { if ((e.ctrlKey || e.metaKey) && (e.keyCode === 13 || e.keyCode === 10)) { @@ -57,7 +56,9 @@ export function addTextareaInputEventListener(textarea) { // input pause and this level of optimisation is not needed for this project } }); - textarea.addEventListener('input', function () { + textarea.addEventListener('input', function saveNoteEventFunction() { + // Get most recent noteId dataset value (it changes from 'new-note' to the actual id when the note is new) + let noteId = textarea.dataset.noteId; userIsTypingOnNoteId = noteId; // Hide loader if there was one hideCheckmarkLoader(textarea.parentNode.querySelector('.circle-loader'), 'New input'); @@ -68,12 +69,11 @@ export function addTextareaInputEventListener(textarea) { clearTimeout(textareaInputPauseTimeoutId); textareaInputPauseTimeoutId = setTimeout(function () { // Runs 1 second after the last change - // console.log(textarea.checkValidity()); if (textarea.checkValidity() !== false) { if (noteId === 'new-note') { insertNewNoteToDb(textarea); } else if (noteId === 'new-main-note') { - insertNewNoteToDb(textarea, true) + insertNewNoteToDb(textarea, true); } else { // Call function to save note passing textarea as "this" and noteId as argument saveNoteChangeToDb.call(textarea, noteId); diff --git a/public/assets/client/note/client-read-note-loading-placeholder.js b/public/assets/client/note/client-read-note-loading-placeholder.js index b88977d7..078a5836 100644 --- a/public/assets/client/note/client-read-note-loading-placeholder.js +++ b/public/assets/client/note/client-read-note-loading-placeholder.js @@ -1,4 +1,4 @@ -import {getClientNoteLoadingPlaceholderHtml} from "./client-read-template-note.html.js?v=0.1.0"; +import {getClientNoteLoadingPlaceholderHtml} from "./client-read-template-note.html.js?v=0.2.1"; /** * Display client note content placeholders diff --git a/public/assets/client/note/client-read-note-loading.js b/public/assets/client/note/client-read-note-loading.js index f9db8297..dae557ed 100644 --- a/public/assets/client/note/client-read-note-loading.js +++ b/public/assets/client/note/client-read-note-loading.js @@ -1,12 +1,12 @@ -import {getNoteHtml} from "./client-read-template-note.html.js?v=0.1.0"; +import {getNoteHtml} from "./client-read-template-note.html.js?v=0.2.1"; import { displayClientNoteLoadingPlaceholder, removeClientNoteContentPlaceholder -} from "./client-read-note-loading-placeholder.js?v=0.1.0"; -import {fetchData} from "../../general/ajax/fetch-data.js?v=0.1.0"; -import {initNotesEventListeners} from "./client-read-note-event-listener-setup.js?v=0.1.0"; -import {initAutoResizingTextareas} from "../../general/page-component/textarea/auto-resizing-textarea.js?v=0.1.0"; -import {scrollToAnchor} from "../../general/page-behaviour/scroll-to-anchor.js?v=0.1.0"; +} from "./client-read-note-loading-placeholder.js?v=0.2.1"; +import {fetchData} from "../../general/ajax/fetch-data.js?v=0.2.1"; +import {initNotesEventListeners} from "./client-read-note-event-listener-setup.js?v=0.2.1"; +import {initAutoResizingTextareas} from "../../general/page-component/textarea/auto-resizing-textarea.js?v=0.2.1"; +import {scrollToAnchor} from "../../general/page-behaviour/scroll-to-anchor.js?v=0.2.1"; /** * Loading notes into dom diff --git a/public/assets/client/note/client-read-save-existing-note.js b/public/assets/client/note/client-read-save-existing-note.js index e28a2cbb..f89d92cb 100644 --- a/public/assets/client/note/client-read-save-existing-note.js +++ b/public/assets/client/note/client-read-save-existing-note.js @@ -1,10 +1,10 @@ -import {basePath} from "../../general/general-js/config.js?v=0.1.0"; +import {basePath} from "../../general/general-js/config.js?v=0.2.1"; import { changeUserIsTyping, hideCheckmarkLoader, userIsTypingOnNoteId -} from "./client-read-note-event-listener-setup.js?v=0.1.0"; -import {handleFail, removeValidationErrorMessages} from "../../general/ajax/ajax-util/fail-handler.js?v=0.1.0"; +} from "./client-read-note-event-listener-setup.js?v=0.2.1"; +import {handleFail, removeValidationErrorMessages} from "../../general/ajax/ajax-util/fail-handler.js?v=0.2.1"; let noteSaveHideCheckMarkTimeout = []; diff --git a/public/assets/client/note/client-read-template-note.html.js b/public/assets/client/note/client-read-template-note.html.js index 6a68628f..78ec7e63 100644 --- a/public/assets/client/note/client-read-template-note.html.js +++ b/public/assets/client/note/client-read-template-note.html.js @@ -1,4 +1,4 @@ -import {escapeHtml} from "../../general/general-js/functions.js?v=0.1.0"; +import {escapeHtml} from "../../general/general-js/functions.js?v=0.2.1"; export function getNoteHtml(note) { // Thanks https://www.youtube.com/watch?v=Mus_vwhTCq0 for this syntax diff --git a/public/assets/client/read/client-read-main.js b/public/assets/client/read/client-read-main.js index f194dbf3..618da93d 100644 --- a/public/assets/client/read/client-read-main.js +++ b/public/assets/client/read/client-read-main.js @@ -1,12 +1,12 @@ -import {makeClientFieldEditable} from "./update/client-update-contenteditable.js?v=0.1.0"; -import {makeFieldSelectValueEditable} from "./update/client-update-dropdown.js?v=0.1.0"; -import {loadAvailablePersonalInfoIconsDiv} from "./client-read-personal-info.js?v=0.1.0"; -import {submitFieldChangeWithFlash} from "../../general/ajax/submit-field-change-with-flash.js?v=0.1.0"; -import {createAlertModal} from "../../general/page-component/modal/alert-modal.js?v=0.1.0"; -import {submitDelete} from "../../general/ajax/submit-delete-request.js?v=0.1.0"; -import {submitUpdate} from "../../general/ajax/submit-update-data.js?v=0.1.0"; -import {fetchAndLoadClientNotes} from "../note/client-read-note-loading.js?v=0.1.0"; -import {addNewNoteTextarea} from "../note/client-read-create-note.js?v=0.1.0"; +import {makeClientFieldEditable} from "./update/client-update-contenteditable.js?v=0.2.1"; +import {makeFieldSelectValueEditable} from "./update/client-update-dropdown.js?v=0.2.1"; +import {loadAvailablePersonalInfoIconsDiv} from "./client-read-personal-info.js?v=0.2.1"; +import {submitFieldChangeWithFlash} from "../../general/ajax/submit-field-change-with-flash.js?v=0.2.1"; +import {createAlertModal} from "../../general/page-component/modal/alert-modal.js?v=0.2.1"; +import {submitDelete} from "../../general/ajax/submit-delete-request.js?v=0.2.1"; +import {submitUpdate} from "../../general/ajax/submit-update-data.js?v=0.2.1"; +import {fetchAndLoadClientNotes} from "../note/client-read-note-loading.js?v=0.2.1"; +import {addNewNoteTextarea} from "../note/client-read-create-note.js?v=0.2.1"; const clientId = document.getElementById('client-id').value; @@ -113,5 +113,3 @@ function changeMainNoteBorderAccordingToVigilanceLevel(vigilanceLevel) { break; } } - -// debug diff --git a/public/assets/client/read/client-read-save-dropdown-change.js b/public/assets/client/read/client-read-save-dropdown-change.js index 1e19c806..ab7f8504 100644 --- a/public/assets/client/read/client-read-save-dropdown-change.js +++ b/public/assets/client/read/client-read-save-dropdown-change.js @@ -1,5 +1,5 @@ -import {basePath} from "../../general/general-js/config.js?v=0.1.0"; -import {handleFail} from "../../general/ajax/ajax-util/fail-handler.js?v=0.1.0"; +import {basePath} from "../../general/general-js/config.js?v=0.2.1"; +import {handleFail} from "../../general/ajax/ajax-util/fail-handler.js?v=0.2.1"; export function saveClientReadDropdownChange() { // Make ajax call diff --git a/public/assets/client/read/update/client-update-contenteditable.js b/public/assets/client/read/update/client-update-contenteditable.js index e40ea0fa..8ea96fe1 100644 --- a/public/assets/client/read/update/client-update-contenteditable.js +++ b/public/assets/client/read/update/client-update-contenteditable.js @@ -1,15 +1,15 @@ -import {removeValidationErrorMessages} from "../../../general/ajax/ajax-util/fail-handler.js?v=0.1.0"; +import {removeValidationErrorMessages} from "../../../general/ajax/ajax-util/fail-handler.js?v=0.2.1"; import { addIconToAvailableDiv, removeIconFromAvailableDiv, showPersonalInfoContainerIfHidden -} from "../client-read-personal-info.js?v=0.1.0"; +} from "../client-read-personal-info.js?v=0.2.1"; import { contentEditableFieldValueIsValid, disableEditableField, makeFieldEditable -} from "../../../general/page-component/contenteditable/contenteditable-main.js?v=0.1.0"; -import {submitUpdate} from "../../../general/ajax/submit-update-data.js?v=0.1.0"; +} from "../../../general/page-component/contenteditable/contenteditable-main.js?v=0.2.1"; +import {submitUpdate} from "../../../general/ajax/submit-update-data.js?v=0.2.1"; function preventLinkOpening(e) { /* Prevent link from being opened */ diff --git a/public/assets/client/read/update/client-update-dropdown.js b/public/assets/client/read/update/client-update-dropdown.js index 06cdb62e..acd10e7b 100644 --- a/public/assets/client/read/update/client-update-dropdown.js +++ b/public/assets/client/read/update/client-update-dropdown.js @@ -2,8 +2,8 @@ import { addIconToAvailableDiv, removeIconFromAvailableDiv, showPersonalInfoContainerIfHidden -} from "../client-read-personal-info.js?v=0.1.0"; -import {submitUpdate} from "../../../general/ajax/submit-update-data.js?v=0.1.0"; +} from "../client-read-personal-info.js?v=0.2.1"; +import {submitUpdate} from "../../../general/ajax/submit-update-data.js?v=0.2.1"; /** * Make personal info field editable by adding a dropdown diff --git a/public/assets/dashboard/dashboard-main.js b/public/assets/dashboard/dashboard-main.js index 20209378..2b7a5915 100644 --- a/public/assets/dashboard/dashboard-main.js +++ b/public/assets/dashboard/dashboard-main.js @@ -1,8 +1,8 @@ -import {fetchAndLoadClients} from "../client/list/client-list-loading.js?v=0.1.0"; -import {fetchAndLoadClientNotes} from "../client/note/client-read-note-loading.js?v=0.1.0"; -import {initFilterChipEventListeners} from "../general/page-component/filter-chip/filter-chip.js?v=0.1.0"; -import {loadUserActivities} from "../user/read/user-activity/activity-main.js?v=0.1.0"; -import {submitUpdate} from "../general/ajax/submit-update-data.js?v=0.1.0"; +import {fetchAndLoadClients} from "../client/list/client-list-loading.js?v=0.2.1"; +import {fetchAndLoadClientNotes} from "../client/note/client-read-note-loading.js?v=0.2.1"; +import {initFilterChipEventListeners} from "../general/page-component/filter-chip/filter-chip.js?v=0.2.1"; +import {loadUserActivities} from "../user/read/user-activity/activity-main.js?v=0.2.1"; +import {submitUpdate} from "../general/ajax/submit-update-data.js?v=0.2.1"; // Toggle enable / disable panel const panelToggleButtons = document.getElementsByClassName('dashboard-panel-toggle-btn'); diff --git a/public/assets/general/ajax/ajax-util/fail-handler.js b/public/assets/general/ajax/ajax-util/fail-handler.js index 4ff72d2a..565a5955 100644 --- a/public/assets/general/ajax/ajax-util/fail-handler.js +++ b/public/assets/general/ajax/ajax-util/fail-handler.js @@ -1,5 +1,5 @@ -import {displayValidationErrorMessage} from "../../validation/form-validation.js?v=0.1.0"; -import {displayFlashMessage} from "../../page-component/flash-message/flash-message.js?v=0.1.0"; +import {displayValidationErrorMessage} from "../../validation/form-validation.js?v=0.2.1"; +import {displayFlashMessage} from "../../page-component/flash-message/flash-message.js?v=0.2.1"; /** * If a request fails this function can be called which gives the user diff --git a/public/assets/general/ajax/fetch-data.js b/public/assets/general/ajax/fetch-data.js index de078bf3..12a09b1c 100644 --- a/public/assets/general/ajax/fetch-data.js +++ b/public/assets/general/ajax/fetch-data.js @@ -1,5 +1,5 @@ -import {handleFail} from "./ajax-util/fail-handler.js?v=0.1.0"; -import {basePath} from "../general-js/config.js?v=0.1.0"; +import {handleFail} from "./ajax-util/fail-handler.js?v=0.2.1"; +import {basePath} from "../general-js/config.js?v=0.2.1"; /** * Sends a GET request and returns result in promise diff --git a/public/assets/general/ajax/submit-delete-request.js b/public/assets/general/ajax/submit-delete-request.js index 81f2d8dd..3c539470 100644 --- a/public/assets/general/ajax/submit-delete-request.js +++ b/public/assets/general/ajax/submit-delete-request.js @@ -1,5 +1,5 @@ -import {basePath} from "../general-js/config.js?v=0.1.0"; -import {handleFail} from "./ajax-util/fail-handler.js?v=0.1.0"; +import {basePath} from "../general-js/config.js?v=0.2.1"; +import {handleFail} from "./ajax-util/fail-handler.js?v=0.2.1"; /** diff --git a/public/assets/general/ajax/submit-field-change-with-flash.js b/public/assets/general/ajax/submit-field-change-with-flash.js index 7f7e486c..fe14214a 100644 --- a/public/assets/general/ajax/submit-field-change-with-flash.js +++ b/public/assets/general/ajax/submit-field-change-with-flash.js @@ -1,7 +1,7 @@ // In square brackets to be evaluated -import {submitUpdate} from "./submit-update-data.js?v=0.1.0"; -import {displayFlashMessage} from "../page-component/flash-message/flash-message.js?v=0.1.0"; -import {removeSpecialChars} from "../general-js/functions.js?v=0.1.0"; +import {submitUpdate} from "./submit-update-data.js?v=0.2.1"; +import {displayFlashMessage} from "../page-component/flash-message/flash-message.js?v=0.2.1"; +import {removeSpecialChars} from "../general-js/functions.js?v=0.2.1"; /** * diff --git a/public/assets/general/ajax/submit-update-data.js b/public/assets/general/ajax/submit-update-data.js index af54f772..f7da03f0 100644 --- a/public/assets/general/ajax/submit-update-data.js +++ b/public/assets/general/ajax/submit-update-data.js @@ -1,5 +1,5 @@ -import {basePath} from "../general-js/config.js?v=0.1.0"; -import {handleFail, removeValidationErrorMessages} from "./ajax-util/fail-handler.js?v=0.1.0"; +import {basePath} from "../general-js/config.js?v=0.2.1"; +import {handleFail, removeValidationErrorMessages} from "./ajax-util/fail-handler.js?v=0.2.1"; /** diff --git a/public/assets/general/event-handler/open-link-on-html-element.js b/public/assets/general/event-handler/open-link-on-html-element.js index 00e3d8c0..97e01b85 100644 --- a/public/assets/general/event-handler/open-link-on-html-element.js +++ b/public/assets/general/event-handler/open-link-on-html-element.js @@ -1,4 +1,4 @@ -import {basePath} from "../general-js/config.js?v=0.1.0"; +import {basePath} from "../general-js/config.js?v=0.2.1"; /** * Open link when click or focus and enter key press diff --git a/public/assets/general/general-js/default.js b/public/assets/general/general-js/default.js index 5d167f2a..10b30f5e 100644 --- a/public/assets/general/general-js/default.js +++ b/public/assets/general/general-js/default.js @@ -1,7 +1,7 @@ -import {displayServerSideFlashMessages} from "../page-component/flash-message/flash-message.js?v=0.1.0"; -import {initAutoResizingTextareas} from "../page-component/textarea/auto-resizing-textarea.js?v=0.1.0"; -import {scrollToAnchor} from "../page-behaviour/scroll-to-anchor.js?v=0.1.0"; -import {countDownThrottleTimer} from "../../authentication/throttle-timer.js?v=0.1.0"; +import {displayServerSideFlashMessages} from "../page-component/flash-message/flash-message.js?v=0.2.1"; +import {initAutoResizingTextareas} from "../page-component/textarea/auto-resizing-textarea.js?v=0.2.1"; +import {scrollToAnchor} from "../page-behaviour/scroll-to-anchor.js?v=0.2.1"; +import {countDownThrottleTimer} from "../../authentication/throttle-timer.js?v=0.2.1"; // displayFlashMessage('success', 'This is a success flash message.'); // displayFlashMessage('info', 'This is an info flash message.'); diff --git a/public/assets/general/page-component/contenteditable/contenteditable-main.js b/public/assets/general/page-component/contenteditable/contenteditable-main.js index c622c6b4..257fe541 100644 --- a/public/assets/general/page-component/contenteditable/contenteditable-main.js +++ b/public/assets/general/page-component/contenteditable/contenteditable-main.js @@ -1,4 +1,4 @@ -import {displayValidationErrorMessage} from "../../validation/form-validation.js?v=0.1.0"; +import {displayValidationErrorMessage} from "../../validation/form-validation.js?v=0.2.1"; /** * Make field value editable diff --git a/public/assets/general/page-component/modal/dropdown-request.js b/public/assets/general/page-component/modal/dropdown-request.js index dac19e07..d3441d3f 100644 --- a/public/assets/general/page-component/modal/dropdown-request.js +++ b/public/assets/general/page-component/modal/dropdown-request.js @@ -1,5 +1,5 @@ -import {basePath} from "../../general-js/config.js?v=0.1.0"; -import {handleFail} from "../../ajax/ajax-util/fail-handler.js?v=0.1.0"; +import {basePath} from "../../general-js/config.js?v=0.2.1"; +import {handleFail} from "../../ajax/ajax-util/fail-handler.js?v=0.2.1"; /** * @param {string} moduleRoute name of the module for the route preceding "/dropdown-options" diff --git a/public/assets/general/page-component/modal/modal-submit-request.js b/public/assets/general/page-component/modal/modal-submit-request.js index 12f3d87e..9534f365 100644 --- a/public/assets/general/page-component/modal/modal-submit-request.js +++ b/public/assets/general/page-component/modal/modal-submit-request.js @@ -1,7 +1,7 @@ -import {getFormData, toggleEnableDisableForm} from "./modal-form.js?v=0.1.0"; -import {handleFail} from "../../ajax/ajax-util/fail-handler.js?v=0.1.0"; -import {closeModal} from "./modal.js?v=0.1.0"; -import {basePath} from "../../general-js/config.js?v=0.1.0"; +import {getFormData, toggleEnableDisableForm} from "./modal-form.js?v=0.2.1"; +import {handleFail} from "../../ajax/ajax-util/fail-handler.js?v=0.2.1"; +import {closeModal} from "./modal.js?v=0.2.1"; +import {basePath} from "../../general-js/config.js?v=0.2.1"; /** * Check form validity, disable form, submit modal form and close it on success diff --git a/public/assets/general/template/template-util.js b/public/assets/general/template/template-util.js index ec17fb9c..af4984d6 100644 --- a/public/assets/general/template/template-util.js +++ b/public/assets/general/template/template-util.js @@ -5,7 +5,7 @@ * @param {number|string} selectedKey optional selected key. If not found, no option is selected * @return {string} */ -import {escapeHtml} from "../general-js/functions.js?v=0.1.0"; +import {escapeHtml} from "../general-js/functions.js?v=0.2.1"; /** * @param {Object} allEntries diff --git a/public/assets/user/create/user-create-main.js b/public/assets/user/create/user-create-main.js index 763f4743..b3e01a12 100644 --- a/public/assets/user/create/user-create-main.js +++ b/public/assets/user/create/user-create-main.js @@ -1,7 +1,7 @@ -import {displayUserCreateModal} from "./user-create-modal.html.js?v=0.1.0"; -import {submitModalForm} from "../../general/page-component/modal/modal-submit-request.js?v=0.1.0"; -import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.1.0"; -import {loadUserList} from "../list/user-list-loading.js?v=0.1.0"; +import {displayUserCreateModal} from "./user-create-modal.html.js?v=0.2.1"; +import {submitModalForm} from "../../general/page-component/modal/modal-submit-request.js?v=0.2.1"; +import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.2.1"; +import {loadUserList} from "../list/user-list-loading.js?v=0.2.1"; document.querySelector('#create-user-btn').addEventListener('click', displayUserCreateModal); diff --git a/public/assets/user/create/user-create-modal.html.js b/public/assets/user/create/user-create-modal.html.js index 33343867..966950eb 100644 --- a/public/assets/user/create/user-create-modal.html.js +++ b/public/assets/user/create/user-create-modal.html.js @@ -1,8 +1,8 @@ -import {createModal} from "../../general/page-component/modal/modal.js?v=0.1.0"; -import {requestDropdownOptions} from "../../general/page-component/modal/dropdown-request.js?v=0.1.0"; -import {getDropdownAsHtmlOptions} from "../../general/template/template-util.js?v=0.1.0"; -import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.1.0"; -import {addPasswordStrengthCheck} from "../../authentication/password-strength-checker.js?v=0.1.0"; +import {createModal} from "../../general/page-component/modal/modal.js?v=0.2.1"; +import {requestDropdownOptions} from "../../general/page-component/modal/dropdown-request.js?v=0.2.1"; +import {getDropdownAsHtmlOptions} from "../../general/template/template-util.js?v=0.2.1"; +import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.2.1"; +import {addPasswordStrengthCheck} from "../../authentication/password-strength-checker.js?v=0.2.1"; /** * Create and display modal box to create a new client diff --git a/public/assets/user/list/user-list-card-dom-appending.js b/public/assets/user/list/user-list-card-dom-appending.js index 54dcf392..a614fba9 100644 --- a/public/assets/user/list/user-list-card-dom-appending.js +++ b/public/assets/user/list/user-list-card-dom-appending.js @@ -1,4 +1,4 @@ -import {getUserCardHtml} from "./user-list-card.html.js?v=0.1.0"; +import {getUserCardHtml} from "./user-list-card.html.js?v=0.2.1"; /** * Add elements to page diff --git a/public/assets/user/list/user-list-card.html.js b/public/assets/user/list/user-list-card.html.js index 518b81f0..481eff1f 100644 --- a/public/assets/user/list/user-list-card.html.js +++ b/public/assets/user/list/user-list-card.html.js @@ -1,5 +1,5 @@ -import {getDropdownAsHtmlOptions} from "../../general/template/template-util.js?v=0.1.0"; -import {escapeHtml} from "../../general/general-js/functions.js?v=0.1.0"; +import {getDropdownAsHtmlOptions} from "../../general/template/template-util.js?v=0.2.1"; +import {escapeHtml} from "../../general/general-js/functions.js?v=0.2.1"; /** * HTML code for client profile card diff --git a/public/assets/user/list/user-list-content-placeholder.js b/public/assets/user/list/user-list-content-placeholder.js index 7c7bf33a..46ee0644 100644 --- a/public/assets/user/list/user-list-content-placeholder.js +++ b/public/assets/user/list/user-list-content-placeholder.js @@ -1,4 +1,4 @@ -import {getUserCardLoadingPlaceholderHtml} from "./user-list-card.html.js?v=0.1.0"; +import {getUserCardLoadingPlaceholderHtml} from "./user-list-card.html.js?v=0.2.1"; /** * Display content placeholders diff --git a/public/assets/user/list/user-list-loading.js b/public/assets/user/list/user-list-loading.js index 251b6f38..5361f9d8 100644 --- a/public/assets/user/list/user-list-loading.js +++ b/public/assets/user/list/user-list-loading.js @@ -1,17 +1,17 @@ import { displayUserCardLoadingPlaceholder, removeUserCardContentPlaceholder -} from "./user-list-content-placeholder.js?v=0.1.0"; -import {fetchData} from "../../general/ajax/fetch-data.js?v=0.1.0"; -import {addUsersToDom} from "./user-list-card-dom-appending.js?v=0.1.0"; +} from "./user-list-content-placeholder.js?v=0.2.1"; +import {fetchData} from "../../general/ajax/fetch-data.js?v=0.2.1"; +import {addUsersToDom} from "./user-list-card-dom-appending.js?v=0.2.1"; import { disableMouseWheelClickScrolling, openLinkOnHtmlElement -} from "../../general/event-handler/open-link-on-html-element.js?v=0.1.0"; +} from "../../general/event-handler/open-link-on-html-element.js?v=0.2.1"; import { triggerClickOnHtmlElementEnterKeypress -} from "../../general/event-handler/trigger-click-on-enter-keypress.js?v=0.1.0"; -import {submitFieldChangeWithFlash} from "../../general/ajax/submit-field-change-with-flash.js?v=0.1.0"; +} from "../../general/event-handler/trigger-click-on-enter-keypress.js?v=0.2.1"; +import {submitFieldChangeWithFlash} from "../../general/ajax/submit-field-change-with-flash.js?v=0.2.1"; /** * Load user list into DOM diff --git a/public/assets/user/list/user-list-main.js b/public/assets/user/list/user-list-main.js index fe531ba2..7553af4b 100644 --- a/public/assets/user/list/user-list-main.js +++ b/public/assets/user/list/user-list-main.js @@ -1,4 +1,4 @@ -import {loadUserList} from "./user-list-loading.js?v=0.1.0"; +import {loadUserList} from "./user-list-loading.js?v=0.2.1"; // Load users at page startup - this function cannot be here as it's used by the dashboard for loading in tailored wrapper loadUserList(); \ No newline at end of file diff --git a/public/assets/user/profile.js b/public/assets/user/profile.js index 78038833..87c1e6ae 100644 --- a/public/assets/user/profile.js +++ b/public/assets/user/profile.js @@ -1,6 +1,6 @@ // First name -import {createAlertModal} from "../general/page-component/modal/alert-modal.js?v=0.1.0"; -import {handleFail} from "../general/ajax/ajax-util/fail-handler.js?v=0.1.0"; +import {createAlertModal} from "../general/page-component/modal/alert-modal.js?v=0.2.1"; +import {handleFail} from "../general/ajax/ajax-util/fail-handler.js?v=0.2.1"; let firstNameEditIco = document.getElementById('edit-first-name-ico'); firstNameEditIco.addEventListener('click', function () { diff --git a/public/assets/user/read/user-activity/activity-main.js b/public/assets/user/read/user-activity/activity-main.js index 723f5a79..1338a04c 100644 --- a/public/assets/user/read/user-activity/activity-main.js +++ b/public/assets/user/read/user-activity/activity-main.js @@ -1,6 +1,6 @@ -import {fetchData} from "../../../general/ajax/fetch-data.js?v=0.1.0"; -import {getUserActivityListHtml} from "./user-activtiy-list.html.js?v=0.1.0"; -import {initCollapsible} from "../../../general/page-component/collapsible/collapsible.js?v=0.1.0"; +import {fetchData} from "../../../general/ajax/fetch-data.js?v=0.2.1"; +import {getUserActivityListHtml} from "./user-activtiy-list.html.js?v=0.2.1"; +import {initCollapsible} from "../../../general/page-component/collapsible/collapsible.js?v=0.2.1"; /** diff --git a/public/assets/user/read/user-read-update-main.js b/public/assets/user/read/user-read-update-main.js index d1da69fc..53aa357c 100644 --- a/public/assets/user/read/user-read-update-main.js +++ b/public/assets/user/read/user-read-update-main.js @@ -1,11 +1,11 @@ -import {makeUserFieldEditable} from "./user-update-contenteditable.js?v=0.1.0"; -import {displayChangePasswordModal} from "../update/change-password-modal.html.js?v=0.1.0"; -import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.1.0"; -import {submitModalForm} from "../../general/page-component/modal/modal-submit-request.js?v=0.1.0"; -import {submitFieldChangeWithFlash} from "../../general/ajax/submit-field-change-with-flash.js?v=0.1.0"; -import {submitDelete} from "../../general/ajax/submit-delete-request.js?v=0.1.0"; -import {createAlertModal} from "../../general/page-component/modal/alert-modal.js?v=0.1.0"; -import {loadUserActivities} from "./user-activity/activity-main.js?v=0.1.0"; +import {makeUserFieldEditable} from "./user-update-contenteditable.js?v=0.2.1"; +import {displayChangePasswordModal} from "../update/change-password-modal.html.js?v=0.2.1"; +import {displayFlashMessage} from "../../general/page-component/flash-message/flash-message.js?v=0.2.1"; +import {submitModalForm} from "../../general/page-component/modal/modal-submit-request.js?v=0.2.1"; +import {submitFieldChangeWithFlash} from "../../general/ajax/submit-field-change-with-flash.js?v=0.2.1"; +import {submitDelete} from "../../general/ajax/submit-delete-request.js?v=0.2.1"; +import {createAlertModal} from "../../general/page-component/modal/alert-modal.js?v=0.2.1"; +import {loadUserActivities} from "./user-activity/activity-main.js?v=0.2.1"; const userId = document.getElementById('user-id').value; diff --git a/public/assets/user/read/user-update-contenteditable.js b/public/assets/user/read/user-update-contenteditable.js index 9afd9939..9df0e043 100644 --- a/public/assets/user/read/user-update-contenteditable.js +++ b/public/assets/user/read/user-update-contenteditable.js @@ -1,10 +1,10 @@ -import {removeValidationErrorMessages} from "../../general/ajax/ajax-util/fail-handler.js?v=0.1.0"; +import {removeValidationErrorMessages} from "../../general/ajax/ajax-util/fail-handler.js?v=0.2.1"; import { contentEditableFieldValueIsValid, disableEditableField, makeFieldEditable -} from "../../general/page-component/contenteditable/contenteditable-main.js?v=0.1.0"; -import {submitUpdate} from "../../general/ajax/submit-update-data.js?v=0.1.0"; +} from "../../general/page-component/contenteditable/contenteditable-main.js?v=0.2.1"; +import {submitUpdate} from "../../general/ajax/submit-update-data.js?v=0.2.1"; /** * Make text value as editable and attach event listeners diff --git a/public/assets/user/update/change-password-modal.html.js b/public/assets/user/update/change-password-modal.html.js index 77572ed2..148f7606 100644 --- a/public/assets/user/update/change-password-modal.html.js +++ b/public/assets/user/update/change-password-modal.html.js @@ -1,5 +1,5 @@ -import {createModal} from "../../general/page-component/modal/modal.js?v=0.1.0"; -import {addPasswordStrengthCheck} from "../../authentication/password-strength-checker.js?v=0.1.0"; +import {createModal} from "../../general/page-component/modal/modal.js?v=0.2.1"; +import {addPasswordStrengthCheck} from "../../authentication/password-strength-checker.js?v=0.2.1"; /** * Create and display modal box to change password