<template>
<div v-click-outside="hideDelete" class="check" @click="showDelete">
- <NcMultiselect ref="checkSelector"
+ <NcSelect ref="checkSelector"
v-model="currentOption"
:options="options"
label="name"
track-by="class"
- :allow-empty="false"
+ :clearable="false"
:placeholder="t('workflowengine', 'Select a filter')"
@input="updateCheck" />
- <NcMultiselect v-model="currentOperator"
+ <NcSelect v-model="currentOperator"
:disabled="!currentOption"
:options="operators"
class="comparator"
label="name"
track-by="operator"
- :allow-empty="false"
+ :clearable="false"
:placeholder="t('workflowengine', 'Select a comparator')"
@input="updateCheck" />
<component :is="currentOption.component"
class="option"
@input="updateCheck">
<NcActions v-if="deleteVisible || !currentOption">
- <NcActionButton icon="icon-close" @click="$emit('remove')" />
+ <NcActionButton :title="t('workflowengine', 'Remove filter')" @click="$emit('remove')">
+ <template #icon>
+ <CloseIcon :size="20" />
+ </template>
+ </NcActionButton>
</NcActions>
</div>
</template>
<script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+
+import CloseIcon from 'vue-material-design-icons/Close.vue'
+
import ClickOutside from 'vue-click-outside'
export default {
components: {
NcActionButton,
NcActions,
- NcMultiselect,
+ NcSelect,
+
+ // Icons
+ CloseIcon,
},
directives: {
ClickOutside,
.check {
display: flex;
flex-wrap: wrap;
+ align-items: flex-start; // to not stretch components vertically
width: 100%;
padding-right: 20px;
+
& > *:not(.close) {
width: 180px;
}
& > .comparator {
- min-width: 130px;
- width: 130px;
+ min-width: 200px;
+ width: 200px;
}
& > .option {
- min-width: 230px;
- width: 230px;
+ min-width: 260px;
+ width: 260px;
+ min-height: 48px;
+
+ & > input[type=text] {
+ min-height: 48px;
+ }
}
- & > .multiselect,
+ & > .v-select,
+ & > .button-vue,
& > input[type=text] {
margin-right: 5px;
margin-bottom: 5px;
}
-
- .multiselect::v-deep .multiselect__content-wrapper li>span,
- .multiselect::v-deep .multiselect__single {
- display: block;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
}
input[type=text] {
margin: 0;
}
- ::placeholder {
- font-size: 10px;
- }
- button.action-item.action-item--single.icon-close {
- height: 44px;
- width: 44px;
- margin-top: -5px;
- margin-bottom: -5px;
- }
.invalid {
border-color: var(--color-error) !important;
}
-->
<template>
<div>
- <NcMultiselect :value="currentValue"
+ <NcSelect :value="currentValue"
:placeholder="t('workflowengine', 'Select a file type')"
label="label"
- track-by="pattern"
:options="options"
- :multiple="false"
- :tagging="false"
+ :clearable="false"
@input="setValue">
- <template slot="singleLabel" slot-scope="props">
- <span v-if="props.option.icon" class="option__icon" :class="props.option.icon" />
- <img v-else
- class="option__icon-img"
- :src="props.option.iconUrl"
- alt="">
- <span class="option__title option__title_single">{{ props.option.label }}</span>
+ <template #option="option">
+ <span v-if="option.icon" class="option__icon" :class="option.icon" />
+ <span v-else class="option__icon-img">
+ <img :src="option.iconUrl" alt="">
+ </span>
+ <span class="option__title">
+ <NcEllipsisedOption :name="String(option.label)" />
+ </span>
</template>
- <template slot="option" slot-scope="props">
- <span v-if="props.option.icon" class="option__icon" :class="props.option.icon" />
- <img v-else
- class="option__icon-img"
- :src="props.option.iconUrl"
- alt="">
- <span class="option__title">{{ props.option.label }}</span>
+ <template #selected-option="selectedOption">
+ <span v-if="selectedOption.icon" class="option__icon" :class="selectedOption.icon" />
+ <span v-else class="option__icon-img">
+ <img :src="selectedOption.iconUrl" alt="">
+ </span>
+ <span class="option__title">
+ <NcEllipsisedOption :name="String(selectedOption.label)" />
+ </span>
</template>
- </NcMultiselect>
+ </NcSelect>
<input v-if="!isPredefined"
type="text"
- :value="currentValue.pattern"
+ :value="currentValue.id"
:placeholder="t('workflowengine', 'e.g. httpd/unix-directory')"
@input="updateCustom">
</div>
</template>
<script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import NcEllipsisedOption from '@nextcloud/vue/dist/Components/NcEllipsisedOption.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import valueMixin from './../../mixins/valueMixin.js'
import { imagePath } from '@nextcloud/router'
export default {
name: 'FileMimeType',
components: {
- NcMultiselect,
+ NcEllipsisedOption,
+ NcSelect,
},
mixins: [
valueMixin,
{
icon: 'icon-folder',
label: t('workflowengine', 'Folder'),
- pattern: 'httpd/unix-directory',
+ id: 'httpd/unix-directory',
},
{
icon: 'icon-picture',
label: t('workflowengine', 'Images'),
- pattern: '/image\\/.*/',
+ id: '/image\\/.*/',
},
{
iconUrl: imagePath('core', 'filetypes/x-office-document'),
label: t('workflowengine', 'Office documents'),
- pattern: '/(vnd\\.(ms-|openxmlformats-|oasis\\.opendocument).*)$/',
+ id: '/(vnd\\.(ms-|openxmlformats-|oasis\\.opendocument).*)$/',
},
{
iconUrl: imagePath('core', 'filetypes/application-pdf'),
label: t('workflowengine', 'PDF documents'),
- pattern: 'application/pdf',
+ id: 'application/pdf',
},
],
}
return [...this.predefinedTypes, this.customValue]
},
isPredefined() {
- const matchingPredefined = this.predefinedTypes.find((type) => this.newValue === type.pattern)
+ const matchingPredefined = this.predefinedTypes.find((type) => this.newValue === type.id)
if (matchingPredefined) {
return true
}
return {
icon: 'icon-settings-dark',
label: t('workflowengine', 'Custom MIME type'),
- pattern: '',
+ id: '',
}
},
currentValue() {
- const matchingPredefined = this.predefinedTypes.find((type) => this.newValue === type.pattern)
+ const matchingPredefined = this.predefinedTypes.find((type) => this.newValue === type.id)
if (matchingPredefined) {
return matchingPredefined
}
return {
icon: 'icon-settings-dark',
label: t('workflowengine', 'Custom mimetype'),
- pattern: this.newValue,
+ id: this.newValue,
}
},
},
},
setValue(value) {
if (value !== null) {
- this.newValue = value.pattern
+ this.newValue = value.id
this.$emit('input', this.newValue)
}
},
}
</script>
<style scoped lang="scss">
-.multiselect, input[type='text'] {
+.v-select,
+input[type='text'] {
width: 100%;
}
-.multiselect::v-deep .multiselect__content-wrapper li > span,
-.multiselect::v-deep .multiselect__single {
- display: flex;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+
+input[type=text] {
+ min-height: 48px;
}
-.option__icon {
+.option__icon,
+.option__icon-img {
display: inline-block;
min-width: 30px;
- background-position: left;
+ background-position: center;
+ vertical-align: middle;
}
.option__icon-img {
- margin-right: 14px;
+ text-align: center;
+}
+
+.option__title {
+ display: inline-flex;
+ width: calc(100% - 36px);
+ vertical-align: middle;
}
</style>
<p v-if="!valid" class="invalid-hint">
{{ t('workflowengine', 'Please enter a valid time span') }}
</p>
- <NcMultiselect v-show="valid"
+ <NcSelect v-show="valid"
v-model="newValue.timezone"
+ :clearable="false"
:options="timezones"
@input="update" />
</div>
</template>
<script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import moment from 'moment-timezone'
import valueMixin from '../../mixins/valueMixin.js'
export default {
name: 'RequestTime',
components: {
- NcMultiselect,
+ NcSelect,
},
mixins: [
valueMixin,
width: 50%;
margin: 0;
margin-bottom: 5px;
+ min-height: 48px;
&.timeslot--start {
margin-right: 5px;
<template>
<div>
- <NcMultiselect :value="currentValue"
+ <NcSelect :value="currentValue"
:placeholder="t('workflowengine', 'Select a request URL')"
label="label"
- track-by="pattern"
- group-values="children"
- group-label="label"
+ :clearable="false"
:options="options"
- :multiple="false"
- :tagging="false"
@input="setValue">
- <template slot="singleLabel" slot-scope="props">
- <span class="option__icon" :class="props.option.icon" />
- <span class="option__title option__title_single">{{ props.option.label }}</span>
+ <template #option="option">
+ <span class="option__icon" :class="option.icon" />
+ <span class="option__title">
+ <NcEllipsisedOption :name="String(option.label)" />
+ </span>
</template>
- <template slot="option" slot-scope="props">
- <span class="option__icon" :class="props.option.icon" />
- <span class="option__title">{{ props.option.label }} {{ props.option.$groupLabel }}</span>
+ <template #selected-option="selectedOption">
+ <span class="option__icon" :class="selectedOption.icon" />
+ <span class="option__title">
+ <NcEllipsisedOption :name="String(selectedOption.label)" />
+ </span>
</template>
- </NcMultiselect>
+ </NcSelect>
<input v-if="!isPredefined"
type="text"
- :value="currentValue.pattern"
+ :value="currentValue.id"
:placeholder="placeholder"
@input="updateCustom">
</div>
</template>
<script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import NcEllipsisedOption from '@nextcloud/vue/dist/Components/NcEllipsisedOption.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import valueMixin from '../../mixins/valueMixin.js'
export default {
name: 'RequestURL',
components: {
- NcMultiselect,
+ NcEllipsisedOption,
+ NcSelect,
},
mixins: [
valueMixin,
newValue: '',
predefinedTypes: [
{
- label: t('workflowengine', 'Predefined URLs'),
- children: [
- { pattern: 'webdav', label: t('workflowengine', 'Files WebDAV') },
- ],
+ icon: 'icon-files-dark',
+ id: 'webdav',
+ label: t('workflowengine', 'Files WebDAV'),
},
],
}
},
matchingPredefined() {
return this.predefinedTypes
- .map(groups => groups.children)
- .flat()
- .find((type) => this.newValue === type.pattern)
+ .find((type) => this.newValue === type.id)
},
isPredefined() {
return !!this.matchingPredefined
},
customValue() {
return {
- label: t('workflowengine', 'Others'),
- children: [
- {
- icon: 'icon-settings-dark',
- label: t('workflowengine', 'Custom URL'),
- pattern: '',
- },
- ],
+ icon: 'icon-settings-dark',
+ label: t('workflowengine', 'Custom URL'),
+ id: '',
}
},
currentValue() {
return {
icon: 'icon-settings-dark',
label: t('workflowengine', 'Custom URL'),
- pattern: this.newValue,
+ id: this.newValue,
}
},
},
setValue(value) {
// TODO: check if value requires a regex and set the check operator according to that
if (value !== null) {
- this.newValue = value.pattern
+ this.newValue = value.id
this.$emit('input', this.newValue)
}
},
}
</script>
<style scoped lang="scss">
- .multiselect, input[type='text'] {
+ .v-select,
+ input[type='text'] {
width: 100%;
}
+ input[type='text'] {
+ min-height: 48px;
+ }
.option__icon {
display: inline-block;
min-width: 30px;
- background-position: left;
+ background-position: center;
+ vertical-align: middle;
+ }
+
+ .option__title {
+ display: inline-flex;
+ width: calc(100% - 36px);
+ vertical-align: middle;
}
</style>
<template>
<div>
- <NcMultiselect :value="currentValue"
+ <NcSelect :value="currentValue"
:placeholder="t('workflowengine', 'Select a user agent')"
label="label"
- track-by="pattern"
:options="options"
- :multiple="false"
- :tagging="false"
+ :clearable="false"
@input="setValue">
- <template slot="singleLabel" slot-scope="props">
- <span class="option__icon" :class="props.option.icon" />
- <!-- v-html can be used here as t() always passes our translated strings though DOMPurify.sanitize -->
- <!-- eslint-disable-next-line vue/no-v-html -->
- <span class="option__title option__title_single" v-html="props.option.label" />
+ <template #option="option">
+ <span class="option__icon" :class="option.icon" />
+ <span class="option__title">
+ <NcEllipsisedOption :name="String(option.label)" />
+ </span>
</template>
- <template slot="option" slot-scope="props">
- <span class="option__icon" :class="props.option.icon" />
- <!-- eslint-disable-next-line vue/no-v-html -->
- <span v-if="props.option.$groupLabel" class="option__title" v-html="props.option.$groupLabel" />
- <!-- eslint-disable-next-line vue/no-v-html -->
- <span v-else class="option__title" v-html="props.option.label" />
+ <template #selected-option="selectedOption">
+ <span class="option__icon" :class="selectedOption.icon" />
+ <span class="option__title">
+ <NcEllipsisedOption :name="String(selectedOption.label)" />
+ </span>
</template>
- </NcMultiselect>
+ </NcSelect>
<input v-if="!isPredefined"
type="text"
:value="currentValue.pattern"
</template>
<script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import NcEllipsisedOption from '@nextcloud/vue/dist/Components/NcEllipsisedOption.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import valueMixin from '../../mixins/valueMixin.js'
export default {
name: 'RequestUserAgent',
components: {
- NcMultiselect,
+ NcEllipsisedOption,
+ NcSelect,
},
mixins: [
valueMixin,
return {
newValue: '',
predefinedTypes: [
- { pattern: 'android', label: t('workflowengine', 'Android client'), icon: 'icon-phone' },
- { pattern: 'ios', label: t('workflowengine', 'iOS client'), icon: 'icon-phone' },
- { pattern: 'desktop', label: t('workflowengine', 'Desktop client'), icon: 'icon-desktop' },
- { pattern: 'mail', label: t('workflowengine', 'Thunderbird & Outlook addons'), icon: 'icon-mail' },
+ { id: 'android', label: t('workflowengine', 'Android client'), icon: 'icon-phone' },
+ { id: 'ios', label: t('workflowengine', 'iOS client'), icon: 'icon-phone' },
+ { id: 'desktop', label: t('workflowengine', 'Desktop client'), icon: 'icon-desktop' },
+ { id: 'mail', label: t('workflowengine', 'Thunderbird & Outlook addons'), icon: 'icon-mail' },
],
}
},
},
matchingPredefined() {
return this.predefinedTypes
- .find((type) => this.newValue === type.pattern)
+ .find((type) => this.newValue === type.id)
},
isPredefined() {
return !!this.matchingPredefined
return {
icon: 'icon-settings-dark',
label: t('workflowengine', 'Custom user agent'),
- pattern: '',
+ id: '',
}
},
currentValue() {
return {
icon: 'icon-settings-dark',
label: t('workflowengine', 'Custom user agent'),
- pattern: this.newValue,
+ id: this.newValue,
}
},
},
setValue(value) {
// TODO: check if value requires a regex and set the check operator according to that
if (value !== null) {
- this.newValue = value.pattern
+ this.newValue = value.id
this.$emit('input', this.newValue)
}
},
}
</script>
<style scoped>
- .multiselect, input[type='text'] {
+ .v-select,
+ input[type='text'] {
width: 100%;
}
-
- .multiselect .multiselect__content-wrapper li>span {
- display: flex;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- .multiselect::v-deep .multiselect__single {
- width: 100%;
- display: flex;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ input[type='text'] {
+ min-height: 48px;
}
+
.option__icon {
display: inline-block;
min-width: 30px;
- background-position: left;
+ background-position: center;
+ vertical-align: middle;
}
+
.option__title {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+ display: inline-flex;
+ width: calc(100% - 36px);
+ vertical-align: middle;
}
</style>
<template>
<div>
- <NcMultiselect :value="currentValue"
+ <NcSelect :value="currentValue"
:loading="status.isLoading && groups.length === 0"
:options="groups"
- :multiple="false"
+ :clearable="false"
label="displayname"
track-by="id"
@search-change="searchAsync"
</template>
<script>
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
export default {
name: 'RequestUserGroup',
components: {
- NcMultiselect,
+ NcSelect,
},
props: {
value: {
}
</script>
<style scoped>
- .multiselect {
- width: 100%;
- }
+.v-select {
+ width: 100%;
+}
</style>
<input v-if="lastCheckComplete"
type="button"
class="check--add"
- value="Add a new filter"
+ :value="t('workflowengine', 'Add a new filter')"
@click="onAddFilter">
</p>
</div>
flex-wrap: wrap;
border-left: 5px solid var(--color-primary-element);
- .trigger, .action {
+ .trigger,
+ .action {
flex-grow: 1;
min-height: 100px;
- max-width: 700px;
+ max-width: 920px;
}
.action {
max-width: 400px;
.trigger p:first-child span {
padding-top: 3px;
}
+ .trigger p:last-child {
+ padding-top: 8px;
+ }
.check--add {
background-position: 7px center;