From 4f69436bc0209526b93b87e4125979182e35fe63 Mon Sep 17 00:00:00 2001
From: noogen <tom@noogen.net>
Date: Sun, 16 Jan 2022 23:00:13 -0600
Subject: [PATCH] update config

---
 includes/AdminLoader.php     |   3 +-
 public/admin.html            |   4 +-
 public/frontend.html         |   2 +-
 public/frontview.html        |   2 +-
 public/js/admin.js           |  37 ++++++++---
 public/js/vendor.js          | 116 +++++++++++++++++++++++++++++++++++
 public/mix-manifest.json     |   4 +-
 src/admin/App.vue            |   8 ++-
 src/admin/admin-menu-fix.js  |  16 ++++-
 src/admin/views/Settings.vue |   7 ++-
 10 files changed, 181 insertions(+), 18 deletions(-)

diff --git a/includes/AdminLoader.php b/includes/AdminLoader.php
index d861cfa..236b584 100644
--- a/includes/AdminLoader.php
+++ b/includes/AdminLoader.php
@@ -94,7 +94,8 @@ public function plugin_page()
 		        'nonce' => wp_create_nonce('wp_rest')
 		    ],
 		    'settings' => $settingController->get_settings_raw(),
-		    'settingStructure' => $settingController->get_settings_structure(true)
+		    'settingStructure' => $settingController->get_settings_structure(true),
+		    'prefix' => $this->prefix
 		] );
 
 		$content = '<div class="admin-app-wrapper"><div id="vue-admin-app"></div></div>';
diff --git a/public/admin.html b/public/admin.html
index fe7c494..179613f 100644
--- a/public/admin.html
+++ b/public/admin.html
@@ -47,8 +47,8 @@
 
   <div id="vue-admin-app"></div>
   <script src="js/manifest.js?id=77cdbc52e55e2aeb2a17"></script>
-  <script src="js/vendor.js?id=a6c831aec7be8e864900"></script>
-  <script src="js/admin.js?id=558fc38e688452e19108"></script>
+  <script src="js/vendor.js?id=3ab70a818cc8399588b3"></script>
+  <script src="js/admin.js?id=78f93e841dd3701c07e3"></script>
   <style>
     html, body, #vue-admin-app {
       height: 100%;
diff --git a/public/frontend.html b/public/frontend.html
index 8bf4d8d..e3ed52c 100644
--- a/public/frontend.html
+++ b/public/frontend.html
@@ -40,7 +40,7 @@
 
   <div id="vue-frontend-app"></div>
   <script src="js/manifest.js?id=77cdbc52e55e2aeb2a17"></script>
-  <script src="js/vendor.js?id=a6c831aec7be8e864900"></script>
+  <script src="js/vendor.js?id=3ab70a818cc8399588b3"></script>
   <script src="js/frontend.js?id=b5dbb8b0cbf2ff8653a3"></script>
   <style>
     html, body, #vue-frontend-app {
diff --git a/public/frontview.html b/public/frontview.html
index 51462e1..efef29e 100644
--- a/public/frontview.html
+++ b/public/frontview.html
@@ -40,7 +40,7 @@
 
   <div id="vue-frontview-app"></div>
   <script src="js/manifest.js?id=77cdbc52e55e2aeb2a17"></script>
-  <script src="js/vendor.js?id=a6c831aec7be8e864900"></script>
+  <script src="js/vendor.js?id=3ab70a818cc8399588b3"></script>
   <script src="js/frontview.js?id=b908769d9aaf69bad912"></script>
   <style>
     html, body, #vue-frontview-app {
diff --git a/public/js/admin.js b/public/js/admin.js
index 1fc3128..98ff3d5 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -25,8 +25,12 @@ var admin_menu_fix_1 = __importDefault(__webpack_require__(/*! ./admin-menu-fix
 
 exports["default"] = (0, vue_1.defineComponent)({
   mounted: function mounted() {
-    // fix the admin menu for the slug "vue-app"
-    (0, admin_menu_fix_1.default)('vue-app');
+    var that = this; // @ts-ignore
+
+    setTimeout(function () {
+      // fix the admin menu for the prefix slug or 'vue-app' if none is defined
+      (0, admin_menu_fix_1.default)(that.$win.vue_wp_plugin_config_admin.prefix || 'vue-app');
+    }, 1000);
   }
 });
 
@@ -379,7 +383,7 @@ var _default = (0, _vue.defineComponent)({
       var _this = this;
 
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var data, rst, settings;
+        var data, rst, config, oldSettings, settings;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -400,11 +404,15 @@ var _default = (0, _vue.defineComponent)({
                     title: 'Your settings has been saved.',
                     showConfirmButton: false,
                     timer: 1500
-                  });
+                  }); // @ts-ignore
+
 
+                  config = _this.$win.vue_wp_plugin_config_admin;
+                  oldSettings = config.settings || {};
                   settings = _objectSpread({}, _this.settings);
                   Object.keys(settings).forEach(function (key) {
                     _this.oldSettings[key] = settings[key];
+                    oldSettings[key] = settings[key];
                   }); // force rerendered
 
                   _this.ui.actionKey = _this.ui.actionKey + 1;
@@ -817,7 +825,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
 /*!*************************************!*\
   !*** ./src/admin/admin-menu-fix.js ***!
   \*************************************/
-/***/ (function(__unused_webpack_module, exports) {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
 
@@ -826,12 +834,14 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports["default"] = void 0;
 
+__webpack_require__(/*! core-js/modules/es.string.ends-with.js */ "./node_modules/core-js/modules/es.string.ends-with.js");
+
 // @ts-ignore
 function menuFix(slug) {
   var currentUrl = window.location.href;
   var isLocal = currentUrl.indexOf('admin.html') > 0;
-  var currentPath = currentUrl.substr(currentUrl.indexOf(isLocal ? '#/' : 'admin.php'));
   var menuRoot = document.querySelector(isLocal ? '.wp-menu-open' : "#toplevel_page_".concat(slug));
+  var currentPath = currentUrl.substr(currentUrl.indexOf(isLocal ? '#/' : 'admin.php'));
 
   if (menuRoot) {
     menuRoot.addEventListener('click', function (e) {
@@ -847,10 +857,23 @@ function menuFix(slug) {
           target.parentElement.classList.add('current');
         }
       }
-    });
+    }); // remove all current
+
+    var items = menuRoot.querySelectorAll(".current");
+
+    for (var i = 0; i < items.length; i++) {
+      var node = items[i];
+      node.classList.remove('current');
+    }
+
     var menu = menuRoot.querySelector(".wp-submenu a[href=\"".concat(currentPath, "\""));
 
+    if (!isLocal && currentPath.endsWith('#/')) {
+      menu = menuRoot.querySelector(".wp-submenu a.wp-first-item");
+    }
+
     if (menu) {
+      console.log(menu);
       menu.parentElement.classList.add('current');
     }
   }
diff --git a/public/js/vendor.js b/public/js/vendor.js
index dfc75d5..a13bc55 100644
--- a/public/js/vendor.js
+++ b/public/js/vendor.js
@@ -34430,6 +34430,31 @@ module.exports = function (target, source, exceptions) {
 };
 
 
+/***/ }),
+
+/***/ "./node_modules/core-js/internals/correct-is-regexp-logic.js":
+/*!*******************************************************************!*\
+  !*** ./node_modules/core-js/internals/correct-is-regexp-logic.js ***!
+  \*******************************************************************/
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+var wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symbol */ "./node_modules/core-js/internals/well-known-symbol.js");
+
+var MATCH = wellKnownSymbol('match');
+
+module.exports = function (METHOD_NAME) {
+  var regexp = /./;
+  try {
+    '/./'[METHOD_NAME](regexp);
+  } catch (error1) {
+    try {
+      regexp[MATCH] = false;
+      return '/./'[METHOD_NAME](regexp);
+    } catch (error2) { /* empty */ }
+  } return false;
+};
+
+
 /***/ }),
 
 /***/ "./node_modules/core-js/internals/create-non-enumerable-property.js":
@@ -35447,6 +35472,28 @@ module.exports = function (it) {
 module.exports = false;
 
 
+/***/ }),
+
+/***/ "./node_modules/core-js/internals/is-regexp.js":
+/*!*****************************************************!*\
+  !*** ./node_modules/core-js/internals/is-regexp.js ***!
+  \*****************************************************/
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+var isObject = __webpack_require__(/*! ../internals/is-object */ "./node_modules/core-js/internals/is-object.js");
+var classof = __webpack_require__(/*! ../internals/classof-raw */ "./node_modules/core-js/internals/classof-raw.js");
+var wellKnownSymbol = __webpack_require__(/*! ../internals/well-known-symbol */ "./node_modules/core-js/internals/well-known-symbol.js");
+
+var MATCH = wellKnownSymbol('match');
+
+// `IsRegExp` abstract operation
+// https://tc39.es/ecma262/#sec-isregexp
+module.exports = function (it) {
+  var isRegExp;
+  return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : classof(it) == 'RegExp');
+};
+
+
 /***/ }),
 
 /***/ "./node_modules/core-js/internals/is-symbol.js":
@@ -35786,6 +35833,26 @@ module.exports.f = function (C) {
 };
 
 
+/***/ }),
+
+/***/ "./node_modules/core-js/internals/not-a-regexp.js":
+/*!********************************************************!*\
+  !*** ./node_modules/core-js/internals/not-a-regexp.js ***!
+  \********************************************************/
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+var global = __webpack_require__(/*! ../internals/global */ "./node_modules/core-js/internals/global.js");
+var isRegExp = __webpack_require__(/*! ../internals/is-regexp */ "./node_modules/core-js/internals/is-regexp.js");
+
+var TypeError = global.TypeError;
+
+module.exports = function (it) {
+  if (isRegExp(it)) {
+    throw TypeError("The method doesn't accept regular expressions");
+  } return it;
+};
+
+
 /***/ }),
 
 /***/ "./node_modules/core-js/internals/object-create.js":
@@ -37600,6 +37667,55 @@ $({ target: PROMISE, stat: true, forced: INCORRECT_ITERATION }, {
 });
 
 
+/***/ }),
+
+/***/ "./node_modules/core-js/modules/es.string.ends-with.js":
+/*!*************************************************************!*\
+  !*** ./node_modules/core-js/modules/es.string.ends-with.js ***!
+  \*************************************************************/
+/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
+
+"use strict";
+
+var $ = __webpack_require__(/*! ../internals/export */ "./node_modules/core-js/internals/export.js");
+var uncurryThis = __webpack_require__(/*! ../internals/function-uncurry-this */ "./node_modules/core-js/internals/function-uncurry-this.js");
+var getOwnPropertyDescriptor = (__webpack_require__(/*! ../internals/object-get-own-property-descriptor */ "./node_modules/core-js/internals/object-get-own-property-descriptor.js").f);
+var toLength = __webpack_require__(/*! ../internals/to-length */ "./node_modules/core-js/internals/to-length.js");
+var toString = __webpack_require__(/*! ../internals/to-string */ "./node_modules/core-js/internals/to-string.js");
+var notARegExp = __webpack_require__(/*! ../internals/not-a-regexp */ "./node_modules/core-js/internals/not-a-regexp.js");
+var requireObjectCoercible = __webpack_require__(/*! ../internals/require-object-coercible */ "./node_modules/core-js/internals/require-object-coercible.js");
+var correctIsRegExpLogic = __webpack_require__(/*! ../internals/correct-is-regexp-logic */ "./node_modules/core-js/internals/correct-is-regexp-logic.js");
+var IS_PURE = __webpack_require__(/*! ../internals/is-pure */ "./node_modules/core-js/internals/is-pure.js");
+
+// eslint-disable-next-line es/no-string-prototype-endswith -- safe
+var un$EndsWith = uncurryThis(''.endsWith);
+var slice = uncurryThis(''.slice);
+var min = Math.min;
+
+var CORRECT_IS_REGEXP_LOGIC = correctIsRegExpLogic('endsWith');
+// https://github.com/zloirock/core-js/pull/702
+var MDN_POLYFILL_BUG = !IS_PURE && !CORRECT_IS_REGEXP_LOGIC && !!function () {
+  var descriptor = getOwnPropertyDescriptor(String.prototype, 'endsWith');
+  return descriptor && !descriptor.writable;
+}();
+
+// `String.prototype.endsWith` method
+// https://tc39.es/ecma262/#sec-string.prototype.endswith
+$({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, {
+  endsWith: function endsWith(searchString /* , endPosition = @length */) {
+    var that = toString(requireObjectCoercible(this));
+    notARegExp(searchString);
+    var endPosition = arguments.length > 1 ? arguments[1] : undefined;
+    var len = that.length;
+    var end = endPosition === undefined ? len : min(toLength(endPosition), len);
+    var search = toString(searchString);
+    return un$EndsWith
+      ? un$EndsWith(that, search, end)
+      : slice(that, end - search.length, end) === search;
+  }
+});
+
+
 /***/ }),
 
 /***/ "./node_modules/core-js/modules/es.symbol.description.js":
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index dd14e82..755ae79 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,10 +1,10 @@
 {
-    "/js/admin.js": "/js/admin.js?id=558fc38e688452e19108",
+    "/js/admin.js": "/js/admin.js?id=78f93e841dd3701c07e3",
     "/js/frontend.js": "/js/frontend.js?id=b5dbb8b0cbf2ff8653a3",
     "/js/frontview.js": "/js/frontview.js?id=b908769d9aaf69bad912",
     "/js/manifest.js": "/js/manifest.js?id=77cdbc52e55e2aeb2a17",
     "/css/frontview.css": "/css/frontview.css?id=7cf1befae2b37c53e819",
     "/css/frontend.css": "/css/frontend.css?id=7cf1befae2b37c53e819",
     "/css/admin.css": "/css/admin.css?id=4fd00009cd2f4b4fdb69",
-    "/js/vendor.js": "/js/vendor.js?id=a6c831aec7be8e864900"
+    "/js/vendor.js": "/js/vendor.js?id=3ab70a818cc8399588b3"
 }
diff --git a/src/admin/App.vue b/src/admin/App.vue
index aa686dd..c618031 100644
--- a/src/admin/App.vue
+++ b/src/admin/App.vue
@@ -10,8 +10,12 @@ import menuFix from './admin-menu-fix'
 
 export default defineComponent({
   mounted() {
-    // fix the admin menu for the slug "vue-app"
-    menuFix('vue-app')
+    const that = this
+    // @ts-ignore
+    setTimeout(() => {
+      // fix the admin menu for the prefix slug or 'vue-app' if none is defined
+      menuFix(that.$win.vue_wp_plugin_config_admin.prefix || 'vue-app')
+    }, 1000)
   }
 })
 </script>
diff --git a/src/admin/admin-menu-fix.js b/src/admin/admin-menu-fix.js
index be0f01a..678f85c 100644
--- a/src/admin/admin-menu-fix.js
+++ b/src/admin/admin-menu-fix.js
@@ -2,9 +2,10 @@
 function menuFix(slug) {
   const currentUrl  = window.location.href
   const isLocal     = currentUrl.indexOf('admin.html') > 0
-  const currentPath = currentUrl.substr(currentUrl.indexOf(isLocal ? '#/' : 'admin.php'))
   const menuRoot    = document.querySelector(isLocal ? '.wp-menu-open' : `#toplevel_page_${slug}`)
 
+  var currentPath = currentUrl.substr(currentUrl.indexOf(isLocal ? '#/' : 'admin.php'))
+
   if (menuRoot) {
     menuRoot.addEventListener('click', function (e) {
       const target = e.target
@@ -19,8 +20,21 @@ function menuFix(slug) {
       }
     })
 
+    // remove all current
+    var items = menuRoot.querySelectorAll(`.current`)
+    for (let i = 0; i < items.length; i++) {
+      let node = items[i];
+      node.classList.remove('current')
+    }
+
     var menu = menuRoot.querySelector(`.wp-submenu a[href="${currentPath}"`)
+
+    if (! isLocal && currentPath.endsWith('#/')) {
+      menu = menuRoot.querySelector(`.wp-submenu a.wp-first-item`)
+    }
+
     if (menu) {
+      console.log(menu)
       menu.parentElement.classList.add('current')
     }
   }
diff --git a/src/admin/views/Settings.vue b/src/admin/views/Settings.vue
index 2db338f..29f09f4 100644
--- a/src/admin/views/Settings.vue
+++ b/src/admin/views/Settings.vue
@@ -158,9 +158,14 @@ export default defineComponent({
             timer: 1500
           })
 
-          const settings = {...this.settings}
+          // @ts-ignore
+          const config      = this.$win.vue_wp_plugin_config_admin
+          const oldSettings = config.settings || {}
+          const settings    = {...this.settings}
+
           Object.keys(settings).forEach((key) => {
             this.oldSettings[key] = settings[key]
+            oldSettings[key] = settings[key]
           })
 
           // force rerendered