-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
feat: Imp[NoteSettings] add func to sort team in correct order #308
Open
3388ShubinPavel
wants to merge
6
commits into
main
Choose a base branch
from
fix-team-sort
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+43
−5
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
feb0c90
add sort func sorting
3388ShubinPavel b29ca2d
ESLint fix
3388ShubinPavel 3ea320e
fix JSDoc
3388ShubinPavel 10211be
fix
3388ShubinPavel cb4284e
fix type
3388ShubinPavel 30d7502
fix - TeamMember -> Team
3388ShubinPavel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,10 +4,10 @@ | |
:caption="t('noteSettings.team.caption')" | ||
> | ||
<Row | ||
v-for="(member, memberIndex) in team" | ||
v-for="(member, memberIndex) in sortedTeam" | ||
:key="member.id" | ||
:title="member.user.name || member.user.email" | ||
:has-delimiter="memberIndex !== team.length - 1" | ||
:has-delimiter="memberIndex !== sortedTeam.length - 1" | ||
data-dimensions="medium" | ||
> | ||
<template #right> | ||
|
@@ -33,13 +33,16 @@ | |
</template> | ||
|
||
<script setup lang="ts"> | ||
import { Team } from '@/domain/entities/Team'; | ||
import { Team, TeamMember, MemberRole } from '@/domain/entities/Team'; | ||
import { NoteId } from '@/domain/entities/Note'; | ||
import { Section, Row, Avatar } from 'codex-ui/vue'; | ||
import RoleSelect from './RoleSelect.vue'; | ||
import { useI18n } from 'vue-i18n'; | ||
import { computed, defineProps } from 'vue'; | ||
|
||
defineProps<{ | ||
const { t } = useI18n(); | ||
|
||
const props = defineProps<{ | ||
/** | ||
* Team of the current note | ||
*/ | ||
|
@@ -50,7 +53,42 @@ defineProps<{ | |
noteId: NoteId; | ||
}>(); | ||
|
||
const { t } = useI18n(); | ||
/** | ||
* Sorts the team members based on their role and whether they are the creator of the note. | ||
* | ||
* @param members - Array of TeamMember objects to be sorted. | ||
* @returns {TeamMember}TeamMember - Sorted array of TeamMember objects. | ||
*/ | ||
const sortMembers = (members: TeamMember[]): TeamMember[] => { | ||
return members.sort((a, b) => { | ||
const roleOrder = { | ||
[MemberRole.Write]: 0, | ||
[MemberRole.Read]: 1, | ||
}; | ||
|
||
const isCreatorA = String(a.user.id) === props.noteId; | ||
const isCreatorB = String(b.user.id) === props.noteId; | ||
|
||
if (isCreatorA && !isCreatorB) { | ||
return -1; | ||
} | ||
if (!isCreatorA && isCreatorB) { | ||
return 1; | ||
} | ||
|
||
if (!roleOrder[a.role] && !roleOrder[b.role]) { | ||
return 0; | ||
} | ||
Comment on lines
+79
to
+81
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this condition will work if both roles are write and you will get however below you have condition that will return same thing for same data so this condition seems redundant |
||
|
||
if (roleOrder[a.role] === roleOrder[b.role]) { | ||
return 0; | ||
} | ||
|
||
return roleOrder[a.role] < roleOrder[b.role] ? -1 : 1; | ||
}); | ||
}; | ||
|
||
const sortedTeam = computed(() => sortMembers(props.team)); | ||
</script> | ||
|
||
<style scoped> | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
user.id
should never be equal tonoteId