Просмотр исходного кода

refactor(webapp): fix `vue/multi-word-component-names`

Rotzbua 2 лет назад
Родитель
Сommit
8cef2bbb4b

+ 1 - 1
www/webapp/src/components/Field/Checkbox.vue → www/webapp/src/components/Field/GenericCheckbox.vue

@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  name: 'Checkbox',
+  name: 'GenericCheckbox',
   props: {
     disabled: {
       type: Boolean,

+ 1 - 1
www/webapp/src/components/Field/Switchbox.vue → www/webapp/src/components/Field/GenericSwitchbox.vue

@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  name: 'Switchbox',
+  name: 'GenericSwitchbox',
   props: {
     disabled: {
       type: Boolean,

+ 2 - 2
www/webapp/src/components/Field/Record/A.vue

@@ -1,10 +1,10 @@
 <script>
 import { ipAddress } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 export default {
   name: 'RecordA',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     errors: {
       ipAddress: 'This field must contain an IPv4 address.',

+ 2 - 2
www/webapp/src/components/Field/Record/AAAA.vue

@@ -1,13 +1,13 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 // from https://stackoverflow.com/a/17871737/6867099, without the '%' and '.' parts
 const ip6Address = helpers.regex('ip6Address', /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/);
 
 export default {
   name: 'RecordAAAA',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     errors: {
       ip6Address: 'This field must contain an IPv6 address.',

+ 2 - 2
www/webapp/src/components/Field/Record/CAA.vue

@@ -1,6 +1,6 @@
 <script>
 import { integer, between } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const MAX8 = 255;
 const int8 = between(0, MAX8);
@@ -11,7 +11,7 @@ const tag = (value) => !value || tags.some(v => value == v);
 
 export default {
   name: 'RecordCAA',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       { label: 'Flags', validations: { integer, int8 } },

+ 2 - 2
www/webapp/src/components/Field/Record/CNAME.vue

@@ -1,13 +1,13 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z0-9_-]+\.)+[a-zA-Z]{2,}))[.]?$/);
 const trailingDot = helpers.regex('trailingDot', /[.]$/);
 
 export default {
   name: 'RecordCNAME',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     errors: {
       hostname: 'Please enter a valid hostname.',

+ 2 - 2
www/webapp/src/components/Field/Record/DNSKEY.vue

@@ -1,6 +1,6 @@
 <script>
 import { helpers, integer, between } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const base64 = helpers.regex('base64', /^[0-9a-zA-Z+/][0-9a-zA-Z+/\s]*(=\s*){0,3}$/);
 
@@ -14,7 +14,7 @@ const equals3 = (value) => !value || value == 3;
 
 export default {
   name: 'RecordDNSKEY',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       { label: 'Flags', validations: { integer, int16 } },

+ 2 - 2
www/webapp/src/components/Field/Record/DS.vue

@@ -1,6 +1,6 @@
 <script>
 import { and, helpers, integer, between } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const hex = helpers.regex('hex', /^([0-9a-fA-F]\s*)*[0-9a-fA-F]$/);
 const trim = and(helpers.regex('trimBegin', /^[^\s]/), helpers.regex('trimEnd', /[^\s]$/));
@@ -13,7 +13,7 @@ const int16 = between(0, MAX16);
 
 export default {
   name: 'RecordDS',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       { label: 'Key Tag', validations: { integer, int16 } },

+ 2 - 2
www/webapp/src/components/Field/Record/MX.vue

@@ -1,6 +1,6 @@
 <script>
 import { helpers, integer, between } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const hostname = helpers.regex('hostname', /^((([a-zA-Z0-9-]+\.?)+)|\.)$/);
 const trailingDot = helpers.regex('trailingDot', /[.]$/);
@@ -10,7 +10,7 @@ const int16 = between(0, MAX16);
 
 export default {
   name: 'RecordMX',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       {

+ 2 - 2
www/webapp/src/components/Field/Record/NS.vue

@@ -1,13 +1,13 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const hostname = helpers.regex('hostname', /^((([a-zA-Z0-9-]+\.?)+)|\.)$/);
 const trailingDot = helpers.regex('trailingDot', /[.]$/);
 
 export default {
   name: 'RecordNS',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       {

+ 2 - 2
www/webapp/src/components/Field/Record/OPENPGPKEY.vue

@@ -1,12 +1,12 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const base64 = helpers.regex('base64', /^[0-9a-zA-Z+/][0-9a-zA-Z+/\s]*(=\s*){0,3}$/);
 
 export default {
   name: 'RecordOPENPGPKEY',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       { label: 'Public Key', validations: { base64 } },

+ 2 - 2
www/webapp/src/components/Field/Record/SRV.vue

@@ -1,6 +1,6 @@
 <script>
 import { helpers, integer, between } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 // Allow for root label only, see RFC 2052
 const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))?[.]?$/);
@@ -11,7 +11,7 @@ const int16 = between(0, MAX16);
 
 export default {
   name: 'RecordSRV',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       { label: 'Priority', validations: { integer, int16 } },

+ 2 - 2
www/webapp/src/components/Field/Record/SVCB.vue

@@ -1,6 +1,6 @@
 <script>
 import { helpers, integer, between } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 // Allow for root label only
 const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))?[.]?$/);
@@ -11,7 +11,7 @@ const int16 = between(0, MAX16);
 
 export default {
   name: 'RecordDNSKEY',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       { label: 'Priority', validations: { integer, int16 } },

+ 2 - 2
www/webapp/src/components/Field/Record/Subnet.vue

@@ -1,6 +1,6 @@
 <script>
 import { helpers, or } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 // from https://www.oreilly.com/library/view/regular-expressions-cookbook/9781449327453/ch08s16.html, adding subnet
 const ip4AddressOrSubnet = helpers.regex('ip4Address', /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\/(3[0-2]|[12]?[0-9]))?$/);
@@ -12,7 +12,7 @@ const ipAddressOrSubnet = or(ip4AddressOrSubnet, ip6AddressOrSubnet);
 
 export default {
   name: 'RecordSubnet',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     errors: {
       ipAddressOrSubnet: 'This field must contain an IP address or subnet.'

+ 2 - 2
www/webapp/src/components/Field/Record/TLSA.vue

@@ -1,6 +1,6 @@
 <script>
 import { and, helpers, integer, between } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const hex = helpers.regex('hex', /^([0-9a-fA-F]\s*)*[0-9a-fA-F]$/);
 const trim = and(helpers.regex('trimBegin', /^[^\s]/), helpers.regex('trimEnd', /[^\s]$/));
@@ -10,7 +10,7 @@ const int8 = between(0, MAX8);
 
 export default {
   name: 'RecordTLSA',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     fields: [
       { label: 'Usage', validations: { integer, int8 } },

+ 2 - 2
www/webapp/src/components/Field/Record/TXT.vue

@@ -1,12 +1,12 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import Record from '../Record.vue';
+import RecordItem from '../RecordItem.vue';
 
 const txtToken = helpers.regex('txtToken', /^".*"$/);
 
 export default {
   name: 'RecordTXT',
-  extends: Record,
+  extends: RecordItem,
   data: () => ({
     errors: {
       txtToken: 'This record must begin and end with quotes (").',

+ 1 - 1
www/webapp/src/components/Field/Record.vue → www/webapp/src/components/Field/RecordItem.vue

@@ -44,7 +44,7 @@
 import { requiredUnless } from 'vuelidate/lib/validators';
 
 export default {
-  name: 'Record',
+  name: 'RecordItem',
   components: {
   },
   props: {

+ 3 - 3
www/webapp/src/components/Field/RecordList.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import Record from './Record.vue';
+import RecordItem from './RecordItem.vue';
 import RecordA from './Record/A.vue';
 import RecordAAAA from './Record/AAAA.vue';
 import RecordCAA from './Record/CAA.vue';
@@ -54,7 +54,7 @@ import RecordSubnet from './Record/Subnet.vue';
 export default {
   name: 'RecordList',
   components: {
-    Record,
+    RecordItem,
     RecordA,
     RecordAAAA,
     RecordCAA,
@@ -143,7 +143,7 @@ export default {
   },
   methods: {
     getRecordComponentName(type) {
-      const genericComponentName = 'Record';
+      const genericComponentName = 'RecordItem';
       const specificComponentName = genericComponentName + type;
       if (this.types.includes(type) && specificComponentName in this.$options.components) {
         return specificComponentName;

+ 6 - 6
www/webapp/src/views/CrudList.vue

@@ -343,12 +343,12 @@
 import { HTTP, withWorking, digestError } from '@/utils';
 import RRSetType from '@/components/Field/RRSetType';
 import TimeAgo from '@/components/Field/TimeAgo';
-import Checkbox from '@/components/Field/Checkbox';
+import GenericCheckbox from '@/components/Field/GenericCheckbox.vue';
 import GenericText from '@/components/Field/GenericText';
 import GenericTextarea from '@/components/Field/GenericTextarea';
-import Record from '@/components/Field/Record';
+import RecordItem from '@/components/Field/RecordItem.vue';
 import RecordList from '@/components/Field/RecordList';
-import Switchbox from '@/components/Field/Switchbox';
+import GenericSwitchbox from '@/components/Field/GenericSwitchbox.vue';
 import TTL from '@/components/Field/TTL';
 import ErrorAlert from '@/components/ErrorAlert'
 import {useUserStore} from "@/store/user";
@@ -370,11 +370,11 @@ export default {
   components: {
     RRSetType,
     TimeAgo,
-    Switchbox,
-    Checkbox,
+    GenericSwitchbox,
+    GenericCheckbox,
     GenericText,
     GenericTextarea,
-    Record,
+    RecordItem,
     RecordList,
     TTL,
     ErrorAlert,