Skip to content

Fix Merge member action in members page #1217

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

Merged
joanagmaia merged 1 commit into from
Aug 7, 2023
Merged

Fix Merge member action in members page #1217

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
5 changes: 4 additions & 1 deletion frontend/src/modules/member/components/list/member-list-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,10 @@
class="block w-full"
>
<div class="h-full flex items-center justify-center w-full">
<app-member-dropdown :member="scope.row" @merge="isMergeDialogOpen = scope.row" />
<app-member-dropdown
:member="scope.row"
@merge="isMergeDialogOpen = scope.row"
/>
</div>
</router-link>
</template>
Expand Down
1 change: 0 additions & 1 deletion frontend/src/modules/member/components/member-dropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ import Message from '@/shared/message/message';
import { MemberPermissions } from '@/modules/member/member-permissions';
import ConfirmDialog from '@/shared/dialog/confirm-dialog';
import AppSvg from '@/shared/svg/svg.vue';
import AppMemberMergeDialog from '@/modules/member/components/member-merge-dialog.vue';
import { useMemberStore } from '@/modules/member/store/pinia';
import { CrowdIntegrations } from '@/integrations/integrations-config';
import { HubspotEntity } from '@/integrations/hubspot/types/HubspotEntity';
Expand Down
13 changes: 10 additions & 3 deletions frontend/src/modules/member/components/view/member-view-header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
<div class="flex items-center gap-4">
<app-member-sentiment :member="member" />
<app-member-engagement-level :member="member" />
<app-member-dropdown :member="member" :show-view-member="false" />
<app-member-dropdown
:member="member"
:show-view-member="false"
@merge="isMergeDialogOpen = member"
/>
</div>
</div>
<app-member-organizations
Expand Down Expand Up @@ -72,14 +76,15 @@
<div class="absolute inset-x-0 bottom-0 rounded-b-md bg-gray-50 p-6 mt-9">
<div class="text-sm">
<app-tags :long="true" :member="member" @edit="isEditTagsDialogOpen = true" />
<app-tag-popover v-model="isEditTagsDialogOpen" :member="member" />
<app-tag-popover v-model="isEditTagsDialogOpen" :member="member" />
</div>
</div>
<app-member-merge-dialog v-model="isMergeDialogOpen" />
</div>
</template>

<script setup>
import { defineProps, ref } from "vue";
import { ref } from 'vue';
import moment from 'moment/moment';
import AppMemberOrganizations from '@/modules/member/components/member-organizations.vue';
import { formatNumberToCompact, formatNumber } from '@/utils/number';
Expand All @@ -92,6 +97,7 @@ import AppMemberBadge from '@/modules/member/components/member-badge.vue';
import AppTags from '@/modules/tag/components/tag-list.vue';
import AppMemberBio from '@/modules/member/components/member-bio.vue';
import AppTagPopover from '@/modules/tag/components/tag-popover.vue';
import AppMemberMergeDialog from '@/modules/member/components/member-merge-dialog.vue';

defineProps({
member: {
Expand All @@ -101,6 +107,7 @@ defineProps({
});

const isEditTagsDialogOpen = ref(false);
const isMergeDialogOpen = ref(null);

const formattedInformation = (value, type) => {
// Show dash for empty information
Expand Down