From 23596fdf347e73799f40929f6474e6d5964dbdac Mon Sep 17 00:00:00 2001
From: joanagmaia
Date: Wed, 11 Sep 2024 17:15:09 +0100
Subject: [PATCH 1/2] Adjust verified identity copy (#2608)
---
.../contributor-details-identity-item.vue | 9 ++-----
.../organization-details-identity-item.vue | 9 ++-----
.../organization-manage-domains-drawer.vue | 7 ++---
.../view/_aside/_aside-identities-extra.vue | 21 +++++----------
.../components/emails-vertical-list.vue | 7 ++---
.../components/identities-vertical-list.vue | 7 ++---
.../components/verified-identity-badge.vue | 27 +++++++++++++++++++
7 files changed, 43 insertions(+), 44 deletions(-)
create mode 100644 frontend/src/shared/modules/identities/components/verified-identity-badge.vue
diff --git a/frontend/src/modules/contributor/components/details/identity/contributor-details-identity-item.vue b/frontend/src/modules/contributor/components/details/identity/contributor-details-identity-item.vue
index 3b2768738c..9fe4f8c1c4 100644
--- a/frontend/src/modules/contributor/components/details/identity/contributor-details-identity-item.vue
+++ b/frontend/src/modules/contributor/components/details/identity/contributor-details-identity-item.vue
@@ -44,13 +44,7 @@
{{ props.identity.platform }}
-
-
-
+
Source: {{ CrowdIntegrations.getPlatformsLabel(props.identity.platforms) }}
@@ -125,6 +119,7 @@ import { useContributorStore } from '@/modules/contributor/store/contributor.sto
import usePermissions from '@/shared/modules/permissions/helpers/usePermissions';
import { LfPermission } from '@/shared/modules/permissions/types/Permissions';
import { computed, ref } from 'vue';
+import LfVerifiedIdentityBadge from '@/shared/modules/identities/components/verified-identity-badge.vue';
const props = defineProps<{
identity: ContributorIdentity,
diff --git a/frontend/src/modules/organization/components/details/identity/organization-details-identity-item.vue b/frontend/src/modules/organization/components/details/identity/organization-details-identity-item.vue
index 6ed361155f..6a7f11a9e2 100644
--- a/frontend/src/modules/organization/components/details/identity/organization-details-identity-item.vue
+++ b/frontend/src/modules/organization/components/details/identity/organization-details-identity-item.vue
@@ -42,13 +42,7 @@
{{ props.identity.handle ?? props.identity.value }}
-
-
-
+
@@ -98,6 +92,7 @@ import { LfPermission } from '@/shared/modules/permissions/types/Permissions';
import { ref } from 'vue';
import { Organization, OrganizationIdentity } from '@/modules/organization/types/Organization';
import { useOrganizationStore } from '@/modules/organization/store/pinia';
+import LfVerifiedIdentityBadge from '@/shared/modules/identities/components/verified-identity-badge.vue';
const props = defineProps<{
identity: OrganizationIdentity,
diff --git a/frontend/src/modules/organization/components/organization-manage-domains-drawer.vue b/frontend/src/modules/organization/components/organization-manage-domains-drawer.vue
index 406348cd73..998d032eed 100644
--- a/frontend/src/modules/organization/components/organization-manage-domains-drawer.vue
+++ b/frontend/src/modules/organization/components/organization-manage-domains-drawer.vue
@@ -13,11 +13,7 @@
{{ identity.value }}
-
-
-
-
-
+
Source: {{ platformLabel(identity.platforms) }}
@@ -111,6 +107,7 @@ import { MemberIdentity } from '@/modules/member/types/Member';
import { CrowdIntegrations } from '@/integrations/integrations-config';
import LfDropdownSeparator from '@/ui-kit/dropdown/DropdownSeparator.vue';
import AppSvg from '@/shared/svg/svg.vue';
+import LfVerifiedIdentityBadge from '@/shared/modules/identities/components/verified-identity-badge.vue';
const props = defineProps<{
modelValue: boolean,
diff --git a/frontend/src/modules/organization/components/view/_aside/_aside-identities-extra.vue b/frontend/src/modules/organization/components/view/_aside/_aside-identities-extra.vue
index 4aed7f7851..fe121a39a8 100644
--- a/frontend/src/modules/organization/components/view/_aside/_aside-identities-extra.vue
+++ b/frontend/src/modules/organization/components/view/_aside/_aside-identities-extra.vue
@@ -41,11 +41,8 @@
:href="emailIdentity.link ?? undefined"
>
{{ emailIdentity.handle }}
-
-
-
-
-
+
+
@@ -106,11 +103,7 @@
:href="domainIdentity.link ?? undefined"
>
{{ domainIdentity.handle }}
-
-
-
-
-
+
@@ -165,11 +158,8 @@
:href="affiliatedProfileIdentity.link ?? undefined"
>
{{ affiliatedProfileIdentity.handle }}
-
-
-
-
-
+
+
@@ -253,6 +243,7 @@ import {
} from 'vue';
import { LfPermission } from '@/shared/modules/permissions/types/Permissions';
import usePermissions from '@/shared/modules/permissions/helpers/usePermissions';
+import LfVerifiedIdentityBadge from '@/shared/modules/identities/components/verified-identity-badge.vue';
const props = defineProps<{
emails: {
diff --git a/frontend/src/shared/modules/identities/components/emails-vertical-list.vue b/frontend/src/shared/modules/identities/components/emails-vertical-list.vue
index c219618dc2..cb0918b553 100644
--- a/frontend/src/shared/modules/identities/components/emails-vertical-list.vue
+++ b/frontend/src/shared/modules/identities/components/emails-vertical-list.vue
@@ -40,11 +40,7 @@
-
-
-
-
-
+
@@ -57,6 +53,7 @@
import AppPlatform from '@/shared/modules/platform/components/platform.vue';
import { CrowdIntegrations } from '@/integrations/integrations-config';
import { computed } from 'vue';
+import LfVerifiedIdentityBadge from '@/shared/modules/identities/components/verified-identity-badge.vue';
const props = defineProps<{
emails: {
diff --git a/frontend/src/shared/modules/identities/components/identities-vertical-list.vue b/frontend/src/shared/modules/identities/components/identities-vertical-list.vue
index c5c6f4c807..7105ecddc3 100644
--- a/frontend/src/shared/modules/identities/components/identities-vertical-list.vue
+++ b/frontend/src/shared/modules/identities/components/identities-vertical-list.vue
@@ -50,11 +50,7 @@
{{ handle }}
-
-
-
-
-
+
+
+
+
+
+
+ Verified identity
+
+
+ Identities from connected integrations are automatically verified.
+
+
+
+
+
+
+
+
+
From 35ccbf1d25377da4c10476cad66a14a9b46479c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Grom?=
Date: Wed, 11 Sep 2024 20:23:42 +0200
Subject: [PATCH 2/2] Unaffiliated filter fix (#2605)
---
.../src/modules/member/config/filters/main.ts | 2 ++
.../config/filters/unaffiliated/config.ts | 29 +++++++++++++++++++
.../config/saved-views/views/unaffiliated.ts | 4 +--
3 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 frontend/src/modules/member/config/filters/unaffiliated/config.ts
diff --git a/frontend/src/modules/member/config/filters/main.ts b/frontend/src/modules/member/config/filters/main.ts
index 6ecab3c420..0f2c76e8ff 100644
--- a/frontend/src/modules/member/config/filters/main.ts
+++ b/frontend/src/modules/member/config/filters/main.ts
@@ -1,5 +1,6 @@
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
+import unaffiliated from '@/modules/member/config/filters/unaffiliated/config';
import noOfActivities from './noOfActivities/config';
import noOfOSSContributions from './noOfOSSContributions/config';
import activeOn from './activeOn/config';
@@ -34,6 +35,7 @@ export const memberFilters: Record = {
reach,
projects,
tags,
+ unaffiliated,
};
export const memberSearchFilter: SearchFilterConfig = {
diff --git a/frontend/src/modules/member/config/filters/unaffiliated/config.ts b/frontend/src/modules/member/config/filters/unaffiliated/config.ts
new file mode 100644
index 0000000000..10adc8474d
--- /dev/null
+++ b/frontend/src/modules/member/config/filters/unaffiliated/config.ts
@@ -0,0 +1,29 @@
+import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig';
+import {
+ BooleanFilterConfig, BooleanFilterOptions,
+ BooleanFilterValue,
+} from '@/shared/modules/filters/types/filterTypes/BooleanFilterConfig';
+import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType';
+
+const unaffiliated: BooleanFilterConfig = {
+ id: 'unaffiliated',
+ label: 'Unaffiliated profile',
+ iconClass: 'ri-id-card-line',
+ type: FilterConfigType.BOOLEAN,
+ options: {},
+ itemLabelRenderer(value: BooleanFilterValue, options: BooleanFilterOptions): string {
+ return itemLabelRendererByType[FilterConfigType.BOOLEAN]('Unaffiliated profile', value, options);
+ },
+ apiFilterRenderer({ value }: BooleanFilterValue): any[] {
+ const filter = {
+ organizations: {
+ [value ? 'eq' : 'ne']: null,
+ },
+ };
+ return [
+ filter,
+ ];
+ },
+};
+
+export default unaffiliated;
diff --git a/frontend/src/modules/member/config/saved-views/views/unaffiliated.ts b/frontend/src/modules/member/config/saved-views/views/unaffiliated.ts
index 50502e0bd8..81b2342ec5 100644
--- a/frontend/src/modules/member/config/saved-views/views/unaffiliated.ts
+++ b/frontend/src/modules/member/config/saved-views/views/unaffiliated.ts
@@ -17,8 +17,8 @@ const unaffiliated: SavedView = {
teamMember: 'exclude',
organization: 'exclude',
},
- enrichedMember: {
- value: false,
+ unaffiliated: {
+ value: true,
},
},
};