Skip to content

Fix organization updating #2186

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
merged 2 commits into from
Feb 12, 2024
Merged

Fix organization updating #2186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c561e7c
Fix organization updating
gaspergrom Feb 7, 2024
869295f
Fix for multi identties
gaspergrom Feb 12, 2024
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
27 changes: 21 additions & 6 deletions frontend/src/modules/organization/components/form/organization-form-identities.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
</template>

<script setup>
import { reactive, ref, watch } from 'vue';
import {
computed, reactive, ref, watch,
} from 'vue';
import { CrowdIntegrations } from '@/integrations/integrations-config';

const emit = defineEmits(['update:modelValue']);
Expand Down Expand Up @@ -104,17 +106,30 @@ watch(
{ deep: true, immediate: true },
);

const existingIdentities = computed(() => (props.record?.identities || []).map((i) => ({
...i,
username: i.url ? i.url.split('/').at(-1) : '',
})));

watch(
model,
(value) => {
// Parse username object

const identities = value
.filter((i) => !Object.keys(identitiesForm).includes(i.platform) || !!i.username?.trim().length)
.map((i) => ({
...i,
name: i.username || i.name,
url: i.username?.length ? `https://${identitiesForm[i.platform]?.urlPrefix}${i.username}` : null,
}));
.map((i) => {
const existingOnes = existingIdentities.value.filter((id) => id.platform === i.platform);
const index = value
.filter((id) => id.platform === i.platform)
.findIndex((id) => id.username === i.username);
const existingOne = index >= 0 ? existingOnes[index] : null;
return {
...i,
name: !existingOne || existingOne.username !== i.username ? i.username || i.name : i.name,
url: i.username?.length ? `https://${identitiesForm[i.platform]?.urlPrefix}${i.username}` : null,
};
});

// Emit updated member
emit('update:modelValue', {
Expand Down