diff --git a/app/.eslintrc.js b/app/.eslintrc.js
index 9a5864e8..a95931eb 100644
--- a/app/.eslintrc.js
+++ b/app/.eslintrc.js
@@ -25,7 +25,10 @@ module.exports = {
camelcase: 'warn',
indent: 'off',
'no-irregular-whitespace': 'off',
- 'no-unused-vars': 'warn',
+ 'no-unused-vars': [
+ 'warn',
+ { varsIgnorePattern: '^_', destructuredArrayIgnorePattern: '^_' }
+ ],
quotes: 'warn',
'no-multiple-empty-lines': [
'error',
diff --git a/app/src/App.vue b/app/src/App.vue
index 06382574..b3809363 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -8,10 +8,10 @@
exact exact-active-class="active"
>
-
+
-
+
diff --git a/app/src/components/AdressInputSelect.vue b/app/src/components/AdressInputSelect.vue
index 815a028b..7a74748a 100644
--- a/app/src/components/AdressInputSelect.vue
+++ b/app/src/components/AdressInputSelect.vue
@@ -1,10 +1,13 @@
@@ -13,9 +16,11 @@
@@ -40,24 +45,12 @@ export default {
type: { type: String, default: 'email' }
},
- computed: {
- listeners: function () {
- return Object.assign({},
- // Forwards all parent events listeners
- this.$listeners,
- // Overwrite input behavior so this component can work with v-model
- {
- input: (event) => {
- this.$parent.$emit('touch')
- this.$emit('input', this.value)
- },
-
- blur: event => {
- this.$parent.$emit('touch')
- this.$emit('blur', this.value)
- }
- }
- )
+ methods: {
+ onInput (key, value) {
+ this.$emit('input', {
+ ...this.value,
+ [key]: value
+ })
}
}
}
diff --git a/app/src/store/settings.js b/app/src/store/settings.js
index 6c4341e9..08f1a877 100644
--- a/app/src/store/settings.js
+++ b/app/src/store/settings.js
@@ -16,7 +16,7 @@ export default {
theme: localStorage.getItem('theme') === 'true',
experimental: localStorage.getItem('experimental') === 'true',
spinner: 'pacman',
- supportedLocales: supportedLocales
+ supportedLocales
},
mutations: {
diff --git a/app/src/views/_partials/ViewLockOverlay.vue b/app/src/views/_partials/ViewLockOverlay.vue
index efe6ba66..64b41756 100644
--- a/app/src/views/_partials/ViewLockOverlay.vue
+++ b/app/src/views/_partials/ViewLockOverlay.vue
@@ -6,7 +6,7 @@
>
-
+
diff --git a/app/src/views/app/AppInfo.vue b/app/src/views/app/AppInfo.vue
index 8f22236b..13606337 100644
--- a/app/src/views/app/AppInfo.vue
+++ b/app/src/views/app/AppInfo.vue
@@ -396,13 +396,15 @@ export default {
? app.from_catalog.potential_alternative_to.join(this.$i18n.t('words.separator'))
: null,
description: DESCRIPTION ? formatI18nField(DESCRIPTION) : app.description,
- integration: app.manifest.packaging_format >= 2 ? {
- archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
- ldap: ldap === 'not_relevant' ? null : ldap,
- sso: sso === 'not_relevant' ? null : sso,
- multi_instance,
- resources: { ram: ram.runtime, disk }
- } : null,
+ integration: app.manifest.packaging_format >= 2
+ ? {
+ archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
+ ldap: ldap === 'not_relevant' ? null : ldap,
+ sso: sso === 'not_relevant' ? null : sso,
+ multi_instance,
+ resources: { ram: ram.runtime, disk }
+ }
+ : null,
links: [
['license', `https://spdx.org/licenses/${app.manifest.upstream.license}`],
...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, app.manifest.upstream[key]])),
@@ -411,9 +413,11 @@ export default {
doc: {
notifications: {
postInstall: notifs.POST_INSTALL && notifs.POST_INSTALL.main ? [['main', formatI18nField(notifs.POST_INSTALL.main)]] : [],
- postUpgrade: notifs.POST_UPGRADE ? Object.entries(notifs.POST_UPGRADE).map(([key, content]) => {
- return [key, formatI18nField(content)]
- }) : []
+ postUpgrade: notifs.POST_UPGRADE
+ ? Object.entries(notifs.POST_UPGRADE).map(([key, content]) => {
+ return [key, formatI18nField(content)]
+ })
+ : []
},
admin: [
['admin', formatI18nField(ADMIN)],
diff --git a/app/src/views/app/AppInstall.vue b/app/src/views/app/AppInstall.vue
index 98edf56c..d4d3ae9e 100644
--- a/app/src/views/app/AppInstall.vue
+++ b/app/src/views/app/AppInstall.vue
@@ -254,13 +254,15 @@ export default {
demo: _app.upstream.demo,
version,
license: _app.upstream.license,
- integration: _app.packaging_format >= 2 ? {
- archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
- ldap: ldap === 'not_relevant' ? null : ldap,
- sso: sso === 'not_relevant' ? null : sso,
- multi_instance,
- resources: { ram: ram.runtime, disk }
- } : null,
+ integration: _app.packaging_format >= 2
+ ? {
+ archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
+ ldap: ldap === 'not_relevant' ? null : ldap,
+ sso: sso === 'not_relevant' ? null : sso,
+ multi_instance,
+ resources: { ram: ram.runtime, disk }
+ }
+ : null,
links: [
['license', `https://spdx.org/licenses/${_app.upstream.license}`],
...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, _app.upstream[key]])),
diff --git a/app/src/views/app/AppList.vue b/app/src/views/app/AppList.vue
index ff993345..ebd4c04f 100644
--- a/app/src/views/app/AppList.vue
+++ b/app/src/views/app/AppList.vue
@@ -16,7 +16,7 @@
diff --git a/app/src/views/user/UserImport.vue b/app/src/views/user/UserImport.vue
index a30eab39..50813568 100644
--- a/app/src/views/user/UserImport.vue
+++ b/app/src/views/user/UserImport.vue
@@ -84,7 +84,7 @@ export default {
if (!confirmed) return
}
- var requestArgs = {}
+ const requestArgs = {}
Object.assign(requestArgs, this.form)
if (!requestArgs.delete) delete requestArgs.delete
if (!requestArgs.update) delete requestArgs.update