Skip to content

Fix broken bulkEditTags and refactor logic of the component #1137

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
skwowet merged 7 commits into from
Jul 19, 2023
Merged

Fix broken bulkEditTags and refactor logic of the component #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce43748
Fix broken bulkEditTags and refactor logic of the component
skwowet Jul 18, 2023
e333416
Merge branch 'main' into bugfix/editTags
skwowet Jul 18, 2023
84a7c70
Remove comments from code
skwowet Jul 18, 2023
18fa890
Merge branch 'bugfix/editTags' of github.com:yeganathan18/crowd.dev i…
skwowet Jul 18, 2023
d14db1f
Fix edit tags when we click Edit tags in one member row
skwowet Jul 19, 2023
2ba65b1
Merge branch 'main' into bugfix/editTags
skwowet Jul 19, 2023
7f17805
Add toaster for successful and error while updating tags
skwowet Jul 19, 2023
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
136 changes: 0 additions & 136 deletions frontend/src/modules/member/components/list/member-list-bulk-update-tags.vue
View file
Open in desktop

This file was deleted.

12 changes: 9 additions & 3 deletions 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 @@ -354,7 +354,7 @@
}"
class="block"
>
<app-tag-list :member="scope.row" @edit="isEditTagsDialogOpen = scope.row" />
<app-tag-list :member="scope.row" @edit="handleEditTagsDialog(scope.row)" />
</router-link>
</template>
</el-table-column>
Expand Down Expand Up @@ -391,7 +391,7 @@
</div>
</div>
<app-member-merge-dialog v-model="isMergeDialogOpen" />
<app-tag-popover v-model="isEditTagsDialogOpen" @reload="fetchMembers({ reload: true })" />
<app-tag-popover v-model="isEditTagsDialogOpen" :member="editTagMember" @reload="fetchMembers({ reload: true })" />
</div>
</template>

Expand Down Expand Up @@ -431,7 +431,8 @@ const isTableHovered = ref(false);
const isCursorDown = ref(false);

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

const props = defineProps({
hasIntegrations: {
Expand Down Expand Up @@ -518,6 +519,11 @@ document.onmouseup = () => {
isCursorDown.value = false;
};

function handleEditTagsDialog(member) {
isEditTagsDialogOpen.value = true;
editTagMember.value = member;
}

function doChangeSort(sorter) {
filters.value.order = {
prop: sorter.prop,
Expand Down
9 changes: 4 additions & 5 deletions frontend/src/modules/member/components/list/member-list-toolbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,9 @@
</template>
</el-dropdown>

<app-member-list-bulk-update-tags
v-model="bulkTagsUpdateVisible"
:selected-rows="selectedMembers"
/>
<app-tag-popover v-model="bulkTagsUpdateVisible"
@reload="fetchMembers({ reload: true })" />

</div>
</template>

Expand All @@ -120,7 +119,7 @@ import {
getEnrichmentMax,
showEnrichmentLoadingMessage,
} from '@/modules/member/member-enrichment';
import AppMemberListBulkUpdateTags from '@/modules/member/components/list/member-list-bulk-update-tags.vue';
import AppTagPopover from '@/modules/tag/components/tag-popover.vue';
import AppSvg from '@/shared/svg/svg.vue';

const { currentUser, currentTenant } = mapGetters('auth');
Expand Down
6 changes: 3 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 @@ -71,8 +71,8 @@

<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 = member" />
<app-tag-popover v-model="isEditTagsDialogOpen" />
<app-tags :long="true" :member="member" @edit="isEditTagsDialogOpen = true" />
<app-tag-popover v-model="isEditTagsDialogOpen" :member="member" />
</div>
</div>
</div>
Expand Down Expand Up @@ -100,7 +100,7 @@ defineProps({
},
});

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

const formattedInformation = (value, type) => {
// Show dash for empty information
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/modules/member/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,11 @@ export default {
return acc;
}, []);
const updatedMembers = await MemberService.updateBulk(payload);
Message.success('Tags updated successfully');
commit('BULK_UPDATE_MEMBERS_TAGS_SUCCESS', updatedMembers);
} catch (error) {
Errors.handle(error);
Message.error('There was an error updating tags');
}
},

Expand Down
Loading