Skip to content
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

Outsource NoContentMessage component #6643

Merged
merged 3 commits into from
Mar 22, 2022
Merged

Outsource NoContentMessage component #6643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
506c083
Outsource NoContentMessage component
Mar 22, 2022
cfaa81f
Outsource NoContentMessage test
Mar 22, 2022
22c9e01
Add changelog item
Mar 22, 2022
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
5 changes: 5 additions & 0 deletions changelog/unreleased/enhancement-move-no-content-message-component
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: Move NoContentMessage component

We've moved the NoContentMessage component into the web-pkg package to ease the use in other packages

https://github.com/owncloud/web/pull/6643
2 changes: 1 addition & 1 deletion packages/web-app-files/src/components/Search/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import { useRouteQuery, useStore } from 'web-pkg/src/composables'
import { VisibilityObserver } from 'web-pkg/src/observer'
import { ImageType, ImageDimension } from '../../constants'
import { createLocationSpaces } from '../../router'
import NoContentMessage from '../FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import ResourceTable from '../FilesList/ResourceTable.vue'
import ContextActions from '../FilesList/ContextActions.vue'
import debounce from 'lodash-es/debounce'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/components/TrashBin.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import MixinResources from '../mixins/resources'
import MixinMountSideBar from '../mixins/sidebar/mountSideBar'

import ListLoader from './FilesList/ListLoader.vue'
import NoContentMessage from './FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import ListInfo from './FilesList/ListInfo.vue'
import Pagination from './FilesList/Pagination.vue'
import ContextActions from './FilesList/ContextActions.vue'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/Favorites.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import debounce from 'lodash-es/debounce'

import QuickActions from '../components/FilesList/QuickActions.vue'
import ListLoader from '../components/FilesList/ListLoader.vue'
import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import ListInfo from '../components/FilesList/ListInfo.vue'
import Pagination from '../components/FilesList/Pagination.vue'
import ContextActions from '../components/FilesList/ContextActions.vue'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/LocationPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ import MixinsGeneral from '../mixins'
import MixinFilesListFilter from '../mixins/filesListFilter'
import { useTask } from 'vue-concurrency'

import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import ListLoader from '../components/FilesList/ListLoader.vue'
import ListInfo from '../components/FilesList/ListInfo.vue'
import Pagination from '../components/FilesList/Pagination.vue'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/Personal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ import { bus } from 'web-pkg/src/instance'
import ResourceTable from '../components/FilesList/ResourceTable.vue'
import QuickActions from '../components/FilesList/QuickActions.vue'
import ListLoader from '../components/FilesList/ListLoader.vue'
import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import NotFoundMessage from '../components/FilesList/NotFoundMessage.vue'
import ListInfo from '../components/FilesList/ListInfo.vue'
import Pagination from '../components/FilesList/Pagination.vue'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/PublicFiles.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import debounce from 'lodash-es/debounce'
import { bus } from 'web-pkg/src/instance'

import ListLoader from '../components/FilesList/ListLoader.vue'
import NoContentMessage from '../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import NotFoundMessage from '../components/FilesList/NotFoundMessage.vue'
import ListInfo from '../components/FilesList/ListInfo.vue'
import Pagination from '../components/FilesList/Pagination.vue'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/shares/SharedViaLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import { ImageDimension, ImageType } from '../../constants'
import debounce from 'lodash-es/debounce'

import ListLoader from '../../components/FilesList/ListLoader.vue'
import NoContentMessage from '../../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import ListInfo from '../../components/FilesList/ListInfo.vue'
import Pagination from '../../components/FilesList/Pagination.vue'
import ContextActions from '../../components/FilesList/ContextActions.vue'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/shares/SharedWithMe.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ import { useRouteQuery } from 'web-pkg/src/composables'
import debounce from 'lodash-es/debounce'

import ListLoader from '../../components/FilesList/ListLoader.vue'
import NoContentMessage from '../../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import ListInfo from '../../components/FilesList/ListInfo.vue'
import ContextActions from '../../components/FilesList/ContextActions.vue'
import { ShareStatus } from '../../helpers/share'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/shares/SharedWithOthers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ import { ImageDimension, ImageType } from '../../constants'
import debounce from 'lodash-es/debounce'

import ListLoader from '../../components/FilesList/ListLoader.vue'
import NoContentMessage from '../../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import ListInfo from '../../components/FilesList/ListInfo.vue'
import Pagination from '../../components/FilesList/Pagination.vue'
import ContextActions from '../../components/FilesList/ContextActions.vue'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/spaces/Project.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</template>

<script>
import NoContentMessage from '../../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import NotFoundMessage from '../../components/FilesList/NotFoundMessage.vue'
import ListLoader from '../../components/FilesList/ListLoader.vue'
import { computed, ref } from '@vue/composition-api'
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-files/src/views/spaces/Projects.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
</template>

<script>
import NoContentMessage from '../../components/FilesList/NoContentMessage.vue'
import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
import ListLoader from '../../components/FilesList/ListLoader.vue'
import { computed } from '@vue/composition-api'
import { useStore } from 'web-pkg/src/composables'
Expand Down
0 ...components/FilesList/NoContentMessage.vue → ...b-pkg/src/components/NoContentMessage.vue
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions ...onents/FilesList/NoContentMessage.spec.js → .../unit/components/NoContentMessage.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { shallowMount } from '@vue/test-utils'
import stubs from '../../../../../../tests/unit/stubs/index.js'
import NoContentMessage from '../../../../src/components/FilesList/NoContentMessage.vue'
import NoContentMessage from '../../../src/components/NoContentMessage.vue'
kulmann marked this conversation as resolved.
Show resolved Hide resolved

describe('NoContentMessage', () => {
describe('icon prop', () => {
Expand Down Expand Up @@ -49,6 +48,8 @@ function getWrapper(slots = {}) {
return shallowMount(NoContentMessage, {
slots: slots,
propsData: { icon: 'mdi-test-icon' },
stubs: stubs
stubs: {
'oc-icon': true
}
})
}