Skip to content

Commit

Permalink
refactor: rename open and sideBarOpen to isOpen and isSideBarOpen
Browse files Browse the repository at this point in the history
  • Loading branch information
kulmann committed Dec 6, 2023
1 parent e97bc86 commit 294647c
Show file tree
Hide file tree
Showing 33 changed files with 124 additions and 112 deletions.
12 changes: 6 additions & 6 deletions packages/web-app-admin-settings/src/components/AppTemplate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
<slot name="mainContent" />
</div>
<side-bar
v-if="sideBarOpen"
v-if="isSideBarOpen"
:active-panel="sideBarActivePanel"
:available-panels="sideBarAvailablePanels"
:panel-context="sideBarPanelContext"
:loading="sideBarLoading"
:open="sideBarOpen"
:is-open="isSideBarOpen"
:is-header-compact="isSideBarHeaderCompact"
@select-panel="selectPanel"
@close="closeSideBar"
Expand Down Expand Up @@ -101,7 +101,7 @@ export default defineComponent({
required: true,
type: Array as PropType<BreadcrumbItem[]>
},
sideBarOpen: {
isSideBarOpen: {
required: false,
type: Boolean,
default: false
Expand Down Expand Up @@ -165,7 +165,7 @@ export default defineComponent({
const appBarRef = ref<VNodeRef>()
const limitedScreenSpace = ref(false)
const onResize = () => {
limitedScreenSpace.value = props.sideBarOpen
limitedScreenSpace.value = props.isSideBarOpen
? window.innerWidth <= 1600
: window.innerWidth <= 1200
}
Expand Down Expand Up @@ -213,12 +213,12 @@ export default defineComponent({
},
computed: {
toggleSidebarButtonLabel() {
return this.sideBarOpen
return this.isSideBarOpen
? this.$gettext('Close sidebar to hide details')
: this.$gettext('Open sidebar to view details')
},
toggleSidebarButtonIconFillType() {
return this.sideBarOpen ? 'fill' : 'line'
return this.isSideBarOpen ? 'fill' : 'line'
}
}
})
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-admin-settings/src/views/Groups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:side-bar-active-panel="sideBarActivePanel"
:side-bar-available-panels="sideBarAvailablePanels"
:side-bar-panel-context="sideBarPanelContext"
:side-bar-open="sideBarOpen"
:is-side-bar-open="isSideBarOpen"
:show-batch-actions="!!selectedGroups.length"
:batch-actions="batchActions"
:batch-action-items="selectedGroups"
Expand Down
8 changes: 4 additions & 4 deletions packages/web-app-admin-settings/src/views/Spaces.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:side-bar-active-panel="sideBarActivePanel"
:side-bar-available-panels="sideBarAvailablePanels"
:side-bar-panel-context="sideBarPanelContext"
:side-bar-open="sideBarOpen"
:is-side-bar-open="isSideBarOpen"
:is-side-bar-header-compact="selectedSpaces.length === 1"
:show-batch-actions="!!selectedSpaces.length"
:batch-actions="batchActions"
Expand Down Expand Up @@ -41,7 +41,7 @@
<div v-else>
<SpacesList
:spaces="spaces"
:class="{ 'spaces-table-squashed': sideBarOpen }"
:class="{ 'spaces-table-squashed': isSideBarOpen }"
:selected-spaces="selectedSpaces"
@toggle-select-space="toggleSelectSpace"
@select-spaces="selectSpaces"
Expand Down Expand Up @@ -113,7 +113,7 @@ export default defineComponent({
const spaces = ref([])
const clientService = useClientService()
const { $gettext } = useGettext()
const { sideBarOpen, sideBarActivePanel } = useSideBar()
const { isSideBarOpen, sideBarActivePanel } = useSideBar()
const loadResourcesEventToken = ref(null)
let updateQuotaForSpaceEventToken
Expand Down Expand Up @@ -281,7 +281,7 @@ export default defineComponent({
return {
maxQuota: useCapabilitySpacesMaxQuota(),
sideBarOpen,
isSideBarOpen,
sideBarActivePanel,
spaces,
loadResourcesTask,
Expand Down
4 changes: 2 additions & 2 deletions packages/web-app-admin-settings/src/views/Users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:side-bar-active-panel="sideBarActivePanel"
:side-bar-available-panels="sideBarAvailablePanels"
:side-bar-panel-context="sideBarPanelContext"
:side-bar-open="sideBarOpen"
:is-side-bar-open="isSideBarOpen"
:side-bar-loading="sideBarLoading"
:show-batch-actions="!!selectedUsers.length"
:batch-actions="batchActions"
Expand Down Expand Up @@ -34,7 +34,7 @@
<UsersList
:users="users"
:roles="roles"
:class="{ 'users-table-squashed': sideBarOpen }"
:class="{ 'users-table-squashed': isSideBarOpen }"
:selected-users="selectedUsers"
@toggle-select-user="toggleSelectUser"
@select-users="selectUsers"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ describe('AppTemplate', () => {
})
describe('sideBar', () => {
it('should show when opened', () => {
const { wrapper } = getWrapper({ props: { sideBarOpen: true } })
const { wrapper } = getWrapper({ props: { isSideBarOpen: true } })
expect(wrapper.find(stubSelectors.sideBar).exists()).toBeTruthy()
})
it('should not show when closed', () => {
const { wrapper } = getWrapper({ props: { sideBarOpen: false } })
const { wrapper } = getWrapper({ props: { isSideBarOpen: false } })
expect(wrapper.find(stubSelectors.sideBar).exists()).toBeFalsy()
})
it('can be toggled', async () => {
Expand Down Expand Up @@ -129,7 +129,7 @@ function getWrapper({ props = {}, isMobileWidth = false } = {}) {
props: {
loading: false,
breadcrumbs: [],
sideBarOpen: true,
isSideBarOpen: true,
sideBarAvailablePanels: [],
sideBarActivePanel: '',
...props
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

exports[`General view renders component 1`] = `
<div>
<app-template-stub batchactionitems="" batchactions="" breadcrumbs="[object Object],[object Object]" issidebarheadercompact="false" loading="false" showappbar="false" showbatchactions="false" showviewoptions="false" sidebaravailablepanels="" sidebarloading="false" sidebaropen="false"></app-template-stub>
<app-template-stub batchactionitems="" batchactions="" breadcrumbs="[object Object],[object Object]" issidebarheadercompact="false" loading="false" showappbar="false" showbatchactions="false" showviewoptions="false" sidebaravailablepanels="" sidebarloading="false" issidebaropen="false"></app-template-stub>
</div>
`;
8 changes: 6 additions & 2 deletions packages/web-app-files/src/components/Search/List.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<template>
<div class="files-search-result oc-flex">
<files-view-wrapper>
<app-bar :breadcrumbs="breadcrumbs" :has-bulk-actions="true" :side-bar-open="sideBarOpen" />
<app-bar
:breadcrumbs="breadcrumbs"
:has-bulk-actions="true"
:is-side-bar-open="isSideBarOpen"
/>
<div v-if="displayFilter" class="files-search-result-filter oc-flex oc-mx-m oc-mb-m oc-mt-xs">
<div class="oc-mr-m oc-flex oc-flex-middle">
<oc-icon name="filter-2" class="oc-mr-xs" />
Expand Down Expand Up @@ -138,7 +142,7 @@
</template>
</files-view-wrapper>
<file-side-bar
:open="sideBarOpen"
:is-open="isSideBarOpen"
:active-panel="sideBarActivePanel"
:space="selectedResourceSpace"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
v-model:selectedIds="selectedResourcesIds"
:data-test-share-status="shareStatus"
class="files-table"
:class="{ 'files-table-squashed': sideBarOpen }"
:class="{ 'files-table-squashed': isSideBarOpen }"
:fields-displayed="displayedFields"
sidebar-closed
:are-thumbnails-displayed="displayThumbnails"
Expand Down Expand Up @@ -171,7 +171,7 @@ export default defineComponent({
type: Boolean,
default: true
},
sideBarOpen: {
isSideBarOpen: {
type: Boolean,
default: false
},
Expand Down
4 changes: 2 additions & 2 deletions packages/web-app-files/src/components/Spaces/SpaceHeader.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
class="space-header oc-p-m"
:class="{ 'oc-flex': !imageExpanded && !isMobileWidth, 'space-header-squashed': sideBarOpen }"
:class="{ 'oc-flex': !imageExpanded && !isMobileWidth, 'space-header-squashed': isSideBarOpen }"
>
<div
class="space-header-image"
Expand Down Expand Up @@ -106,7 +106,7 @@ export default defineComponent({
type: Object as PropType<SpaceResource>,
required: true
},
sideBarOpen: { type: Boolean, default: false }
isSideBarOpen: { type: Boolean, default: false }
},
setup(props) {
const language = useGettext()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type ResourcesViewDefaultsResult<T, TT, TU extends any[]> = {
selectedResourcesIds: Ref<(string | number)[]>
isResourceInSelection(resource: Resource): boolean

sideBarOpen: Ref<boolean>
isSideBarOpen: Ref<boolean>
sideBarActivePanel: Ref<string>
} & SelectedResourcesResult &
ScrollToResult
Expand Down
6 changes: 3 additions & 3 deletions packages/web-app-files/src/views/Favorites.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="oc-flex">
<files-view-wrapper>
<app-bar :view-modes="viewModes" :side-bar-open="sideBarOpen" />
<app-bar :view-modes="viewModes" :is-side-bar-open="isSideBarOpen" />
<app-loading-spinner v-if="areResourcesLoading" />
<template v-else>
<no-content-message
Expand All @@ -19,7 +19,7 @@
id="files-favorites-table"
v-model:selectedIds="selectedResourcesIds"
class="files-table"
:class="{ 'files-table-squashed': sideBarOpen }"
:class="{ 'files-table-squashed': isSideBarOpen }"
:are-paths-displayed="true"
:are-thumbnails-displayed="displayThumbnails"
:resources="paginatedResources"
Expand Down Expand Up @@ -53,7 +53,7 @@
</template>
</files-view-wrapper>
<file-side-bar
:open="sideBarOpen"
:is-open="isSideBarOpen"
:active-panel="sideBarActivePanel"
:space="selectedResourceSpace"
/>
Expand Down
6 changes: 3 additions & 3 deletions packages/web-app-files/src/views/shares/SharedViaLink.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="oc-flex">
<files-view-wrapper>
<app-bar :side-bar-open="sideBarOpen">
<app-bar :is-side-bar-open="isSideBarOpen">
<template #navigation>
<SharesNavigation />
</template>
Expand All @@ -23,7 +23,7 @@
id="files-shared-via-link-table"
v-model:selectedIds="selectedResourcesIds"
class="files-table"
:class="{ 'files-table-squashed': sideBarOpen }"
:class="{ 'files-table-squashed': isSideBarOpen }"
:fields-displayed="['name', 'sharedWith', 'sdate']"
:are-thumbnails-displayed="displayThumbnails"
:are-paths-displayed="true"
Expand Down Expand Up @@ -56,7 +56,7 @@
</template>
</files-view-wrapper>
<file-side-bar
:open="sideBarOpen"
:is-open="isSideBarOpen"
:active-panel="sideBarActivePanel"
:space="selectedResourceSpace"
/>
Expand Down
17 changes: 11 additions & 6 deletions packages/web-app-files/src/views/shares/SharedWithMe.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="oc-flex">
<files-view-wrapper class="oc-flex-column">
<app-bar :has-bulk-actions="true" :side-bar-open="sideBarOpen">
<app-bar :has-bulk-actions="true" :is-side-bar-open="isSideBarOpen">
<template #navigation>
<SharesNavigation />
</template>
Expand Down Expand Up @@ -72,7 +72,7 @@
:display-thumbnails="displayThumbnails"
:file-list-header-y="fileListHeaderY"
:items="items"
:side-bar-open="sideBarOpen"
:is-side-bar-open="isSideBarOpen"
:sort-by="sortBy"
:sort-dir="sortDir"
:sort-handler="handleSort"
Expand All @@ -85,7 +85,7 @@
</template>
</files-view-wrapper>
<file-side-bar
:open="sideBarOpen"
:is-open="isSideBarOpen"
:active-panel="sideBarActivePanel"
:space="selectedShareSpace"
/>
Expand All @@ -97,7 +97,12 @@ import Fuse from 'fuse.js'
import Mark from 'mark.js'
import { useResourcesViewDefaults } from '../../composables'
import { AppLoadingSpinner, FileSideBar, InlineFilterOption, ItemFilter } from '@ownclouders/web-pkg'
import {
AppLoadingSpinner,
FileSideBar,
InlineFilterOption,
ItemFilter
} from '@ownclouders/web-pkg'
import { AppBar, ItemFilterInline } from '@ownclouders/web-pkg'
import { queryItemAsString, useRouteQuery } from '@ownclouders/web-pkg'
import SharedWithMeSection from '../../components/Shares/SharedWithMeSection.vue'
Expand Down Expand Up @@ -135,7 +140,7 @@ export default defineComponent({
selectedResources,
selectedResourcesIds,
sideBarActivePanel,
sideBarOpen,
isSideBarOpen,
storeItems,
scrollToResourceFromRoute
} = useResourcesViewDefaults<Resource, any, any[]>()
Expand Down Expand Up @@ -260,7 +265,7 @@ export default defineComponent({
selectedResources,
selectedResourcesIds,
fileListHeaderY,
sideBarOpen,
isSideBarOpen,
sideBarActivePanel,
selectedShareSpace,
Expand Down
6 changes: 3 additions & 3 deletions packages/web-app-files/src/views/shares/SharedWithOthers.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="oc-flex">
<files-view-wrapper>
<app-bar :side-bar-open="sideBarOpen">
<app-bar :is-side-bar-open="isSideBarOpen">
<template #navigation>
<SharesNavigation />
</template>
Expand Down Expand Up @@ -45,7 +45,7 @@
id="files-shared-with-others-table"
v-model:selectedIds="selectedResourcesIds"
class="files-table"
:class="{ 'files-table-squashed': sideBarOpen }"
:class="{ 'files-table-squashed': isSideBarOpen }"
:fields-displayed="['name', 'sharedWith', 'sdate']"
:are-thumbnails-displayed="displayThumbnails"
:are-paths-displayed="true"
Expand Down Expand Up @@ -77,7 +77,7 @@
</template>
</files-view-wrapper>
<file-side-bar
:open="sideBarOpen"
:is-open="isSideBarOpen"
:active-panel="sideBarActivePanel"
:space="selectedResourceSpace"
/>
Expand Down
8 changes: 4 additions & 4 deletions packages/web-app-files/src/views/spaces/GenericSpace.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:show-actions-on-selection="displayFullAppBar"
:has-sidebar-toggle="displayFullAppBar"
:has-view-options="displayFullAppBar"
:side-bar-open="sideBarOpen"
:is-side-bar-open="isSideBarOpen"
:space="space"
:view-modes="viewModes"
@item-dropped="fileDropped"
Expand Down Expand Up @@ -48,7 +48,7 @@
<space-header
v-if="hasSpaceHeader"
:space="space"
:side-bar-open="sideBarOpen"
:is-side-bar-open="isSideBarOpen"
class="oc-px-m oc-mt-m"
/>
<no-content-message
Expand Down Expand Up @@ -107,7 +107,7 @@
id="files-space-table"
v-model:selectedIds="selectedResourcesIds"
class="files-table"
:class="{ 'files-table-squashed': sideBarOpen }"
:class="{ 'files-table-squashed': isSideBarOpen }"
:view-mode="viewMode"
:are-thumbnails-displayed="displayThumbnails"
:resources="paginatedResources"
Expand Down Expand Up @@ -150,7 +150,7 @@
</template>
</template>
</files-view-wrapper>
<file-side-bar :open="sideBarOpen" :active-panel="sideBarActivePanel" :space="space" />
<file-side-bar :is-open="isSideBarOpen" :active-panel="sideBarActivePanel" :space="space" />
</div>
</template>

Expand Down
Loading

0 comments on commit 294647c

Please sign in to comment.