not-options 0.3.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-options",
-	"version": "0.3.0",
+	"version": "0.3.2",
 	"description": "not-* family options model in not- environment",
 	"main": "index.js",
 	"scripts": {

package/src/controllers/common/actions/json.import.export/export.to.json.js

@@ -49,11 +49,10 @@ const DEFAULT_BREADCRUMB_TAIL = `${MODULE_NAME}:action_export_to_json_title`;
     static prepareUIOptions(controller, response) {
         const actionName = this.getModelActionName(controller);
         return {
-            target: controller.getContainerInnerElement(),
-            props: {
+            
                 value: response.result,
                 actionName,
-            },
+           
         };
     }
 
@@ -79,11 +78,10 @@ const DEFAULT_BREADCRUMB_TAIL = `${MODULE_NAME}:action_export_to_json_title`;
             if (this.isResponseBad(response)) {
                 return controller.showErrorMessage(response);
             }
-            //creating action UI component
-            const uiComponent = this.UIConstructor;
-            this.setUI(
+            //creating action UI component           
+            this.buildUI(
                 controller,
-                new uiComponent(this.prepareUIOptions(controller, response))
+                this.prepareUIOptions(controller, response)
             );
             //bind events to UI
             this.bindUIEvents(controller, params, response);

package/src/controllers/common/actions/json.import.export/import.from.json.js

@@ -42,10 +42,9 @@ class ncaImportFromJSON extends CRUDGenericActionCreate {
     static prepareUIOptions(controller, value) {
         const actionName = this.getModelActionName(controller);
         return {
-            props: {
+           
                 actionName,
-            },
-            target: controller.getContainerInnerElement(),
+            
         };
     }
 
@@ -71,9 +70,9 @@ class ncaImportFromJSON extends CRUDGenericActionCreate {
             //creating action UI component
             const uiComponent = this.UIConstructor;
             const response = {};
-            this.setUI(
+            this.buildUI(
                 controller,
-                new uiComponent(this.prepareUIOptions(controller, response))
+                this.prepareUIOptions(controller, response)
             );
             //bind events to UI
             this.bindUIEvents(controller, params, response);
@@ -91,24 +90,24 @@ class ncaImportFromJSON extends CRUDGenericActionCreate {
 
     static bindUIEvents(controller, params, response) {
         if (notCommon.isFunc(controller.goBack)) {
-            this.bindUIEvent(controller, "reject", () => controller.goBack());
+            this.bindUIEvent(controller, "onreject", () => controller.goBack());
         }
 
-        this.bindUIEvent(controller, "import", ({ detail }) => {
+        this.bindUIEvent(controller, "onimport", ({ detail }) => {
             ncaImportFromJSON.import(controller, detail);
         });
     }
 
     static setUILoading(controller) {
-        this.getUI(controller).$set({ loading: true });
+        this.getUI(controller).set('loading', true );
     }
 
     static setUILoaded(controller) {
-        this.getUI(controller).$set({ loading: false });
+        this.getUI(controller).set('loading', false );
     }
 
     static setUIError(controller, message) {
-        this.getUI(controller).$set({ error: message });
+        this.getUI(controller).set( 'error', message);
     }
 
     static async import(controller, jsonAsText) {

package/src/controllers/common/actions/json.import.export/import.from.json.svelte

@@ -1,6 +1,4 @@
 <script>
-    import { createEventDispatcher } from "svelte";
-    const dispatch = createEventDispatcher();
     import UITextarea from "not-bulma/src/elements/form/ui.textarea.svelte";
     import UIButton from "not-bulma/src/elements/button/ui.button.svelte";
     import { MODULE_NAME } from "../../../../const.js";
@@ -11,15 +9,17 @@
      */
 
     /** @type {Props} */
-    let { value = $bindable(""), loading = false } = $props();
+    let {
+        value = $bindable(""),
+        loading = false,
+        onimport = () => {},
+    } = $props();
 </script>
 
 <UITextarea bind:value rows={20} disabled={loading} placeholder={""} />
 
 <UIButton
-    action={() => {
-        dispatch("import", value);
-    }}
+    action={() => onimport(value)}
     color={"primary"}
     disabled={loading}
     {loading}

package/src/controllers/common/import.svelte

@@ -1,125 +1,147 @@
 <script>
-  import { createEventDispatcher } from 'svelte';
-  import { Elements } from 'not-bulma';
-  const UIOverlay = Elements.Modals.UIOverlay;
-
-  let has_error = $state(false);
-  let error = $state('');
-  let has_info = $state(false);
-  let info = $state('');
-  let show = true;
-  let closeOnClick = false;
-	let closeButton = false;
-  /**
-   * @typedef {Object} Props
-   * @property {boolean} [importing]
-   */
-
-  /** @type {Props} */
-  let { importing = $bindable(false) } = $props();
-  let fileField = $state(),overlay = $state(), filename = $state('');
-
-  const dispatch = createEventDispatcher();
-
-  function overlayClosed(){
-		rejectImport();
-	}
-
-  function rejectImport(){
-		overlay.$destroy();
-		dispatch('reject', {});
-	};
-
-  function resolveImport(){
-		overlay.$destroy();
-		dispatch('resolve', {});
-	};
-
-  function fileNameUpdate(){
-    if (fileField.files.length > 0){
-      let file = fileField.files[0];
-      filename = file.name;
+    import { Elements } from "not-bulma";
+    const UIOverlay = Elements.Modals.UIOverlay;
+
+    let closeOnClick = false;
+    let closeButton = false;
+    /**
+     * @typedef {Object} Props
+     * @property {boolean} [importing]
+     */
+
+    /** @type {Props} */
+    let {
+        importing = $bindable(false),
+        error = "",
+        info = "",
+        show = true,
+        onreject = () => {},
+        onresolve = () => {},
+        onimport = () => {},
+    } = $props();
+
+    let has_error = $derived(typeof error === "string" && error.length > 0);
+    let has_info = $derived(typeof info === "string" && info.length > 0);
+
+    let fileField = $state(),
+        overlay = $state(),
+        filename = $state("");
+
+    function overlayClosed() {
+        rejectImport();
     }
-  }
-
-  export function setError(message){
-    has_error = true;
-    error = message;
-    importing = false;
-  }
-
-  export function setInfo(message){
-    has_info = true;
-    info = message;
-  }
-
-  async function importFile(){
-    try{
-      if (fileField.files.length > 0){
-        let file = fileField.files[0];
-        let contentStr = await file.text();
-        importing = true;
-        dispatch('import', { options: contentStr });
-      }
-    }catch(e){
-      dispatch('reject', {error: e});
+
+    function rejectImport() {
+        overlay.$destroy();
+        onreject({});
     }
-  }
-</script>
 
+    function resolveImport() {
+        overlay.$destroy();
+        onresolve({});
+    }
 
-<UIOverlay on:reject="{overlayClosed}" bind:this={overlay} show={true} {closeOnClick} {closeButton}>
-  <div class="form-paper box {has_error}">
-    <h4 class="title is-4">Импорт настроек из файла</h4>
-    <div class="file is-boxed file-select-box">
-      <label class="file-label">
-        <input class="file-input" type="file" name="optionsToImport" onchange={fileNameUpdate} bind:this="{fileField}" accept=".json" multiple="false">
-        <span class="file-cta">
-          <span class="file-icon">
-            <i class="fas fa-upload"></i>
-          </span>
-          <span class="file-label has-text-centered">
-            {#if filename }
-            {filename}
-            {:else}
-            Выберите файл
-            {/if}
-          </span>
-        </span>
-      </label>
-    </div>
+    function fileNameUpdate() {
+        if (fileField.files.length > 0) {
+            const file = fileField.files[0];
+            filename = file.name;
+        }
+    }
+
+    export function setError(message) {
+        has_error = true;
+        error = message;
+        importing = false;
+    }
+
+    export function setInfo(message) {
+        has_info = true;
+        info = message;
+    }
+
+    async function importFile() {
+        try {
+            if (fileField.files.length > 0) {
+                const file = fileField.files[0];
+                const contentStr = await file.text();
+                importing = true;
+                onimport({ options: contentStr });
+            }
+        } catch (e) {
+            onreject({ error: e });
+        }
+    }
+</script>
 
-    {#if has_error}
-    <div class="notification is-danger">{error}</div>
-    {/if}
-
-    {#if has_info}
-    <div class="notification is-info">{info}</div>
-    {/if}
-
-    <div class="field is-grouped is-grouped-centered">
-      <p class="control">
-        <button class="button is-primary {importing?'is-loading':''}" onclick={importFile}>Загрузить</button>
-      </p>
-      <p class="control">
-        <button class="button is-light" onclick={rejectImport}>Закрыть</button>
-      </p>
+<UIOverlay
+    onreject={overlayClosed}
+    bind:this={overlay}
+    show={true}
+    {closeOnClick}
+    {closeButton}
+>
+    <div class="form-paper box {has_error}">
+        <h4 class="title is-4">Импорт настроек из файла</h4>
+        <div class="file is-boxed file-select-box">
+            <label class="file-label">
+                <input
+                    class="file-input"
+                    type="file"
+                    name="optionsToImport"
+                    onchange={fileNameUpdate}
+                    bind:this={fileField}
+                    accept=".json"
+                    multiple="false"
+                />
+                <span class="file-cta">
+                    <span class="file-icon">
+                        <i class="fas fa-upload"></i>
+                    </span>
+                    <span class="file-label has-text-centered">
+                        {#if filename}
+                            {filename}
+                        {:else}
+                            Выберите файл
+                        {/if}
+                    </span>
+                </span>
+            </label>
+        </div>
+
+        {#if has_error}
+            <div class="notification is-danger">{error}</div>
+        {/if}
+
+        {#if has_info}
+            <div class="notification is-info">{info}</div>
+        {/if}
+
+        <div class="field is-grouped is-grouped-centered">
+            <p class="control">
+                <button
+                    class="button is-primary {importing ? 'is-loading' : ''}"
+                    onclick={importFile}>Загрузить</button
+                >
+            </p>
+            <p class="control">
+                <button class="button is-light" onclick={rejectImport}
+                    >Закрыть</button
+                >
+            </p>
+        </div>
     </div>
-  </div>
 </UIOverlay>
 
-
 <style>
-  .form-paper {
-    width: 30vw;
-    margin: 35vh auto auto auto;
-  }
-  .file-select-box{
-    margin: 2em 2em;
-  }
-
-  .file-select-box .file-label{
-    width: 100%;
-  }
+    .form-paper {
+        width: 30vw;
+        margin: 35vh auto auto auto;
+    }
+    .file-select-box {
+        margin: 2em 2em;
+    }
 
+    .file-select-box .file-label {
+        width: 100%;
+    }
 </style>

package/src/controllers/common/index.js

@@ -1,3 +1,3 @@
-import "styles.scss";
+import "./styles.scss";
 
 export {};

package/src/controllers/root/index.js

@@ -11,7 +11,7 @@ let manifest = {
                     id: "system.options",
                     section: "system",
                     title: "Настройки",
-                    url: "/not-options/options",
+                    href: "/not-options/options",
                 },
             ],
         },

package/src/controllers/root/ncOptions.js

@@ -6,7 +6,8 @@ const notCRUD = Frame.notCRUD;
 
 import UIImport from "../common/import.svelte";
 import CRUDActionList from "not-bulma/src/frame/crud/actions/list";
-import { mount } from "svelte";
+
+import { UIAdapterSvelte } from "not-bulma/src/frame/index.js";
 
 const LABELS = {
     plural: `${MODULE_NAME}:${modelName}_label_plural`,
@@ -99,7 +100,7 @@ class ncOptions extends notCRUD {
             {
                 section: ncOptions.MODULE_NAME,
                 title: ncOptions.LABELS.plural,
-                url: `/${notCommon.lowerFirstLetter(
+                href: `/${notCommon.lowerFirstLetter(
                     ncOptions.MODULE_NAME
                 )}/${notCommon.lowerFirstLetter(ncOptions.MODEL_NAME)}`,
             },
@@ -120,24 +121,22 @@ class ncOptions extends notCRUD {
     openImport() {
         this.log("import");
         this.closeImportPopup();
-        this.ui.import = mount(UIImport, {
-                    target: document.body,
-                });
-        this.ui.import.$on("reject", (ev) => {
-            if (ev.detail.error) {
-                this.error(ev.detail.error);
+        this.ui.import = new UIAdapterSvelte(UIImport, document.body);
+        this.ui.import.on("onreject", (ev) => {
+            if (ev.error) {
+                this.error(ev.error);
             }
             this.closeImportPopup();
         });
-        this.ui.import.$on("resolve", () => this.closeImportPopup());
-        this.ui.import.$on("import", async (ev) => {
-            if (ev.detail.options) {
+        this.ui.import.on("onresolve", () => this.closeImportPopup());
+        this.ui.import.on("onimport", async (ev) => {
+            if (ev.options) {
                 try {
-                    let res = await this.requestImport(ev.detail.options);
+                    let res = await this.requestImport(ev.options);
                     this.log(res);
                     if (res.status === "ok") {
                         if (res.result && res.result.info) {
-                            this.ui.import.setInfo(res.result.info);
+                            this.ui.import.set('info', res.result.info);
                             this.afterImportSuccess(res.result);
                         }
                     } else {

package/src/fields/value.js

@@ -1,11 +1,14 @@
-const Schema = require("mongoose").Schema;
+//const Schema = require("mongoose").Schema;
+const Validators = require("not-node/src/core/validators");
 
 module.exports = {
     parent: "not-node//requiredObject",
     model: {
-        type: Schema.Types.Mixed,
+        type: String,
+        default: '{}',
         searchable: true,
         required: true,
+        validate: Validators.String.type
     },
     ui: {
         component: "UITextarea",

package/src/models/options.js

@@ -1,12 +1,13 @@
 const log = require("not-log")(module, "Options Model");
 try {
     const MODEL_NAME = "Options";
+    const {MODULE_NAME} = require('../const');
     const Increment = require("not-node").Increment;
     const notError = require("not-error").notError;
 
     const FIELDS = [
         "id",
-        "value",
+        `${MODULE_NAME}//value`,
         [
             "active",
             {