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.

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

Enable report data for all users #2638

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,15 @@
</lf-dropdown-item>
</lf-tooltip>

<!-- Unmerge -->
<lf-dropdown-item
v-if="hasPermission(LfPermission.memberEdit)"
@click="emit('unmerge')"
>
<lf-icon name="link-unlink" />Unmerge identity
</lf-dropdown-item>

<lf-dropdown-item
v-else
@click="setReportDataModal({
contributor: props.contributor,
type: ReportDataType.IDENTITY,
Expand All @@ -96,14 +103,6 @@
<lf-icon name="feedback-line" class="!text-red-500" />Report issue
</lf-dropdown-item>

<!-- Unmerge -->
<lf-dropdown-item
v-if="hasPermission(LfPermission.memberEdit)"
@click="emit('unmerge')"
>
<lf-icon name="link-unlink" />Unmerge identity
</lf-dropdown-item>

<template
v-if="hasPermission(LfPermission.memberEdit)"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
<lf-icon name="pencil-line" />Edit affiliation
</lf-dropdown-item>
<lf-dropdown-item
v-else
@click="setReportDataModal({
contributor: props.contributor,
type: ReportDataType.PROJECT_AFFILIATION,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<lf-icon name="pencil-line" />Edit work experience
</lf-dropdown-item>
<lf-dropdown-item
v-else
@click="setReportDataModal({
contributor: props.contributor,
type: ReportDataType.WORK_EXPERIENCE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
<lf-icon name="robot-line" />
{{ isBot(props.contributor) ? 'Unmark' : 'Mark' }} as bot
</lf-dropdown-item>
<lf-dropdown-item
v-if="hasPermission(LfPermission.memberEdit)"
@click="setReportDataModal({
contributor: props.contributor,
})"
>
<lf-icon name="feedback-line" class="!text-red-500" />Report issue
</lf-dropdown-item>
<template v-if="hasPermission(LfPermission.memberDestroy)">
<lf-dropdown-separator />
<lf-dropdown-item type="danger" @click="deleteContributor()">
Expand Down Expand Up @@ -50,6 +58,7 @@ import { ref } from 'vue';
import useContributorHelpers from '@/modules/contributor/helpers/contributor.helpers';
import { Contributor } from '@/modules/contributor/types/Contributor';
import { useContributorStore } from '@/modules/contributor/store/contributor.store';
import { useSharedStore } from '@/shared/pinia/shared.store';

const props = defineProps<{
contributor: Contributor,
Expand All @@ -64,6 +73,8 @@ const { trackEvent } = useProductTracking();
const { isTeamMember, isBot, isMasked } = useContributorHelpers();
const { updateContributorAttributes } = useContributorStore();

const { setReportDataModal } = useSharedStore();

const unmerge = ref<Contributor | null>(null);

const markTeamMember = (teamMember: boolean) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,16 @@
>
<lf-icon name="pencil-line" />Edit domain
</lf-dropdown-item>

<!-- Unmerge -->
<lf-dropdown-item
v-if="hasPermission(LfPermission.memberEdit)"
@click="emit('unmerge')"
>
<lf-icon name="link-unlink" />Unmerge domain
</lf-dropdown-item>

<lf-dropdown-item
v-else
@click="setReportDataModal({
organization: props.organization,
type: ReportDataType.DOMAIN,
Expand All @@ -55,14 +63,6 @@
<lf-icon name="feedback-line" class="!text-red-500" />Report issue
</lf-dropdown-item>

<!-- Unmerge -->
<lf-dropdown-item
v-if="hasPermission(LfPermission.memberEdit)"
@click="emit('unmerge')"
>
<lf-icon name="link-unlink" />Unmerge domain
</lf-dropdown-item>

<lf-dropdown-separator
v-if="hasPermission(LfPermission.memberEdit)"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,15 @@
>
<lf-icon name="pencil-line" />Edit email
</lf-dropdown-item>
<!-- Unmerge -->
<lf-dropdown-item
v-if="hasPermission(LfPermission.organizationEdit)"
@click="emit('unmerge')"
>
<lf-icon name="link-unlink" />Unmerge email
</lf-dropdown-item>

<lf-dropdown-item
v-else
@click="setReportDataModal({
contributor: props.contributor,
type: ReportDataType.WORK_EXPERIENCE,
Expand All @@ -63,13 +70,6 @@
>
<lf-icon name="feedback-line" class="!text-red-500" />Report issue
</lf-dropdown-item>
<!-- Unmerge -->
<lf-dropdown-item
v-if="hasPermission(LfPermission.organizationEdit)"
@click="emit('unmerge')"
>
<lf-icon name="link-unlink" />Unmerge email
</lf-dropdown-item>

<lf-dropdown-separator
v-if="hasPermission(LfPermission.organizationEdit)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,16 @@
>
<lf-icon name="pencil-line" />Edit identity
</lf-dropdown-item>

<!-- Unmerge -->
<lf-dropdown-item
v-if="hasPermission(LfPermission.organizationEdit)"
@click="emit('unmerge')"
>
<lf-icon name="link-unlink" />Unmerge identity
</lf-dropdown-item>

<lf-dropdown-item
v-else
@click="setReportDataModal({
organization: props.organization,
type: ReportDataType.IDENTITY,
Expand All @@ -72,14 +80,6 @@
<lf-icon name="feedback-line" class="!text-red-500" />Report issue
</lf-dropdown-item>

<!-- Unmerge -->
<lf-dropdown-item
v-if="hasPermission(LfPermission.organizationEdit)"
@click="emit('unmerge')"
>
<lf-icon name="link-unlink" />Unmerge identity
</lf-dropdown-item>

<lf-dropdown-separator
v-if="hasPermission(LfPermission.organizationEdit)"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
<lf-icon name="team-line" />
{{ props.organization.isTeamOrganization ? 'Unmark' : 'Mark' }} as team organization
</lf-dropdown-item>

<lf-dropdown-item
v-if="hasPermission(LfPermission.organizationEdit)"
@click="setReportDataModal({
contributor: props.contributor,
})"
>
<lf-icon name="feedback-line" class="!text-red-500" />Report issue
</lf-dropdown-item>
<template v-if="hasPermission(LfPermission.organizationDestroy)">
<lf-dropdown-separator />
<lf-dropdown-item type="danger" @click="deleteOrganization()">
Expand Down Expand Up @@ -43,6 +52,7 @@ import { OrganizationService } from '@/modules/organization/organization-service
import AppOrganizationUnmergeDialog from '@/modules/organization/components/organization-unmerge-dialog.vue';
import { ref } from 'vue';
import { useOrganizationStore } from '@/modules/organization/store/pinia';
import { useSharedStore } from '@/shared/pinia/shared.store';

const props = defineProps<{
organization: Organization,
Expand All @@ -54,6 +64,7 @@ const route = useRoute();
const router = useRouter();
const { hasPermission } = usePermissions();
const { trackEvent } = useProductTracking();
const { setReportDataModal } = useSharedStore();

const unmerge = ref<Organization | null>(null);

Expand Down
Loading