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

chore: migrate all lodash usages with ramda in web device mode integrations #1684

Merged
merged 20 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 @@ -2,13 +2,13 @@
/* eslint-disable no-undef */
import get from 'lodash.get';
import each from '@ndhoule/each';
import { isDefined } from '@rudderstack/analytics-js-common/utilities/checks';
import { DISPLAY_NAME } from '@rudderstack/analytics-js-common/constants/integrations/AdobeAnalytics/constants';
import Logger from '../../utils/logger';
import {
toIso,
getHashFromArray,
isDefinedAndNotNullAndNotEmpty,
isDefined,
} from '../../utils/commonUtils';

const logger = new Logger(DISPLAY_NAME);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* eslint-disable class-methods-use-this */
import isEqual from 'lodash.isequal';
import { isEmpty } from 'ramda';
import { isEmpty, equals } from 'ramda';
import {
NAME,
DISPLAY_NAME,
Expand Down Expand Up @@ -199,17 +198,17 @@ class Braze {

if (email && email !== prevEmail) setEmail();
if (phone && phone !== prevPhone) setPhone();
if (birthday && !isEqual(birthday, prevBirthday)) setBirthday();
if (birthday && !equals(birthday, prevBirthday)) setBirthday();
if (firstName && firstName !== prevFirstname) setFirstName();
if (lastName && lastName !== prevLastname) setLastName();
if (gender && formatGender(gender) !== formatGender(prevGender))
setGender(formatGender(gender));
if (address && !isEqual(address, prevAddress)) setAddress();
if (address && !equals(address, prevAddress)) setAddress();
if (isObject(traits)) {
Object.keys(traits)
.filter(key => reserved.indexOf(key) === -1)
.forEach(key => {
if (!prevTraits[key] || !isEqual(prevTraits[key], traits[key])) {
if (!prevTraits[key] || !equals(prevTraits[key], traits[key])) {
window.braze.getUser().setCustomUserAttribute(key, traits[key]);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
NAME,
DISPLAY_NAME,
} from '@rudderstack/analytics-js-common/constants/integrations/FacebookPixel/constants';
import { isDefined } from '@rudderstack/analytics-js-common/utilities/checks';
import Logger from '../../utils/logger';
import { isDefined } from '../../utils/commonUtils';

const logger = new Logger(DISPLAY_NAME);

Expand Down
17 changes: 7 additions & 10 deletions packages/analytics-js-integrations/src/utils/commonUtils.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import _isUndefined from 'lodash.isundefined';
import _isEmpty from 'lodash.isempty';
import _pickBy from 'lodash.pickby';
import _toString from 'lodash.tostring';
import { pick as ramdaPick } from 'ramda';
import { isDefined } from '@rudderstack/analytics-js-common/utilities/checks';
import { pick as ramdaPick, pickBy } from 'ramda';

const isDefined = x => !_isUndefined(x);
const isNotEmpty = x => !_isEmpty(x);
const isNotNull = x => x != null;
const isDefinedAndNotNull = x => isDefined(x) && isNotNull(x);
const isDefinedAndNotNullAndNotEmpty = x => isDefined(x) && isNotNull(x) && isNotEmpty(x);
const removeUndefinedValues = obj => _pickBy(obj, isDefined);
const removeNullValues = obj => _pickBy(obj, isNotNull);
const removeUndefinedAndNullValues = obj => _pickBy(obj, isDefinedAndNotNull);
const removeUndefinedAndNullAndEmptyValues = obj => _pickBy(obj, isDefinedAndNotNullAndNotEmpty);
const removeUndefinedValues = obj => pickBy(isDefined, obj);
const removeNullValues = obj => pickBy(isNotNull, obj);
const removeUndefinedAndNullValues = obj => pickBy(isDefinedAndNotNull, obj);
const removeUndefinedAndNullAndEmptyValues = obj => pickBy(isDefinedAndNotNullAndNotEmpty, obj);
const isBlank = value => _isEmpty(_toString(value).trim());
const pick = (argObj, argArr) => ramdaPick(argArr, argObj);

Expand Down Expand Up @@ -201,7 +199,6 @@ export {
removeUndefinedAndNullValues,
removeNullValues,
removeUndefinedAndNullAndEmptyValues,
isDefined,
isNotEmpty,
isNotNull,
isDefinedAndNotNull,
Expand All @@ -211,4 +208,4 @@ export {
pick,
validateEmail,
validatePhoneWithCountryCode,
};
};
2 changes: 1 addition & 1 deletion packages/analytics-js-integrations/src/utils/utils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import get from 'get-value';
import { v4 as uuid } from '@lukeed/uuid';
import { v4 as uuidSecure } from '@lukeed/uuid/secure';
import { isDefined } from '@rudderstack/analytics-js-common/utilities/checks';
import { logger } from '@rudderstack/analytics-js-common/v1.1/utils/logUtil';

/**
Expand Down Expand Up @@ -301,7 +302,6 @@ const isEmptyObject = obj => {
*/
const isArray = obj => type(obj) === 'array';

const isDefined = x => x !== undefined;
const isNotNull = x => x !== null;
const isDefinedAndNotNull = x => isDefined(x) && isNotNull(x);

Expand Down