Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion apps/appstore/src/components/LimitToGroupDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
-->

<script setup lang="ts">
import type { NcSelectUsersModel } from '@nextcloud/vue/components/NcSelectUsers'
import type { IAppstoreApp, IAppstoreExApp } from '../apps.d.ts'

import { t } from '@nextcloud/l10n'
Expand All @@ -12,7 +13,7 @@ import { useDebounceFn } from '@vueuse/core'
import { computed, ref, watch } from 'vue'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcDialog from '@nextcloud/vue/components/NcDialog'
import NcSelectUsers, { type NcSelectUsersModel } from '@nextcloud/vue/components/NcSelectUsers'
import NcSelectUsers from '@nextcloud/vue/components/NcSelectUsers'
import { useAppsStore } from '../store/apps.ts'
import { useGroupsStore } from '../store/groups.ts'

Expand Down
7 changes: 3 additions & 4 deletions apps/files/src/utils/fileUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
* SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import {
type Node,

FileType,
} from '@nextcloud/files'
import type { Node } from '@nextcloud/files'

import { FileType } from '@nextcloud/files'
import { n } from '@nextcloud/l10n'

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
:model-value="expirationDate"
name="expirationDate"
type="date"
@input="$emit('update:expirationDate', $event)" />
@input="$emit('update:expirationDate', $event) /* eslint-disable-line vue/custom-event-name-casing */" />

<p v-if="defaultExpireDateEnforced" class="file-request-dialog__info">
<IconInfo :size="18" class="file-request-dialog__info-icon" />
Expand Down Expand Up @@ -87,12 +87,12 @@
</template>

<script lang="ts">
import { t } from '@nextcloud/l10n'
import {
type PropType,
/* eslint-disable vue/custom-event-name-casing */

import type { PropType } from 'vue'

defineComponent,
} from 'vue'
import { t } from '@nextcloud/l10n'
import { defineComponent } from 'vue'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcDateTimePickerNative from '@nextcloud/vue/components/NcDateTimePickerNative'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
</template>

<script lang="ts" setup>
import {
type Component,
type PropType,
import type { Component, PropType } from 'vue'

computed,
} from 'vue'
import { computed } from 'vue'

const props = defineProps({
fileInfo: {
Expand Down
6 changes: 2 additions & 4 deletions apps/files_versions/src/components/VirtualScrolling.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
</template>

<script lang="ts">
import {
type PropType,
import type { PropType } from 'vue'

defineComponent,
} from 'vue'
import { defineComponent } from 'vue'
import logger from '../utils/logger.ts'

export interface RowItem {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
-->

<script setup lang="ts">
import type { PresetAppConfigs, PresetIds } from './models.ts'

import { t } from '@nextcloud/l10n'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import AccountGroupOutline from 'vue-material-design-icons/AccountGroupOutline.vue'
Expand All @@ -13,7 +15,6 @@ import Crowd from 'vue-material-design-icons/Crowd.vue'
import Domain from 'vue-material-design-icons/Domain.vue'
import MinusCircleOutline from 'vue-material-design-icons/MinusCircleOutline.vue'
import SchoolOutline from 'vue-material-design-icons/SchoolOutline.vue'
import { type PresetAppConfigs, type PresetIds } from './models.ts'

defineProps({
presets: {
Expand Down
6 changes: 3 additions & 3 deletions apps/settings/src/components/Users/EditUserDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class="edit-dialog"
size="small"
:name="t('settings', 'Edit account')"
outTransition
out-transition
@closing="$emit('closing')">
<form
id="edit-user-form"
Expand All @@ -17,9 +17,9 @@
:disabled="saving"
@submit.prevent="save">
<UserFormFields
:fieldConfig="fieldConfig"
:field-config="fieldConfig"
:errors="fieldErrors"
:quotaOptions="quotaOptions" />
:quota-options="quotaOptions" />
</form>

<template #actions>
Expand Down
14 changes: 11 additions & 3 deletions apps/settings/src/components/Users/UserFormManager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<template>
<div class="user-form__item user-form__managers">
<NcSelectUsers
:modelValue="managerModel"
:model-value="managerModel"
class="user-form__select"
:input-label="t('settings', 'Manager')"
:placeholder="t('settings', 'Search for a manager…')"
Expand Down Expand Up @@ -75,14 +75,22 @@ export default {
},

methods: {
/** Map NcSelectUsersModel back to internal formData shape */
/**
* Map NcSelectUsersModel back to internal formData shape
*
* @param {object|null} value - The selected user from NcSelectUsers, or null if cleared
*/
onManagerChange(value) {
this.formData.manager = value
? { id: value.id, displayname: value.displayName }
: ''
},

/** Debounce keystrokes so a 10-char query produces 1-2 requests, not 10. */
/**
* Debounce keystrokes so a 10-char query produces 1-2 requests, not 10.
*
* @param {string} query - The search string typed by the user
*/
searchUserManager(query) {
clearTimeout(this.searchTimeout)
this.searchTimeout = setTimeout(() => this.fetchManagers(query), 200)
Expand Down
6 changes: 6 additions & 0 deletions apps/settings/src/store/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,12 @@ const getters = {
const CancelToken = axios.CancelToken
let searchRequestCancelSource = null

/**
* Commit groups from a users response to the store.
*
* @param context - The Vuex store context
* @param response - The response from the API containing user and group data
*/
function commitGroupsFromUsersResponse(context, response) {
const groups = response.data.ocs.data.groups ?? []
if (groups.length === 0) {
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/views/SettingsApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->

<template>
<NcContent :class="$style.settingsApp" appName="settings">
<NcContent :class="$style.settingsApp" app-name="settings">
<SettingsNavigation />
<SettingsContentWrapper />
</NcContent>
Expand Down
1 change: 0 additions & 1 deletion core/src/OC/msg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export default {
return
}

// eslint-disable-next-line @stylistic/exp-list-style
const animation = el.animate?.(
[
{ opacity: 1 },
Expand Down
4 changes: 2 additions & 2 deletions core/src/views/PublicPageMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
</template>

<script setup lang="ts">
import type { Ref } from 'vue'

import { loadState } from '@nextcloud/initial-state'
import { t } from '@nextcloud/l10n'
import { useIsSmallMobile } from '@nextcloud/vue/composables/useIsMobile'
import { spawnDialog } from '@nextcloud/vue/functions/dialog'
import {
type Ref,

computed,
ref,
} from 'vue'
Expand Down
1 change: 0 additions & 1 deletion dist/1598-1598.js.map

This file was deleted.

1 change: 0 additions & 1 deletion dist/1598-1598.js.map.license

This file was deleted.

2 changes: 0 additions & 2 deletions dist/1991-1991.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/1991-1991.js.map.license

This file was deleted.

4 changes: 2 additions & 2 deletions dist/1598-1598.js → dist/9354-9354.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions dist/9354-9354.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/9354-9354.js.map.license
2 changes: 2 additions & 0 deletions dist/9703-9703.js

Large diffs are not rendered by default.

File renamed without changes.
2 changes: 1 addition & 1 deletion dist/1991-1991.js.map → dist/9703-9703.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/9703-9703.js.map.license
Loading
Loading