Skip to content

MP-141 fix trait exists errors -> dev #861

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

Merged
merged 1 commit into from
Aug 2, 2023
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 @@ -11,7 +11,7 @@ import {
} from '~/libs/ui'
import {
updateMemberPasswordAsync,
updateMemberTraitsAsync,
updateOrCreateMemberTraitsAsync,
useMemberTraits,
UserProfile,
UserTrait,
Expand Down Expand Up @@ -69,7 +69,7 @@ const UserAndPassword: FC<UserAndPasswordProps> = (props: UserAndPasswordProps)
}

function handleUserConsentChange(): void {
updateMemberTraitsAsync(props.profile.handle, [{
updateOrCreateMemberTraitsAsync(props.profile.handle, [{
categoryName: 'Personalization',
traitId: 'personalization',
traits: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { bind } from 'lodash'
import { KeyedMutator } from 'swr'
import { toast } from 'react-toastify'

import { updateMemberTraitsAsync, useMemberTraits, UserProfile, UserTraits } from '~/libs/core'
import { updateOrCreateMemberTraitsAsync, useMemberTraits, UserProfile, UserTraits } from '~/libs/core'
import { Button, Collapsible, FormToggleSwitch } from '~/libs/ui'
import { triggerSprigSurvey } from '~/apps/accounts/src/lib'

Expand Down Expand Up @@ -38,7 +38,7 @@ const Communities: FC<CommunitiesProps> = (props: CommunitiesProps) => {
[communityId]: !memberCommunities?.[communityId],
}

updateMemberTraitsAsync(props.profile.handle, [{
updateOrCreateMemberTraitsAsync(props.profile.handle, [{
categoryName: 'Communities',
traitId: 'communities',
traits: {
Expand Down
9 changes: 2 additions & 7 deletions src/apps/accounts/src/settings/tabs/tools/devices/Devices.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { toast } from 'react-toastify'
import classNames from 'classnames'

import {
createMemberTraitsAsync,
updateMemberTraitsAsync,
updateOrCreateMemberTraitsAsync,
useMemberDevicesLookup,
UserProfile,
UserTrait,
Expand All @@ -31,11 +31,6 @@ interface DevicesProps {
profile: UserProfile
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const Devices: FC<DevicesProps> = (props: DevicesProps) => {
const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()

Expand Down Expand Up @@ -293,7 +288,7 @@ const Devices: FC<DevicesProps> = (props: DevicesProps) => {
setIsEditMode(false)
})
} else {
methodsMap[!deviceTypesData || !deviceTypesData.length ? 'create' : 'update'](
updateOrCreateMemberTraitsAsync(
props.profile.handle,
[{
categoryName: 'Device',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { bind, isEmpty, reject, trim } from 'lodash'
import { toast } from 'react-toastify'
import classNames from 'classnames'

import { createMemberTraitsAsync, updateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
import { updateMemberTraitsAsync, updateOrCreateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
import { Button, Collapsible, ConfirmModal, IconOutline, InputSelect, InputText } from '~/libs/ui'
import {
FinancialInstitutionIcon,
Expand All @@ -23,11 +23,6 @@ interface ServiceProviderProps {
profile: UserProfile
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const ServiceProvider: FC<ServiceProviderProps> = (props: ServiceProviderProps) => {
const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()

Expand Down Expand Up @@ -166,7 +161,7 @@ const ServiceProvider: FC<ServiceProviderProps> = (props: ServiceProviderProps)
setIsEditMode(false)
})
} else {
methodsMap[!serviceProviderTypesData || !serviceProviderTypesData.length ? 'create' : 'update'](
updateOrCreateMemberTraitsAsync(
props.profile.handle,
[{
categoryName: 'Service Provider',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { bind, isEmpty, reject, trim } from 'lodash'
import { toast } from 'react-toastify'
import classNames from 'classnames'

import { createMemberTraitsAsync, updateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
import { updateMemberTraitsAsync, updateOrCreateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
import { Button, Collapsible, ConfirmModal, IconOutline, InputSelect, InputText } from '~/libs/ui'
import { SettingSection, SoftwareIcon, triggerSprigSurvey } from '~/apps/accounts/src/lib'

Expand All @@ -15,11 +15,6 @@ interface SoftwareProps {
profile: UserProfile
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const Software: FC<SoftwareProps> = (props: SoftwareProps) => {
const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()

Expand Down Expand Up @@ -154,7 +149,7 @@ const Software: FC<SoftwareProps> = (props: SoftwareProps) => {
setIsEditMode(false)
})
} else {
methodsMap[!softwareTypesData || !softwareTypesData.length ? 'create' : 'update'](
updateOrCreateMemberTraitsAsync(
props.profile.handle,
[{
categoryName: 'Software',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { bind, isEmpty, reject, trim } from 'lodash'
import { toast } from 'react-toastify'
import classNames from 'classnames'

import { createMemberTraitsAsync, updateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
import { updateMemberTraitsAsync, updateOrCreateMemberTraitsAsync, UserProfile, UserTrait } from '~/libs/core'
import { Button, Collapsible, ConfirmModal, IconOutline, InputText } from '~/libs/ui'
import { SettingSection, SubscriptionsIcon, triggerSprigSurvey } from '~/apps/accounts/src/lib'

Expand All @@ -14,11 +14,6 @@ interface SubscriptionsProps {
profile: UserProfile
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const Subscriptions: FC<SubscriptionsProps> = (props: SubscriptionsProps) => {
const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()

Expand Down Expand Up @@ -139,7 +134,7 @@ const Subscriptions: FC<SubscriptionsProps> = (props: SubscriptionsProps) => {
setIsEditMode(false)
})
} else {
methodsMap[!subscriptionsTypesData || !subscriptionsTypesData.length ? 'create' : 'update'](
updateOrCreateMemberTraitsAsync(
props.profile.handle,
[{
categoryName: 'Subscription',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ import { toast } from 'react-toastify'

import { BaseModal, Button, InputText, InputTextarea } from '~/libs/ui'
import {
createMemberTraitsAsync,
updateMemberProfileAsync,
updateMemberTraitsAsync,
updateOrCreateMemberTraitsAsync,
UserProfile,
UserTrait,
UserTraitCategoryNames,
Expand All @@ -22,11 +21,6 @@ interface ModifyAboutMeModalProps {
memberPersonalizationTraitsData: UserTrait[] | undefined
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const ModifyAboutMeModal: FC<ModifyAboutMeModalProps> = (props: ModifyAboutMeModalProps) => {
const [memberTitle, setMemberTitle]: [
string | undefined,
Expand Down Expand Up @@ -79,7 +73,7 @@ const ModifyAboutMeModal: FC<ModifyAboutMeModalProps> = (props: ModifyAboutMeMod
props.profile.handle,
{ description: updatedDescription },
),
methodsMap[!!props.memberPersonalizationTraitsData ? 'update' : 'create'](props.profile.handle, [{
updateOrCreateMemberTraitsAsync(props.profile.handle, [{
categoryName: UserTraitCategoryNames.personalization,
traitId: UserTraitIds.personalization,
traits: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import classNames from 'classnames'

import { BaseModal, Button, IconOutline, InputSelect, InputText } from '~/libs/ui'
import {
createMemberTraitsAsync,
updateMemberTraitsAsync,
updateOrCreateMemberTraitsAsync,
UserProfile,
UserTrait,
UserTraitCategoryNames,
Expand All @@ -25,11 +24,6 @@ interface ModifyEducationModalProps {
education: UserTrait[] | undefined
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const years: number[] = range(1979, getYear(new Date()) + 10)
const yearOptions: any = years
.map(v => ({
Expand Down Expand Up @@ -78,7 +72,7 @@ const ModifyEducationModal: FC<ModifyEducationModalProps> = (props: ModifyEducat

setIsSaving(true)

methodsMap[!!props.education ? 'update' : 'create'](props.profile.handle, [{
updateOrCreateMemberTraitsAsync(props.profile.handle, [{
categoryName: UserTraitCategoryNames.education,
traitId: UserTraitIds.education,
traits: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import classNames from 'classnames'

import { BaseModal, Button, IconOutline, InputSelect } from '~/libs/ui'
import {
createMemberTraitsAsync,
updateMemberTraitsAsync,
updateOrCreateMemberTraitsAsync,
UserProfile,
UserTrait,
UserTraitCategoryNames,
Expand All @@ -25,11 +24,6 @@ interface ModifyLanguagesModalProps {
memberLanguages: UserTrait[] | undefined
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const ModifyLanguagesModal: FC<ModifyLanguagesModalProps> = (props: ModifyLanguagesModalProps) => {
const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()

Expand Down Expand Up @@ -88,7 +82,7 @@ const ModifyLanguagesModal: FC<ModifyLanguagesModalProps> = (props: ModifyLangua

setIsSaving(true)

methodsMap[!!props.memberLanguages ? 'update' : 'create'](props.profile.handle, [{
updateOrCreateMemberTraitsAsync(props.profile.handle, [{
categoryName: UserTraitCategoryNames.languages,
traitId: UserTraitIds.languages,
traits: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import classNames from 'classnames'

import { BaseModal, Button, IconOutline, InputSelect, InputText } from '~/libs/ui'
import {
createMemberTraitsAsync,
updateMemberTraitsAsync,
updateOrCreateMemberTraitsAsync,
UserProfile,
UserTrait,
UserTraitCategoryNames,
Expand All @@ -27,11 +26,6 @@ interface ModifyMemberLinksModalProps {
memberPersonalizationTraitsFullData: UserTrait[] | undefined
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const ModifyMemberLinksModal: FC<ModifyMemberLinksModalProps> = (props: ModifyMemberLinksModalProps) => {
const formElRef: MutableRefObject<HTMLDivElement | any> = useRef()

Expand Down Expand Up @@ -95,7 +89,7 @@ const ModifyMemberLinksModal: FC<ModifyMemberLinksModalProps> = (props: ModifyMe
})
}

methodsMap[!!props.memberPersonalizationTraitsFullData ? 'update' : 'create'](props.profile.handle, [{
updateOrCreateMemberTraitsAsync(props.profile.handle, [{
categoryName: UserTraitCategoryNames.personalization,
traitId: UserTraitIds.personalization,
traits: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import { reject, trim } from 'lodash'
import { toast } from 'react-toastify'

import {
createMemberTraitsAsync,
updateMemberProfileAsync,
updateMemberTraitsAsync,
updateOrCreateMemberTraitsAsync,
UserProfile,
UserTrait,
UserTraitCategoryNames,
Expand All @@ -25,11 +24,6 @@ interface ModifyMemberNameModalProps {
namesAndHandleAppearance: NamesAndHandleAppearance | undefined
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const ModifyMemberNameModal: FC<ModifyMemberNameModalProps> = (props: ModifyMemberNameModalProps) => {
const [isSaving, setIsSaving]: [boolean, Dispatch<SetStateAction<boolean>>]
= useState<boolean>(false)
Expand Down Expand Up @@ -96,7 +90,7 @@ const ModifyMemberNameModal: FC<ModifyMemberNameModalProps> = (props: ModifyMemb
props.profile.handle,
{ firstName: updatedFirstName, lastName: updatedLastName },
),
methodsMap[!!props.memberPersonalizationTraitsData ? 'update' : 'create'](props.profile.handle, [{
updateOrCreateMemberTraitsAsync(props.profile.handle, [{
categoryName: UserTraitCategoryNames.personalization,
traitId: UserTraitIds.personalization,
traits: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import { reject } from 'lodash'

import { BaseModal, Button, InputText } from '~/libs/ui'
import {
createMemberTraitsAsync,
updateMemberTraitsAsync,
updateOrCreateMemberTraitsAsync,
UserProfile,
UserTrait,
UserTraitCategoryNames,
Expand All @@ -22,11 +21,6 @@ interface OpenForGigsModifyModalProps {
profile: UserProfile
}

const methodsMap: { [key: string]: any } = {
create: createMemberTraitsAsync,
update: updateMemberTraitsAsync,
}

const OpenForGigsModifyModal: FC<OpenForGigsModifyModalProps> = (props: OpenForGigsModifyModalProps) => {
const [isSaving, setIsSaving]: [boolean, Dispatch<SetStateAction<boolean>>]
= useState<boolean>(false)
Expand All @@ -47,7 +41,7 @@ const OpenForGigsModifyModal: FC<OpenForGigsModifyModalProps> = (props: OpenForG
(trait: UserTrait) => trait.availableForGigs !== undefined,
)

methodsMap[!!props.memberPersonalizationTraitsFullData ? 'update' : 'create'](props.profile.handle, [{
updateOrCreateMemberTraitsAsync(props.profile.handle, [{
categoryName: UserTraitCategoryNames.personalization,
traitId: UserTraitIds.personalization,
traits: {
Expand Down

This file was deleted.

Loading