diff --git a/client/src/components/content-block-form/ContentBlockForm.vue b/client/src/components/content-block-form/ContentBlockForm.vue index 0c3f7a6e..6450cd3c 100644 --- a/client/src/components/content-block-form/ContentBlockForm.vue +++ b/client/src/components/content-block-form/ContentBlockForm.vue @@ -140,7 +140,7 @@ import {CHOOSER, transformInnerContents} from '@/components/content-block-form/helpers.js'; import ContentElementActions from '@/components/content-block-form/ContentElementActions.vue'; import {ContentBlock, numberOrUndefined} from "@/@types"; - import {DEFAULT_FEATURES} from "@/consts/features.consts"; + import {DEFAULT_FEATURE_SET} from "@/consts/features.consts"; // TODO: refactor this file, it's huuuuuge! interface ContentBlockFormData { @@ -159,7 +159,7 @@ }, features: { type: String, - default: DEFAULT_FEATURES + default: DEFAULT_FEATURE_SET } }, provide(): object { @@ -191,7 +191,7 @@ return this.localContentBlock.title > ''; }, hasDefaultFeatures(): boolean { - return this.features === DEFAULT_FEATURES; + return this.features === DEFAULT_FEATURE_SET; } }, methods: { diff --git a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue index 5742b99d..8164777a 100644 --- a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue +++ b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue @@ -46,7 +46,7 @@ import formElementIcons from '@/components/ui/form-element-icons'; import CrossIcon from '@/components/icons/CrossIcon'; import ChooserElement from '@/components/content-forms/ChooserElement'; - import {DEFAULT_FEATURES} from '@/consts/features.consts'; + import {DEFAULT_FEATURE_SET} from '@/consts/features.consts'; export default { @@ -73,7 +73,7 @@ }, data() { - const hasDefaultFeatures = this.features === DEFAULT_FEATURES; + const hasDefaultFeatures = this.features === DEFAULT_FEATURE_SET; return { convertToList: false, chooserTypes: [ @@ -127,7 +127,7 @@ return this.chooserTypes.filter(type => !("show" in type) || type.show ); // display element if `show` is not set or if `show` evaluates to true }, hasDefaultFeatures() { - return this.features === DEFAULT_FEATURES; + return this.features === DEFAULT_FEATURE_SET; } }, diff --git a/client/src/consts/features.consts.js b/client/src/consts/features.consts.js index f63eb63d..8b7a4a23 100644 --- a/client/src/consts/features.consts.js +++ b/client/src/consts/features.consts.js @@ -1,2 +1,2 @@ -export const DEFAULT_FEATURES = 'default'; -export const ROOMS_FEATURES = 'rooms'; +export const DEFAULT_FEATURE_SET = 'default'; +export const ROOMS_FEATURE_SET = 'rooms'; diff --git a/client/src/pages/rooms/newRoomEntry.vue b/client/src/pages/rooms/newRoomEntry.vue index d4915711..4da1c07e 100644 --- a/client/src/pages/rooms/newRoomEntry.vue +++ b/client/src/pages/rooms/newRoomEntry.vue @@ -7,14 +7,14 @@