Fixed notes duplications after changes on newly created notes [SLE-18…

…8][SLE-164]

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',
 ];
 

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()

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;
 

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);

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

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

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.

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();

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

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 = [];
 

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

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);

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

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

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 = [];
 

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

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

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

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 */

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

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');

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

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

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";
 
 
 /**

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";
 
 /**
  *

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";
 
 
 /**

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

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.');

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