not-options 0.1.38 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-options",
-	"version": "0.1.38",
+	"version": "0.2.0",
 	"description": "not-* family options model in not- environment",
 	"main": "index.js",
 	"scripts": {
@@ -34,7 +34,7 @@
 		"eslint": "*",
 		"ink-docstrap": "^1.3.2",
 		"istanbul": "*",
-		"jsdoc": "^3.6.6",
+		"jsdoc": "^3.6.7",
 		"mocha": "*"
 	}
 }

package/src/controllers/common/import.svelte

@@ -1,6 +1,7 @@
 <script>
   import { createEventDispatcher } from 'svelte';
-  import { UIOverlay } from 'not-bulma';
+  import { Elements } from 'not-bulma';
+  const UIOverlay = Elements.Modals.UIOverlay;
 
   let has_error = false;
   let error = '';

package/src/controllers/common/validators.js

@@ -3,7 +3,7 @@ export default {
 		id(){return [];},
 		codeName(){return [];},
 	},
-	form:{
+	forms:{
 		edit(){
 			return {
 				clean: true

package/src/controllers/root/index.js

@@ -3,10 +3,7 @@ import ncOptions from './ncOptions.js';
 let manifest = {
 	router: {
 		manifest: [
-			{
-				paths: ['options\/([^\/]+)\/([^\/]+)', 'options\/([^\/]+)', 'options'],
-				controller: ncOptions
-			},
+			ncOptions.getRoutes()
 		]
 	},
 	menu:{

package/src/controllers/root/ncOptions.js

@@ -1,8 +1,10 @@
 import Validators from '../common/validators.js';
 import {
-	ncCRUD
+	Frame
 } from 'not-bulma';
 
+const notCRUD = Frame.notCRUD;
+
 import UIImport from '../common/import.svelte';
 
 const LABELS = {
@@ -12,7 +14,9 @@ const LABELS = {
 
 const MODEL = 'options';
 
-class ncOptions extends ncCRUD {
+class ncOptions extends notCRUD {
+	static MODEL_NAME = MODEL;
+	static MODULE_NAME = '';
 	constructor(app, params, schemes) {
 		super(app, MODEL);
 		this.setModuleName('');

package/src/models/options.js

@@ -1,7 +1,6 @@
 const log = require('not-log')(module, 'Options Model');
 try {
   const MODEL_NAME = 'Options';
-  const initFields = require('not-node').Fields.initFields;
   const Increment = require('not-node').Increment;
   const notError = require('not-error').notError;
 
@@ -13,12 +12,15 @@ try {
       {
         default: true
       }
-    ]
+    ],
+    'createdAt',
+    'updatedAt'
   ];
 
+  exports.FIELDS = FIELDS;
+
   exports.keepNotExtended = false;
   exports.thisModelName = MODEL_NAME;
-  exports.thisSchema = initFields(FIELDS, 'model');
 
   exports.enrich = {
     versioning: true,
@@ -72,6 +74,7 @@ try {
           __closed: false
         }, {
           value,
+          updatedAt: Date.now()
         }).exec();
         let item = await this.findOne({
           id: name,
@@ -87,10 +90,11 @@ try {
           });
         }
       } else {
-        this.add({
+        return this.add({
           id: name,
           value,
-          active: true
+          active: true,
+          updatedAt: Date.now()
         });
       }
     },

package/src/routes/options.js

@@ -240,8 +240,22 @@ exports._updateForModule = async (req, res) => {
 			throw new Error('moduleName is now valid');
 		}
 		const notApp = notNode.Application;
-		await notApp.getModel(MODEL_NAME).writeModuleOptions(moduleName, options);
+		const result = await notApp.getModel(MODEL_NAME).writeModuleOptions(moduleName, options);
 		notNode.Application.emit(`module:${moduleName}:options:updated`);
+		const information  = {
+			recipient:{
+				role: 		'root'
+			},
+			tags: 			['moduleOptionsUpdated'],
+			userId,
+			username: req.user.username,
+			userRole: req.user.role.toString(),
+			updatedAt: result.updatedAt,
+			moduleName
+		};
+		setTimeout(()=>{
+			notNode.Application.inform(information);
+		}, 1000);
 		res.status(200).json({
 			status: 'ok'
 		});

package/src/routes/options.manifest.js

@@ -1,10 +1,7 @@
-const initFromSchema = require('not-node').Fields.fromSchema;
-const modelSchema = require('../models/options').thisSchema;
-
-const FIELDS = initFromSchema(modelSchema, [
+const FIELDS = [
 	'_id',
 	['optionsID', {}, 'ID'],
-]);
+];
 
 module.exports = {
 	model: 'options',