Skip to content

Update linting rules to Vue3 #836

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.

Sign up for GitHub

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

Merged
guergana merged 8 commits into from
Jan 24, 2024
Merged

Update linting rules to Vue3 #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e953f2
Update vue plugin to vue3 rules
guergana Jan 15, 2024
e660068
Fix errors from changing linting plugin
guergana Jan 15, 2024
54123ad
Adjust tests to changes
guergana Jan 15, 2024
161ee0d
Remove unneeded linting rules from configuration file
guergana Jan 15, 2024
9c726db
Update browser tests to new prop names
guergana Jan 15, 2024
d62aae1
Adjust prop names in feature tests
guergana Jan 15, 2024
7326182
Fix merge mistake
guergana Jan 17, 2024
d752dcb
Fix indentation removed by merge
guergana Jan 17, 2024
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
14 changes: 2 additions & 12 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,12 @@ module.exports = {
extends: [
'eslint:recommended',
'@vue/typescript/recommended',
'plugin:vue/essential',
'plugin:vue/vue3-strongly-recommended',
],
parser: 'vue-eslint-parser',
rules: {
'max-len': [ 'error', 120 ],
'no-multiple-empty-lines' : ['error', { 'max': 1 }],
'vue/multi-word-component-names' : [ 'off' ],
// Migration changes
'vue/no-deprecated-v-bind-sync': 'off',
'vue/no-deprecated-slot-attribute': 'off',
'vue/require-explicit-emits': 'off',
'vue/no-deprecated-v-on-native-modifier': 'off',
'vue/no-deprecated-slot-scope-attribute': 'off',
'vue/no-v-for-template-key-on-child': 'off',
'vue/no-deprecated-destroyed-lifecycle': 'off',
'vue/no-v-model-argument': 'off',
'vue/no-multiple-template-root': 'off' // TODO: remove this rule in T351644
'vue/multi-word-component-names' : [ 'off' ]
},
};
4 changes: 2 additions & 2 deletions app/Http/Controllers/ResultsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ public function index(MismatchGetRequest $request, WikibaseAPIClient $wikidata):
$props = array_merge(
[
'user' => $user,
'item_ids' => $requestedItemIds,
'itemIds' => $requestedItemIds,
// Use wikidata to fetch labels for found entity ids
'labels' => $wikidata->getLabels($entityIds, $lang),
'formatted_values' => $formattedTimeValues,
'formattedValues' => $formattedTimeValues,
],
// only add 'results' prop if mismatches have been found
$mismatches->isNotEmpty() ? [ 'results' => $mismatches->groupBy('item_id') ] : []
Expand Down
26 changes: 17 additions & 9 deletions resources/js/Components/AuthWidget.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
<template>
<div class="auth-widget_wrapper">
<div class="auth-widget" v-if="user">
<a :href="`https://www.wikidata.org/wiki/User:${user.name}`">
<img src="images/user.svg" class="icon-user" /><span class="username">{{ user.name }}</span>
</a>
<a href="/auth/logout">{{ $i18n('log-out') }}</a>
</div>
<a v-else href="/auth/login">{{ $i18n('log-in') }}</a>
<div class="auth-widget_wrapper">
<div
class="auth-widget"
v-if="user"
>
<a :href="`https://www.wikidata.org/wiki/User:${user.name}`">
<img
src="images/user.svg"
class="icon-user"
><span class="username">{{ user.name }}</span>
</a>
<a href="/auth/logout">{{ $i18n('log-out') }}</a>
</div>

<a
v-else
href="/auth/login"
>{{ $i18n('log-in') }}</a>
</div>
</template>

<script setup lang="ts">
Expand Down
31 changes: 17 additions & 14 deletions resources/js/Components/ItemIdSearchTextarea.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<template>
<cdx-field
:status="validationError ? validationError.type : 'default'"
:messages="validationError ? validationError.message : null"
:status="validationError ? validationError.type : 'default'"
:messages="validationError ? validationError.message : null"
>
<div class="progress-bar-wrapper">
<cdx-progress-bar v-if="loading" :aria-label="$i18n('item-form-progress-bar-aria-label')" />
</div>
<cdx-text-area
:label="$i18n('item-form-id-input-label')"
:placeholder="$i18n('item-form-id-input-placeholder')"
:rows="8"
:status="validationError ? validationError.type : 'default'"
v-model="textareaInputValue"
<div class="progress-bar-wrapper">
<cdx-progress-bar
v-if="loading"
:aria-label="$i18n('item-form-progress-bar-aria-label')"
/>
<template #label>
{{$i18n('item-form-id-input-label')}}
</template>
</div>
<template #label>
{{ $i18n('item-form-id-input-label') }}
</template>
<cdx-text-area
:label="$i18n('item-form-id-input-label')"
:placeholder="$i18n('item-form-id-input-placeholder')"
:rows="8"
:status="validationError ? validationError.type : 'default'"
v-model="textareaInputValue"
/>
</cdx-field>
</template>

Expand Down
63 changes: 33 additions & 30 deletions resources/js/Components/LanguageSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
<template>
<div class="mismatchfinder__language-selector">
<div class="languageSelector__mobile-header">
<span>{{ $i18n('language-selector-mobile-header') }}</span>
<button @click="onCloseMenu">
<img :src="closeUrl" :alt="$i18n( 'language-selector-close-button-label' )">
</button>
</div>
<LanguageSelectorInput
ref="input"
:value="searchInput"
:placeholder="$i18n( 'language-selector-input-placeholder' )"
@input="onInput"
@clear="onClearInputValue"
@tab="onCloseMenu"
@arrowDown="onArrowDown"
@arrowUp="onArrowUp"
@enter="onEnter"
@escape="onCloseMenu"
/>
<LanguageSelectorOptionsMenu
tabindex="-1"
:languages="shownLanguages"
:highlighted-index="highlightedIndex"
@select="onSelect"
>
<template #no-results>
<slot name="no-results"/>
</template>
</LanguageSelectorOptionsMenu>
</div>
<div class="mismatchfinder__language-selector">
<div class="languageSelector__mobile-header">
<span>{{ $i18n('language-selector-mobile-header') }}</span>
<button @click="onCloseMenu">
<img
:src="closeUrl"
:alt="$i18n( 'language-selector-close-button-label' )"
>
</button>
</div>
<LanguageSelectorInput
ref="input"
:value="searchInput"
:placeholder="$i18n( 'language-selector-input-placeholder' )"
@input="onInput"
@clear="onClearInputValue"
@tab="onCloseMenu"
@arrow-down="onArrowDown"
@arrow-up="onArrowUp"
@enter="onEnter"
@escape="onCloseMenu"
/>
<LanguageSelectorOptionsMenu
tabindex="-1"
:languages="shownLanguages"
:highlighted-index="highlightedIndex"
@select="onSelect"
>
<template #no-results>
<slot name="no-results" />
</template>
</LanguageSelectorOptionsMenu>
</div>
</template>

<script setup lang="ts">
Expand Down
60 changes: 33 additions & 27 deletions resources/js/Components/LanguageSelectorInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
<template>
<div class="languageSelector__input__wrapper">
<div class="languageSelector__input-left-side">
<div class="languageSelector__input__search-icon">
<img :src="searchUrl" alt="">
</div>
<input
ref="input"
type="text"
class="languageSelector__input"
:value="value"
:placeholder="placeholder"
@input="onInput"
@keydown.tab="$emit('tab')"
@keydown.down.prevent="$emit('arrowDown')"
@keydown.up.prevent="$emit('arrowUp')"
@keydown.enter="$emit('enter')"
@keydown.esc.prevent="$emit('escape')"
>
</div>
<button
class="languageSelector__input__clear-button"
:class="clearBtnVisible ? 'languageSelector__input__clear-button--visible' : ''"
@click="onClearInputValue"
>
<img :src="clearUrl" :alt="$i18n( 'language-selector-clear-button-label' )">
</button>
</div>
<div class="languageSelector__input__wrapper">
<div class="languageSelector__input-left-side">
<div class="languageSelector__input__search-icon">
<img
:src="searchUrl"
alt=""
>
</div>
<input
ref="input"
type="text"
class="languageSelector__input"
:value="value"
:placeholder="placeholder"
@input="onInput"
@keydown.tab="$emit('tab')"
@keydown.down.prevent="$emit('arrowDown')"
@keydown.up.prevent="$emit('arrowUp')"
@keydown.enter="$emit('enter')"
@keydown.esc.prevent="$emit('escape')"
>
</div>
<button
class="languageSelector__input__clear-button"
:class="clearBtnVisible ? 'languageSelector__input__clear-button--visible' : ''"
@click="onClearInputValue"
>
<img
:src="clearUrl"
:alt="$i18n( 'language-selector-clear-button-label' )"
>
</button>
</div>
</template>

<script setup lang="ts">
Expand Down
66 changes: 34 additions & 32 deletions resources/js/Components/LanguageSelectorOptionsMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
<template>
<div
ref="container"
class="languageSelector__options-menu"
role="listbox"
:aria-label="$i18n( 'language-selector-options-menu-aria-label' )"
>
<div
ref="languagesList"
class="languageSelector__options-menu__languages-list"
tabindex="-1">
<div
v-for="( language, index ) in languages"
:key="language.code"
:aria-selected="language.code === selectedLanguageCode || null"
class="languageSelector__options-menu__languages-list__item"
:class="{
'language--selected': language.code === selectedLanguageCode,
highlight: highlightedIndex === index
}"
role="option"
@click="onSelect( language.code )"
>
{{ language.autonym }}
</div>
</div>
<div
v-if="languages.length === 0"
class="languageSelector__options-menu__no-results"
role="option">
<slot name="no-results"/>
</div>
</div>
<div
ref="container"
class="languageSelector__options-menu"
role="listbox"
:aria-label="$i18n( 'language-selector-options-menu-aria-label' )"
>
<div
ref="languagesList"
class="languageSelector__options-menu__languages-list"
tabindex="-1"
>
<div
v-for="( language, index ) in languages"
:key="language.code"
:aria-selected="language.code === selectedLanguageCode || null"
class="languageSelector__options-menu__languages-list__item"
:class="{
'language--selected': language.code === selectedLanguageCode,
highlight: highlightedIndex === index
}"
role="option"
@click="onSelect( language.code )"
>
{{ language.autonym }}
</div>
</div>
<div
v-if="languages.length === 0"
class="languageSelector__options-menu__no-results"
role="option"
>
<slot name="no-results" />
</div>
</div>
</template>

<script setup lang="ts">
Expand Down
11 changes: 7 additions & 4 deletions resources/js/Components/LoadingOverlay.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<template>
<div class="loading-indicator" v-if="shown">
<div class="overlay" >
<cdx-progress-bar aria-label="Indeterminate progress bar"/>
</div>
<div
class="loading-indicator"
v-if="shown"
>
<div class="overlay">
<cdx-progress-bar aria-label="Indeterminate progress bar" />
</div>
</div>
</template>

<script setup lang="ts">
Expand Down
Loading