Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix remaining vue-compat warnings #6966

Merged
merged 34 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0178941
PascalCase files
depperm Aug 18, 2023
16c600d
emit warnings
depperm Aug 19, 2023
f2feb8d
merge 5216
depperm Aug 19, 2023
99f0b06
minor updates
depperm Aug 19, 2023
cf099ed
Merge branch 'master' of https://github.com/depperm/openmct into Mct4398
depperm Aug 22, 2023
f0e1955
merge conflict resolve pt 1
depperm Sep 24, 2023
9f704fc
part 2
depperm Sep 24, 2023
c2511ae
merge master
depperm Sep 24, 2023
6a8dc7e
update to eventbus
depperm Sep 24, 2023
e405d31
merge conflicts
depperm Sep 24, 2023
33bd351
eventbus spelling
depperm Sep 25, 2023
f6f5e1e
Merge branch 'master' into pr/depperm/6966-1
ozyx Oct 6, 2023
8894eb8
fix: import
ozyx Oct 6, 2023
c5709c2
Merge branch 'master' into Mct4398
ozyx Oct 6, 2023
377262e
fix: eventBus injection
ozyx Oct 6, 2023
0093de9
fix: import
ozyx Oct 6, 2023
f47589f
fix(test): provide eventBus in overlay plot tests
ozyx Oct 6, 2023
c3513b8
refactor: EventBus as composable
ozyx Oct 6, 2023
8fe52d3
chore: lint:fix
ozyx Oct 6, 2023
07dbbf6
chore: require vue event hyphenation
ozyx Oct 6, 2023
d8e9a7f
fix: revert event renames
ozyx Oct 6, 2023
9785381
refactor: use PascalCase name
ozyx Oct 6, 2023
41bd3e3
fix: ensure `$attrs` are properly bound
ozyx Oct 6, 2023
c137607
Merge branch 'master' into Mct4398
depperm Oct 7, 2023
3e53e06
fix: emit `click` event from SearchComponent
ozyx Oct 9, 2023
3a58786
chore: remove rules already included in `vue/vue3-recommended` ruleset
ozyx Oct 9, 2023
aea6b7c
fix: remove `Vue` import
ozyx Oct 9, 2023
cda36e7
chore: remove unused files
ozyx Oct 9, 2023
e051553
fix: fix lint scripts and make them cross-platform
ozyx Oct 9, 2023
68d2458
refactor: rename `DataImagery.vue` -> `ImageryInspectorView.vue`
ozyx Oct 9, 2023
55e93bd
refactor: rename `NumericData.vue` -> `NumericDataInspectorView.vue`
ozyx Oct 9, 2023
ae17cb0
refactor: rename components
ozyx Oct 9, 2023
95beddc
refactor: rename `GeneralIndicators.vue` -> `StatusIndicators.vue`
ozyx Oct 9, 2023
6374679
refactor: rename components
ozyx Oct 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,29 +145,26 @@ module.exports = {
'no-implicit-coercion': 'error',
//https://eslint.org/docs/rules/no-unneeded-ternary
'no-unneeded-ternary': 'error',
"unicorn/filename-case": [
"error",
'unicorn/filename-case': [
'error',
{
"cases": {
"pascalCase": true
cases: {
pascalCase: true
},
"ignore": [
"^.*\\.js$"
]
ignore: ['^.*\\.js$']
}
],
'vue/first-attribute-linebreak': 'error',
'vue/multiline-html-element-content-newline': 'off',
'vue/singleline-html-element-content-newline': 'off',
'vue/multi-word-component-names': 'off', // TODO enable, align with conventions
'vue/no-mutating-props': 'off'
'vue/no-mutating-props': 'off' // TODO: Remove this rule and fix resulting errors
},
overrides: [
{
files: LEGACY_FILES,
rules: {
'no-unused-vars': [
'warn',
'error',
{
vars: 'all',
args: 'none',
Expand Down
19 changes: 0 additions & 19 deletions example/simpleVuePlugin/HelloWorld.vue

This file was deleted.

36 changes: 0 additions & 36 deletions example/simpleVuePlugin/plugin.js

This file was deleted.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"sass-loader": "13.3.2",
"sinon": "15.1.0",
"style-loader": "3.3.3",
"tiny-emitter": "2.1.0",
"typescript": "5.2.2",
"uuid": "9.0.0",
"vue": "3.3.4",
Expand All @@ -85,8 +86,8 @@
"start": "npx webpack serve --config ./.webpack/webpack.dev.js",
"start:prod": "npx webpack serve --config ./.webpack/webpack.prod.js",
"start:coverage": "npx webpack serve --config ./.webpack/webpack.coverage.js",
"lint:js": "eslint example src e2e --ext .js openmct.js --max-warnings=0",
"lint:vue": "eslint example src --ext .vue",
"lint:js": "eslint \"example/**/*.js\" \"src/**/*.js\" \"e2e/**/*.js\" \"openmct.js\" --max-warnings=0",
"lint:vue": "eslint \"src/**/*.vue\"",
"lint:spelling": "cspell \"**/*.{js,md,vue}\" --show-context --gitignore --quiet",
"lint": "run-p \"lint:js -- {1}\" \"lint:vue -- {1}\" \"lint:spelling -- {1}\" --",
"lint:fix": "eslint example src e2e --ext .js,.vue openmct.js --fix",
Expand Down
2 changes: 1 addition & 1 deletion src/MCT.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ define([
'./ui/registries/ToolbarRegistry',
'./ui/router/ApplicationRouter',
'./ui/router/Browse',
'./ui/layout/Layout.vue',
'./ui/layout/AppLayout.vue',
'./ui/preview/plugin',
'./api/Branding',
'./plugins/licenses/plugin',
Expand Down
6 changes: 3 additions & 3 deletions src/api/forms/FormController.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import mount from 'utils/mount';
import AutoCompleteField from './components/controls/AutoCompleteField.vue';
import CheckBoxField from './components/controls/CheckBoxField.vue';
import ClockDisplayFormatField from './components/controls/ClockDisplayFormatField.vue';
import Datetime from './components/controls/Datetime.vue';
import Datetime from './components/controls/DatetimeField.vue';
import FileInput from './components/controls/FileInput.vue';
import Locator from './components/controls/Locator.vue';
import Locator from './components/controls/LocatorField.vue';
import NumberField from './components/controls/NumberField.vue';
import SelectField from './components/controls/SelectField.vue';
import TextAreaField from './components/controls/TextAreaField.vue';
Expand Down Expand Up @@ -87,7 +87,7 @@ export default class FormControl {
onChange
};
},
template: `<FormControlComponent :model="model" @onChange="onChange"></FormControlComponent>`
template: `<FormControlComponent :model="model" @on-change="onChange"></FormControlComponent>`
},
{
element,
Expand Down
2 changes: 1 addition & 1 deletion src/api/forms/FormsAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export default class FormsAPI {
};
},
template:
'<FormProperties :model="formStructure" @onChange="onChange" @onCancel="onCancel" @onSave="onSave"></FormProperties>'
'<FormProperties :model="formStructure" @on-change="onChange" @on-cancel="onCancel" @on-save="onSave"></FormProperties>'
},
{
element,
Expand Down
9 changes: 5 additions & 4 deletions src/api/forms/components/FormProperties.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
:css-class="row.cssClass"
:first="index < 1"
:row="row"
@onChange="onChange"
@on-change="onChange"
/>
</div>
</form>
Expand Down Expand Up @@ -94,6 +94,7 @@ export default {
}
}
},
emits: ['on-change', 'on-save', 'on-cancel'],
data() {
return {
invalidProperties: {},
Expand Down Expand Up @@ -144,13 +145,13 @@ export default {
onChange(data) {
this.invalidProperties[data.model.key] = data.invalid;

this.$emit('onChange', data);
this.$emit('on-change', data);
},
onCancel() {
this.$emit('onCancel');
this.$emit('on-cancel');
},
onSave() {
this.$emit('onSave');
this.$emit('on-save');
}
}
};
Expand Down
5 changes: 3 additions & 2 deletions src/api/forms/components/FormRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
-->

<template>
<div class="form-row c-form__row" :class="[{ first: first }, cssClass]" @onChange="onChange">
<div class="form-row c-form__row" :class="[{ first: first }, cssClass]" @on-change="onChange">
<label class="c-form-row__label" :title="row.description" :for="`form-${row.key}`">
{{ row.name }}
</label>
Expand Down Expand Up @@ -51,6 +51,7 @@ export default {
required: true
}
},
emits: ['on-change'],
data() {
return {
formControl: this.openmct.forms.getFormControl(this.row.control),
Expand Down Expand Up @@ -101,7 +102,7 @@ export default {
this.valid = this.validateRow(data);
data.invalid = !this.valid;

this.$emit('onChange', data);
this.$emit('on-change', data);
},
validateRow(data) {
let valid = true;
Expand Down
3 changes: 2 additions & 1 deletion src/api/forms/components/controls/AutoCompleteField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export default {
}
}
},
emits: ['on-change'],
data() {
return {
hideOptions: true,
Expand Down Expand Up @@ -138,7 +139,7 @@ export default {
value: newValue
};

this.$emit('onChange', data);
this.$emit('on-change', data);
}
},
hideOptions(newValue) {
Expand Down
5 changes: 3 additions & 2 deletions src/api/forms/components/controls/ClockDisplayFormatField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<template>
<div class="c-form-control--clock-display-format-fields">
<SelectField v-for="item in items" :key="item.key" :model="item" @onChange="onChange" />
<SelectField v-for="item in items" :key="item.key" :model="item" @on-change="onChange" />
</div>
</template>

Expand All @@ -39,6 +39,7 @@ export default {
required: true
}
},
emits: ['on-change'],
data() {
return {
items: []
Expand All @@ -55,7 +56,7 @@ export default {
},
methods: {
onChange(data) {
this.$emit('onChange', data);
this.$emit('on-change', data);
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
:first="index < 1"
:value="JSON.stringify(model.value[index])"
:item="item"
@onChange="onChange"
@on-change="onChange"
/>
</span>
</template>
Expand All @@ -46,12 +46,13 @@ export default {
required: true
}
},
emits: ['on-change'],
mounted() {
this.model.items.forEach((item, index) => (item.key = `${this.model.key}.${index}`));
},
methods: {
onChange(data) {
this.$emit('onChange', data);
this.$emit('on-change', data);
}
}
};
Expand Down
5 changes: 3 additions & 2 deletions src/api/forms/components/controls/CompositeItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<template>
<div :class="compositeCssClass">
<FormRow :css-class="item.cssClass" :first="first" :row="row" @onChange="onChange" />
<FormRow :css-class="item.cssClass" :first="first" :row="row" @on-change="onChange" />
<span class="composite-control-label">
{{ item.name }}
</span>
Expand Down Expand Up @@ -50,6 +50,7 @@ export default {
}
}
},
emits: ['on-change'],
computed: {
compositeCssClass() {
return `l-composite-control l-${this.item.control}`;
Expand All @@ -63,7 +64,7 @@ export default {
},
methods: {
onChange(data) {
this.$emit('onChange', data);
this.$emit('on-change', data);
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export default {
required: true
}
},
emits: ['on-change'],
data() {
return {
format: DATE_FORMAT,
Expand Down Expand Up @@ -139,7 +140,7 @@ export default {
value: new Date(timestamp).toISOString()
};

this.$emit('onChange', data);
this.$emit('on-change', data);
},
resetValues() {
this.setDatetime();
Expand Down
7 changes: 4 additions & 3 deletions src/api/forms/components/controls/FileInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export default {
required: true
}
},
emits: ['on-change'],
data() {
return {
fileInfo: undefined
Expand Down Expand Up @@ -101,7 +102,7 @@ export default {
model: self.model,
value: fileInfo
};
self.$emit('onChange', data);
self.$emit('on-change', data);
};

fileReader.onerror = function (error) {
Expand All @@ -123,7 +124,7 @@ export default {
value: fileInfo
};

this.$emit('onChange', data);
this.$emit('on-change', data);
},
selectFile() {
this.$refs.fileInput.click();
Expand All @@ -135,7 +136,7 @@ export default {
model: this.model,
value: undefined
};
this.$emit('onChange', data);
this.$emit('on-change', data);
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@ export default {
required: true
}
},
emits: ['on-change'],
methods: {
handleItemSelection(item) {
const data = {
model: this.model,
value: item.objectPath
};

this.$emit('onChange', data);
this.$emit('on-change', data);
}
}
};
Expand Down
3 changes: 2 additions & 1 deletion src/api/forms/components/controls/NumberField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export default {
required: true
}
},
emits: ['on-change'],
data() {
return {
field: this.model.value
Expand All @@ -61,7 +62,7 @@ export default {
value: this.field
};

this.$emit('onChange', data);
this.$emit('on-change', data);
}
}
};
Expand Down
Loading