aloha-vue 1.9.0 → 1.9.1

package/CHANGELOG.md

@@ -7,6 +7,10 @@
 ---
 # Versions
 
+## 1.9.1
+
+- `ARouterLinkConfig`: Improvements
+
 ## 1.9.0
 
 - New component `ARouterLinkConfig`

package/docs/src/router/index.js

@@ -11,7 +11,7 @@ const ROUTES = [
   },
   {
     path: "/aloha/:id/:aloha",
-    name: "NotFound",
+    name: "NotFoundTest",
     component: () => import("../views/NotFound.vue"),
   },
   {

package/docs/src/views/Form/PageRouterLinkConfig/PageRouterLinkConfigBasic/PageRouterLinkConfigBasic.js

@@ -16,7 +16,7 @@ export default {
   },
   setup() {
     const model = ref({
-      route: "NotFound",
+      route: "NotFoundTest",
       query: {
         key: "Aloha",
       },

package/docs/src/views/Form/PageRouterLinkConfig/PageRouterLinkConfigBasic/PageRouterLinkConfigBasic.pug

@@ -7,5 +7,6 @@ aloha-example(
   a-router-link-config(
     v-model="model"
     label="Aloha"
+    :required="true"
   )
   div model: {{ model }}

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/plugins/ARouterLinkConfigPlugin.js

@@ -1,12 +1,8 @@
-import {
-  ref,
-} from "vue";
-
 import {
   forEach,
 } from "lodash-es";
 
-export const routerLinkConfigPluginOptions = ref({
+export const routerLinkConfigPluginOptions = {
   propsDefault: {
     classColumn: "a_column a_column_12",
     classColumns: "a_columns a_columns_count_12 a_columns_gap_y_1",
@@ -22,9 +18,49 @@ export const routerLinkConfigPluginOptions = ref({
     labelTarget: "_A_ROUTER_LINK_CONFIG_LABEL_TARGET_",
     routes: [],
     sortOrderRoute: "asc",
+    targets: [
+      {
+        id: "_blank",
+        label: "_A_TARGET_BLANK_",
+      },
+      {
+        id: "_self",
+        label: "_A_TARGET_SELF_",
+      },
+      {
+        id: "_parent",
+        label: "_A_TARGET_PARENT_",
+      },
+      {
+        id: "_top",
+        label: "_A_TARGET_TOP_",
+      },
+    ],
   },
-  excludedPathRoutes: {},
-});
+};
+
+function setRoutes({ routes = [], excludedPathRoutes = [] }) {
+  const ROUTES = [];
+  const EXCLUDED_PATH_ROUTES_MAP = {};
+  if (excludedPathRoutes.length) {
+    forEach(excludedPathRoutes, path => {
+      EXCLUDED_PATH_ROUTES_MAP[path] = true;
+    });
+  }
+  forEach(routes, route => {
+    const PATH = route.path;
+    if (route.name &&
+      !EXCLUDED_PATH_ROUTES_MAP[PATH]) {
+      ROUTES.push({
+        path: route.path,
+        name: route.name,
+        meta: route.meta,
+      });
+    }
+  });
+
+  return ROUTES;
+}
 
 
 export default {
@@ -32,14 +68,10 @@ export default {
     propsDefault = {},
     excludedPathRoutes = [],
   } = {}) => {
-    if (excludedPathRoutes.length) {
-      forEach(excludedPathRoutes, path => {
-        routerLinkConfigPluginOptions.value.excludedPathRoutes[path] = true;
-      });
-    }
-    routerLinkConfigPluginOptions.value.propsDefault = {
-      ...routerLinkConfigPluginOptions.value.propsDefault,
+    routerLinkConfigPluginOptions.propsDefault = {
+      ...routerLinkConfigPluginOptions.propsDefault,
       ...propsDefault,
+      routes: setRoutes({ routes: propsDefault.routes, excludedPathRoutes }),
     };
   },
 };

package/src/ui/ARouterLinkConfig/ARouterLinkConfig.js

@@ -13,7 +13,6 @@ import AttributesAPI from "../ACheckbox/compositionAPI/AttributesAPI";
 import ModelLocalAPI from "./compositionAPI/ModelLocalAPI";
 import ParamAPI from "./compositionAPI/ParamAPI";
 import RouteAPI from "./compositionAPI/RouteAPI";
-import TargetAPI from "./compositionAPI/TargetAPI";
 import TextAfterLabelAPI from "../ACheckbox/compositionAPI/TextAfterLabelAPI";
 import UiAPI from "../compositionApi/UiAPI";
 import UiDisabledAPI from "../compositionApi/UiDisabledAPI";
@@ -43,12 +42,12 @@ export default {
     classColumn: {
       type: [String, Object],
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.classColumn,
+      default: () => routerLinkConfigPluginOptions.propsDefault.classColumn,
     },
     classColumns: {
       type: [String, Object],
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.classColumns,
+      default: () => routerLinkConfigPluginOptions.propsDefault.classColumns,
     },
     classFieldset: {
       type: [String, Object],
@@ -87,22 +86,22 @@ export default {
     helpTextParam: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.helpTextParam,
+      default: () => routerLinkConfigPluginOptions.propsDefault.helpTextParam,
     },
     helpTextQuery: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.helpTextQuery,
+      default: () => routerLinkConfigPluginOptions.propsDefault.helpTextQuery,
     },
     helpTextRoute: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.helpTextRoute,
+      default: () => routerLinkConfigPluginOptions.propsDefault.helpTextRoute,
     },
     helpTextTarget: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.helpTextTarget,
+      default: () => routerLinkConfigPluginOptions.propsDefault.helpTextTarget,
     },
     htmlId: {
       type: String,
@@ -136,7 +135,7 @@ export default {
     keyIdRoute: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.keyIdRoute,
+      default: () => routerLinkConfigPluginOptions.propsDefault.keyIdRoute,
     },
     keyLabelCallbackRoute: {
       type: Function,
@@ -146,7 +145,7 @@ export default {
     keyLabelRoute: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.keyLabelRoute,
+      default: () => routerLinkConfigPluginOptions.propsDefault.keyLabelRoute,
     },
     label: {
       type: [String, Number],
@@ -161,17 +160,17 @@ export default {
     labelParam: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.labelParam,
+      default: () => routerLinkConfigPluginOptions.propsDefault.labelParam,
     },
     labelQuery: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.labelQuery,
+      default: () => routerLinkConfigPluginOptions.propsDefault.labelQuery,
     },
     labelRoute: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.labelRoute,
+      default: () => routerLinkConfigPluginOptions.propsDefault.labelRoute,
     },
     labelScreenReader: {
       type: [String, Number],
@@ -181,7 +180,7 @@ export default {
     labelTarget: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.labelTarget,
+      default: () => routerLinkConfigPluginOptions.propsDefault.labelTarget,
     },
     modelUndefined: {
       type: [String, Number, Object, Array, Boolean],
@@ -191,7 +190,7 @@ export default {
     modelValue: {
       type: Object,
       required: false,
-      default: undefined,
+      default: () => ({}),
     },
     required: {
       type: Boolean,
@@ -201,7 +200,7 @@ export default {
     routes: {
       type: Array,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.routes,
+      default: () => routerLinkConfigPluginOptions.propsDefault.routes,
     },
     slotName: {
       type: String,
@@ -211,9 +210,14 @@ export default {
     sortOrderRoute: {
       type: String,
       required: false,
-      default: () => routerLinkConfigPluginOptions.value.propsDefault.sortOrderRoute,
+      default: () => routerLinkConfigPluginOptions.propsDefault.sortOrderRoute,
       validator: value => ["asc", "desc"].indexOf(value) !== -1,
     },
+    targets: {
+      type: Array,
+      required: false,
+      default: () => routerLinkConfigPluginOptions.propsDefault.targets,
+    },
   },
   emits: [
     "update:modelValue",
@@ -277,10 +281,6 @@ export default {
       routePathKeyByKeyId,
     });
 
-    const {
-      targets,
-    } = TargetAPI();
-
     return {
       ariaDescribedbyLocal,
       attributesToExcludeFromRender,
@@ -301,7 +301,6 @@ export default {
       onBlur,
       onFocus,
       routesLocal,
-      targets,
       textAfterLabel,
     };
   },
@@ -356,7 +355,7 @@ export default {
               class: this.classColumn,
             }, [
               h(ASelect, {
-                id: "query",
+                id: "route",
                 change: this.changeRouteModel,
                 data: this.routesLocal,
                 deselectable: true,
@@ -386,6 +385,7 @@ export default {
                   idPrefix: this.htmlIdLocal,
                   label: this.labelParam,
                   modelValue: this.modelValue.param || {},
+                  required: this.required,
                 }),
               ]) :
               "",

package/src/ui/ARouterLinkConfig/compositionAPI/ParamAPI.js

@@ -12,6 +12,7 @@ export default function ParamAPI(props, {
   routePathKeyByKeyId = computed(() => ({})),
 }) {
   const modelValue = toRef(props, "modelValue");
+  const required = toRef(props, "required");
 
   const extractRouteParams = path => {
     const regex = /:([a-zA-Z0-9_]+)/g;
@@ -46,6 +47,7 @@ export default function ParamAPI(props, {
         label: _id,
         type: "text",
         idPrefix: htmlIdLocal.value,
+        required: required.value,
       };
 
       CHILDREN.push(CHILD);

package/src/ui/ARouterLinkConfig/compositionAPI/RouteAPI.js

@@ -3,9 +3,6 @@ import {
   toRef,
 } from "vue";
 
-import {
-  routerLinkConfigPluginOptions,
-} from "../../../plugins/ARouterLinkConfigPlugin";
 import {
   forEach,
   get,
@@ -16,19 +13,7 @@ export default function RouteAPI(props) {
   const routes = toRef(props, "routes");
 
   const routesLocal = computed(() => {
-    const ROUTES = [];
-    forEach(routes.value, route => {
-      const PATH = route.path;
-      if (route.name &&
-        !routerLinkConfigPluginOptions.value.excludedPathRoutes[PATH]) {
-        ROUTES.push({
-          path: route.path,
-          name: route.name,
-          meta: route.meta,
-        });
-      }
-    });
-    return ROUTES;
+    return routes.value;
   });
 
   const routePathKeyByKeyId = computed(() => {

package/src/ui/ARouterLinkConfig/compositionAPI/TargetAPI.js

@@ -1,24 +0,0 @@
-export default function TargetAPI() {
-  const targets = [
-    {
-      id: "_blank",
-      label: "_A_TARGET_BLANK_",
-    },
-    {
-      id: "_self",
-      label: "_A_TARGET_SELF_",
-    },
-    {
-      id: "_parent",
-      label: "_A_TARGET_PARENT_",
-    },
-    {
-      id: "_top",
-      label: "_A_TARGET_TOP_",
-    },
-  ];
-
-  return {
-    targets,
-  };
-}