Skip to content

Commit

Permalink
Fix oc-checkbox-usages
Browse files Browse the repository at this point in the history
  • Loading branch information
JammingBen committed Jan 20, 2023
1 parent e030df1 commit cab8fc4
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
type="checkbox"
name="checkbox"
:class="classes"
:modelValue="option"
:value="option"
:disabled="disabled"
/>
<label :for="id" :class="labelClasses" v-text="label" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
size="large"
class="oc-ml-s"
:label="$gettext('Select all groups')"
:value="allGroupsSelected"
:model-value="allGroupsSelected"
hide-label
@input="$emit('toggleSelectAllGroups')"
@update:modelValue="$emit('toggleSelectAllGroups')"
/>
</template>
<template #select="rowData">
<oc-checkbox
class="oc-ml-s"
size="large"
:value="selectedGroups"
:model-value="selectedGroups"
:option="rowData.item"
:label="getSelectGroupLabel(rowData.item)"
hide-label
@input="$emit('toggleSelectGroup', rowData.item)"
@update:modelValue="$emit('toggleSelectGroup', rowData.item)"
/>
</template>
<template #avatar="rowData">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@
size="large"
class="oc-ml-s"
:label="$gettext('Select all spaces')"
:value="allSpacesSelected"
:model-value="allSpacesSelected"
hide-label
@input="$emit('toggleSelectAllSpaces')"
@update:modelValue="$emit('toggleSelectAllSpaces')"
/>
</template>
<template #select="{ item }">
<oc-checkbox
class="oc-ml-s"
size="large"
:value="isSpaceSelected(item)"
:model-value="isSpaceSelected(item)"
:option="item"
:label="getSelectSpaceLabel(item)"
hide-label
@input="$emit('toggleSelectSpace', item)"
@update:modelValue="$emit('toggleSelectSpace', item)"
@click.stop
/>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,18 @@
<script lang="ts">
import { defineComponent } from 'vue'
import UserInfoBox from './UserInfoBox.vue'
import { PropType } from 'vue'
import { User } from 'web-client/src/generated'
export default defineComponent({
name: 'DetailsPanel',
components: {
UserInfoBox
},
props: {
user: {
type: Object,
required: true
type: Object as PropType<User>,
required: false
},
users: {
type: Array,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue'
import { defineComponent, PropType } from 'vue'
import * as EmailValidator from 'email-validator'
import UserInfoBox from './UserInfoBox.vue'
import CompareSaveDialog from 'web-pkg/src/components/sideBar/CompareSaveDialog.vue'
import QuotaSelect from 'web-pkg/src/components/QuotaSelect.vue'
import { cloneDeep } from 'lodash-es'
import { User } from 'web-client/src/generated'
export default defineComponent({
name: 'EditPanel',
Expand All @@ -78,8 +79,8 @@ export default defineComponent({
},
props: {
user: {
type: Object,
required: true
type: Object as PropType<User>,
required: false
},
roles: {
type: Array,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
size="large"
class="oc-ml-s"
:label="$gettext('Select all users')"
:value="allUsersSelected"
:model-value="allUsersSelected"
hide-label
@input="$emit('toggleSelectAllUsers')"
@update:modelValue="$emit('toggleSelectAllUsers')"
/>
</template>
<template #select="{ item }">
<oc-checkbox
class="oc-ml-s"
size="large"
:value="selectedUsers"
:model-value="selectedUsers"
:option="item"
:label="getSelectUserLabel(item)"
hide-label
@input="$emit('toggleSelectUser', item)"
@update:modelValue="$emit('toggleSelectUser', item)"
/>
</template>
<template #avatar="{ item }">
Expand Down Expand Up @@ -104,6 +104,7 @@ export default defineComponent({
required: true
}
},
emits: ['unSelectAllUsers', 'toggleSelectAllUsers', 'toggleSelectUser'],
setup(props, { emit }) {
const showDetails = (user) => {
emit('unSelectAllUsers')
Expand Down
3 changes: 2 additions & 1 deletion packages/web-app-admin-settings/src/views/Users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ export default defineComponent({
loadResourcesTask,
loadAdditionalUserDataTask,
graphClient,
accessToken
accessToken,
listHeaderPosition
}
},
data: function () {
Expand Down
24 changes: 11 additions & 13 deletions packages/web-app-files/src/views/spaces/DriveRedirect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,17 @@ export default defineComponent({
path: unref(itemPath)
})
return (
router
.replace({
...unref(route),
params: {
...unref(route).params,
...params
},
query
})
// avoid NavigationDuplicated error in console
.catch(() => {})
)
router
.replace({
...unref(route),
params: {
...unref(route).params,
...params
},
query
})
// avoid NavigationDuplicated error in console
.catch(() => {})
}
})
</script>
6 changes: 3 additions & 3 deletions packages/web-pkg/src/composables/sideBar/useSideBar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ interface SideBarOptions {
export const useSideBar = (options?: SideBarOptions): SideBarResult => {
const eventBus = options?.bus || defaultEventBus
const sideBarOpen = ref(false)
const sideBarActivePanel = ref(null)
const sideBarActivePanel = ref('')
const toggleSideBarToken = eventBus.subscribe(SideBarEventTopics.toggle, () => {
sideBarOpen.value = !unref(sideBarOpen)
})
Expand All @@ -28,14 +28,14 @@ export const useSideBar = (options?: SideBarOptions): SideBarResult => {
})
const openSideBarWithPanelToken = eventBus.subscribe(
SideBarEventTopics.openWithPanel,
(panelName) => {
(panelName: string) => {
sideBarOpen.value = true
sideBarActivePanel.value = panelName
}
)
const setActiveSideBarPanelToken = eventBus.subscribe(
SideBarEventTopics.setActivePanel,
(panelName) => {
(panelName: string) => {
sideBarActivePanel.value = panelName
}
)
Expand Down
20 changes: 10 additions & 10 deletions packages/web-runtime/src/compatConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ export const compatConfig: CompatConfig = {
// CONFIG_SILENT: false,
// CONFIG_WHITESPACE: false,
// CUSTOM_DIR: false,
// FILTERS: false,
// GLOBAL_DELETE: false,
FILTERS: false,
GLOBAL_DELETE: false,
GLOBAL_EXTEND: false,
// GLOBAL_MOUNT: false,
// GLOBAL_MOUNT_CONTAINER: false,
// GLOBAL_OBSERVABLE: false,
// GLOBAL_PRIVATE_UTIL: false,
GLOBAL_MOUNT: false,
GLOBAL_MOUNT_CONTAINER: false,
GLOBAL_OBSERVABLE: false,
GLOBAL_PRIVATE_UTIL: false,
GLOBAL_PROTOTYPE: false,
GLOBAL_SET: false,
INSTANCE_ATTRS_CLASS_STYLE: false,
INSTANCE_CHILDREN: false,
INSTANCE_DELETE: false,
// INSTANCE_DESTROY: false,
INSTANCE_DESTROY: false,
INSTANCE_EVENT_EMITTER: false,
INSTANCE_EVENT_HOOKS: false,
// INSTANCE_LISTENERS: false,
INSTANCE_SCOPED_SLOTS: false,
// INSTANCE_SET: false,
INSTANCE_SET: false,
OPTIONS_BEFORE_DESTROY: false,
// OPTIONS_DATA_FN: false,
OPTIONS_DATA_FN: false,
OPTIONS_DATA_MERGE: false,
OPTIONS_DESTROYED: false,
// PRIVATE_APIS: false,
// PROPS_DEFAULT_THIS: false,
PROPS_DEFAULT_THIS: false,
RENDER_FUNCTION: false,
// TRANSITION_CLASSES: false,
// TRANSITION_GROUP_ROOT: false,
Expand Down
2 changes: 1 addition & 1 deletion packages/web-runtime/src/store/spaces.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { buildSpace, isProjectSpaceResource, SpaceResource } from 'web-client/src/helpers'
import Vue, { Ref } from 'vue'
import { Ref } from 'vue'
import { set, has } from 'lodash-es'
import { unref } from 'vue'
import { buildSpaceShare } from 'web-client/src/helpers/share'
Expand Down

0 comments on commit cab8fc4

Please sign in to comment.