mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	nice UI for attributes with validation
This commit is contained in:
		| @@ -14,26 +14,94 @@ const attributesDialog = (function() { | ||||
|  | ||||
|             const attributes = await server.get('notes/' + noteId + '/attributes'); | ||||
|  | ||||
|             this.attributes(attributes); | ||||
|             self.attributes(attributes.map(ko.observable)); | ||||
|  | ||||
|             addLastEmptyRow(); | ||||
|         }; | ||||
|  | ||||
|         this.addNewRow = function() { | ||||
|             self.attributes.push({ | ||||
|                 attributeId: '', | ||||
|                 name: '', | ||||
|                 value: '' | ||||
|             }); | ||||
|         }; | ||||
|         function isValid() { | ||||
|             for (let attrs = self.attributes(), i = 0; i < attrs.length; i++) { | ||||
|                 if (self.isEmptyName(i) || self.isNotUnique(i)) { | ||||
|                     return false; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             return true; | ||||
|         } | ||||
|  | ||||
|         this.save = async function() { | ||||
|             if (!isValid()) { | ||||
|                 alert("Please fix all validation errors and try saving again."); | ||||
|                 return; | ||||
|             } | ||||
|  | ||||
|             const noteId = noteEditor.getCurrentNoteId(); | ||||
|  | ||||
|             const attributes = await server.put('notes/' + noteId + '/attributes', this.attributes()); | ||||
|             const attributesToSave = self.attributes() | ||||
|                 .map(attr => attr()) | ||||
|                 .filter(attr => attr.attributeId !== "" || attr.name !== ""); | ||||
|  | ||||
|             self.attributes(attributes); | ||||
|             const attributes = await server.put('notes/' + noteId + '/attributes', attributesToSave); | ||||
|  | ||||
|             self.attributes(attributes.map(ko.observable)); | ||||
|  | ||||
|             addLastEmptyRow(); | ||||
|  | ||||
|             showMessage("Attributes have been saved."); | ||||
|         }; | ||||
|  | ||||
|         function addLastEmptyRow() { | ||||
|             const attrs = self.attributes(); | ||||
|             const last = attrs[attrs.length - 1](); | ||||
|  | ||||
| //            console.log("last", attrs.map(attr => attr())); | ||||
|  | ||||
|             if (last.name.trim() !== "" || last.value !== "") { | ||||
|                 console.log("Adding new row"); | ||||
|  | ||||
|                 self.attributes.push(ko.observable({ | ||||
|                     attributeId: '', | ||||
|                     name: '', | ||||
|                     value: '' | ||||
|                 })); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         this.attributeChanged = function (row) { | ||||
|             console.log(row); | ||||
|  | ||||
|             addLastEmptyRow(); | ||||
|  | ||||
|             for (const attr of self.attributes()) { | ||||
|                 if (row.attributeId === attr().attributeId) { | ||||
|                     attr.valueHasMutated(); | ||||
|                 } | ||||
|             } | ||||
|         }; | ||||
|  | ||||
|         this.isNotUnique = function(index) { | ||||
|             const cur = self.attributes()[index](); | ||||
|  | ||||
|             if (cur.name.trim() === "") { | ||||
|                 return false; | ||||
|             } | ||||
|  | ||||
|             for (let attrs = self.attributes(), i = 0; i < attrs.length; i++) { | ||||
|                 const attr = attrs[i](); | ||||
|  | ||||
|                 if (index !== i && cur.name === attr.name) { | ||||
|                     return true; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             return false; | ||||
|         }; | ||||
|  | ||||
|         this.isEmptyName = function(index) { | ||||
|             const cur = self.attributes()[index](); | ||||
|  | ||||
|             return cur.name.trim() === "" && (cur.attributeId !== "" || cur.value !== ""); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     async function showDialog() { | ||||
|   | ||||
| @@ -383,10 +383,8 @@ | ||||
|  | ||||
|     <div id="attributes-dialog" title="Note attributes" style="display: none; padding: 20px;"> | ||||
|       <form data-bind="submit: save"> | ||||
|       <div style="display: flex; justify-content: space-between; padding: 15px; padding-top: 0;"> | ||||
|         <button class="btn-default" type="button" data-bind="click: addNewRow">Add new attribute</button> | ||||
|  | ||||
|         <button class="btn-primary" type="submit">Save</button> | ||||
|       <div style="text-align: center"> | ||||
|         <button class="btn-primary btn-large" type="submit">Save</button> | ||||
|       </div> | ||||
|  | ||||
|       <div style="height: 97%; overflow: auto"> | ||||
| @@ -402,10 +400,13 @@ | ||||
|             <tr> | ||||
|               <td data-bind="text: attributeId"></td> | ||||
|               <td> | ||||
|                 <input type="text" data-bind="value: name"/> | ||||
|                 <input type="text" data-bind="value: name, event: { change: $parent.attributeChanged }"/> | ||||
|  | ||||
|                 <div style="color: red" data-bind="if: $parent.isNotUnique($index())">Attribute name must be unique per note.</div> | ||||
|                 <div style="color: red" data-bind="if: $parent.isEmptyName($index())">Attribute name can't be empty.</div> | ||||
|               </td> | ||||
|               <td> | ||||
|                 <input type="text" data-bind="value: value" style="width: 300px"/> | ||||
|                 <input type="text" data-bind="value: value, event: { change: $parent.attributeChanged }" style="width: 300px"/> | ||||
|               </td> | ||||
|             </tr> | ||||
|           </tbody> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user