@osfarm/itineraire-technique 1.1.11 → 1.1.13

package/editor.html

@@ -51,6 +51,7 @@
                             <span class="visually-hidden">Autres options de chargement</span>
                         </button>
                         <ul class="dropdown-menu">
+                            <li><a class="dropdown-item" href="#" onclick="showSaveAsModal()"><i class="fa fa-save" aria-hidden="true"></i> Enregistrer sous</a></li>
                             <li><a class="dropdown-item" href="#" onclick="exportToJsonFile()"><i class="fa fa-download" aria-hidden="true"></i> Exporter</a></li>
                         </ul>
                     </div>
@@ -271,6 +272,47 @@
         </div>
     </div>
 
+    <!-- Save As Modal -->
+    <div class="modal fade" id="saveAsModal" tabindex="-1" aria-labelledby="saveAsModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="saveAsModalLabel">Enregistrer sous</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <form>
+                        <div class="mb-3 form-check">
+                            <input type="checkbox" class="form-check-input" id="saveAsUseExistingPage">
+                            <label class="form-check-label" for="saveAsUseExistingPage">
+                                Enregistrer sous une page existante
+                            </label>
+                        </div>
+                        <div class="mb-3" id="saveAsPageSelectContainer">
+                            <label for="saveAsPageSelect" class="form-label">Page parent</label>
+                            <select class="form-select" id="saveAsPageSelect" disabled>
+                                <option value="">Sélectionner une page...</option>
+                            </select>
+                            <div class="form-text">Si non coché, le fichier sera enregistré sous "Non classified"</div>
+                        </div>
+                        <div class="mb-3">
+                            <label for="saveAsFilename" class="form-label">Nom du fichier</label>
+
+                            <div class="input-group mb-3">
+                                <input type="text" class="form-control" id="saveAsFilename" placeholder="Nom du fichier (sans extension)">
+                                <span class="input-group-text" id="basic-addon2">.json</span>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Annuler</button>
+                    <button type="button" class="btn btn-primary" id="saveAsConfirmBtn">Enregistrer</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <!-- Modal -->
     <div class="modal fade" id="modalParams" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog">
@@ -645,6 +687,17 @@
 
             we = new WikiEditor();
             we.loadPageFromURL();
+
+            // Set up Save As modal event listeners
+            $('#saveAsUseExistingPage').on('change', function() {
+                $('#saveAsPageSelect').prop('disabled', !this.checked);
+            });
+
+            $('#saveAsConfirmBtn').on('click', function() {
+                if (we) {
+                    we.saveAs();
+                }
+            });
         } else {
             document.getElementById("WikiButtons").classList.add("d-none");
             document.getElementById("NonWikiButtons").classList.remove("d-none");
@@ -670,12 +723,20 @@
         }
     }
 
+    function showSaveAsModal() {
+        if (typeof we !== 'undefined') {
+            we.showSaveAsModal();
+        } else {
+            console.error('WikiEditor instance not available');
+        }
+    }
+
     class StepModel {
         constructor(step) {
             this.step = step; // keep a reference to the original object
 
             this.step.id = step.id ?? crypto.randomUUID();
-            this.step.name = step.name ?? "Nouvelle culture";
+            this.step.name = step.name ?? "";
             this.step.color = step.color ?? "#0db3bf";
             this.step.startDate = step.startDate ? new Date(step.startDate) : new Date();
             this.step.endDate = step.endDate ? new Date(step.endDate) : new Date();
@@ -1013,7 +1074,9 @@
             if (this.textContent.trim() === "") {
                 this.textContent = DEFAULT_TITLE;
             }
+
             crops.title = this.textContent;
+            crops.defaultTitle = false;
         });
     }
 

package/js/editor-export.js

@@ -100,7 +100,7 @@ function showJsonErrorModal(errorMessage) {
 function showConfirmationModal(onConfirm) {
 
     if (crops?.steps.length === 0)
-        return true;
+        return onConfirm();
 
     const confirmationModal = new bootstrap.Modal(document.getElementById('confirmationModal'));
     const confirmButton = document.getElementById('confirmImport');

package/js/editor-wiki-editor.js

@@ -53,7 +53,6 @@ class WikiEditor {
                     const jsonErrorModal = new bootstrap.Modal(document.getElementById('jsonErrorModal'));
                     jsonErrorModal.show();
                 }
-
             }
         });
     
@@ -66,17 +65,13 @@ class WikiEditor {
         const self = this;
 
         if (!self.pageTitle) {
-            alert("Aucun titre de page spécifié pour l'enregistrement.");
+            self.showSaveAsModal();
             return;
         }
         
         // If a page title is provided, save to that page
         self.savePageToWiki(self.pageTitle, JSON.stringify(crops, null, 2))
-            .then(() => {
-
-                // TODO : Also set a few semantic properties on the page, including the chart type, the geolocation, etc.
-
-
+            .then(async () => {
                 alert("Itinéraire technique enregistré avec succès !");
             })
             .catch(err => {
@@ -151,6 +146,25 @@ class WikiEditor {
         }
     }
 
+
+    async getWikiUserPages(username) {
+        try {
+            // Encode the username for the URL
+            const encodedUsername = 'User:' + username;
+            const query = encodeURIComponent(`[[Page author::${encodedUsername}]][[A un type de page::+]]`);
+            const url = `/api.php?action=ask&query=${query}|sort=Modification date|order=desc&format=json`;
+            
+            const response = await fetch(url, {
+                credentials: 'include'
+            });
+            const data = await response.json();
+            return data;
+        } catch (error) {
+            console.error("Error fetching wiki files:", error);
+            throw error;
+        }
+    }
+
     async loadFromWiki() {
         // Show the modal
         const modal = new bootstrap.Modal(document.getElementById('wikiFilesModal'));
@@ -220,4 +234,121 @@ class WikiEditor {
         }
     }
 
+    /**
+     * Show the Save As modal and handle the save as functionality
+     */
+    async showSaveAsModal() {
+        const self = this;
+        
+        try {
+            // Get user info to check if logged in
+            const userInfo = await this.getWikiUserInfo();
+            
+            if (!userInfo.id || userInfo.id === 0) {
+                alert('Vous devez être connecté au wiki pour utiliser cette fonctionnalité.');
+                return;
+            }
+
+            // Get user's existing pages
+            const pagesData = await this.getWikiUserPages(userInfo.name);
+            
+            // Show the modal
+            const modal = new bootstrap.Modal(document.getElementById('saveAsModal'));
+            modal.show();
+            
+            // Populate the select with user's pages
+            const pageSelect = $('#saveAsPageSelect');
+            pageSelect.empty();
+            pageSelect.append('<option value="">Sélectionner une page...</option>');
+            
+            if (pagesData.query?.results) {
+                for (const [pageTitle, pageData] of Object.entries(pagesData.query.results)) {
+                    const displayTitle = pageData.displaytitle || pageTitle;
+                    pageSelect.append(`<option value="${pageTitle}">${displayTitle}</option>`);
+                }
+            }
+            
+            // Set default filename from title if it's been changed
+            const filenameInput = $('#saveAsFilename');
+            const currentTitle = crops.title || '';
+            if (crops.defaultTitle === false) {
+                filenameInput.val(currentTitle);
+            } else {
+                filenameInput.val('');
+            }
+            
+        } catch (error) {
+            console.error("Error showing save as modal:", error);
+            alert('Erreur lors du chargement des données utilisateur.');
+        }
+    }
+
+    /**
+     * Build the URL for saving based on the save as modal selections
+     */
+    buildSaveAsUrl() {
+        const useExistingPage = $('#saveAsUseExistingPage').prop('checked');
+        const selectedPage = $('#saveAsPageSelect').val();
+        const filename = $('#saveAsFilename').val().trim();
+        
+        if (!filename) {
+            alert('Veuillez saisir un nom de fichier.');
+            return null;
+        }
+        
+        let subpageName;
+        
+        if (useExistingPage && selectedPage) {
+            subpageName = selectedPage;
+        } else {
+            subpageName = 'Non classified';
+        }
+        
+        // Build the final URL: subpagename/filename.json
+        const finalUrl = `${subpageName}/${filename}.json`;
+
+        if (crops.defaultTitle !== false) {
+            crops.title = filename;
+        }
+
+        return finalUrl;
+    }
+
+    /**
+     * Handle the save as operation
+     */
+    async saveAs() {
+        const url = this.buildSaveAsUrl();
+        
+        if (!url) {
+            return; // Error already handled in buildSaveAsUrl
+        }
+        
+        const self = this;
+        const oldPageTitle = self.pageTitle;
+
+        try {
+            // Set the new page title
+            self.pageTitle = url;
+
+            // Save to the wiki first
+            await self.savePageToWiki(self.pageTitle, JSON.stringify(crops, null, 2));
+            
+            // Close the modal
+            const modal = bootstrap.Modal.getInstance(document.getElementById('saveAsModal'));
+            modal.hide();
+            
+            alert(`Itinéraire technique enregistré avec succès sous "${url}"`);
+            
+            // Only navigate after successful save
+            const newEditorUrl = `editor.html?wiki=${encodeURIComponent(self.pageTitle)}`;
+            window.location.href = newEditorUrl;
+            
+        } catch (error) {
+            // Restore the old page title if save failed
+            self.pageTitle = oldPageTitle;
+            console.error("Error saving as new file:", error);
+            alert('Erreur lors de l\'enregistrement du fichier.');
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osfarm/itineraire-technique",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "A visualisation tool to show agricultural technical itineraries based on Echarts",
   "main": "editor.html",
   "scripts": {