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

Jump to bottom

[next] feat(NcAvatar): migrate to vue 3 #4719

Merged
merged 1 commit into from
Oct 31, 2023
Merged

[next] feat(NcAvatar): migrate to vue 3 #4719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ module.exports = {
'src/components/NcBreadcrumb*/*.vue',
'src/components/NcContent/*.vue',
'src/components/NcDashboard*/*.vue',
'src/components/NcAvatar*/*.vue',
'src/components/NcHeaderMenu*/*.vue',
'src/components/NcRelatedResourcesPanel*/*.vue',
'src/components/NcRich*/**/*.vue',
Expand Down
4 changes: 2 additions & 2 deletions src/components/NcAvatar/NcAvatar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default {
v-on="hasMenu ? {
click: toggleMenu,
keydown: toggleMenu,
} : null">
} : {}">
<!-- @slot Icon slot -->
<slot name="icon">
<!-- Avatar icon or image -->
Expand Down Expand Up @@ -558,7 +558,7 @@ export default {
}
},

beforeDestroy() {
beforeUnmount() {
unsubscribe('settings:avatar:updated', this.loadAvatarUrl)
unsubscribe('settings:display-name:updated', this.loadAvatarUrl)
if (this.showUserStatus && this.user && !this.isNoUser) {
Expand Down
9 changes: 4 additions & 5 deletions src/components/NcListItemIcon/NcListItemIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,13 @@ It might be used for list rendering or within the multiselect for example
<span :id="id"
class="option"
:style="cssVars">
<!-- <NcAvatar v-bind="$attrs"
<NcAvatar v-bind="$attrs"
:disable-menu="true"
:disable-tooltip="true"
:display-name="displayName || name"
:is-no-user="isNoUser"
:size="avatarSize"
class="option__avatar" /> -->
class="option__avatar" />
<div class="option__details">
<NcHighlight class="option__lineone"
:text="name"
Expand Down Expand Up @@ -158,8 +158,7 @@ It might be used for list rendering or within the multiselect for example
</template>

<script>
// TODO: bring back avatar once migrated
// import NcAvatar from '../NcAvatar/index.js'
import NcAvatar from '../NcAvatar/index.js'
import NcHighlight from '../NcHighlight/index.js'
import NcIconSvgWrapper from '../NcIconSvgWrapper/index.js'

Expand All @@ -173,7 +172,7 @@ export default {
name: 'NcListItemIcon',

components: {
// NcAvatar,
NcAvatar,
NcHighlight,
NcIconSvgWrapper,
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export { default as NcActionTextEditable } from './NcActionTextEditable/index.js
// export { default as NcAppSettingsSection } from './NcAppSettingsSection/index.js'
// export { default as NcAppSidebar } from './NcAppSidebar/index.js'
// export { default as NcAppSidebarTab } from './NcAppSidebarTab/index.js'
// export { default as NcAvatar } from './NcAvatar/index.js'
export { default as NcAvatar } from './NcAvatar/index.js'
// export { default as NcBreadcrumb } from './NcBreadcrumb/index.js'
// export { default as NcBreadcrumbs } from './NcBreadcrumbs/index.js'
export { default as NcButton } from './NcButton/index.js'
Expand Down
1 change: 0 additions & 1 deletion styleguide.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ module.exports = async () => {
'src/components/NcUserBubble/NcUserBubbleDiv.vue',

// Not yet adjusted for vue3
'src/components/NcAvatar*/*.vue',
'src/components/NcHeaderMenu*/*.vue',
'src/components/NcRelatedResourcesPanel*/*.vue',
'src/components/NcRichContenteditable*/*.vue',
Expand Down
7 changes: 4 additions & 3 deletions tests/unit/components/NcAvatar/NcAvatar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/

import { mount } from '@vue/test-utils'
import { describe, expect, it } from 'vitest'
import { nextTick } from 'vue'
import NcAvatar from '../../../../src/components/NcAvatar/NcAvatar.vue'

Expand All @@ -33,7 +34,7 @@ describe('NcAvatar.vue', () => {
}

const wrapper = mount(NcAvatar, {
propsData: {
props: {
user: 'janedoe',
displayName: 'J. Doe',
preloadedUserStatus: status,
Expand All @@ -53,7 +54,7 @@ describe('NcAvatar.vue', () => {
}

const wrapper = mount(NcAvatar, {
propsData: {
props: {
user: 'janedoe',
displayName: 'J. Doe',
preloadedUserStatus: status,
Expand All @@ -74,7 +75,7 @@ describe('NcAvatar.vue', () => {
}

const wrapper = mount(NcAvatar, {
propsData: {
props: {
user: 'janedoe',
displayName: 'J. Doe',
preloadedUserStatus: status,
Expand Down
1 change: 0 additions & 1 deletion vite.config.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ const overrides = defineConfig({
setupFiles: resolve(__dirname, './tests/setup.js'),
exclude:[
...configDefaults.exclude,
'./tests/unit/components/NcAvatar',
'./tests/unit/components/NcAppNavigation',
'./tests/unit/components/NcAppSidebar',
'./tests/unit/components/NcRichContenteditable',
Expand Down
Loading