simpledomcontrol 0.158.6__tar.gz → 0.158.7__tar.gz

{simpledomcontrol-0.158.6 → simpledomcontrol-0.158.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SimpleDomControl
-Version: 0.158.6
+Version: 0.158.7
 Summary: Simple DOM control -> a django MVC framework
 License: Apache-2.0
 Keywords: django,MVC

{simpledomcontrol-0.158.6 → simpledomcontrol-0.158.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.158.6"
+version = "0.158.7"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"

{simpledomcontrol-0.158.6 → simpledomcontrol-0.158.7}/sdc_core/management/commands/sdc_make_model_js.py

@@ -21,6 +21,7 @@ def generate_field_config(field):
         "one_to_one": field["one_to_one"],
         "related_model": field["related_model"],
         "remote_field": field["remote_field"],
+        "reverse_relation": field["reverse_relation"],
     }
 
     if field["type"] == "FileField":
@@ -64,8 +65,11 @@ def _generate_js_class(schema):
         setter_line.append("    try {")
 
         if field["is_relation"] and field["related_model"]:
-            constructor_line.append(f"    this._{name} = new SdcQuerySet('{field['related_model']}');")
-            if field["many_to_many"] or field["one_to_many"]:
+            if field["reverse_relation"]:
+                constructor_line.append(f"    this._{name} = new SdcQuerySet('{field['related_model']}', {{ {field['remote_field'] }: this.id }});")
+            else:
+                constructor_line.append(f"    this._{name} = new SdcQuerySet('{field['related_model']}');")
+            if field["reverse_relation"] or field["many_to_many"] or field["one_to_many"]:
                 constructor_line.append(f"    this._toManyFields.push([this._{name}, '{field['remote_field']}']);")
                 setter_line.append(f"    this.{name}.setFilter({{ {field['remote_field']}:  data.id }});")
                 setter_line.append(f"    this.{name} = data.{name} || [];")

{simpledomcontrol-0.158.6 → simpledomcontrol-0.158.7}/sdc_core/management/commands/utils/__init__.py

@@ -76,6 +76,7 @@ def get_model_schema(model):
             "one_to_one": field.one_to_one,
             "related_model": field.related_model.__name__ if field.related_model else None,
             "remote_field": field.remote_field.name if field.related_model else None,
+            "reverse_relation": field.auto_created and not field.concrete,
         }
 
         fields[field_info['name']] = field_info

{simpledomcontrol-0.158.6 → simpledomcontrol-0.158.7}/sdc_core/template_files/controller/template_controller.js.txt

@@ -24,7 +24,6 @@ class §CONTROLLERNAMETITLE§Controller extends AbstractSDC {
 
     //-------------------------------------------------//
     // Lifecycle handler                               //
-    // - onInit (tag parameter)                        //
     // - onLoad (DOM not set)                          //
     // - willShow  (DOM set)                           //
     // - onRefresh  (recalled on reload)              //
@@ -32,9 +31,6 @@ class §CONTROLLERNAMETITLE§Controller extends AbstractSDC {
     // - onRemove                                      //
     //-------------------------------------------------//
 
-    onInit() {
-    }
-
     onLoad($html) {
         return super.onLoad($html);
     }

{simpledomcontrol-0.158.6 → simpledomcontrol-0.158.7}/sdc_core/template_files/js_test.js.txt

@@ -4,5 +4,6 @@
 
 import {test_utils} from 'sdc_client';
 import {} from "#root/src/§APPNAME§/§APPNAME§.organizer.js";
-import '#root/src/sdc_tools/sdc_tools.organizer.js'
-import '#root/src/sdc_user/sdc_user.organizer.js'
+import '#root/libs/sdc_tools/sdc_tools.organizer.js'
+import '#root/libs/sdc_user/sdc_user.organizer.js'
+import '#root/src/models/src.js'

{simpledomcontrol-0.158.6 → simpledomcontrol-0.158.7}/sdc_core/template_files/package.json

@@ -78,6 +78,6 @@
     "esm": "^3.2.25",
     "jquery": "^3.7.0",
     "lodash": "^4.17.23",
-    "sdc_client": "^0.158.6"
+    "sdc_client": "^0.158.7"
   }
 }

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_alert_messenger/sdc_alert_messenger.js

@@ -18,7 +18,6 @@ export class SdcAlertMessengerController extends AbstractSDC {
 
     //-------------------------------------------------//
     // Lifecycle handler                               //
-    // - onInit (tag parameter)                        //
     // - onLoad (DOM not set)                          //
     // - willShow  (DOM set)                           //
     // - onRefresh  (recalled on reload)              //
@@ -26,9 +25,6 @@ export class SdcAlertMessengerController extends AbstractSDC {
     // - onRemove                                      //
     //-------------------------------------------------//
 
-    onInit() {
-    }
-
     onLoad($html) {
         on('pushMsg', this);
         on('pushErrorMsg', this);

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_auto_submit/sdc_auto_submit.js

@@ -42,7 +42,6 @@ export class SdcAutoSubmitController extends AbstractSDC {
 
     //-------------------------------------------------//
     // Lifecycle handler                               //
-    // - onInit (tag parameter)                        //
     // - onLoad (DOM not set)                          //
     // - willShow  (DOM set)                           //
     // - onRefresh  (recalled on reload)              //
@@ -50,9 +49,6 @@ export class SdcAutoSubmitController extends AbstractSDC {
     // - onRemove                                      //
     //-------------------------------------------------//
 
-    onInit() {
-    }
-
     onLoad($html) {
         return super.onLoad($html);
     }

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_detail_view/sdc_detail_view.js

@@ -1,4 +1,4 @@
-import {AbstractSDC, app} from 'sdc_client';
+import { AbstractSDC, app, SdcModel, SdcQuerySet } from 'sdc_client';
 
 
 export class SdcDetailViewController extends AbstractSDC {
@@ -19,7 +19,6 @@ export class SdcDetailViewController extends AbstractSDC {
 
   //-------------------------------------------------//
   // Lifecycle handler                               //
-  // - onInit (tag parameter)                        //
   // - onLoad (DOM not set)                          //
   // - willShow  (DOM set)                           //
   // - onRefresh  (recalled on reload)              //
@@ -27,18 +26,39 @@ export class SdcDetailViewController extends AbstractSDC {
   // - onRemove                                      //
   //-------------------------------------------------//
 
-  async onInit(model, pk) {
-    if (!this.model) {
-      if (!model || typeof pk === 'undefined') {
-        console.error("You have to set data-model and data-pk in the <sdc-detail-view> tag!");
-      }
-      this.querySetInstance = this.querySet(model, {pk: pk});
+  async onInitDetails({ model, pk, id }) {
+    this.id ??= id ?? pk;
 
+    if (this.model) {
+      model = this.model;
     }
+
+    if (model instanceof Promise) {
+      model = await model;
+    }
+
+
+
+    if (typeof model === 'object' && model instanceof SdcModel) {
+      this.model = model;
+      this.querySetInstance = model.querySet;
+      return;
+    }
+
+    if (typeof model === 'object' && model instanceof SdcQuerySet) {
+      this.querySetInstance = model;
+    }
+
+    if (typeof model !== 'object') {
+      this.querySetInstance = this.querySet(this.model_name || model, { id: this.id  });
+    }
+
+    this.model = await this.querySetInstance.get();
   }
 
   async onLoad($html) {
-    this.model ??= await this.querySetInstance.get();
+    await this.onInitDetails(this.params);
+
     const $dt = this.model.detailView({
       cbResolve: () => {
         let $lc = this.find('.detail-container');
@@ -48,10 +68,12 @@ export class SdcDetailViewController extends AbstractSDC {
 
       }, templateContext: this.template_context
     });
-    this.querySetInstance.onUpdate = async () => {
-      await this._updateView();
-      this._onUpdate();
-    };
+    if (this.querySetInstance) {
+      this.querySetInstance.onUpdate = async () => {
+        await this._updateView();
+        this._onUpdate();
+      };
+    }
     return super.onLoad($html);
   }
 
@@ -81,8 +103,7 @@ export class SdcDetailViewController extends AbstractSDC {
 
   _updateView() {
     return new Promise((resolve) => {
-      const $div = this.model.listView({
-        modelQuery: this.search_values,
+      const $div = this.model.detailView({
         cbResolve: () => {
           const elems = $('.tooltip.fade.show');
           elems.remove();

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_dummy/sdc_dummy.js

@@ -17,7 +17,6 @@ class SdcDummyController extends AbstractSDC {
 
     //-------------------------------------------------//
     // Lifecycle handler                               //
-    // - onInit (tag parameter)                        //
     // - onLoad (DOM not set)                          //
     // - willShow  (DOM set)                           //
     // - onRefresh  (recalled on reload)              //
@@ -25,11 +24,12 @@ class SdcDummyController extends AbstractSDC {
     // - onRemove                                      //
     //-------------------------------------------------//
 
-    onInit(text) {
+    onInitDummy({ text }) {
         this._text = text;
     }
 
     onLoad($html) {
+        this.onInitDummy(this.params);
         $html.find('.origen_content').append(this.$container.html());
         return super.onLoad($html);
     }

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_error/sdc_error.js

@@ -17,7 +17,6 @@ export class SdcErrorController extends AbstractSDC {
 
     //-------------------------------------------------//
     // Lifecycle handler                               //
-    // - onInit (tag parameter)                        //
     // - onLoad (DOM not set)                          //
     // - willShow  (DOM set)                           //
     // - onRefresh  (recalled on reload)              //
@@ -25,9 +24,6 @@ export class SdcErrorController extends AbstractSDC {
     // - onRemove                                      //
     //-------------------------------------------------//
 
-    onInit() {
-    }
-
     onLoad($html) {
         $html.find('.error_content').append(this.$container.html());
         return super.onLoad($html);

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_list_view/sdc_list_view.js

@@ -19,7 +19,6 @@ export class SdcListViewController extends AbstractSDC {
 
   //-------------------------------------------------//
   // Lifecycle handler                               //
-  // - onInit (tag parameter)                        //
   // - onLoad (DOM not set)                          //
   // - willShow  (DOM set)                           //
   // - onRefresh  (recalled on reload)              //
@@ -27,7 +26,7 @@ export class SdcListViewController extends AbstractSDC {
   // - onRemove                                      //
   //-------------------------------------------------//
 
-  onInit(model, filter, onUpdate) {
+  onInitList({ model, filter, onUpdate }) {
     if (!this.model) {
       if (this.model_name) {
         model = this.model_name;
@@ -53,6 +52,7 @@ export class SdcListViewController extends AbstractSDC {
   }
 
   onLoad($html) {
+    this.onInitList(this.params);
     let lc = $html.filter('.list-container');
     if (lc.length === 0) {
       lc = $html.find('.list-container');
@@ -81,7 +81,7 @@ export class SdcListViewController extends AbstractSDC {
   }
 
   removeInstance($btn) {
-    this.model.delete({pk: $btn.data('instance-pk')});
+    this.model.delete({id: $btn.data('instance-pk')});
   }
 
   onSearch(form) {

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_model_form/sdc_model_form.js

@@ -1,4 +1,4 @@
-import {AbstractSDC, app, trigger} from 'sdc_client';
+import { AbstractSDC, app, trigger, SdcQuerySet, SdcModel } from 'sdc_client';
 
 
 export class SdcModelFormController extends AbstractSDC {
@@ -6,7 +6,7 @@ export class SdcModelFormController extends AbstractSDC {
 
   constructor() {
     super();
-    this.pk = null;
+    this.id = null;
     this.contentUrl = "/sdc_view/sdc_tools/sdc_model_form"; //<sdc-model-form></sdc-model-form>
     this.model_name = null;
     this.isKeepEditing = null;
@@ -27,67 +27,84 @@ export class SdcModelFormController extends AbstractSDC {
 
   //-------------------------------------------------//
   // Lifecycle handler                               //
-  // - onInit (tag parameter)                        //
   // - onLoad (DOM not set)                          //
   // - willShow  (DOM set)                           //
   // - onRefresh  (recalled on reload)              //
   //-------------------------------------------------//
   // - onRemove                                      //
   //-------------------------------------------------//
-  onInit(model, pk, next, filter = null, on_update, on_error, form_header, button_text, form_name = false, reset_on_save = false, editing_after_save = false, auto_save = true) {
-    !this.on_update && (this.on_update = on_update);
-    !this.on_error && (this.on_error = on_error);
-    !this.next && (this.next = next);
-
-    if (this.buttonText === null && button_text) {
-      this.buttonText = button_text;
-    } else {
-      this.buttonText = gettext('Save');
+  async onInitForm({
+                     model,
+                     pk,
+                     id,
+                     next,
+                     filter = null,
+                     on_update,
+                     on_error,
+                     form_header,
+                     button_text,
+                     form_name = false,
+                     reset_on_save = false,
+                     editing_after_save = false,
+                     auto_save = true
+                   }) {
+
+    this.on_update ??= on_update;
+    this.on_error ??= on_error;
+    this.next ??= next;
+    this.buttonText ??= button_text || gettext('Save');
+    this.formHeader ??= form_header;
+    this.autoSave ??= auto_save;
+    this.isReset ??= reset_on_save;
+    this.isKeepEditing ??= editing_after_save;
+    this.id ??= id ?? pk;
+    this.form_name ??= form_name;
+
+
+    if (this.id) {
+      filter = { id: this.id  };
+    } else if (typeof filter === 'function') {
+      filter = filter();
     }
 
-    if (this.formHeader === null) {
-      this.formHeader = form_header;
-    }
-    if (this.autoSave === null) {
-      this.autoSave = auto_save;
-    }
-    if (this.isReset === null) {
-      this.isReset = reset_on_save;
-    }
-    if (this.isKeepEditing === null) {
-      this.isKeepEditing = editing_after_save;
+    if (this.model) {
+      model = this.model;
     }
 
-    if (typeof filter === 'function') {
-      filter = filter();
+    if (model instanceof Promise) {
+      model = await model;
     }
 
-    if (typeof model === 'object' && model.constructor.name === 'Model') {
+    if (typeof model === 'object' && model instanceof SdcModel) {
       this.model = model;
-    } else if (model instanceof Promise) {
+      this.id ??= model.id;
+    } else if (typeof model !== 'object') {
+      this.model = this.querySet(this.model_name || model, filter);
+    } else if (typeof model === 'object' && model instanceof SdcQuerySet) {
       this.model = model;
-    }else if (model) {
-      this.model = null;
     }
 
-    if (this.model && this.model?.pk > 0) {
-      pk = this.model.pk;
-    } else if (!model && this.model_name) {
-      model = this.model_name;
+    if (typeof this.model === 'object' && this.model instanceof SdcQuerySet) {
+      try {
+        this.model = await this.model.get();
+        this.id = this.model.id;
+      } catch (e) {
+        if (this.model.length !== 0) {
+          this.id = null;
+          this.model = this.model.new();
+        } else {
+          console.error(e);
+          throw e;
+        }
+      }
     }
-
-    const querySet = this.querySet(model, filter);
-    this.form_name ||= form_name;
-    this.pk ||= pk || null;
-    if (typeof (this.pk) === "undefined" || this.pk === null) {
+    if (typeof (this.id) === "undefined" || this.id === null) {
       this.isAutoChange = false;
       this.type = 'create';
-      this.model ??= querySet.new();
-      this.formGenerator = (modelObj) => modelObj.form({cbResolve: this._onFormLoaded.bind(this)});
+      this.formGenerator = (modelObj) => modelObj.form({ cbResolve: this._onFormLoaded.bind(this) });
     } else if (this.form_name) {
       this.isAutoChange = this.autoSave;
       this.type = 'edit';
-      this.model ??= querySet.setIds(this.pk)[0];
       this.formGenerator = (modelObj) => modelObj.namedForm({
         formName: this.form_name,
         cbResolve: this._onFormLoaded.bind(this)
@@ -95,16 +112,14 @@ export class SdcModelFormController extends AbstractSDC {
     } else {
       this.isAutoChange = true;
       this.type = 'edit';
-      this.model ??= querySet.setIds(this.pk)[0];
-      this.formGenerator = (modelObj) => modelObj.form({cbResolve: this._onFormLoaded.bind(this)});
+      this.formGenerator = (modelObj) => modelObj.form({ cbResolve: this._onFormLoaded.bind(this) });
     }
 
   }
 
   async onLoad($html) {
-    if (this.model instanceof Promise) {
-      this.model = await this.model;
-    }
+    await this.onInitForm(this.params);
+
     this.form = this.formGenerator(this.model).addClass('container-fluid');
     $html.find('.form-container').append(this.form);
     // $html.find(`.not-${this.type}`).remove();
@@ -131,14 +146,16 @@ export class SdcModelFormController extends AbstractSDC {
   }
 
   _createFormToEditForm() {
-    this.pk = this.model.values.pk;
+    this.id = this.model.id;
     this.type = 'edit';
     this.isAutoChange = true;
     const oldForm = this.form?.closest('form');
     const newForm = oldForm.clone();
     const fc = newForm.find('.form-container').safeEmpty();
-    const newFormContent = this.model.editForm(this.pk, () => {
-      this.reconcile(newForm, oldForm);
+    const newFormContent = this.model.form({
+      cbResolve: () => {
+        this.reconcile(newForm, oldForm);
+      }
     }).addClass('container-fluid');
     fc.append(newFormContent);
   }
@@ -152,6 +169,7 @@ export class SdcModelFormController extends AbstractSDC {
         if (self.isReset) {
           $form[0].reset();
         } else if (self.isKeepEditing) {
+          self.model.querySet.setIds(self.model.id);
           self._createFormToEditForm();
         } else {
           trigger('goTo', self.next || '..');

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_navigation_client/sdc_navigation_client.js

@@ -18,7 +18,6 @@ export class SdcNavigationClientController extends AbstractSDC {
 
   //-------------------------------------------------//
   // Lifecycle handler                               //
-  // - onInit (tag parameter)                        //
   // - onLoad (DOM not set)                          //
   // - willShow  (DOM set)                           //
   // - onRefresh  (recalled on reload)              //
@@ -26,9 +25,6 @@ export class SdcNavigationClientController extends AbstractSDC {
   // - onRemove                                      //
   //-------------------------------------------------//
 
-  onInit() {
-  }
-
   onLoad($html) {
     on('_onResize', this);
     return super.onLoad($html);

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_navigator/sdc_navigator.js

@@ -49,7 +49,6 @@ export class SdcNavigatorController extends AbstractSDC {
 
   //-------------------------------------------------//
   // Lifecycle handler                               //
-  // - onInit (tag parameter)                        //
   // - onLoad (DOM not set)                          //
   // - willShow  (DOM set)                           //
   // - onRefresh  (recalled on reload)              //
@@ -57,11 +56,12 @@ export class SdcNavigatorController extends AbstractSDC {
   // - onRemove                                      //
   //-------------------------------------------------//
 
-  onInit(defaultController) {
+  onInitNav({ defaultController }) {
     this._default_controller = defaultController;
   }
 
   onLoad($html) {
+    this.onInitNav(this.params);
     on('onNavLink', this);
     on('onNavigateToController', this);
     on('_RedirectOnView', this);

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_search_select/sdc_search_select.js

@@ -44,7 +44,6 @@ class SdcSearchSelectController extends AbstractSDC {
 
   //-------------------------------------------------//
   // Lifecycle handler                               //
-  // - onInit (tag parameter)                        //
   // - onLoad (DOM not set)                          //
   // - willShow  (DOM set)                           //
   // - onRefresh  (recalled on reload)              //
@@ -52,7 +51,7 @@ class SdcSearchSelectController extends AbstractSDC {
   // - onRemove                                      //
   //-------------------------------------------------//
 
-  onInit(name = 'unknown', required, value = [''], modelName, multiple, ids) {
+  onInitSearchSelect({ name = 'unknown', required, value = [''], modelName, multiple, ids }) {
     this.required = Boolean(required?.toLocaleLowerCase() === 'true');
     this.multi = Boolean(multiple?.toLocaleLowerCase() === 'true');
     this._allowDelete = !this.required || this.multi;
@@ -73,6 +72,7 @@ class SdcSearchSelectController extends AbstractSDC {
   }
 
   onLoad($html) {
+    this.onInitSearchSelect(this.params);
     if (!this.model) {
       let self = this;
       const $allOptions = $('<div class="all-option-container"></div>');

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_search_view/sdc_search_view.js

@@ -29,7 +29,6 @@ export class SdcSearchViewController extends AbstractSDC {
 
     //-------------------------------------------------//
     // Lifecycle handler                               //
-    // - onInit (tag parameter)                        //
     // - onLoad (DOM not set)                          //
     // - willShow  (DOM set)                           //
     // - onRefresh  (recalled on reload)              //
@@ -37,7 +36,7 @@ export class SdcSearchViewController extends AbstractSDC {
     // - onRemove                                      //
     //-------------------------------------------------//
 
-    onInit(url, rangeSize, rangeStart, rangeEnd, totalCount, removeLabels) {
+    onInitSearch({ url, rangeSize, rangeStart, rangeEnd, totalCount, removeLabels }) {
         this.url = url || '';
         if (typeof rangeStart === 'undefined' || typeof rangeEnd === 'undefined') {
             this.isRange = false;
@@ -61,6 +60,7 @@ export class SdcSearchViewController extends AbstractSDC {
     };
 
     onLoad($html) {
+        this.onInitSearch(this.params);
         this.$form = $(document.createElement('form'));
         $html.find('.inner-form.search-form').append(this.$container.html());
         this.$form.append(this.$container.html());

{simpledomcontrol-0.158.6/sdc_tools/Assets/src → simpledomcontrol-0.158.7/sdc_tools/Assets/bin}/sdc_tools/controller/sdc_update_on_change/sdc_update_on_change.js

@@ -25,7 +25,6 @@ export class SdcUpdateOnChangeController extends AbstractSDC {
 
     //-------------------------------------------------//
     // Lifecycle handler                               //
-    // - onInit (tag parameter)                        //
     // - onLoad (DOM not set)                          //
     // - willShow  (DOM set)                           //
     // - onRefresh  (recalled on reload)              //
@@ -33,9 +32,6 @@ export class SdcUpdateOnChangeController extends AbstractSDC {
     // - onRemove                                      //
     //-------------------------------------------------//
 
-    onInit() {
-    }
-
     onLoad($html) {
         return super.onLoad($html);
     }