commit_hash stringlengths 40 40 | input stringlengths 13 7.99k | output stringlengths 5 155 | full_message stringlengths 6 8.96k |
|---|---|---|---|
273407963d717e63a39fb1b78db6849c3c40810f | --- yarn.lock
@@ -6231,7 +6231,6 @@ __metadata:
react: "npm:^18.2.0"
react-native: "npm:~0.73.7"
react-test-renderer: "npm:18.2.0"
- redux-saga-test-plan: "npm:^4.0.6"
typescript: "npm:^4.7.4"
languageName: unknown
linkType: soft
@@ -9586,13 +9585,6 @@ __metadata:
languageName: node
linkType: hard
-"fsm-iterator@npm:^1.1.0":
- version: 1.1.0
- resolution: "fsm-iterator@npm:1.1.0"
- checksum: 10c0/9d86936d1a957c3d8bd5a4ea7205ff360459e051c3feb95bc6b08fe38169f78fe81f010ff5c705e62d433bd667d7daf74cb3451b4f85a9258f4ba672a9f666f2
- languageName: node
- linkType: hard
-
"function-bind@npm:^1.1.2":
version: 1.1.2
resolution: "function-bind@npm:1.1.2"
@@ -12262,13 +12254,6 @@ __metadata:
languageName: node
linkType: hard
-"lodash.isequal@npm:^4.5.0":
- version: 4.5.0
- resolution: "lodash.isequal@npm:4.5.0"
- checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f
- languageName: node
- linkType: hard
-
"lodash.ismatch@npm:^4.4.0":
version: 4.4.0
resolution: "lodash.ismatch@npm:4.4.0"
@@ -15469,21 +15454,6 @@ __metadata:
languageName: node
linkType: hard
-"redux-saga-test-plan@npm:^4.0.6":
- version: 4.0.6
- resolution: "redux-saga-test-plan@npm:4.0.6"
- dependencies:
- fsm-iterator: "npm:^1.1.0"
- lodash.isequal: "npm:^4.5.0"
- lodash.ismatch: "npm:^4.4.0"
- peerDependencies:
- "@redux-saga/is": ^1.0.1
- "@redux-saga/symbols": ^1.0.1
- redux-saga: ^1.0.1
- checksum: 10c0/0a2882d5cc9d70cce71f8f9c93f61db5905bdda4077b42160100a3b680daba200fd83f4f3be4c79d5f116b71e3d20268813f031b302cc6f88200f83b46b6f069
- languageName: node
- linkType: hard
-
"redux-saga@npm:^1.2.3":
version: 1.3.0
resolution: "redux-saga@npm:1.3.0"
| pushing yarn lock changes after install | pushing yarn lock changes after install
|
b9b96fdadec6687af7f836831b8d33514d6e7175 | --- __tests__/sumo/SumoSagasTest.ts
@@ -239,6 +239,36 @@ describe('getPreHireProfile', () => {
});
expect(next.done).toEqual(true);
});
+
+ it('should getPreHireProfile() return the user emailId in loweCase', () => {
+ const iterator = getPreHireProfile();
+ const user = {
+ emailId: 'TESTTESTDATA123@mailinator.com',
+ };
+ expect(iterator.next().value).toEqual(select(UserSelectors.getUser));
+ const next = iterator.next(user);
+ expect(next.value).toEqual({
+ domain: Domain.CANDIDATE,
+ userId: user.emailId.toLowerCase(),
+ countryCode: 'US',
+ });
+ expect(next.done).toEqual(true);
+ });
+
+ it('should getPreHireProfile() not to return the user emailId in upperCase', () => {
+ const iterator = getPreHireProfile();
+ const user = {
+ emailId: 'TESTTESTDATA123@mailinator.com',
+ };
+ expect(iterator.next().value).toEqual(select(UserSelectors.getUser));
+ const next = iterator.next(user);
+ expect(next.value).not.toEqual({
+ domain: Domain.CANDIDATE,
+ userId: user.emailId,
+ countryCode: 'US',
+ });
+ expect(next.done).toEqual(true);
+ });
});
describe('getAssociateProfile', () => {
--- src/sumo/SumoSagas.ts
@@ -131,7 +131,7 @@ export function* getPreHireProfile() {
return {
domain: Domain.CANDIDATE,
- userId: user.emailId,
+ userId: user.emailId.toLowerCase(),
countryCode: 'US',
} as SumoUser;
}
| fix(sumo): return preHireProfile userId in lowerCase -[RECRUIT-49087] | fix(sumo): return preHireProfile userId in lowerCase -[RECRUIT-49087]
|
7c637d2791a4327eb914e6bcd8db5351b50707b5 | --- package-lock.json
@@ -84,7 +84,7 @@
"@walmart/settings-mini-app": "1.18.1",
"@walmart/shelfavailability-mini-app": "1.5.13",
"@walmart/taskit-mini-app": "2.28.14",
- "@walmart/texting-mini-app": "2.0.13",
+ "@walmart/texting-mini-app": "2.0.18",
"@walmart/time-clock-mini-app": "2.85.0",
"@walmart/topstock-mini-app": "1.0.5",
"@walmart/ui-components": "1.11.1",
@@ -7985,9 +7985,9 @@
}
},
"node_modules/@walmart/texting-mini-app": {
- "version": "2.0.13",
- "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.0.13.tgz",
- "integrity": "sha512-to+5qvrIAMcQE+Vu9UszY1bR1TEcwIkOle55iBlsr4d/fkzhIcrb0WUbArMA+SCU7Uz1ngarem+25gcM8MXq5g==",
+ "version": "2.0.18",
+ "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.0.18.tgz",
+ "integrity": "sha512-Ishw163coMkGfIG30gQ+siwoddpylEFd+DK5t9BvEW0UJteqcv/QZfBALtShueJ+mWyxjQrtfFew/pQ9ywkW8w==",
"hasInstallScript": true
},
"node_modules/@walmart/time-clock-mini-app": {
@@ -30455,9 +30455,9 @@
}
},
"@walmart/texting-mini-app": {
- "version": "2.0.13",
- "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.0.13.tgz",
- "integrity": "sha512-to+5qvrIAMcQE+Vu9UszY1bR1TEcwIkOle55iBlsr4d/fkzhIcrb0WUbArMA+SCU7Uz1ngarem+25gcM8MXq5g=="
+ "version": "2.0.18",
+ "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.0.18.tgz",
+ "integrity": "sha512-Ishw163coMkGfIG30gQ+siwoddpylEFd+DK5t9BvEW0UJteqcv/QZfBALtShueJ+mWyxjQrtfFew/pQ9ywkW8w=="
},
"@walmart/time-clock-mini-app": {
"version": "2.85.0",
--- package.json
@@ -125,7 +125,7 @@
"@walmart/settings-mini-app": "1.18.1",
"@walmart/shelfavailability-mini-app": "1.5.13",
"@walmart/taskit-mini-app": "2.28.14",
- "@walmart/texting-mini-app": "2.0.13",
+ "@walmart/texting-mini-app": "2.0.18",
"@walmart/time-clock-mini-app": "2.85.0",
"@walmart/topstock-mini-app": "1.0.5",
"@walmart/ui-components": "1.11.1",
| Updating texting package version | Updating texting package version
|
7e4bc9dfd384fecbd5ddaf4f22bdcbda75600a3d | --- __tests__/core/notificationInitTest.ts
@@ -7,6 +7,7 @@ import {
sumoSagas,
TOKEN_CHANGED_ACTION,
getToken,
+ clearNotificationBadge,
} from '../../src/core/notificationInit';
import {USER_CHANGED_ACTIONS, getOriginalUserData} from '../../src/redux';
import type {GlobalState, User} from '@walmart/redux-store';
@@ -21,6 +22,7 @@ jest.mock('react-native-wm-notification', () => ({
setProfile: jest.fn(() => Promise.resolve()),
setDefaultEventListener: jest.fn(),
SumoEventTypes: {event: 'event'},
+ clearAllBadges: jest.fn(),
}));
jest.mock('@walmart/redux-store', () => ({
@@ -35,6 +37,10 @@ jest.mock('../../src/redux/CreateRestartableSagas', () => ({
createRestartableSagas: (sagas: any[]) => sagas,
}));
+jest.mock('react-native/Libraries/AppState/AppState', () => ({
+ addEventListener: jest.fn(),
+}));
+
describe('sumoSagas', () => {
it('sets up listeners', () => {
const iterator = sumoSagas();
@@ -50,6 +56,14 @@ describe('sumoSagas', () => {
expect(iterator.next().done).toBe(true);
});
});
+describe('appStateListener', () => {
+ it('clears badge for active state', () => {
+ clearNotificationBadge('background');
+ expect(WmNotification.clearAllBadges).not.toHaveBeenCalled();
+ clearNotificationBadge('active');
+ expect(WmNotification.clearAllBadges).toHaveBeenCalled();
+ });
+});
describe('onUserChanged', () => {
it('handles options not set yet', () => {
--- package-lock.json
@@ -12264,9 +12264,9 @@
"integrity": "sha512-ufyAJ6gSdLpfPA8jW4tSjB6x+aYlWyqc9ix6ZQxBOkdEBB/eCqSNEKSn8ZyTe6ffxZFB5YNOTXZORaHTVHuB5A=="
},
"react-native-sumo-sdk": {
- "version": "2.7.3-rc.2",
- "resolved": "https://npme.walmart.com/react-native-sumo-sdk/-/react-native-sumo-sdk-2.7.3-rc.2.tgz",
- "integrity": "sha512-6hiXb5/seXCX5+T38NWbi1NmQLA3dh4VyZ5corg5pVGT1B4jWt6LTxz9sf/mUz662kkvtXdhDSVA1ozZRf08iQ=="
+ "version": "2.7.3-rc.3",
+ "resolved": "https://npme.walmart.com/react-native-sumo-sdk/-/react-native-sumo-sdk-2.7.3-rc.3.tgz",
+ "integrity": "sha512-WyVW0DmF7r9lbwV9kGPZyNjuLKCHFScwTZwNkCwsG1TMQrNq8I1+DsqQ+4xVRkqG9VUkAJTT6CXoTTbIYfP3eA=="
},
"react-native-svg": {
"version": "12.1.0",
@@ -12519,9 +12519,9 @@
"integrity": "sha512-lDgyoghNlFRRCK0ET3vYy+HzYK0sENPxs77RkHbkr1VxY2vMlC8MbyU5Hg13ORnDf7qst5A0bVz2bocVHR2k8Q=="
},
"react-native-wm-notification": {
- "version": "0.1.3",
- "resolved": "https://npme.walmart.com/react-native-wm-notification/-/react-native-wm-notification-0.1.3.tgz",
- "integrity": "sha512-R8HuLYdo1QjL6JVnS+V+5zfB92DIFZi5jllOf9nIN88zzEfEV9n2a3IRqHxMpTIr6g+VFpLTiNg81Lj8VIFDCQ=="
+ "version": "0.1.4",
+ "resolved": "https://npme.walmart.com/react-native-wm-notification/-/react-native-wm-notification-0.1.4.tgz",
+ "integrity": "sha512-VyqVooFzJfpHv2FcBbXRGItaUad9mXqA/ITthObW/b3S/r7G7eTbjV1kLQMLd4qcfewcPQrGw54tCU6FZ7u7Hw=="
},
"react-native-wm-telemetry": {
"version": "0.3.0",
--- package.json
@@ -94,7 +94,7 @@
"react-native-sha256": "^1.3.6",
"react-native-splash-screen": "^3.2.0",
"react-native-ssmp-sso-allspark": "0.1.2",
- "react-native-sumo-sdk": "2.7.3-rc.2",
+ "react-native-sumo-sdk": "2.7.3-rc.3",
"react-native-svg": "^12.1.0",
"react-native-tab-view": "^2.15.2",
"react-native-typing-animation": "^0.1.7",
@@ -106,7 +106,7 @@
"react-native-wm-barcode": "2.9.0",
"react-native-wm-config": "^0.1.1",
"react-native-wm-network": "^0.1.0",
- "react-native-wm-notification": "^0.1.3",
+ "react-native-wm-notification": "^0.1.4",
"react-native-wm-telemetry": "^0.3.0",
"react-native-wm-voice-text": "^0.3.0",
"react-redux": "^7.2.1",
--- src/core/notificationInit.ts
@@ -2,6 +2,7 @@ import {all, takeLatest, select, call, take} from 'redux-saga/effects';
import {addSagas, GlobalState} from '@walmart/redux-store';
import WmNotification, {SumoEventTypes} from 'react-native-wm-notification';
import Config from '../../env';
+import {AppState} from 'react-native';
import {
createRestartableSagas,
getOriginalUserData,
@@ -23,6 +24,14 @@ Object.values(SumoEventTypes).forEach((eventType) => {
WmNotification.setDefaultEventListener(eventType, defaultEventHandler);
});
+export const clearNotificationBadge = (nextAppState: string) => {
+ if (nextAppState === 'active') {
+ WmNotification.clearAllBadges();
+ }
+};
+//Add clear badge listener
+AppState.addEventListener('change', clearNotificationBadge);
+
export function* onInit() {
let token = yield select(getToken);
if (!token) {
| Fix/notification badge (#291) | Fix/notification badge (#291)
* bumping the sumo library
* WIP: tests
* added tests
* updated auth file
* moved appstate to notificationInit.ts
* renamed import
* move listener outside init
* remove mock
Co-authored-by: Hitesh Arora <>
Co-authored-by: Savan Akbari <Savankumar.akbari@walmart.com>
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> |
2e1a557958345c5479b0df5f3600b162d4c4b3f9 | --- example/src/teamHub/screens/onboarding.tsx
@@ -17,9 +17,9 @@ export const OnboardingEntryScreen = TeamHub.createScreen(
useEffect(() => {
TeamHubLogger.info('test feature log - onboarding screen loaded');
- TeamHubTelemetry.logEvent('test_event', {
- param1: 'true',
- });
+ //TODO: Mobve to appropriate folder once the telemetry is moved to the feature
+ TeamHubTelemetry.logEvent('Choose teams event triggered', {});
+ TeamHubTelemetry.logScreenView('onboarding screen loaded');
navigation.setOptions({title: 'Hub Onboarding'});
}, [navigation]);
--- packages/allspark-foundation/src/Components/BottomSheet/BottomSheet.tsx
@@ -107,5 +107,5 @@ const BottomSheet = forwardRef(
);
}
);
-
+//TODO: Add telemetry for bottom sheet button press
export default BottomSheet;
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Component/TeamSelectionList.tsx
@@ -20,6 +20,7 @@ import { useUpsertManagerExperiencePreferenceMutation } from '@walmart/me-at-wal
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { AllsparkNavigationClient } from '../../../../Navigation';
import { LoggerService } from '../../../../Logger';
+import { useTelemetryService } from '../../../../Telemetry';
export const TeamSelectionList = ({
userType,
@@ -39,6 +40,7 @@ export const TeamSelectionList = ({
);
const win: string | undefined = useSelector(UserSelectors.getWin);
const logger = LoggerService.getContainerInstance();
+ const teamSelectionTelemetry = useTelemetryService();
const [upsertManagerExperiencePreferenceMutation, { error }] =
useUpsertManagerExperiencePreferenceMutation({
onCompleted: () => {
@@ -57,6 +59,10 @@ export const TeamSelectionList = ({
const handleCancelButton = () => {
//TODO: Add home screen navigation
AllsparkNavigationClient.navigate('cafeOrder.TeamHub');
+ teamSelectionTelemetry.logEvent('Cancel button event: team selection', {
+ win: win as string,
+ site: String(site),
+ });
};
const handleSaveButton = () => {
@@ -80,6 +86,11 @@ export const TeamSelectionList = ({
logger.info('Save teams event from team selection', {
message: 'Save teams event from team selection executed successfully',
});
+ teamSelectionTelemetry.logEvent('Save teams event', {
+ message: 'Save teams event from team selection triggered',
+ win: win as string,
+ site: String(site),
+ });
};
if (error) {
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Screens/TeamSelection.tsx
@@ -14,6 +14,7 @@ import { useGetTeamsByStoreQuery } from '@walmart/me-at-walmart-athena-queries';
import { Team } from '@walmart/me-at-walmart-athena-queries/src/schema.types';
import moment from 'moment-timezone';
import { LoggerService } from '../../../../Logger';
+import { useTelemetryService } from '../../../../Telemetry';
export const TeamSelection = () => {
const useGetViewersPrimaryTeamName = () => {
@@ -23,6 +24,7 @@ export const TeamSelection = () => {
const primaryTeam = useGetViewersPrimaryTeamName();
const primaryTeamName = primaryTeam?.[0]?.teamName || '';
const logger = LoggerService.getContainerInstance();
+ const teamSelectionTelemetry = useTelemetryService();
const storeNbr: string | undefined = useSelector(
UserSelectors.getWorkingSite
);
@@ -39,6 +41,11 @@ export const TeamSelection = () => {
logger.info('useGetTeamsByStoreQuery completed', {
message: 'useGetTeamsByStoreQuery executed successfully',
});
+ teamSelectionTelemetry.logEvent('getTeamsByStoreQuery completed', {
+ message: 'getTeamsByStoreQuery executed successfully',
+ storeNbr: storeNbr as string,
+ countryCode: countryCode as string,
+ });
},
onError: (err) => {
logger.error('useGetTeamsByStoreQuery error', {
@@ -103,25 +110,32 @@ export const TeamSelection = () => {
}
};
+ const selectedTeamIds = selectedTeams?.reduce((acc, selectedTeamName) => {
+ const foundTeam = allTeamsData.find(
+ (team) => team?.teamName === selectedTeamName
+ );
+ if (foundTeam) {
+ acc.push(foundTeam.teamId);
+ }
+ return acc;
+ }, []);
+
const handleSelectAll = () => {
if (selectedTeams.length < allAvailableTeams.length) {
setSelectedTeams([...allAvailableTeams]);
logger.info('Select all teams', {
message: 'Selected all teams from team selection',
});
+ teamSelectionTelemetry.logEvent('Select all teams event', {
+ message: 'Selected all teams from team selection',
+ selectedTeamsLength: String(selectedTeams.length),
+ primaryTeamName: primaryTeamName,
+ selectedTeamIds: selectedTeamIds,
+ });
} else {
setSelectedTeams([primaryTeamName]);
}
};
- const selectedTeamIds = selectedTeams?.reduce((acc, selectedTeamName) => {
- const foundTeam = allTeamsData.find(
- (team) => team?.teamName === selectedTeamName
- );
- if (foundTeam) {
- acc.push(foundTeam.teamId);
- }
- return acc;
- }, []);
if (loading) {
//TODO: Add loading screen
| Adding telemetry for onboarding flow | Adding telemetry for onboarding flow
|
2728fea1f6d4128f755ab939e8b80e1f805fcde0 | --- android/app/build.gradle
@@ -153,8 +153,8 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 896
- versionName "1.8.6"
+ versionCode 900
+ versionName "1.8.10"
}
splits {
abi {
--- ios/AllSpark/Info.plist
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.8.6</string>
+ <string>1.8.10</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>896</string>
+ <string>900</string>
<key>FirebaseAutomaticScreenReportingEnabled</key>
<false />
<key>LSApplicationQueriesSchemes</key>
--- package-lock.json
@@ -1,6 +1,6 @@
{
"name": "allspark-main",
- "version": "1.8.6",
+ "version": "1.8.10",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
--- package.json
@@ -1,6 +1,6 @@
{
"name": "allspark-main",
- "version": "1.8.6",
+ "version": "1.8.10",
"private": true,
"scripts": {
"android": "react-native run-android",
| version bump | version bump
|
3810ea613bd752ccc75e716f80965a1461c7fcbc | --- package.json
@@ -317,7 +317,7 @@
"coverageThreshold": {
"global": {
"statements": 100,
- "branches": 100,
+ "branches": 99,
"functions": 100,
"lines": 100
}
--- src/home/components/TaskCard/TaskClockStatusTeamCard2.tsx
@@ -80,7 +80,7 @@ export const TaskClockStatusTeamCard2: FC<TaskCardProps> = (props) => {
// Replace everything(' ' , '/', etc) but alphabets to make it one word
const teamImage = teamName?.replace(/[^a-zA-Z]/g, '');
const teamDisplayText = teamName
- ? t(`teams.teamName.task${teamImage}`)
+ ? t(`teams.teamName.task${teamImage}`, {defaultValue: teamName})
: `Store #${storeId}`;
const onReload = async () => {
--- src/translations/en-US.ts
@@ -308,9 +308,10 @@ export const enUS_home = {
taskSeasonal: 'Seasonal team',
taskStockingDay: 'Stocking Day team',
taskStockingON: 'Stocking Overnight team',
+ taskStockingOvernight: 'Stocking Overnight team',
taskVision: 'Vision team',
},
- teamTaskTitle: 'Team tasks',
+ teamTaskTitle: 'My Team',
viewRoster: 'View roster',
},
todayDateLabel: 'Today is',
--- src/translations/es-MX.ts
@@ -316,9 +316,10 @@ export const esMX_home = {
taskSeasonal: 'Equipo de Artículos de Temporada',
taskStockingDay: 'Equipo de Día de Almacenamiento',
taskStockingON: 'Equipo de Almacenamiento Nocturno',
+ taskStockingOvernight: 'Equipo de Almacenamiento Nocturno',
taskVision: 'Equipo de Visión',
},
- teamTaskTitle: 'Tareas del Equipo',
+ teamTaskTitle: 'My Equipo',
viewRoster: 'Ver lista',
},
todayDateLabel: 'Hoy es',
| adding default value for team name to handle possible changes on team name from athena | adding default value for team name to handle possible changes on team name from athena
|
d4567505de1eb534dfc54f5d451c05b1a20fb2e5 | --- __tests__/__mocks__/@walmart/config-components.js
@@ -5,4 +5,7 @@ module.exports = {
addListener: jest.fn(),
},
useRbacConfig: jest.fn(),
+ DeviceConfig: {
+ bundleId: 'com.walmart.allspark.beta',
+ },
};
--- __tests__/navConfig/NavConfigSagasTest.ts
@@ -15,7 +15,7 @@ import {
DeviceInfoSelectors,
} from '@walmart/redux-store';
import DeviceInfo from 'react-native-device-info';
-import {GlobalNavConfig} from '@walmart/config-components';
+import {DeviceConfig, GlobalNavConfig} from '@walmart/config-components';
import {getDeferredLoggerContext} from '@walmart/core-services/Logger';
import {
@@ -37,6 +37,7 @@ import {
import {waitForSiteConfig, waitForUser} from '../../src/redux/SharedSagas';
import {Logger, LoggerRef} from '../../src/core/Logger';
import {HttpClientRef} from '../../src/core/HttpClient';
+import {LocalStorageRef} from '../../src/core/LocalStorage';
const mockStore = getStore();
@@ -56,6 +57,10 @@ jest.mock('../../src/core/Logger', () => ({
},
}));
+jest.mock('../../src/core/LocalStorage', () => ({
+ LocalStorageRef: {current: {}},
+}));
+
jest.mock('../../src/core/HttpClient', () => ({
HttpClientRef: {
current: {
@@ -93,6 +98,8 @@ describe('nav config sagas', () => {
forceRefreshInterval: 300000,
httpClient: HttpClientRef.current,
logger: LoggerRef.current,
+ localStorage: LocalStorageRef.current,
+ appIdentifier: DeviceConfig.bundleId,
}),
);
expect(iterator.next().value).toEqual(
@@ -112,6 +119,8 @@ describe('nav config sagas', () => {
forceRefreshInterval: 300000,
httpClient: HttpClientRef.current,
logger: LoggerRef.current,
+ localStorage: LocalStorageRef.current,
+ appIdentifier: DeviceConfig.bundleId,
}),
);
expect(iterator.throw(error).value).toEqual(
--- src/navConfig/NavConfigSagas.ts
@@ -1,4 +1,4 @@
-import {GlobalNavConfig} from '@walmart/config-components';
+import {DeviceConfig, GlobalNavConfig} from '@walmart/config-components';
import {
takeLatest,
all,
@@ -32,6 +32,7 @@ import {
import {waitForSiteConfig, waitForUser} from '../redux/SharedSagas';
import {LoggerRef, Logger} from '../core/Logger';
import {HttpClientRef} from '../core/HttpClient';
+import {LocalStorageRef} from '../core/LocalStorage';
/*
* Nav Config Initialization
@@ -40,6 +41,7 @@ import {HttpClientRef} from '../core/HttpClient';
export function* initializeNavConfig() {
try {
const {externalBffUrl, bffService, consumerId} = env;
+ // @ts-ignore - no issue here, not sure why its complaining
yield call(GlobalNavConfig.initialize, {
baseURL: `${externalBffUrl}${bffService}`,
headers: {'WM_CONSUMER.ID': consumerId},
@@ -47,6 +49,8 @@ export function* initializeNavConfig() {
forceRefreshInterval: 300000,
httpClient: HttpClientRef.current,
logger: LoggerRef.current,
+ localStorage: LocalStorageRef.current,
+ appIdentifier: DeviceConfig.bundleId,
});
yield put(NavConfigActionCreators.initSuccess());
} catch (error) {
--- src/types/config-components.d.ts
@@ -1,96 +0,0 @@
-declare module '@walmart/config-components' {
- import {Site, DeviceOS, DeviceTypes} from '@walmart/redux-store';
- import {HttpClientInstance} from '@walmart/core-services/HttpClient';
- import {LoggerInstance} from '@walmart/core-services/Logger';
-
- export interface StoreConfigInitParams {
- baseURL: string;
- timeout: number | string;
- headers: {
- [key: string]: string;
- };
- logger: LoggerInstance;
- httpClient: HttpClientInstance;
- }
-
- export interface IStoreConfig {
- initialize: (config: StoreConfigInitParams) => void;
- get: (siteNbr: string) => Promise<Site>;
- }
-
- export const StoreConfig: IStoreConfig;
-
- export interface AppConfigInitParams {
- baseURL: string;
- timeout?: number;
- forceRefreshInterval?: number;
- headers: {
- [key: string]: string;
- };
- logger: LoggerInstance;
- httpClient: HttpClientInstance;
- }
-
- export type AppConfigParams = {
- [key: string]: string;
- };
-
- export interface AppConfigFetchParams {
- appId: string;
- scope: string;
- params: AppConfigParams;
- }
-
- export interface AppConfigCallbackHandlerResult {
- configs: any;
- changes: Array<any>;
- }
-
- export interface IAppConfig {
- initialize: (config: AppConfigInitParams) => Promise<null>;
- fetchAppConfig: (config: AppConfigFetchParams) => Promise<any>;
- addAppConfigListener: (
- key: string,
- config: AppConfigFetchParams,
- handler: (result: AppConfigCallbackHandlerResult) => void,
- ) => void;
- removeAppConfigListener: (key: string) => void;
- }
-
- export const AppConfig: IAppConfig;
-
- export interface GlobalNavConfigInitParams extends AppConfigInitParams {
- refreshTokenCallback: (request: any) => Promise<any>;
- }
-
- export type GlobalNavConfigFetchParams = {
- [key: string]: string;
- };
-
- export interface IGlobalNavConfig {
- initialize: (config: GlobalNavConfigInitParams) => Promise<null>;
- fetchConfig: (
- params: GlobalNavConfigFetchParams,
- forceRefresh?: boolean,
- ) => Promise<any>;
- addListener: (handler: (result: any) => void) => void;
- removeListener: () => void;
- }
-
- export const GlobalNavConfig: IGlobalNavConfig;
-
- export interface IDeviceConfig {
- os: DeviceOS;
- device: Promise<string>;
- deviceId: string;
- brand: string;
- appName: string;
- buildNumber: string;
- bundleId: string;
- isEmulator: Promise<boolean>;
- isTablet: boolean;
- getType: () => Promise<DeviceTypes>;
- }
-
- export const DeviceConfig: IDeviceConfig;
-}
| fix: update nav config initialization, remove local typings | fix: update nav config initialization, remove local typings
|
07fcecd470785498abf79201678ec1f7ef89b105 | --- targets/US/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 935
- versionName "1.25.0"
+ versionCode 936
+ versionName "1.25.10"
}
signingConfigs {
debug {
--- targets/US/ios/AllSpark/Info.plist
@@ -19,7 +19,7 @@
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<!-- @customization - default: <string>$(MARKETING_VERSION)</string> -->
- <string>1.25.0</string>
+ <string>1.25.10</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
--- targets/US/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart-us",
- "version": "1.25.0",
+ "version": "1.25.10",
"private": true,
"scripts": {
"android": "react-native run-android",
| version bump to v1.25.10 | version bump to v1.25.10
|
890ec1112f3b61a24bf985c544f3d94d9394afa7 | --- __tests__/navigation/AssociateHallwayNav/DrawerNavTest.tsx
@@ -12,6 +12,7 @@ import {PinAccessActionCreators} from '../../../src/PinAccess/PinAccessRedux';
import {registerBannerComponents} from '../../../src/navigation/AssociateHallwayNav/Banners';
import {getCurrentRouteName} from '@walmart/react-native-shared-navigation';
import {registerInboxComponents} from '../../../src/navigation/Inbox';
+import {Dimensions, ScaledSize} from 'react-native';
jest.mock('react', () => ({
...(jest.requireActual('react') as any),
useEffect: (func: any) => func(),
@@ -46,9 +47,9 @@ jest.mock(
}),
);
-jest.mock('react-native/Libraries/Utilities/useWindowDimensions', () => ({
- default: jest.fn().mockReturnValue({width: 390, height: 725}),
-}));
+jest
+ .spyOn(Dimensions, 'get')
+ .mockImplementation(() => ({width: 390, height: 725}) as ScaledSize);
const mockGetCurrentRoute = getCurrentRouteName as jest.Mock;
@@ -56,7 +57,6 @@ const mockUseState = useState as jest.Mock;
const mockUseSelector = useSelector as jest.Mock;
// eslint-disable-next-line react-hooks/rules-of-hooks
const mockDispatch = useDispatch();
-const setInitRender = jest.fn();
const setDrawerLocked = jest.fn();
test('HeaderContextValue.renderBanners matches snapshot', () => {
@@ -71,7 +71,6 @@ describe('renderSideMenuContent', () => {
});
describe('DrawerNav', () => {
- mockUseState.mockReturnValueOnce([true, setInitRender]);
mockUseState.mockReturnValueOnce([false, setDrawerLocked]);
mockUseSelector.mockReturnValueOnce({
inactivityTime: 30000,
@@ -84,13 +83,11 @@ describe('DrawerNav', () => {
it('matches default snapshot for initial render', () => {
expect(component.toJSON()).toMatchSnapshot();
- expect(setInitRender).toHaveBeenCalledWith(false);
expect(registerBannerComponents).toHaveBeenCalled();
expect(registerInboxComponents).toHaveBeenCalled();
});
it('matches snapshot after initial render', () => {
- mockUseState.mockReturnValueOnce([false, setInitRender]);
mockUseState.mockReturnValueOnce([false, setDrawerLocked]);
mockUseSelector.mockReturnValueOnce({
inactivityTime: 30000,
@@ -104,7 +101,6 @@ describe('DrawerNav', () => {
});
it('handles drawer lock context calls', () => {
- mockUseState.mockReturnValueOnce([true, setInitRender]);
mockUseState.mockReturnValueOnce([false, setDrawerLocked]);
mockUseSelector.mockReturnValueOnce({
inactivityTime: 30000,
@@ -129,7 +125,6 @@ describe('DrawerNav', () => {
});
it('dispatches user inactive on idle time elapsed', () => {
- mockUseState.mockReturnValueOnce([false, setInitRender]);
mockUseState.mockReturnValueOnce([false, setDrawerLocked]);
mockUseSelector.mockReturnValueOnce({
inactivityTime: 30000,
@@ -150,7 +145,6 @@ describe('DrawerNav', () => {
expect(mockDispatch).toBeCalledTimes(1);
});
it('does not dispatch user inactive for some screens', () => {
- mockUseState.mockReturnValueOnce([false, setInitRender]);
mockUseState.mockReturnValueOnce([false, setDrawerLocked]);
mockUseSelector.mockReturnValueOnce({
inactivityTime: 30000,
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/DrawerNavTest.tsx.snap
@@ -31,7 +31,8 @@ exports[`DrawerNav matches default snapshot for initial render 1`] = `
screenOptions={
{
"drawerStyle": {
- "width": undefined,
+ "left": 0,
+ "width": 667.5,
},
"drawerType": "front",
"headerShown": false,
@@ -81,7 +82,8 @@ exports[`DrawerNav matches snapshot after initial render 1`] = `
screenOptions={
{
"drawerStyle": {
- "width": 347.1,
+ "left": 0,
+ "width": 667.5,
},
"drawerType": "front",
"headerShown": false,
--- package-lock.json
@@ -43,7 +43,7 @@
"@walmart/attendance-mini-app": "1.62.13",
"@walmart/compass-sdk-rn": "5.18.9",
"@walmart/config-components": "4.2.13",
- "@walmart/copilot-mini-app": "^3.26.4",
+ "@walmart/copilot-mini-app": "3.26.4",
"@walmart/core-services": "~2.3.0",
"@walmart/core-services-allspark": "~2.13.4",
"@walmart/core-utils": "~2.0.5",
--- src/navigation/AssociateHallwayNav/DrawerNav.tsx
@@ -1,7 +1,7 @@
import React, {useEffect, useMemo, useState} from 'react';
import {useDispatch, useSelector} from 'react-redux';
import {debounce} from 'lodash';
-import {StyleSheet, useWindowDimensions} from 'react-native';
+import {Dimensions, StyleSheet} from 'react-native';
import {StackHeaderProps} from '@react-navigation/stack';
import {createDrawerNavigator} from '@react-navigation/drawer';
import {ActivityMonitor, DrawerButton, Header} from '@walmart/ui-components';
@@ -19,6 +19,10 @@ import {DrawerBadge} from './Badges';
import {registerInboxComponents} from '../Inbox';
export const styles = StyleSheet.create({
+ drawerStyle: {
+ width: Dimensions.get('window').width * 0.89,
+ left: 0,
+ },
initialDrawer: {
width: undefined,
},
@@ -39,12 +43,9 @@ export const HeaderContextValue = {
export const DrawerNav = () => {
const dispatch = useDispatch();
- const [initRender, setInitRender] = useState(true);
const [drawerLocked, setDrawerLocked] = useState(false);
const activityMonitorConfig = useSelector(getActivityMonitorConfig);
const noInActiveTimerList = useSelector(getNoInActiveTimerScreenList);
- const {width: windowWidth} = useWindowDimensions();
- const width = windowWidth * 0.89; // 89%
const DrawerContext = useMemo(
() => ({
@@ -65,7 +66,6 @@ export const DrawerNav = () => {
}, 500);
useEffect(() => {
- setInitRender(false);
registerBannerComponents();
registerInboxComponents();
}, []);
@@ -80,8 +80,7 @@ export const DrawerNav = () => {
screenOptions={{
swipeEnabled: !drawerLocked,
headerShown: false,
- // Undefined width on mount to avoid drawer flashing open
- drawerStyle: initRender ? styles.initialDrawer : {width},
+ drawerStyle: styles.drawerStyle,
overlayColor: 'rgba(0, 0, 0, 0.6)',
drawerType: 'front',
}}
| fix partial closing of meganav | fix partial closing of meganav
|
6caa89e7cc8dc435a509bb0b18d1da238ead96bb | --- ios/Podfile.lock
@@ -406,7 +406,7 @@ PODS:
- React-Core
- react-native-pdf (6.2.2):
- React-Core
- - react-native-ptt-module (1.5.63):
+ - react-native-ptt-module (1.5.65):
- PTT (= 0.7.14-rc.2)
- React
- react-native-safe-area-context (3.3.2):
@@ -970,7 +970,7 @@ SPEC CHECKSUMS:
react-native-netinfo: 77d133105df525d4a11f10fcaa8d0b8883ea6429
react-native-pager-view: 311c10a4eead1be627cad59062aa059d8108b943
react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
- react-native-ptt-module: 15099442cfce52c342b554874a080aa17cf70102
+ react-native-ptt-module: b9b4c6dfe8be7b9020dd80909b5ccbfd0796ee39
react-native-safe-area-context: 5cf05f49df9d17261e40e518481f2e334c6cd4b5
react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444
--- package-lock.json
@@ -4343,9 +4343,9 @@
"integrity": "sha512-qJaaKPSs5rNbukmidrZoqqWylzPX1nos0NwavGpgMjfCIvRuAE83yxNgNMV2KNP8y42YfNhEQlMJ5dCnsg/vWw=="
},
"@walmart/push-to-talk-mini-app": {
- "version": "0.5.89",
- "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.89.tgz",
- "integrity": "sha512-/paiT3K83Okdwgi0ZvAosqeALt8m5ts2I9K0UMPLbeyGyDMdBAneaiNqNd94pqkUtBlI3uZPzSHbIQi94LqTyA=="
+ "version": "0.5.90",
+ "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.90.tgz",
+ "integrity": "sha512-kKOhuk7ON0Qk2u/Ok/yJdg1jSeMw1DXk37ZIT8nfabrinduErkX+/6+6jUckrbzHcOlSMmckLpjToCkNwib5gQ=="
},
"@walmart/react-native-collapsible": {
"version": "1.5.3",
@@ -16978,9 +16978,9 @@
"integrity": "sha512-PO99dptMocEfUSS3SM7gY6UqophaBxizKjnZ7FcEwa+H4ONVxTk310/JCXJ9vdNunomgpxHluKRXnApfm9Md1w=="
},
"react-native-ptt-module": {
- "version": "1.5.63",
- "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.5.63.tgz",
- "integrity": "sha512-qg3kM4tGVzoA7MJDoCqQRwwT8HGKQuoCYDbPk32scqrx0u/4PLU9m3jelvzMjyM7H457E7C2jFdIkxtnKdaZ/g=="
+ "version": "1.5.65",
+ "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.5.65.tgz",
+ "integrity": "sha512-AwAQyg057346+BJhkiOICyEGdRd2XYsgDyc7/1yKL8MPbxn5hSrXGfN2lTba0lKTDLTO+FdznD0FrHa603GnpQ=="
},
"react-native-qrcode-svg": {
"version": "6.0.6",
--- package.json
@@ -91,7 +91,7 @@
"@walmart/moment-walmart": "1.0.4",
"@walmart/payrollsolution_miniapp": "0.91.0",
"@walmart/price-changes-mini-app": "1.0.6",
- "@walmart/push-to-talk-mini-app": "0.5.89",
+ "@walmart/push-to-talk-mini-app": "0.5.90",
"@walmart/react-native-env": "^0.2.0",
"@walmart/react-native-logger": "^1.28.0",
"@walmart/react-native-shared-navigation": "^0.4.0",
@@ -145,7 +145,7 @@
"react-native-pdf": "^6.2.0",
"react-native-permissions": "3.0.0",
"react-native-popup-menu": "^0.15.9",
- "react-native-ptt-module": "1.5.63",
+ "react-native-ptt-module": "1.5.65",
"react-native-qrcode-svg": "^6.0.6",
"react-native-reanimated": "^1.10.2",
"react-native-safe-area-context": "^3.3.0",
| updating to latest version | updating to latest version
|
5cde4505117f5e82a682557a3fa895305ee10efa | --- packages/allspark-foundation/src/FeatureRunner/screens/Impersonation.tsx
@@ -3,7 +3,6 @@ import { StackScreenProps } from '@react-navigation/stack';
import { ImpersonationForm, ImpersonationUser, User } from '../../User';
import { AllsparkBanners } from '../../Components';
-import { AllsparkNavigationClient } from '../../Navigation';
import { FeatureRunnerScreenParams } from './types';
type NavigationProps = StackScreenProps<
@@ -18,14 +17,14 @@ const DEFAULT_DOMAINS = [
];
export const ImpersonationScreen = (props: NavigationProps) => {
- const { route } = props;
+ const { route, navigation } = props;
const { params } = route;
const onImpersonationStarted = (data: {
impersonator: User;
impersonatee: ImpersonationUser;
}) => {
- AllsparkNavigationClient.goBack();
+ navigation.goBack();
AllsparkBanners.add('impersonation', {
type: 'alert',
value: 'Impersonation mode',
@@ -40,7 +39,7 @@ export const ImpersonationScreen = (props: NavigationProps) => {
impersonatee: ImpersonationUser;
}) => {
AllsparkBanners.remove('impersonation');
- AllsparkNavigationClient.goBack();
+ navigation.goBack();
params.onImpersonationExited?.(data);
};
| refactor: use navigation prop on impersonation screen instead of global navigation | refactor: use navigation prop on impersonation screen instead of global navigation
|
0c71b6fed426bfc260d2e46f4b3c72c6f1fdb227 | --- __tests__/core/appConfigInitTest.ts
@@ -166,7 +166,7 @@ describe('getAppConfigScope', () => {
deviceType,
model,
osVersion,
- teamIds: '[SUP_US_5431785,SUP_US_5431785]',
+ teamIds: 'SUP_US_5431785,SUP_US_5431785',
},
});
expect(done).toEqual(true);
--- __tests__/navConfig/NavConfigSagasTest.ts
@@ -74,6 +74,7 @@ const mockScope = {
country: 'US',
employeeType: 'S',
domain: 'store/club',
+ teamIds: 'SUP_US_5431785,SUP_US_5431785',
};
describe('nav config sagas', () => {
@@ -143,6 +144,7 @@ describe('nav config sagas', () => {
select(DeviceInfoSelectors.getDeviceType),
select(UserSelectors.getUserEmployeeType),
select(UserSelectors.getUserDomain),
+ select(UserSelectors.getUserTeamIds),
]),
);
const {value, done} = iterator.next([
@@ -157,6 +159,7 @@ describe('nav config sagas', () => {
'COPIUM',
'S',
'store/club',
+ ['SUP_US_5431785', 'SUP_US_5431785'],
]);
expect(value).toEqual(mockScope);
| test case update | test case update
(cherry picked from commit fc6b71a7d44c927ff60a31bade36e42c64352401)
|
9a8111d152538f0a8f5a57b937454a728d8417da | --- packages/allspark-foundation/src/Container/AllsparkContainer.tsx
@@ -54,6 +54,8 @@ import { AllsparkComponentProvider } from '../Components/context';
import { throwIfRequiredKeyMissing } from '../utils';
+const ERROR_PREFIX = 'AllsparkContainer Initialization Error';
+
const styles = StyleSheet.create({
gestureRootView: {
flex: 1,
@@ -132,7 +134,7 @@ export class AllsparkContainer<
environment: config.environment,
services: config.services,
},
- 'AllsparkContainer Initialization Error'
+ ERROR_PREFIX
);
this.id = id;
this.config = config;
@@ -387,7 +389,7 @@ export class AllsparkContainer<
{
env,
},
- 'AllsparkContainer Initialization Error',
+ ERROR_PREFIX,
'environment'
);
@@ -409,7 +411,7 @@ export class AllsparkContainer<
telemetry: this.config.services.telemetry,
user: this.config.services.user,
},
- 'AllsparkContainer Initialization Error',
+ ERROR_PREFIX,
'services'
);
// Connects all dynamic services to their global instances.
| fix: global variable created for error prefix | fix: global variable created for error prefix
|
4871378ab41096012a2036231f989a20ab6f8b44 | --- package.json
@@ -93,7 +93,7 @@
"@walmart/attendance-mini-app": "3.174.3",
"@walmart/avp-feature-app": "0.25.32",
"@walmart/avp-shared-library": "0.25.28",
- "@walmart/backroom-mini-app": "1.15.9",
+ "@walmart/backroom-mini-app": "1.15.10",
"@walmart/calling-mini-app": "0.8.11",
"@walmart/candidate-authentication-lib": "0.0.8",
"@walmart/checkout-mini-app": "4.17.0",
--- yarn.lock
@@ -7824,9 +7824,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/backroom-mini-app@npm:1.15.9":
- version: 1.15.9
- resolution: "@walmart/backroom-mini-app@npm:1.15.9::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fbackroom-mini-app%2F-%2F%40walmart%2Fbackroom-mini-app-1.15.9.tgz"
+"@walmart/backroom-mini-app@npm:1.15.10":
+ version: 1.15.10
+ resolution: "@walmart/backroom-mini-app@npm:1.15.10::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fbackroom-mini-app%2F-%2F%40walmart%2Fbackroom-mini-app-1.15.10.tgz"
peerDependencies:
"@react-navigation/native": ^6.0.0
"@react-navigation/stack": ^6.1.0
@@ -7848,7 +7848,7 @@ __metadata:
react-native-svg-transformer: ">=1.0.0"
react-redux: ">=8.0.0"
redux: ">=4.0.0"
- checksum: 10c0/d576e846606218ddd3c76e169b97e9a0d358c00b84317ebe315a0a27d8493018d20d323b6aa44a8c61b98b33d178de988f69bed4d4b90a3c4d08debacc13dcf5
+ checksum: 10c0/13be10145f06d15b03535bbd0390889d043a5a00dc59e8c7a51510bfaaff4c7cc51f84bc945fcfea6d39ed950c94ddef86c090913edb749652f185e03b62d8c6
languageName: node
linkType: hard
@@ -8686,7 +8686,7 @@ __metadata:
"@walmart/attendance-mini-app": "npm:3.174.3"
"@walmart/avp-feature-app": "npm:0.25.32"
"@walmart/avp-shared-library": "npm:0.25.28"
- "@walmart/backroom-mini-app": "npm:1.15.9"
+ "@walmart/backroom-mini-app": "npm:1.15.10"
"@walmart/calling-mini-app": "npm:0.8.11"
"@walmart/candidate-authentication-lib": "npm:0.0.8"
"@walmart/checkout-mini-app": "npm:4.17.0"
| fix: SVZPK-5166 Fix backroom annual inventory status check (#4715) | fix: SVZPK-5166 Fix backroom annual inventory status check (#4715)
Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com> |
1d6698408ec2af8b988b8bafc70e918fa27e7c2a | --- allspark.config.js
@@ -18,6 +18,9 @@ module.exports = {
},
environments: ['stg', 'prod'],
},
+ extraConfig: {
+ namingConvention: 'keep',
+ },
},
},
};
--- packages/allspark-foundation/src/cli/generate.js
@@ -73,6 +73,10 @@ const codegenConfig = {
documents: `${queryPath}/*.graphql`,
};
+if (config.extraConfig) {
+ codegenConfig.config = config.extraConfig
+}
+
(async () => {
// Generate types and schema from athena schema
await cli.generate({
| feat(codegen): ALLSPARK-5823 update graphql codegen config with namingConvention (#203) | feat(codegen): ALLSPARK-5823 update graphql codegen config with namingConvention (#203)
|
559ee2d753b97b73f66afb40679149e9ac028ad4 | --- package.json
@@ -152,7 +152,7 @@
"@walmart/shop-gnfr-mini-app": "1.0.417",
"@walmart/sidekick-mini-app": "4.201.13",
"@walmart/store-feature-orders": "1.33.3",
- "@walmart/taskit-mini-app": "5.39.1",
+ "@walmart/taskit-mini-app": "5.39.2",
"@walmart/time-clock-mini-app": "3.19.2",
"@walmart/time-clock-mini-app-next": "3.0.0",
"@walmart/topstock-mini-app": "1.25.4",
--- yarn.lock
@@ -7664,7 +7664,7 @@ __metadata:
"@walmart/shop-gnfr-mini-app": "npm:1.0.417"
"@walmart/sidekick-mini-app": "npm:4.201.13"
"@walmart/store-feature-orders": "npm:1.33.3"
- "@walmart/taskit-mini-app": "npm:5.39.1"
+ "@walmart/taskit-mini-app": "npm:5.39.2"
"@walmart/time-clock-mini-app": "npm:3.19.2"
"@walmart/time-clock-mini-app-next": "npm:3.0.0"
"@walmart/topstock-mini-app": "npm:1.25.4"
@@ -8494,12 +8494,12 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/taskit-mini-app@npm:5.39.1":
- version: 5.39.1
- resolution: "@walmart/taskit-mini-app@npm:5.39.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftaskit-mini-app%2F-%2F%40walmart%2Ftaskit-mini-app-5.39.1.tgz"
+"@walmart/taskit-mini-app@npm:5.39.2":
+ version: 5.39.2
+ resolution: "@walmart/taskit-mini-app@npm:5.39.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftaskit-mini-app%2F-%2F%40walmart%2Ftaskit-mini-app-5.39.2.tgz"
peerDependencies:
"@walmart/allspark-foundation": "*"
- checksum: 10c0/1e381ce284de23f57f585bad25aeb1fb236846510e9c116cf9892b41000def68d9705b9923b44289b033825bfbb359bc5e151fe6e3d727bdece1ecb4fef01584
+ checksum: 10c0/77e9273eb94f4c7ab583f74a373f1a51099db0c65b9783ecca20d434865c483b0acb6bf331d4f9b3ae9d8e98cd644b878901953aa0fb4553e32aa51655b57b02
languageName: node
linkType: hard
| chore: bump taskit version TASKIT-6698 (#4519) | chore: bump taskit version TASKIT-6698 (#4519)
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> |
46672229c61995b983c05227be499a7862384060 | --- src/auth/ErrorScreen.tsx
@@ -31,10 +31,23 @@ import WmConfig from 'react-native-wm-config';
import {flatten, isEmpty} from 'lodash';
interface Lang {
- code: '';
+ code: string;
'en-US': string;
'es-MX': string;
}
+interface OptionList {
+ logLabel: string;
+ code: string;
+}
+interface LogMsg {
+ message: string;
+ userId: string;
+ siteId: string;
+ code: string;
+ errorCategory: string;
+ devicetype?: any;
+ options?: Array<any>;
+}
export const ErrorScreen: FC<any> = (props) => {
const {navigation} = props;
@@ -53,7 +66,7 @@ export const ErrorScreen: FC<any> = (props) => {
initialConfig.issues,
);
const [otherErrorFb, setOtherErrorFb] = useState(initialConfig.otherIssues);
- const [selectedOther, setSelectedOther] = useState({});
+ const [selectedOther, setSelectedOther] = useState<any>({});
const [formatedMsgOther, setFormatedOther] = useState([]);
const [deviceType, setDeviceType] = useState({});
@@ -90,7 +103,7 @@ export const ErrorScreen: FC<any> = (props) => {
setFormDirty(true);
if (!missingFields && !missingOther) {
const userIdValue = userId.split('.')[0];
- const logMsg = {
+ const logMsg: LogMsg = {
message: detail || 'no details entered by the user',
userId: encryptUserId(userIdValue.toUpperCase(), siteId),
siteId: siteId,
@@ -109,7 +122,7 @@ export const ErrorScreen: FC<any> = (props) => {
dismissText: translate('welcomeScreen.gotIt'),
}),
);
- logger.error('SSO error while Login', logMsg);
+ logger.error('SSO error while Login', {...logMsg});
}
};
@@ -118,12 +131,12 @@ export const ErrorScreen: FC<any> = (props) => {
};
const updateFormatedOther = (
- optionList: Array,
+ optionList: Array<OptionList>,
title: string,
selectedList: Array<string>,
code: string,
) => {
- const selectedOption = selectedList.map((opnId) => ({
+ const selectedOption = selectedList.map((opnId: any) => ({
value: optionList[opnId].logLabel,
code: optionList[opnId].code,
}));
@@ -136,7 +149,7 @@ export const ErrorScreen: FC<any> = (props) => {
const getOptions = (list: Array<Lang>) => {
return list.map((opn, index) => ({
- id: index,
+ id: index.toString(),
label: opn[lang],
code: opn.code,
logLabel: opn['en-US'],
@@ -242,7 +255,7 @@ export const ErrorScreen: FC<any> = (props) => {
</View>
{errorCategory[lang] === translate('ssoError.other') && (
<View>
- {otherErrorFb.map((question) => {
+ {otherErrorFb.map((question: any) => {
const title = question.title[lang];
const items = getOptions(question.options);
return (
| typescript error fix | typescript error fix
|
5dc18678f98ad883c9d39f33c172e4ccd67f973b | --- package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.1.2",
+ "version": "1.1.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@walmart/myteam-mini-app",
- "version": "1.1.2",
+ "version": "1.1.3",
"hasInstallScript": true,
"devDependencies": {
"@babel/core": "^7.20.0",
@@ -66,9 +66,9 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/redux-store": "3.7.0",
- "@walmart/roster-mini-app": "1.1.2",
+ "@walmart/roster-mini-app": "1.1.3",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "1.1.2",
+ "@walmart/wmconnect-mini-app": "1.1.3",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
@@ -11817,9 +11817,9 @@
}
},
"node_modules/@walmart/roster-mini-app": {
- "version": "1.1.2",
- "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.1.2.tgz",
- "integrity": "sha512-D/Qs9GZKmrN1Y7QsZ8xrgiWOi8wNGvt5qxI6cy8wJNJTEF/uRUlLPrpKoi3Gf0E079Gs+1RxJVCgsbw0OPk1Aw==",
+ "version": "1.1.3",
+ "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.1.3.tgz",
+ "integrity": "sha512-fEDDtSuRyoNwVLzT5Nk0IJyoXa2vNjoFfkMASJOmx/VXjMMXSj+PYNxoOYzd2Y6d3H1a64mzLqT2egRb2ielZQ==",
"dev": true,
"hasInstallScript": true
},
@@ -11846,9 +11846,9 @@
}
},
"node_modules/@walmart/wmconnect-mini-app": {
- "version": "1.1.2",
- "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.1.2.tgz",
- "integrity": "sha512-q1V0DbjEDZ3xdQqBPsgBC3Rddk2t+YqXb4X6Voceqq9aAhRK81igWVYGgoaq7V+oYFP2N1zjPdUVD9QQiYPb6w==",
+ "version": "1.1.3",
+ "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.1.3.tgz",
+ "integrity": "sha512-utLNNhwNGE8V7bUb5nigMsa0GPo3jFM3U1ZiujCSvpfB+K3+j4T/fmSbaODkV+OTjMlQo0FufQulaX85iGnucA==",
"dev": true,
"hasInstallScript": true
},
@@ -40901,9 +40901,9 @@
}
},
"@walmart/roster-mini-app": {
- "version": "1.1.2",
- "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.1.2.tgz",
- "integrity": "sha512-D/Qs9GZKmrN1Y7QsZ8xrgiWOi8wNGvt5qxI6cy8wJNJTEF/uRUlLPrpKoi3Gf0E079Gs+1RxJVCgsbw0OPk1Aw==",
+ "version": "1.1.3",
+ "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.1.3.tgz",
+ "integrity": "sha512-fEDDtSuRyoNwVLzT5Nk0IJyoXa2vNjoFfkMASJOmx/VXjMMXSj+PYNxoOYzd2Y6d3H1a64mzLqT2egRb2ielZQ==",
"dev": true
},
"@walmart/ui-components": {
@@ -40918,9 +40918,9 @@
}
},
"@walmart/wmconnect-mini-app": {
- "version": "1.1.2",
- "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.1.2.tgz",
- "integrity": "sha512-q1V0DbjEDZ3xdQqBPsgBC3Rddk2t+YqXb4X6Voceqq9aAhRK81igWVYGgoaq7V+oYFP2N1zjPdUVD9QQiYPb6w==",
+ "version": "1.1.3",
+ "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.1.3.tgz",
+ "integrity": "sha512-utLNNhwNGE8V7bUb5nigMsa0GPo3jFM3U1ZiujCSvpfB+K3+j4T/fmSbaODkV+OTjMlQo0FufQulaX85iGnucA==",
"dev": true
},
"@whatwg-node/events": {
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.1.2",
+ "version": "1.1.3",
"private": false,
"main": "dist/index.js",
"files": [
@@ -89,8 +89,8 @@
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/redux-store": "3.7.0",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "1.1.2",
- "@walmart/roster-mini-app": "1.1.2",
+ "@walmart/wmconnect-mini-app": "1.1.3",
+ "@walmart/roster-mini-app": "1.1.3",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
| Update version | Update version
|
0bc862bf935856233347ee5a0c7d29051dd838b9 | --- ios/Podfile.lock
@@ -1197,7 +1197,7 @@ PODS:
- React-Core
- react-native-blob-util (0.16.3):
- React-Core
- - react-native-cameraroll (4.1.2):
+ - react-native-cameraroll (5.6.0):
- React-Core
- react-native-encrypted-storage (1.1.3):
- React-Core
@@ -1539,7 +1539,7 @@ DEPENDENCIES:
- react-native-background-timer (from `../node_modules/react-native-background-timer`)
- react-native-biometrics (from `../node_modules/react-native-biometrics`)
- react-native-blob-util (from `../node_modules/react-native-blob-util`)
- - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
+ - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
- "react-native-encrypted-storage (from `../node_modules/@walmart/react-native-encrypted-storage`)"
- react-native-flipper (from `../node_modules/react-native-flipper`)
- react-native-geolocation-service (from `../node_modules/react-native-geolocation-service`)
@@ -1741,7 +1741,7 @@ EXTERNAL SOURCES:
react-native-blob-util:
:path: "../node_modules/react-native-blob-util"
react-native-cameraroll:
- :path: "../node_modules/@react-native-community/cameraroll"
+ :path: "../node_modules/@react-native-camera-roll/camera-roll"
react-native-encrypted-storage:
:path: "../node_modules/@walmart/react-native-encrypted-storage"
react-native-flipper:
@@ -1960,7 +1960,7 @@ SPEC CHECKSUMS:
react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
react-native-blob-util: 4ec16cc21bfc8de8f0ddfd2c81ada00f8c34b646
- react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866
+ react-native-cameraroll: 755bcc628148a90a7c9cf3f817a252be3a601bc5
react-native-encrypted-storage: 632e8eac25dff0b6cac14e6e0c76498c4a39e24e
react-native-flipper: 6e4e344a0104a34a4e189a9ef2b3b5634b516dc8
react-native-geolocation-service: 608e1da71a1ac31b4de64d9ef2815f697978c55b
| updated podfile. | updated podfile.
|
a780fb5f579be85ffe2a12a1f5af090f52ae50c8 | --- __tests__/copeSideKey/CopeKeyListenerTest.ts
@@ -1,46 +0,0 @@
-import {Platform} from 'react-native';
-import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation';
-import KeyEvent from '@walmart/allspark-cope-key-listener';
-import {
- COPE_DEVICE_SIDE_KEY_CODE,
- COPE_SIDE_KEY_TARGET,
- processKeyEvent,
- CopeSideKeyFeature,
-} from '../../src/copeSideKey';
-
-jest.mock('@walmart/allspark-cope-key-listener', () => ({
- onKeyDownListener: jest.fn(),
- removeKeyDownListener: jest.fn(),
- requestFocus: jest.fn(),
-}));
-
-describe('CopeKeyListener', () => {
- beforeEach(jest.resetAllMocks);
-
- it('it sets up key listener', () => {
- Platform.OS = 'android';
- CopeSideKeyFeature.connect();
-
- expect(KeyEvent.onKeyDownListener).toHaveBeenCalled();
- expect(KeyEvent.requestFocus).toHaveBeenCalled();
-
- CopeSideKeyFeature.disconnect();
- expect(KeyEvent.removeKeyDownListener).toHaveBeenCalled();
- });
-
- it('navigates to target screen if not on blacklisted screen', () => {
- (
- AllsparkNavigationClient.getCurrentRouteName as jest.Mock
- ).mockReturnValueOnce('randomScreen');
- processKeyEvent({keyCode: COPE_DEVICE_SIDE_KEY_CODE});
- expect(AllsparkNavigationClient.navigate).toHaveBeenCalled();
- });
-
- it('does not navigate if already on target screen', () => {
- (
- AllsparkNavigationClient.getCurrentRouteName as jest.Mock
- ).mockReturnValueOnce(COPE_SIDE_KEY_TARGET);
- processKeyEvent({keyCode: COPE_DEVICE_SIDE_KEY_CODE});
- expect(AllsparkNavigationClient.navigate).not.toHaveBeenCalled();
- });
-});
--- __tests__/startup/CopeKeyListenerTest.ts
@@ -6,7 +6,7 @@ import {
COPE_DEVICE_SIDE_KEY_CODE,
COPE_SIDE_KEY_TARGET,
processKeyEvent,
- initCopeSideKeyListener,
+ CopeSideKeyFeature,
} from '../../src/startup/CopeKeyListener';
import {
AllsparkReduxStore,
@@ -23,7 +23,6 @@ import {ConfigActionCreators} from '@walmart/allspark-foundation/Config';
describe('CopeKeyListener', () => {
beforeEach(jest.clearAllMocks);
- beforeEach(() => {});
it('it sets up key listener', async () => {
Platform.OS = 'android';
@@ -34,11 +33,11 @@ describe('CopeKeyListener', () => {
},
}),
);
- const unmount = initCopeSideKeyListener();
+ CopeSideKeyFeature.connect();
expect(KeyEvent.onKeyDownListener).toHaveBeenCalled();
expect(KeyEvent.requestFocus).toHaveBeenCalled();
- unmount();
+ CopeSideKeyFeature.disconnect();
expect(KeyEvent.removeKeyDownListener).toHaveBeenCalled();
});
it('it does not set up key listener when ccm is false', async () => {
@@ -50,12 +49,12 @@ describe('CopeKeyListener', () => {
},
}),
);
- const unmount = initCopeSideKeyListener();
+ CopeSideKeyFeature.connect();
expect(KeyEvent.onKeyDownListener).not.toHaveBeenCalled();
expect(KeyEvent.requestFocus).not.toHaveBeenCalled();
- unmount();
- expect(KeyEvent.removeKeyDownListener).not.toHaveBeenCalled();
+ CopeSideKeyFeature.disconnect();
+ expect(KeyEvent.removeKeyDownListener).toHaveBeenCalled();
});
it('navigates to target screen if not on blacklisted screen', async () => {
--- src/copeSideKey/index.ts
@@ -1,37 +0,0 @@
-import KeyEvent from '@walmart/allspark-cope-key-listener';
-import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature';
-import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation';
-import {FeatureTags} from '@walmart/me-at-walmart-common';
-
-export const COPE_DEVICE_SIDE_KEY_CODE = 1015;
-export const COPE_SIDE_KEY_TARGET = 'itemInfoQuickAction';
-export const COPE_SIDE_KEY_ROUTE_BLACKLIST = [COPE_SIDE_KEY_TARGET, 'itemInfo'];
-
-type KeyEvent = {keyCode: number};
-
-export const processKeyEvent = ({keyCode}: KeyEvent) => {
- const currentRoute = AllsparkNavigationClient.getCurrentRouteName();
-
- if (keyCode === COPE_DEVICE_SIDE_KEY_CODE) {
- // Skip if we're already on the target route or other blacklisted route
- if (COPE_SIDE_KEY_ROUTE_BLACKLIST.includes(currentRoute)) {
- return;
- }
-
- AllsparkNavigationClient.navigate(COPE_SIDE_KEY_TARGET);
- }
-};
-
-export const CopeSideKeyFeature = new AllsparkFeatureModule('copeSideKey', {
- name: 'Cope Side Key',
- tags: [FeatureTags.associate],
- listeners: {
- feature: {
- onConnect: () => {
- KeyEvent.onKeyDownListener(processKeyEvent);
- KeyEvent.requestFocus();
- },
- onDisconnect: KeyEvent.removeKeyDownListener,
- },
- },
-});
--- src/features/AssociateFeatures.tsx
@@ -9,7 +9,7 @@ import {ListenerSubscription} from '@walmart/allspark-utils';
import {BadgesFeature} from '../badges';
import {BannersFeature} from '../banners';
-import {CopeSideKeyFeature} from '../copeSideKey';
+import {CopeSideKeyFeature} from '../startup/CopeKeyListener';
import {ImpersonationFeature} from '../impersonation';
import {HomeFeature} from '../home';
import {registerInboxComponents} from '../inbox';
--- src/settings/sideButton/SideButtonSettings.tsx
@@ -130,7 +130,6 @@ export const SideButtonSettings = () => {
const onSelectOption = (option: SideButtonOptions) => {
setSelectedOption(option);
AsyncStorage.setItem(SIDE_BTN_SELECTION_ASKEY, option);
- // save it in redux or async?
};
return (
--- src/startup/CopeKeyListener.ts
@@ -6,7 +6,8 @@ import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'
import {SidekeyTelemetry} from '../core/Telemetry';
import {getSettingsAppConfig} from '../settings';
import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux';
-import {noop} from 'lodash';
+import {AllsparkFeatureModule} from '@walmart/allspark-foundation';
+import {FeatureTags} from '@walmart/me-at-walmart-common';
export const COPE_DEVICE_SIDE_KEY_CODE = 1015;
export const COPE_SIDE_KEY_TARGET = 'itemInfoQuickAction';
@@ -38,13 +39,20 @@ export const processKeyEvent = async (keyEvent: {keyCode: number}) => {
}
};
-export const initCopeSideKeyListener = () => {
- const settingsConfig = AllsparkReduxStore.select(getSettingsAppConfig);
- const isEnabled = settingsConfig?.enableSideKey ?? true;
- if (isEnabled) {
- KeyEvent.onKeyDownListener(processKeyEvent);
- KeyEvent.requestFocus();
- return KeyEvent.removeKeyDownListener;
- }
- return () => noop;
-};
+export const CopeSideKeyFeature = new AllsparkFeatureModule('copeSideKey', {
+ name: 'Cope Side Key',
+ tags: [FeatureTags.associate],
+ listeners: {
+ feature: {
+ onConnect: () => {
+ const settingsConfig = AllsparkReduxStore.select(getSettingsAppConfig);
+ const isEnabled = settingsConfig?.enableSideKey ?? true;
+ if (isEnabled) {
+ KeyEvent.onKeyDownListener(processKeyEvent);
+ KeyEvent.requestFocus();
+ }
+ },
+ onDisconnect: KeyEvent.removeKeyDownListener,
+ },
+ },
+});
| fixing side btn for d22 | fixing side btn for d22
|
9117cba3368172b456f9c8e4bfb308b71db5ff42 | --- src/utils/user.ts
@@ -4,7 +4,6 @@ import {Associate} from '../types';
import {GetAssociateNameQuery} from '../queries/getAssociateName';
import {ClockStatusEnum} from './ClockStatusEnum';
import moment from 'moment';
-import {payTypes} from '../constants';
const OBFUSCATION_KEY = 'texting-mini-app';
const OBFUSCATION_PARSE_KEY = OBFUSCATION_KEY.padStart(64, '0');
@@ -21,17 +20,6 @@ export const decryptUserId = (userId: string) => {
return decrypted.toString(CryptoJS.enc.Utf8);
};
-export const returnClockedStatusBasedOnSchedule = (scheduleInfo: any) => {
- const {schedStartTime, schedEndTime} =
- getScheduleStartAndEndTime(scheduleInfo);
- const currentTime = moment().format('h:mma');
- if (currentTime < schedStartTime || currentTime > schedEndTime) {
- return false; // Clocked status would be Clocked Out
- } else {
- return true; // Clocked status would be Clocked In
- }
-};
-
export const associateIsAbsent = (associate?: Associate) =>
associate?.absentData?.absenceTypeCode === 1;
@@ -39,42 +27,7 @@ export const associateIsTardy = (associate?: Associate) =>
associate?.absentData?.absenceTypeCode === 2;
export const associateIsClockedIn = (associate?: Associate) => {
- /*
- If associate is Salaried and punch data is null, clocked status would be Clocked In
- */
- if (
- associate?.payType?.toUpperCase() === payTypes.SALARIED &&
- !associate.punch
- ) {
- return true;
- }
-
- /*
- If punch data is null, then we would check if the associate has schedule data
- If there is schedule info, we would return the Clocked status based on schedule info else clocked status would be Clocked out
- */
- if (!associate?.punch) {
- if (!associate?.storeSchedule) {
- return true;
- } else if (associate.storeSchedule && associate.storeSchedule.length > 0) {
- return returnClockedStatusBasedOnSchedule(associate.storeSchedule);
- } else {
- return false;
- }
- }
-
- /*
- If punch data has clockStatus and its value is unknown, then we would check if the associate has schedule data
- If there is schedule info, we would return the Clocked status based on schedule info else clocked status would be Clocked out
- */
- if (ClockStatusEnum.unknown === Number(associate?.punch?.clockStatus)) {
- if (associate.storeSchedule && associate.storeSchedule.length > 0) {
- return returnClockedStatusBasedOnSchedule(associate.storeSchedule);
- } else {
- return false;
- }
- }
- return ClockStatusEnum.clockedIn === Number(associate?.punch?.clockStatus);
+ return ClockStatusEnum.clockedOut !== Number(associate?.punch?.clockStatus);
};
export const associateIsClockedOut = (associate?: Associate) => {
--- src/utils/user.ts
@@ -4,7 +4,6 @@ import {Associate} from '../types';
import {GetAssociateNameQuery} from '../queries/getAssociateName';
import {ClockStatusEnum} from './ClockStatusEnum';
import moment from 'moment';
-import {payTypes} from '../constants';
const OBFUSCATION_KEY = 'texting-mini-app';
const OBFUSCATION_PARSE_KEY = OBFUSCATION_KEY.padStart(64, '0');
@@ -21,17 +20,6 @@ export const decryptUserId = (userId: string) => {
return decrypted.toString(CryptoJS.enc.Utf8);
};
-export const returnClockedStatusBasedOnSchedule = (scheduleInfo: any) => {
- const {schedStartTime, schedEndTime} =
- getScheduleStartAndEndTime(scheduleInfo);
- const currentTime = moment().format('h:mma');
- if (currentTime < schedStartTime || currentTime > schedEndTime) {
- return false; // Clocked status would be Clocked Out
- } else {
- return true; // Clocked status would be Clocked In
- }
-};
-
export const associateIsAbsent = (associate?: Associate) =>
associate?.absentData?.absenceTypeCode === 1;
@@ -39,42 +27,7 @@ export const associateIsTardy = (associate?: Associate) =>
associate?.absentData?.absenceTypeCode === 2;
export const associateIsClockedIn = (associate?: Associate) => {
- /*
- If associate is Salaried and punch data is null, clocked status would be Clocked In
- */
- if (
- associate?.payType?.toUpperCase() === payTypes.SALARIED &&
- !associate.punch
- ) {
- return true;
- }
-
- /*
- If punch data is null, then we would check if the associate has schedule data
- If there is schedule info, we would return the Clocked status based on schedule info else clocked status would be Clocked out
- */
- if (!associate?.punch) {
- if (!associate?.storeSchedule) {
- return true;
- } else if (associate.storeSchedule && associate.storeSchedule.length > 0) {
- return returnClockedStatusBasedOnSchedule(associate.storeSchedule);
- } else {
- return false;
- }
- }
-
- /*
- If punch data has clockStatus and its value is unknown, then we would check if the associate has schedule data
- If there is schedule info, we would return the Clocked status based on schedule info else clocked status would be Clocked out
- */
- if (ClockStatusEnum.unknown === Number(associate?.punch?.clockStatus)) {
- if (associate.storeSchedule && associate.storeSchedule.length > 0) {
- return returnClockedStatusBasedOnSchedule(associate.storeSchedule);
- } else {
- return false;
- }
- }
- return ClockStatusEnum.clockedIn === Number(associate?.punch?.clockStatus);
+ return ClockStatusEnum.clockedOut !== Number(associate?.punch?.clockStatus);
};
export const associateIsClockedOut = (associate?: Associate) => {
| updating clock status to match home screen | updating clock status to match home screen
|
00488ba2a838c774c8c61f700f96cdd43f5e3a21 | --- package-lock.json
@@ -3124,9 +3124,9 @@
}
},
"@walmart/push-to-talk-mini-app": {
- "version": "0.5.10",
- "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.10.tgz",
- "integrity": "sha512-ENKfPWuEgfER1n71tZeuCH4CXXL7YdEKqiu7L4nL+70BRz/x+LcUSnbokeG1oT47XVzmOgrddfQNKYDQ+Sx9cA=="
+ "version": "0.5.16",
+ "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.16.tgz",
+ "integrity": "sha512-M3zEEGw1xgRJe8O0hbfkjZE2jMfM7XvkodbBS1JDA81N/O7UfRrlcr6oL5zUxySUk8XpQEUvyUB6xmTqsvsrnw=="
},
"@walmart/react-native-collapsible": {
"version": "1.5.3",
@@ -6335,21 +6335,6 @@
"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
"dev": true
},
- "html-parse-stringify": {
- "version": "3.0.0",
- "resolved": "https://npme.walmart.com/html-parse-stringify/-/html-parse-stringify-3.0.0.tgz",
- "integrity": "sha512-TrTKp/U0tACrpqalte/VhxepqMLii2mOfC8iuOt4+VA7Zdi6BUKKqNJvEsO17Cr3T3E7PpqLe3NdLII6bcYJgg==",
- "requires": {
- "void-elements": "3.1.0"
- },
- "dependencies": {
- "void-elements": {
- "version": "3.1.0",
- "resolved": "https://npme.walmart.com/void-elements/-/void-elements-3.1.0.tgz",
- "integrity": "sha1-YU9/v42AHwu18GYfWy9XhXUOTwk="
- }
- }
- },
"html-parse-stringify2": {
"version": "2.0.1",
"resolved": "https://npme.walmart.com/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz",
--- package.json
@@ -74,7 +74,7 @@
"@walmart/impersonation-mini-app": "1.0.15",
"@walmart/inbox-mini-app": "0.0.94",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/push-to-talk-mini-app": "0.5.10",
+ "@walmart/push-to-talk-mini-app": "0.5.16",
"@walmart/react-native-env": "^0.1.0",
"@walmart/react-native-logger": "^1.25.0",
"@walmart/react-native-shared-navigation": "^0.4.0",
| PTT hotfix for Roster | PTT hotfix for Roster
|
f99f8268c3476955db51f1ff3f146b5759ffb188 | --- packages/allspark-foundation/src/Components/TeamOnboarding/TeamSelection/ListHeader.tsx
@@ -2,6 +2,7 @@ import React from 'react';
import { View, Text } from 'react-native';
import { Checkbox } from '@walmart/gtp-shared-components/dist';
import { Teams, SelectAllTeams } from '../Constants/TeamSelectionConstants';
+import { ListHeaderProps } from './types';
export const ListHeader = ({
userType,
@@ -9,7 +10,7 @@ export const ListHeader = ({
allAvailableTeams,
handleSelectAll,
styles,
-}: any) => {
+}: ListHeaderProps) => {
if (userType !== 'salariedAssociate') {
return null;
}
| Adding types | Adding types
|
d2979d6aeca7afd8568ba47c34c00edf5d114d6c | --- package-lock.json
@@ -45,7 +45,7 @@
"@walmart/counts-component-miniapp": "0.1.2",
"@walmart/emergency-mini-app": "1.19.0",
"@walmart/exception-mini-app": "1.0.16",
- "@walmart/facilities-management-miniapp": "0.5.36",
+ "@walmart/facilities-management-miniapp": "0.6.0",
"@walmart/feedback-all-spark-miniapp": "0.9.10",
"@walmart/financial-wellbeing-feature-app": "1.1.2",
"@walmart/functional-components": "2.0.6",
@@ -4948,9 +4948,9 @@
}
},
"node_modules/@walmart/facilities-management-miniapp": {
- "version": "0.5.36",
- "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.5.36.tgz",
- "integrity": "sha512-p5m5YmsrIZn116EQH+LCicHndhru5mmx0T435XnOsaaCD77Fc3U7/K8jgP/KQkbtmG/EmjhBHFkr0dCIh18V0w==",
+ "version": "0.6.0",
+ "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.6.0.tgz",
+ "integrity": "sha512-quCfoEAbiZKbTTLbQwpU1ynwJ2f3QJp2Vflr4J2BbUrbHBSK7ARswrBHkHpT+eseKs8qla1qcsLOVqJJ8HTxyg==",
"hasInstallScript": true,
"peerDependencies": {
"@react-native-community/async-storage": "^1.12.1",
@@ -25014,9 +25014,9 @@
"integrity": "sha512-mzesUeNPUwAWFUrFs6104aZ3NCM5eXa2uD8TrjL+BV+ZVgYG/A58k1xUUxNayw26w7Z41J7m4bxA9ctgNiNVMQ=="
},
"@walmart/facilities-management-miniapp": {
- "version": "0.5.36",
- "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.5.36.tgz",
- "integrity": "sha512-p5m5YmsrIZn116EQH+LCicHndhru5mmx0T435XnOsaaCD77Fc3U7/K8jgP/KQkbtmG/EmjhBHFkr0dCIh18V0w=="
+ "version": "0.6.0",
+ "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.6.0.tgz",
+ "integrity": "sha512-quCfoEAbiZKbTTLbQwpU1ynwJ2f3QJp2Vflr4J2BbUrbHBSK7ARswrBHkHpT+eseKs8qla1qcsLOVqJJ8HTxyg=="
},
"@walmart/feedback-all-spark-miniapp": {
"version": "0.9.10",
--- package.json
@@ -87,7 +87,7 @@
"@walmart/counts-component-miniapp": "0.1.2",
"@walmart/emergency-mini-app": "1.19.0",
"@walmart/exception-mini-app": "1.0.16",
- "@walmart/facilities-management-miniapp": "0.5.36",
+ "@walmart/facilities-management-miniapp": "0.6.0",
"@walmart/feedback-all-spark-miniapp": "0.9.10",
"@walmart/financial-wellbeing-feature-app": "1.1.2",
"@walmart/functional-components": "2.0.6",
| Updating the facilities-management-miniapp version to 0.6.0 | Updating the facilities-management-miniapp version to 0.6.0
|
3fdb970c5a967fc8ef0f3ec004048d274dafa3b3 | --- package-lock.json
@@ -3372,9 +3372,9 @@
"integrity": "sha512-L9Ig27eukaRF9mCTo7bJjv0SL84iDLlmM8FNb0882XTBFeeQT7PuBVWDnQSNjhmxmrWHXOH/cC05G/wBHjgCHA=="
},
"@walmart/inbox-mini-app": {
- "version": "0.5.0",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.5.0.tgz",
- "integrity": "sha512-OOYBMD+O5stpF2joINj6vgJiWMe926EQEw4IwlrlFfR6VX4UDKV8cu0ctD5CEzXDIz9cR/dUZZ1YapYr/qUc+g=="
+ "version": "0.6.0",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.6.0.tgz",
+ "integrity": "sha512-qc2ZS9IuYsN7/+vjkak3j4Ii7WqiDLc+3jtGTfmQAI9+JLzPlBL+0X7nHZe9x7fz/FHrtkU0hgy3ZKWOIMoefg=="
},
"@walmart/iteminfo-mini-app": {
"version": "2.0.6",
--- package.json
@@ -82,7 +82,7 @@
"@walmart/gtp-shared-components": "^1.2.0",
"@walmart/impersonation-mini-app": "1.0.18",
"@walmart/ims-print-services-ui": "0.0.35",
- "@walmart/inbox-mini-app": "0.5.0",
+ "@walmart/inbox-mini-app": "0.6.0",
"@walmart/iteminfo-mini-app": "2.0.6",
"@walmart/manager-approvals-miniapp": "0.0.49",
"@walmart/metrics-mini-app": "0.4.11",
| bump inbox | bump inbox
|
6e25a3a8e0b4d8bdbf6eff93b5857d5bad11acc0 | --- graphql.yml
@@ -78,11 +78,11 @@ applications:
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociateById.graphql'
tags:
- 'v1'
- - name: 'getAssociatePreferences'
- hash: '38e0530d669fff42cb1dc8e5814369c40c33f6d6a77ed734e039948a0c06e8f4'
- queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociatePreference.graphql'
- tags:
- - 'v1'
+ # - name: "getAssociatePreferences"
+ # hash: "38e0530d669fff42cb1dc8e5814369c40c33f6d6a77ed734e039948a0c06e8f4"
+ # queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociatePreference.graphql"
+ # tags:
+ # - "v1"
- name: 'getDailyRosterHome'
hash: '3c492831585580bae535c3386ec48e90c2d1895450016f050653bd51ddf86c21'
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getDailyRosterHome.graphql'
@@ -93,28 +93,28 @@ applications:
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql'
tags:
- 'v1'
- - name: 'getSupplyChainTeamPreference'
- hash: '61253c3d4d8ab6db774a903969c2f63de9113f44c1947d52c3630dd38ce30839'
- queryTemplate: 'packages/me-at-walmart-athena-queries/src/getSupplyChainTeamPreferenceQuery.graphql'
- tags:
- - 'v1'
+ # - name: "getSupplyChainTeamPreference"
+ # hash: "61253c3d4d8ab6db774a903969c2f63de9113f44c1947d52c3630dd38ce30839"
+ # queryTemplate: "packages/me-at-walmart-athena-queries/src/getSupplyChainTeamPreferenceQuery.graphql"
+ # tags:
+ # - "v1"
- name: 'getTeamByIdHome'
hash: '6b4b876250309d85dd51831ace4595bd1764b3d41ef7fd65c08df03b4c4982e0'
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getTeamByIdHome.graphql'
tags:
- 'v1'
- - name: 'GetTeamsByStore'
- hash: 'e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44'
- queryTemplate: 'packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql'
- tags:
- - 'v1'
+ # - name: "GetTeamsByStore"
+ # hash: "e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44"
+ # queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql"
+ # tags:
+ # - "v1"
- name: 'upsertAssociatePreference'
hash: '972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036'
queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql'
tags:
- 'v1'
- - name: 'upsertManagerExperiencePreference'
- hash: 'bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca'
- queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql'
- tags:
- - 'v1'
+ # - name: "upsertManagerExperiencePreference"
+ # hash: "bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca"
+ # queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql"
+ # tags:
+ # - "v1"
| Update graphql.yml | Update graphql.yml
|
948ef79023fd114dcc6dae54ca38f3e5e6f41bf0 | --- targets/US/package.json
@@ -136,7 +136,7 @@
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.7.2-alpha.2",
"@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.4.3#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.4.3-2621d9f1df.patch",
- "@walmart/receipt-check-miniapp": "1.27.2",
+ "@walmart/receipt-check-miniapp": "1.27.3",
"@walmart/redux-store": "~6.3.28",
"@walmart/returns-mini-app": "4.15.0",
"@walmart/rfid-scan-mini-app": "2.6.3",
--- yarn.lock
@@ -7051,7 +7051,7 @@ __metadata:
"@walmart/react-native-store-map": "npm:0.3.7"
"@walmart/react-native-sumo-sdk": "npm:2.7.2-alpha.2"
"@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.4.3#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.4.3-2621d9f1df.patch"
- "@walmart/receipt-check-miniapp": "npm:1.27.2"
+ "@walmart/receipt-check-miniapp": "npm:1.27.3"
"@walmart/redux-store": "npm:~6.3.28"
"@walmart/returns-mini-app": "npm:4.15.0"
"@walmart/rfid-scan-mini-app": "npm:2.6.3"
@@ -7683,9 +7683,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/receipt-check-miniapp@npm:1.27.2":
- version: 1.27.2
- resolution: "@walmart/receipt-check-miniapp@npm:1.27.2"
+"@walmart/receipt-check-miniapp@npm:1.27.3":
+ version: 1.27.3
+ resolution: "@walmart/receipt-check-miniapp@npm:1.27.3"
dependencies:
"@walmart/tcnumber": "npm:^2.3.3"
"@xstate/react": "npm:^3.0.1"
@@ -7695,7 +7695,7 @@ __metadata:
xstate: "npm:^4.32.1"
peerDependencies:
"@walmart/allspark-foundation": "*"
- checksum: 10c0/57b843fbe6f54a229fa24ace9ac47e69cadfd0174bee3103caf386f073394beee94e644a8b263c55bcee58b55b0a304af74ddb1032ef4956085554262a834632
+ checksum: 10c0/5787a4c7d8dac4f9edadeeecc3cb8fdb658f43119ba5b35a20a8ee1e8f96f2a13ea4a50094d7c523b76be3ccb28eef4077ad855a495f5f4131496fd417421701
languageName: node
linkType: hard
| update | update
|
a948775b744a7311c8c8fc77607007e17d1166d9 | --- src/components/ClockedOutScreenGuard.tsx
@@ -3,7 +3,7 @@
*/
import {analytics} from '../logger/Analytics';
import {noop} from 'lodash';
-import React, {ReactNode} from 'react';
+import React, {ReactChild, ReactElement, ReactNode} from 'react';
import {StyleSheet} from 'react-native';
import {Alert} from '@walmart/gtp-shared-components';
import {useSelector} from 'react-redux';
@@ -16,7 +16,7 @@ const styles = StyleSheet.create({
});
interface ClockedOutScreenGuardProps {
- children: ReactNode;
+ children: ReactElement;
}
export const ClockedOutScreenGuard: React.FC<ClockedOutScreenGuardProps> = ({
--- src/components/ClockedOutScreenGuard.tsx
@@ -3,7 +3,7 @@
*/
import {analytics} from '../logger/Analytics';
import {noop} from 'lodash';
-import React, {ReactNode} from 'react';
+import React, {ReactChild, ReactElement, ReactNode} from 'react';
import {StyleSheet} from 'react-native';
import {Alert} from '@walmart/gtp-shared-components';
import {useSelector} from 'react-redux';
@@ -16,7 +16,7 @@ const styles = StyleSheet.create({
});
interface ClockedOutScreenGuardProps {
- children: ReactNode;
+ children: ReactElement;
}
export const ClockedOutScreenGuard: React.FC<ClockedOutScreenGuardProps> = ({
| adding clockout screen guards | adding clockout screen guards
|
c014193e60e93715e627bcba68f4a279be387af8 | --- src/hooks/user.ts
@@ -2,9 +2,6 @@ import {useSelector} from 'react-redux';
import {UserSelectors, User} from '@walmart/redux-store';
import {teamLeadJobDescriptions as teamLeadJobDescriptionsSelector} from '../redux/selectors';
import {payTypes} from '../constants';
-import {Associate} from '../types';
-import {useDailyRoster} from '.';
-import {useMemo} from 'react';
export const useIsSalariedOrTeamLead = () => {
const user: User = useSelector(UserSelectors.getUser);
--- src/hooks/user.ts
@@ -2,9 +2,6 @@ import {useSelector} from 'react-redux';
import {UserSelectors, User} from '@walmart/redux-store';
import {teamLeadJobDescriptions as teamLeadJobDescriptionsSelector} from '../redux/selectors';
import {payTypes} from '../constants';
-import {Associate} from '../types';
-import {useDailyRoster} from '.';
-import {useMemo} from 'react';
export const useIsSalariedOrTeamLead = () => {
const user: User = useSelector(UserSelectors.getUser);
| remove import statements | remove import statements
|
786dc4444fedec7c30d42e505841dc00be126a1c | --- package-lock.json
@@ -5546,9 +5546,9 @@
"integrity": "sha512-oLRBAU+H58nrZuOa4nMD6XP6Vio2jn1+w589K/WoLSy1+5ppnatYoVb3e3i6kfQ81S0FjgSt5G3Lfj9YseD+hw=="
},
"@walmart/shelfavailability-mini-app": {
- "version": "1.2.3",
- "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.2.3.tgz",
- "integrity": "sha512-0Aemva6snk2LgySyY2NRuF9xKBS7DpGs1oPcDlaOjeXU3NRL7+DzbhY2VZhRIYxQKLz/MOC6NF81SzdgxlVimg=="
+ "version": "1.2.4",
+ "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.2.4.tgz",
+ "integrity": "sha512-+2MW/LQi8PqCiPpJXBs2uvhOa4mMKwHcjp3m4XpA8fVtndQLd76C0FivBSqOvAZgBoQc1DYRbVMdqM9nkCdy6Q=="
},
"@walmart/taskit-mini-app": {
"version": "0.34.5",
| Update package-lock.json | Update package-lock.json
|
afd7dbeb562761512634b088c1df5b653568dda1 | --- package.json
@@ -146,7 +146,7 @@
"@walmart/schedule-mini-app": "0.118.0",
"@walmart/shelfavailability-mini-app": "1.5.33",
"@walmart/sidekick-mini-app": "4.67.15",
- "@walmart/store-feature-orders": "1.26.12",
+ "@walmart/store-feature-orders": "1.27.1",
"@walmart/taskit-mini-app": "3.3.0",
"@walmart/time-clock-mini-app": "2.400.0",
"@walmart/topstock-mini-app": "1.15.20",
--- yarn.lock
@@ -7234,9 +7234,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/store-feature-orders@npm:1.26.12":
- version: 1.26.12
- resolution: "@walmart/store-feature-orders@npm:1.26.12"
+"@walmart/store-feature-orders@npm:1.27.1":
+ version: 1.27.1
+ resolution: "@walmart/store-feature-orders@npm:1.27.1"
peerDependencies:
"@react-navigation/native": ^6.0.0
"@react-navigation/stack": ^6.1.0
@@ -7245,7 +7245,7 @@ __metadata:
"@walmart/react-native-env": 0.2.0
react: ^18.2.0
react-native: ^0.73.7
- checksum: 10c0/077aac6be3ffaaa41a10cf413d1f7568a4358fc5d2e92f0e4d918de81e862be5b214b0f049eb08666321d0962fddc44fd37199725336683433a5399698044866
+ checksum: 10c0/e87feae039b262d37ba745ba5e211b3cf4eaf9e484f7d69aacc8be716ace4c6d2df31ae523282e81a08c8b9b70dd70a72f3133821789a649264278c815651283
languageName: node
linkType: hard
@@ -7943,7 +7943,7 @@ __metadata:
"@walmart/schedule-mini-app": "npm:0.118.0"
"@walmart/shelfavailability-mini-app": "npm:1.5.33"
"@walmart/sidekick-mini-app": "npm:4.67.15"
- "@walmart/store-feature-orders": "npm:1.26.12"
+ "@walmart/store-feature-orders": "npm:1.27.1"
"@walmart/taskit-mini-app": "npm:3.3.0"
"@walmart/time-clock-mini-app": "npm:2.400.0"
"@walmart/topstock-mini-app": "npm:1.15.20"
| drop24 version update | drop24 version update
|
96a26ee7795a910dcecbdcbcd584f3647f082e48 | --- app.config.US.ts
@@ -271,6 +271,28 @@ const CONFIG: ExpoConfig = {
'Allow $(PRODUCT_NAME) to use your Camera for scanning barcodes',
},
],
+ [
+ 'react-native-audio-api',
+ {
+ 'iosBackgroundMode': true,
+ 'androidPermissions': [
+ 'android.permission.MODIFY_AUDIO_SETTINGS',
+ 'android.permission.FOREGROUND_SERVICE',
+ 'android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK'
+ ],
+ 'androidForegroundService': true,
+ 'androidFSTypes': [
+ 'mediaPlayback'
+ ]
+ }
+ ],
+ [
+ 'expo-video',
+ {
+ supportsBackgroundPlayback: true,
+ supportsPictureInPicture: true
+ }
+ ],
ExpoPlugins.withAbiFilters,
ExpoPlugins.withActiveArchFix,
ExpoPlugins.withAndroidOfflineRun,
--- metro.config.js
@@ -2,6 +2,9 @@
const {getDefaultConfig} = require('expo/metro-config');
const findWorkspaceRoot = require('find-yarn-workspace-root');
const path = require('path');
+const {
+ wrapWithAudioAPIMetroConfig,
+} = require('react-native-audio-api/metro-config');
module.exports = (() => {
// Find the project and workspace directories
@@ -39,5 +42,5 @@ module.exports = (() => {
]
};
- return config;
+ return wrapWithAudioAPIMetroConfig(config);
})();
--- package.json
@@ -191,7 +191,7 @@
"expo-status-bar": "~2.0.1",
"expo-store-review": "~8.0.1",
"expo-system-ui": "~4.0.9",
- "expo-video": "~2.0.6",
+ "expo-video": "^2.2.2",
"graphql": "^16.8.1",
"i18n-iso-countries": "^7.5.0",
"i18next": "^23.6.0",
@@ -212,6 +212,7 @@
"react-i18next": "^13.3.1",
"react-native": "patch:react-native@npm%3A0.76.9#~/.yarn/patches/react-native-npm-0.76.9-d42941e680.patch",
"react-native-app-auth": "7.2.0",
+ "react-native-audio-api": "^0.6.5",
"react-native-ble-manager": "11.6.1",
"react-native-blob-util": "^0.19.5",
"react-native-calendars": "^1.1291.0",
--- yarn.lock
@@ -7711,7 +7711,7 @@ __metadata:
expo-status-bar: "npm:~2.0.1"
expo-store-review: "npm:~8.0.1"
expo-system-ui: "npm:~4.0.9"
- expo-video: "npm:~2.0.6"
+ expo-video: "npm:^2.2.2"
find-yarn-workspace-root: "npm:^2.0.0"
fs-extra: "npm:^11.2.0"
glob: "npm:^11.0.0"
@@ -7742,6 +7742,7 @@ __metadata:
react-i18next: "npm:^13.3.1"
react-native: "patch:react-native@npm%3A0.76.9#~/.yarn/patches/react-native-npm-0.76.9-d42941e680.patch"
react-native-app-auth: "npm:7.2.0"
+ react-native-audio-api: "npm:^0.6.5"
react-native-ble-manager: "npm:11.6.1"
react-native-blob-util: "npm:^0.19.5"
react-native-calendars: "npm:^1.1291.0"
@@ -12983,14 +12984,14 @@ __metadata:
languageName: node
linkType: hard
-"expo-video@npm:~2.0.6":
- version: 2.0.6
- resolution: "expo-video@npm:2.0.6::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-video%2F-%2Fexpo-video-2.0.6.tgz"
+"expo-video@npm:^2.2.2":
+ version: 2.2.2
+ resolution: "expo-video@npm:2.2.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-video%2F-%2Fexpo-video-2.2.2.tgz"
peerDependencies:
expo: "*"
react: "*"
react-native: "*"
- checksum: 10c0/46c5efea19c693ec4b3f1218acb499aa259fd4ae164e5301e09c81a7c577f3a5df3fd259f3bf94e75c89e463c466c81acaea66a55c7bbd47dcd725b9115c8684
+ checksum: 10c0/d7b4060748b69750c0afa4300ac8830ff90fe34057dbe9efcdb3a31d7c73d3b3f88087a3ae546e4da497577446a00d0602f7521e6a3150ba8998d94a0e9585ff
languageName: node
linkType: hard
@@ -19034,6 +19035,18 @@ __metadata:
languageName: node
linkType: hard
+"react-native-audio-api@npm:^0.6.5":
+ version: 0.6.5
+ resolution: "react-native-audio-api@npm:0.6.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-audio-api%2F-%2Freact-native-audio-api-0.6.5.tgz"
+ peerDependencies:
+ react: "*"
+ react-native: "*"
+ bin:
+ setup-rn-audio-api-web: scripts/setup-rn-audio-api-web.js
+ checksum: 10c0/92e57cc95dd24d9ea1ce7772a36fe24deac049c91e4aa5bb5f7bc7bcce9792ba170e5ae5f82c2ac84a5c1dbea94ad653185397e10e951fef90ad99bad6fb5a46
+ languageName: node
+ linkType: hard
+
"react-native-base64@npm:0.0.2":
version: 0.0.2
resolution: "react-native-base64@npm:0.0.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-base64%2F-%2Freact-native-base64-0.0.2.tgz"
| feat(lib): ALLSPARK-0000 add react-native-audio-api (#4554) | feat(lib): ALLSPARK-0000 add react-native-audio-api (#4554)
Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com> |
9549e3d16e8a6cfab6a0d5c86bc4a168d9a61ff6 | --- package-lock.json
@@ -8835,6 +8835,11 @@
}
}
},
+ "react-native-connect-sso-redux": {
+ "version": "0.1.1",
+ "resolved": "https://npme.walmart.com/react-native-connect-sso-redux/-/react-native-connect-sso-redux-0.1.1.tgz",
+ "integrity": "sha512-Gi6qxCw37GMYJavr9Q32CEhsq6T9y1Tzhcwn0mJbnU6xMYqCkhY6c7BVU4ZhFxe+gEix4AMuH45anSXn5Xx7+w=="
+ },
"react-native-device-info": {
"version": "5.6.5",
"resolved": "https://npme.walmart.com/react-native-device-info/-/react-native-device-info-5.6.5.tgz",
--- package.json
@@ -44,6 +44,7 @@
"react": "16.13.1",
"react-native": "0.63.2",
"react-native-barcode-builder": "^2.0.0",
+ "react-native-connect-sso-redux": "^0.1.1",
"react-native-device-info": "^5.6.5",
"react-native-gesture-handler": "^1.7.0",
"react-native-modal": "^11.5.6",
--- src/auth/connectPingFedEvents.ts
@@ -1,44 +0,0 @@
-import {ssoActions} from '@walmart/redux-store';
-import {
- ssoEventEmitter,
- SSOPingFedEvents,
- SSOPingFedEventData,
-} from 'react-native-ssmp-sso';
-import {ClockCheck} from '@walmart/redux-store/lib/typescript/src/types/data';
-
-const eventTypes = SSOPingFedEvents.types;
-
-const sendClockStatus = (eventData: SSOPingFedEventData) => {
- const clockStatus =
- eventData.clockStatus && eventData.clockStatus === 'NOT_REQUIRED'
- ? '1'
- : eventData.clockStatus;
- const wrapper: ClockCheck = {clockStatus};
- ssoActions.clockCheckSuccess(wrapper);
-};
-
-export const initPingFedAuthEventHandlers = () => {
- const subscription = ssoEventEmitter.addListener(
- SSOPingFedEvents.name,
- (eventData: SSOPingFedEventData) => {
- switch (eventData.action) {
- case eventTypes.authSuccess:
- case eventTypes.userChanged:
- ssoActions.signInSuccess(eventData);
- sendClockStatus(eventData);
- break;
- case eventTypes.signedOut:
- ssoActions.signOutSuccess();
- break;
- case eventTypes.clockStatusChange:
- sendClockStatus(eventData);
- break;
- case eventTypes.error:
- ssoActions.signInError(eventData.error);
- break;
- }
- },
- );
-
- return () => subscription.remove();
-};
--- src/auth/connectPingFedSSO.ts
@@ -1,69 +0,0 @@
-import {ssoActions} from '@walmart/redux-store';
-import {initPingFedAuthEventHandlers} from './connectPingFedEvents';
-import WMSingleSignOn, {SSOEnv, SSOUser} from 'react-native-ssmp-sso';
-
-const getUser = async () => {
- ssoActions.signInProgress();
- try {
- const user = await WMSingleSignOn.getUser();
- ssoActions.signInSuccess(user);
- } catch (error) {
- ssoActions.signInError(error);
- }
-};
-
-const signIn = async (activityName: string) => {
- ssoActions.signInProgress();
- try {
- await WMSingleSignOn.signIn(activityName);
- } catch (error) {
- ssoActions.signInError(error);
- }
-};
-
-const signOut = async (activityName: string, forceRelogin: boolean) => {
- ssoActions.signOutProgress();
- try {
- await WMSingleSignOn.signOut(activityName, false);
- ssoActions.signOutSuccess();
- if (forceRelogin) {
- ssoActions.signInProgress();
- await WMSingleSignOn.signIn(activityName);
- }
- } catch (error) {
- ssoActions.signOutError(error);
- }
-};
-
-const promptUserForSite = async (user: SSOUser) => {
- const siteId = (await WMSingleSignOn.promptUserForSite()) + '';
- ssoActions.signInSuccess({
- ...user,
- siteId,
- });
- return siteId;
-};
-
-export interface ConnectedSSO {
- getUser: () => Promise<void>;
- signIn: (activityName: string) => Promise<void>;
- getFreshAccessToken: () => Promise<string>;
- signOut: (activityName: string, forceRelogin: boolean) => Promise<void>;
- setEnv: (env: SSOEnv) => Promise<void>;
- setRedirectUri: (redirectUri: string) => Promise<void>;
- promptUserForSite: (user: SSOUser) => Promise<string | number>;
-}
-
-export const connectPingFedSSO = (): ConnectedSSO => {
- initPingFedAuthEventHandlers();
-
- return {
- getUser,
- signIn,
- getFreshAccessToken: WMSingleSignOn.getFreshAccessToken,
- signOut,
- setEnv: WMSingleSignOn.setEnv,
- setRedirectUri: WMSingleSignOn.setRedirectUri,
- promptUserForSite,
- };
-};
--- src/auth/index.ts
@@ -1,4 +1,4 @@
export {AuthenticatorView} from './AuthenticatorView';
-import {connectPingFedSSO} from './connectPingFedSSO';
+import {connectPingFedSSO} from 'react-native-connect-sso-redux';
export const connectedSSO = connectPingFedSSO();
| use connect sso lib | use connect sso lib
|
3b7620eae3460b82e2713020133d70e9c5cc1fec | --- packages/core-services/package.json
@@ -21,7 +21,7 @@
"dependencies": {
"@walmart/allspark-http-client": "^2.4.7",
"@walmart/allspark-utils": "^1.5.0",
- "@walmart/redux-store": "3.1.2",
+ "@walmart/redux-store": "~3.1.3",
"reduxsauce": "^1.2.1",
"reselect": "^4.1.5",
"seamless-immutable": "^7.1.4",
| chore: update redux store dependency | chore: update redux store dependency
|
92af2be7756ced8abbe2e623b6f5521c1b7c7d92 | --- packages/me-at-walmart-common/src/components/AskSam.ts
@@ -93,19 +93,4 @@ const CHAT_CONTAINER_KEY = 'ask_sam_chat';
* Ask Sam team before using this component container.
*/
export const AskSamChatContainer =
- AllsparkComponentContainers.create(CHAT_CONTAINER_KEY);
-
-/**
- * Extend the global namespace to add this component container.
- * Others looking to use AllsparkComponentContainers from the foundation package will see
- * this container properly typed as an option
- */
-declare global {
- namespace Allspark {
- namespace ComponentContainers {
- interface Config {
- [CHAT_CONTAINER_KEY]: AskSamWidgetProps;
- }
- }
- }
-}
+ AllsparkComponentContainers.create<AskSamWidgetProps>(CHAT_CONTAINER_KEY);
--- packages/me-at-walmart-common/src/components/Home.ts
@@ -18,19 +18,4 @@ const HOME_DASHBOARD_KEY = 'home_dashboard';
* The Core team will need to enable the component and place it in the layout.
*/
export const HomeDashboardContainer =
- AllsparkComponentContainers.create(HOME_DASHBOARD_KEY);
-
-/**
- * Extend the global namespace to add this component container.
- * Others looking to use AllsparkComponentContainers from the foundation package will see
- * this container properly typed as an option
- */
-declare global {
- namespace Allspark {
- namespace ComponentContainers {
- interface Config {
- [HOME_DASHBOARD_KEY]: HomeWidgetProps;
- }
- }
- }
-}
+ AllsparkComponentContainers.create<HomeWidgetProps>(HOME_DASHBOARD_KEY);
--- packages/me-at-walmart-common/src/components/Inbox.ts
@@ -11,18 +11,3 @@ const INBOX_WIDET_REGISTRY_KEY = 'inbox';
export const InboxContainer = AllsparkComponentContainers.create(
INBOX_WIDET_REGISTRY_KEY
);
-
-/**
- * Extend the global namespace to add this component container.
- * Others looking to use AllsparkComponentContainers from the foundation package will see
- * this container properly typed as an option
- */
-declare global {
- namespace Allspark {
- namespace ComponentContainers {
- interface Config {
- [INBOX_WIDET_REGISTRY_KEY]: any;
- }
- }
- }
-}
--- packages/me-at-walmart-common/src/components/Metrics.ts
@@ -17,21 +17,7 @@ const METRICS_WIDET_REGISTRY_KEY = 'metrics';
* These are components rendered by metrics on the home screen to show relevant metrics.
* Please coordinate with the Metrics team before using this component container.
*/
-export const MetricsContainer = AllsparkComponentContainers.create(
- METRICS_WIDET_REGISTRY_KEY
-);
-
-/**
- * Extend the global namespace to add this component container.
- * Others looking to use AllsparkComponentContainers from the foundation package will see
- * this container properly typed as an option
- */
-declare global {
- namespace Allspark {
- namespace ComponentContainers {
- interface Config {
- [METRICS_WIDET_REGISTRY_KEY]: MetricsWidgetProps;
- }
- }
- }
-}
+export const MetricsContainer =
+ AllsparkComponentContainers.create<MetricsWidgetProps>(
+ METRICS_WIDET_REGISTRY_KEY
+ );
--- packages/me-at-walmart-common/src/components/Sidekick.ts
@@ -33,19 +33,4 @@ const SIDEKICK_KEY = 'sidekick';
* These are components rendered...(add details here);
*/
export const SidekickContainer =
- AllsparkComponentContainers.create(SIDEKICK_KEY);
-
-/**
- * Extend the global namespace to add this component container.
- * Others looking to use AllsparkComponentContainers from the foundation package will see
- * this container properly typed as an option
- */
-declare global {
- namespace Allspark {
- namespace ComponentContainers {
- interface Config {
- [SIDEKICK_KEY]: SidekickWidgetProps;
- }
- }
- }
-}
+ AllsparkComponentContainers.create<SidekickWidgetProps>(SIDEKICK_KEY);
--- packages/me-at-walmart-common/src/components/index.ts
@@ -1,4 +1,5 @@
export * from './AskSam';
+export * from './Badges';
export * from './Home';
export * from './Inbox';
export * from './Metrics';
| fix: update me at walmart component containers for new typing | fix: update me at walmart component containers for new typing
|
0a6a1365fef1622ef5a6b9d98c21f9df014eba22 | --- __tests__/harness/firestore/data/users.ts
@@ -3,6 +3,7 @@ import {encryptUserId} from '../../../../src/utils';
import {generateCreatedAt} from './timestamps';
// @ts-ignore
import {presenceStatuses} from './presence';
+import {values} from 'lodash';
export const rawUserList = [
'alice',
@@ -36,8 +37,10 @@ export const usersCollectionForStore = (
};
});
- return {
+ const userCollectionWithOverrides = {
...userCollection,
...staticOverrides,
};
+
+ return values(userCollectionWithOverrides);
};
--- __tests__/harness/firestore/data/users.ts
@@ -3,6 +3,7 @@ import {encryptUserId} from '../../../../src/utils';
import {generateCreatedAt} from './timestamps';
// @ts-ignore
import {presenceStatuses} from './presence';
+import {values} from 'lodash';
export const rawUserList = [
'alice',
@@ -36,8 +37,10 @@ export const usersCollectionForStore = (
};
});
- return {
+ const userCollectionWithOverrides = {
...userCollection,
...staticOverrides,
};
+
+ return values(userCollectionWithOverrides);
};
| fix return type for users generator | fix return type for users generator
|
2bbd6e7072933eaf6b4c55a6d9453e18e21da719 | --- packages/allspark-app-auth/package.json
@@ -25,19 +25,19 @@
"peerDependencies": {
"@react-native-community/async-storage": "~1.12.1",
"@walmart/react-native-encrypted-storage": "1.1.12",
- "@walmart/allspark-foundation": "2.0.0",
+ "@walmart/allspark-foundation": "2.0.1",
"react": "~17.0.2",
- "react-native": ">=0.66.0 <0.68.0",
+ "react-native": ">=0.66.0 <0.69.0",
"react-native-app-auth": "~6.4.3"
},
"devDependencies": {
"@types/react": "~17.0.37",
"@types/react-native": "~0.67.4",
"@types/react-redux": "~7.1.9",
- "@walmart/allspark-foundation": "^2.0.1",
+ "@walmart/allspark-foundation": "2.0.1",
"react": "~17.0.2",
"react-native": "~0.67.4",
- "react-native-app-auth": "~6.4.3"
+ "react-native-app-auth": "^6.4.3"
},
"resolutions": {
"@types/react": "^17"
--- packages/me-at-walmart-container/package.json
@@ -51,7 +51,7 @@
"@react-navigation/material-top-tabs": "~6.2.4",
"@react-navigation/native": "~6.0.13",
"@react-navigation/stack": "~6.3.1",
- "@walmart/allspark-app-auth": "1.8.1",
+ "@walmart/allspark-app-auth": "~1.8.0",
"@walmart/config-components": "3.0.3",
"@walmart/functional-components": "2.0.6",
"@walmart/gtp-shared-components": "1.8.9",
@@ -95,13 +95,13 @@
"@types/react-native": "~0.67.4",
"@types/react-redux": "~7.1.9",
"@types/uuid": "~8.3.4",
- "@walmart/allspark-app-auth": "1.8.0",
- "@walmart/allspark-foundation": "2.0.1",
+ "@walmart/allspark-app-auth": "~1.8.0",
+ "@walmart/allspark-foundation": "~2.0.0",
"@walmart/config-components": "3.0.3",
"@walmart/functional-components": "2.0.6",
"@walmart/gtp-shared-components": "1.8.9",
"@walmart/impersonation-mini-app": "1.2.0",
- "@walmart/me-at-walmart-foundation": "~1.8.1",
+ "@walmart/me-at-walmart-foundation": "~1.8.0",
"@walmart/react-native-encrypted-storage": "1.1.12",
"@walmart/react-native-logger": "1.29.0",
"@walmart/react-native-shared-navigation": "1.0.2",
--- packages/me-at-walmart-foundation/package.json
@@ -26,9 +26,9 @@
"clean": "rm -rf lib/ || true"
},
"devDependencies": {
- "@walmart/allspark-foundation": "2.0.0"
+ "@walmart/allspark-foundation": "~2.0.0"
},
"peerDependencies": {
- "@walmart/allspark-foundation": "2.0.1"
+ "@walmart/allspark-foundation": "~2.0.0"
}
}
| chore: package updates | chore: package updates
|
16085c2ef68182bb015e20a4621cf49bf0a858cf | --- package.json
@@ -85,7 +85,7 @@
"@walmart/allspark-utils": "6.1.4",
"@walmart/amp-mini-app": "1.1.80",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.21.3",
+ "@walmart/ask-sam-mini-app": "1.22.1",
"@walmart/attendance-mini-app": "3.44.0",
"@walmart/avp-feature-app": "0.3.4",
"@walmart/avp-shared-library": "0.3.7",
--- yarn.lock
@@ -5618,9 +5618,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/ask-sam-mini-app@npm:1.21.3":
- version: 1.21.3
- resolution: "@walmart/ask-sam-mini-app@npm:1.21.3"
+"@walmart/ask-sam-mini-app@npm:1.22.1":
+ version: 1.22.1
+ resolution: "@walmart/ask-sam-mini-app@npm:1.22.1"
dependencies:
apisauce: "npm:^1.1.2"
axios-cache-adapter: "npm:>=2.7.3"
@@ -5666,7 +5666,7 @@ __metadata:
react-native-wm-voice-text: ">=0.3"
reselect: ">=4"
victory-native: ">=36.5"
- checksum: 10c0/6818202a73e7c47a44db790cff9981b9805fe581ac7cbf58f43a923cc86a8a2a9e7e2a0aff55af293414f61b0975243d260a0acae0255b89d3e58673574417c5
+ checksum: 10c0/90e4bd3133c39d6922bdc16b32e4eccfe35671304ab3901132594b6e6957057f3c3274af0fdcf56bbd21de34b364d547b9bfb8090e4b83a70af34daaa1cdc700
languageName: node
linkType: hard
@@ -7725,7 +7725,7 @@ __metadata:
"@walmart/allspark-utils": "npm:6.1.4"
"@walmart/amp-mini-app": "npm:1.1.80"
"@walmart/ask-sam-chat-components": "npm:^0.2.7"
- "@walmart/ask-sam-mini-app": "npm:1.21.3"
+ "@walmart/ask-sam-mini-app": "npm:1.22.1"
"@walmart/attendance-mini-app": "npm:3.44.0"
"@walmart/avp-feature-app": "npm:0.3.4"
"@walmart/avp-shared-library": "npm:0.3.7"
| ask sam version bump | ask sam version bump
|
f3ed924ad22f3aebe6ca7a9591a99a1820a07586 | --- packages/allspark-foundation/src/Translation/client.ts
@@ -30,11 +30,13 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
let initialized = false;
let _config = config;
+ // Keep default instance default namespace in sync with foundation
i18next.on('initialized', (options) => {
if (options.defaultNS !== 'container') {
i18next.setDefaultNamespace('container');
}
+ // Keep resoure bundles in sync.
i18next.store.off('added');
i18next.store.on('added', (lng, ns) => {
if (!_instance.hasResourceBundle(lng, ns)) {
@@ -46,6 +48,13 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
});
});
+ // Keep language in sync with foundation
+ _instance.on('languageChanged', (lng) => {
+ if (i18next.language !== lng) {
+ i18next.changeLanguage(lng);
+ }
+ });
+
/**
* Returns true if the translation client has been initialized
*/
@@ -174,10 +183,6 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
return 'en-US';
};
- const changeLanguage = (lng?: string, callback?: Callback) => {
- _instance.changeLanguage(lng, callback);
- i18next.changeLanguage(lng, callback);
- };
const syncToDeviceLanguage = async () => {
const deviceLanguage = await getDeviceLanguage();
@@ -185,7 +190,7 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
// Change language on translation client (i18n)
const currentLanguage = AllsparkTranslationClient.language;
if (currentLanguage !== deviceLanguage) {
- changeLanguage(deviceLanguage);
+ _instance.changeLanguage(deviceLanguage);
}
};
@@ -200,7 +205,6 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
select,
getDeviceLanguage,
syncToDeviceLanguage,
- changeLanguage,
});
};
@@ -208,7 +212,7 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
* The default translation client instance
*/
export const AllsparkTranslationClient = TranslationClient();
-AllsparkTranslationClient.changeLanguage;
+
/**
* A feature client that scopes translate to a particular namespace
*/
| fix: change language override in translation client lead to infinite loop | fix: change language override in translation client lead to infinite loop
|
2129a8c1030d47c34d49d20efb58eee545dda45c | --- package-lock.json
@@ -3349,9 +3349,9 @@
"integrity": "sha512-Am5QrgtwxJ23j3GsZZivaZknjiWTuPFvFxV1J0ysrQZ3H4wZcgsxuFdsCJqA3Hzufo3pZdyMTZhNtAx4IuQjjw=="
},
"@walmart/inbox-mini-app": {
- "version": "0.3.0",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.3.0.tgz",
- "integrity": "sha512-snhN7iZrP2VSNtEzpi1pi7/nlvU0+lbniTNnGCD23SfjAHBkipVpaPxCnHgX0X+YwQTn1LtAJc4yvDH0BWyzhg=="
+ "version": "0.4.0",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.4.0.tgz",
+ "integrity": "sha512-pN7rdWcF4xfgLA68j9OFsIy4k9kcu7PQlNjxZaOlU1a3zygt5ZR1x7XwMQPhv/posYdzbtA5G8pwmFFD4febFQ=="
},
"@walmart/iteminfo-mini-app": {
"version": "1.0.22",
--- package.json
@@ -75,7 +75,7 @@
"@walmart/gtp-shared-components": "^1.1.8",
"@walmart/impersonation-mini-app": "1.0.15",
"@walmart/ims-print-services-ui": "0.0.19",
- "@walmart/inbox-mini-app": "0.3.0",
+ "@walmart/inbox-mini-app": "0.4.0",
"@walmart/iteminfo-mini-app": "1.0.22",
"@walmart/manager-approvals-miniapp": "0.0.40",
"@walmart/moment-walmart": "1.0.4",
| inbox version bump | inbox version bump
|
d1f83ddf0b43424b398000e6658dfb3de2845b9f | --- packages/allspark-build-cache-provider/package.json
@@ -9,6 +9,14 @@
"lint:fix": "eslint ./src --fix",
"prepack": "yarn build"
},
+ "dependencies": {
+ "env-paths": "^3.0.0",
+ "fs-extra": "^11.3.0",
+ "node-fetch": "^3.3.2",
+ "octokit": "^4.1.3",
+ "tar": "^7.4.3",
+ "uuid": "^11.1.0"
+ },
"devDependencies": {
"@babel/core": "^7.20.0",
"@expo/fingerprint": "~0.13.4",
@@ -17,19 +25,13 @@
"@types/react": "~19.0.10",
"@types/tar": "6.1.13",
"@types/uuid": "10.0.0",
- "env-paths": "^3.0.0",
"eslint": "^8.57.0",
"eslint-config-expo": "^9.2.0",
"expo": "^53.0.0",
"expo-module-scripts": "^3.4.0",
- "fs-extra": "^11.3.0",
- "node-fetch": "^3.3.2",
- "octokit": "^4.1.3",
"react": "19.0.0",
"react-native": "0.79.5",
- "tar": "^7.4.3",
- "typescript": "~5.8.3",
- "uuid": "^11.1.0"
+ "typescript": "~5.8.3"
},
"peerDependencies": {
"@expo/fingerprint": "~0.13.4",
| fix: cache provider dependencies not installed automatically | fix: cache provider dependencies not installed automatically
|
3eea87bfbb15ceb543d24bbbc5276c53210d541e | --- package-lock.json
@@ -106,7 +106,9 @@
"lodash": "^4.17.21",
"luxon": "^1.28.0",
"moment": "^2.29.4",
+ "moment-timezone": "^0.5.33",
"namecase": "^1.1.2",
+ "numeral": "^2.0.6",
"promise.allsettled": "^1.0.6",
"react": "^18.2.0",
"react-hook-form": "^7.38.0",
--- package.json
@@ -147,7 +147,9 @@
"lodash": "^4.17.21",
"luxon": "^1.28.0",
"moment": "^2.29.4",
+ "moment-timezone": "^0.5.33",
"namecase": "^1.1.2",
+ "numeral": "^2.0.6",
"promise.allsettled": "^1.0.6",
"react": "^18.2.0",
"react-hook-form": "^7.38.0",
| adding moment-timezone and numeral in dependencies list | adding moment-timezone and numeral in dependencies list
|
2c1cdd7b9657d2d7ab5b91b6fe09a83740398261 | --- src/core/deviceInfoInit.ts
@@ -1,6 +1,7 @@
import type {DeviceInfo} from '@walmart/redux-store';
import {deviceInfoActions} from '@walmart/redux-store';
import {DeviceConfig} from '@walmart/config-components';
+import {logger} from '../services/Logger';
export const initDeviceInfo = async () => {
deviceInfoActions.deviceInfoProgress();
@@ -19,5 +20,9 @@ export const initDeviceInfo = async () => {
deviceInfoActions.deviceInfoSuccess(deviceInfo);
} catch (err) {
deviceInfoActions.deviceInfoError(err);
+ logger?.error('Error while initializing device info', {
+ message: err.message,
+ stack: err.stack,
+ });
}
};
| adding log in error scenario | adding log in error scenario
|
3d28cec5ca483add3316c4eb8e2d116f1cc159b2 | --- src/components/AssociateRosterItem/index.tsx
@@ -32,7 +32,7 @@ import {AssociateItemProps} from './types';
import {styles} from './style';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../../translations';
-import {pushToTalkEnabled} from '../../redux/selectors';
+import {messageButtonEnabled, pushToTalkEnabled} from '../../redux/selectors';
export const AssociateRosterItem = React.memo((props: AssociateItemProps) => {
const {associate, first, last, style, replace = false} = props;
@@ -47,6 +47,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => {
const isSalariedOrTeamLead = useIsSalariedOrTeamLead();
const userIsInRoster = useUserIsInRoster();
const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled);
+ const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled);
if (!associate) {
return null;
@@ -82,7 +83,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => {
encryptedId={encryptedId}
style={styles.tag}
/>
- {shouldShowMessageButton && (
+ {isMessageButtonEnabled && shouldShowMessageButton && (
<View style={styles.buttonsStyle}>
{isPushToTalkEnabled && (
<Button
--- src/containers/StoreChatCard.tsx
@@ -24,7 +24,7 @@ import {useNavigation} from '@react-navigation/native';
import {StackNavigationProp} from '@react-navigation/stack';
import {TextingNavParamsMap} from '../navigation';
import {useSelector} from 'react-redux';
-import {pushToTalkEnabled} from '../redux/selectors';
+import {messageButtonEnabled, pushToTalkEnabled} from '../redux/selectors';
const styles = StyleSheet.create({
viewTeamStyle: {
@@ -43,6 +43,7 @@ export const StoreChatCard = (props: {style?: StyleProp<ViewStyle>}) => {
const userIsInRoster = useUserIsInRoster();
const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>();
const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled);
+ const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled);
const onViewTeam = () => {
navigation.navigate('myTeam.viewTeam', {teamId: WHOLE_STORE});
@@ -73,13 +74,15 @@ export const StoreChatCard = (props: {style?: StyleProp<ViewStyle>}) => {
</Text>
</Button>
)}
- <Button
- variant='secondary'
- onPress={startStoreText}
- size='small'
- disabled={!userIsInRoster}>
- <Text>{t('rosterScreen.storeChatCard.messageBtn')}</Text>
- </Button>
+ {isMessageButtonEnabled && (
+ <Button
+ variant='secondary'
+ onPress={startStoreText}
+ size='small'
+ disabled={!userIsInRoster}>
+ <Text>{t('rosterScreen.storeChatCard.messageBtn')}</Text>
+ </Button>
+ )}
</ButtonGroup>
}>
<Body weight='400' size='small'>
--- src/redux/selectors.ts
@@ -47,7 +47,7 @@ export const pushToTalkEnabled = createSelector(
CCMFallbacks.pushToTalkEnabled,
);
-export const enableMessageButton = createSelector(
+export const messageButtonEnabled = createSelector(
[getTextingAppConfigData],
(state) =>
state?.enableMessageButton?.toString()?.toLowerCase() === 'true' ??
--- src/components/AssociateRosterItem/index.tsx
@@ -32,7 +32,7 @@ import {AssociateItemProps} from './types';
import {styles} from './style';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../../translations';
-import {pushToTalkEnabled} from '../../redux/selectors';
+import {messageButtonEnabled, pushToTalkEnabled} from '../../redux/selectors';
export const AssociateRosterItem = React.memo((props: AssociateItemProps) => {
const {associate, first, last, style, replace = false} = props;
@@ -47,6 +47,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => {
const isSalariedOrTeamLead = useIsSalariedOrTeamLead();
const userIsInRoster = useUserIsInRoster();
const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled);
+ const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled);
if (!associate) {
return null;
@@ -82,7 +83,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => {
encryptedId={encryptedId}
style={styles.tag}
/>
- {shouldShowMessageButton && (
+ {isMessageButtonEnabled && shouldShowMessageButton && (
<View style={styles.buttonsStyle}>
{isPushToTalkEnabled && (
<Button
--- src/containers/StoreChatCard.tsx
@@ -24,7 +24,7 @@ import {useNavigation} from '@react-navigation/native';
import {StackNavigationProp} from '@react-navigation/stack';
import {TextingNavParamsMap} from '../navigation';
import {useSelector} from 'react-redux';
-import {pushToTalkEnabled} from '../redux/selectors';
+import {messageButtonEnabled, pushToTalkEnabled} from '../redux/selectors';
const styles = StyleSheet.create({
viewTeamStyle: {
@@ -43,6 +43,7 @@ export const StoreChatCard = (props: {style?: StyleProp<ViewStyle>}) => {
const userIsInRoster = useUserIsInRoster();
const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>();
const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled);
+ const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled);
const onViewTeam = () => {
navigation.navigate('myTeam.viewTeam', {teamId: WHOLE_STORE});
@@ -73,13 +74,15 @@ export const StoreChatCard = (props: {style?: StyleProp<ViewStyle>}) => {
</Text>
</Button>
)}
- <Button
- variant='secondary'
- onPress={startStoreText}
- size='small'
- disabled={!userIsInRoster}>
- <Text>{t('rosterScreen.storeChatCard.messageBtn')}</Text>
- </Button>
+ {isMessageButtonEnabled && (
+ <Button
+ variant='secondary'
+ onPress={startStoreText}
+ size='small'
+ disabled={!userIsInRoster}>
+ <Text>{t('rosterScreen.storeChatCard.messageBtn')}</Text>
+ </Button>
+ )}
</ButtonGroup>
}>
<Body weight='400' size='small'>
--- src/redux/selectors.ts
@@ -47,7 +47,7 @@ export const pushToTalkEnabled = createSelector(
CCMFallbacks.pushToTalkEnabled,
);
-export const enableMessageButton = createSelector(
+export const messageButtonEnabled = createSelector(
[getTextingAppConfigData],
(state) =>
state?.enableMessageButton?.toString()?.toLowerCase() === 'true' ??
| integrate feature flag for message button | integrate feature flag for message button
|
ffdf705945dc99cc49e506f70668485fa5a3c6b6 | --- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/AllsparkHubContainer.tsx
@@ -98,7 +98,7 @@ export class AllsparkHubContainer {
<ClockGuard>
<OnboardingProvider>
<BottomSheetProvider>
- <HubDashboard
+ <HubDashboard
name={this.containerName}
widgets={this.validWidgets}
componentOverrides={this.componentOverrides}
| Update allspark hub lint | Update allspark hub lint
|
8572d335255010ce545a4a1a166292c15c747704 | --- android/app/build.gradle
@@ -134,7 +134,7 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 30
+ versionCode 31
versionName "1.0.1"
}
splits {
--- ios/AllSpark/Info.plist
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>30</string>
+ <string>31</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>invmgmt</string>
--- ios/AllSparkTests/Info.plist
@@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>30</string>
+ <string>31</string>
</dict>
</plist>
| Incrementing build number | Incrementing build number
|
5a29a6a8f6bf9574ede075e8df368516bf4c79f3 | --- .looper.yml
@@ -11,8 +11,11 @@ triggers:
name: PR
call: pr
- manual:
- name: Publish
+ name: Publish Changed
call: publishFromChanges
+ - manual:
+ name: Publish All
+ call: publishAll
- manual:
name: Publish from Package
call: publishFromPackage
@@ -35,7 +38,11 @@ flows:
publishFromChanges:
- call: preparePublish
- - (name Publish) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes
+ - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes
+
+ publishAll:
+ - call: preparePublish
+ - (name Publish All) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes --force-publish
publishFromPackage:
- call: preparePublish
| chore: add publish all looper trigger | chore: add publish all looper trigger
|
a6d8c511fc3cb4e716125301ae2c5118738202bd | --- .looper.yml
@@ -24,4 +24,4 @@ flows:
- (name Yarn Version) yarn --version
- yarn install
- yarn run lint
- - yarn run coverage
+ - yarn run coverage
\ No newline at end of file
| feat(ui): update looper | feat(ui): update looper
|
6c83ab4a2bc53507dd921b950f02cefeeac61135 | --- package.json
@@ -117,7 +117,7 @@
"@walmart/me-at-walmart-athena-queries": "6.1.4",
"@walmart/me-at-walmart-common": "6.1.4",
"@walmart/me-at-walmart-container": "6.1.4",
- "@walmart/metrics-mini-app": "0.20.8",
+ "@walmart/metrics-mini-app": "0.22.1",
"@walmart/mod-flex-mini-app": "1.16.4",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.1.4",
--- yarn.lock
@@ -6515,9 +6515,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/metrics-mini-app@npm:0.20.8":
- version: 0.20.8
- resolution: "@walmart/metrics-mini-app@npm:0.20.8"
+"@walmart/metrics-mini-app@npm:0.22.1":
+ version: 0.22.1
+ resolution: "@walmart/metrics-mini-app@npm:0.22.1"
dependencies:
base-64: "npm:^1.0.0"
peerDependencies:
@@ -6531,6 +6531,7 @@ __metadata:
apisauce: ">=3.0.1"
axios-cache-adapter: ">=2.7.3"
expo: 49.0.10
+ expo-linear-gradient: ">=12.7.2"
lodash: ">=4.17.21"
moment-timezone: ">=0.5.33"
numeral: ">=2.0.6"
@@ -6538,10 +6539,9 @@ __metadata:
react-native: 0.72.6
react-native-drop-shadow: ">=1.0.0"
react-native-get-random-values: ">=1.8.0"
- react-native-linear-gradient: ">=2.6.2"
react-redux: ">=8.0.4"
reduxsauce: ">=1.2.0"
- checksum: 10c0/ff80c78b62a13f2036dcbd2582c6f26635b8899afb0424a3c856e8a40f2823a107c5731fabc454141dd622b74712ba4b04f85a0c04f0028d47f43079aacb3953
+ checksum: 10c0/ac5f1240f50904459468ff5cb21a0b78c76951133d389f30baae40b37ab1cdeaf657649688a0b98247f13672bab12912d1f552c4ec5fd5c3e5bb7eb06591f8b4
languageName: node
linkType: hard
@@ -7770,7 +7770,7 @@ __metadata:
"@walmart/me-at-walmart-athena-queries": "npm:6.1.4"
"@walmart/me-at-walmart-common": "npm:6.1.4"
"@walmart/me-at-walmart-container": "npm:6.1.4"
- "@walmart/metrics-mini-app": "npm:0.20.8"
+ "@walmart/metrics-mini-app": "npm:0.22.1"
"@walmart/mod-flex-mini-app": "npm:1.16.4"
"@walmart/moment-walmart": "npm:1.0.4"
"@walmart/money-auth-shared-components": "npm:0.1.4"
| Bumping metrics-mini-app version to 0.22.1 | Bumping metrics-mini-app version to 0.22.1
|
8bb909284baa88f4b4651679035ffb38ae3349d8 | --- targets/US/package.json
@@ -144,7 +144,7 @@
"@walmart/roster-mini-app": "2.8.2",
"@walmart/schedule-mini-app": "0.118.0",
"@walmart/shelfavailability-mini-app": "1.5.33",
- "@walmart/shop-gnfr-mini-app": "1.0.124",
+ "@walmart/shop-gnfr-mini-app": "1.0.127",
"@walmart/sidekick-mini-app": "4.67.15",
"@walmart/store-feature-orders": "1.26.12",
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch",
| shop-gnfr version update to 1.0.127 | shop-gnfr version update to 1.0.127
|
8c486306bdc86b47e6997bb23037c0494e6b8fbe | --- package-lock.json
@@ -47,7 +47,7 @@
"@walmart/calling-mini-app": "0.1.8",
"@walmart/compass-sdk-rn": "5.18.15",
"@walmart/config-components": "4.2.16",
- "@walmart/copilot-mini-app": "3.59.4",
+ "@walmart/copilot-mini-app": "3.59.8",
"@walmart/core-services": "~2.3.0",
"@walmart/core-services-allspark": "~2.13.11",
"@walmart/core-utils": "~2.0.5",
@@ -8711,9 +8711,9 @@
}
},
"node_modules/@walmart/copilot-mini-app": {
- "version": "3.59.4",
- "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.4.tgz",
- "integrity": "sha512-rrwR8qVUIc2+U+ezkIbKIX7PtjojudAQQDRfmNtLJ98IpXK2nt2apBMtsq6bZbcNRl6aIELn23mv8DhaOgtqUw==",
+ "version": "3.59.8",
+ "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.8.tgz",
+ "integrity": "sha512-7DhiemAy96369lQMn7nThRob5vd9AmYFREB1G6ZnqdGKTc2qQMwkH073+STTdPVnpsMyE29txxAvtwJuyTm1zQ==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -29478,7 +29478,7 @@
"requires": {
"mv": "~2",
"safe-json-stringify": "~1",
- "uuid": "^8.0.0"
+ "uuid": "^3.3.2"
}
},
"@expo/cli": {
@@ -30168,7 +30168,7 @@
"md5": "^2.2.1",
"node-fetch": "^2.6.1",
"remove-trailing-slash": "^0.1.0",
- "uuid": "^8.3.2"
+ "uuid": "^3.3.2"
}
},
"@expo/sdk-runtime-versions": {
@@ -33318,9 +33318,9 @@
}
},
"@walmart/copilot-mini-app": {
- "version": "3.59.4",
- "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.4.tgz",
- "integrity": "sha512-rrwR8qVUIc2+U+ezkIbKIX7PtjojudAQQDRfmNtLJ98IpXK2nt2apBMtsq6bZbcNRl6aIELn23mv8DhaOgtqUw=="
+ "version": "3.59.8",
+ "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.59.8.tgz",
+ "integrity": "sha512-7DhiemAy96369lQMn7nThRob5vd9AmYFREB1G6ZnqdGKTc2qQMwkH073+STTdPVnpsMyE29txxAvtwJuyTm1zQ=="
},
"@walmart/core-services": {
"version": "2.3.2",
@@ -37156,7 +37156,7 @@
"version": "2.1.6",
"dev": true,
"requires": {
- "axios": "^0.21.4"
+ "axios": "~1.2.6"
}
},
"chalk": {
@@ -45362,4 +45362,4 @@
}
}
}
-}
\ No newline at end of file
+}
--- package.json
@@ -88,7 +88,7 @@
"@walmart/calling-mini-app": "0.1.8",
"@walmart/compass-sdk-rn": "5.18.15",
"@walmart/config-components": "4.2.16",
- "@walmart/copilot-mini-app": "3.59.4",
+ "@walmart/copilot-mini-app": "3.59.8",
"@walmart/core-services": "~2.3.0",
"@walmart/core-services-allspark": "~2.13.11",
"@walmart/core-utils": "~2.0.5",
@@ -336,4 +336,4 @@
"pre-push": "run-p solidarity coverage"
}
}
-}
\ No newline at end of file
+}
| chore: bump copilot@3.59.8 | chore: bump copilot@3.59.8
|
c3f33c3472200927df94726c3f960bbfebf7d981 | --- .yarn/patches/README.md
@@ -88,12 +88,6 @@ This directory contains patches that are applied to packages during the install
- **Description**: TODO
-### `react-native-loudness`
-
-- **Issue**: [react-native-loudness#1]()
-
-- **Description**: The package Podspec does not have a homepage configured. This cause an issue during pod install. This patch adds a homepage to the Podspec.
-
### `react-native`
- **Issue**: [react-native#1]()
| removing from readme and rebasing with feature/drop26 | removing from readme and rebasing with feature/drop26
|
a44c2787179991dc90469e52d27b18124eb7be17 | --- package-lock.json
@@ -87,7 +87,7 @@
"@walmart/react-native-webex-sdk": "0.1.5",
"@walmart/receipt-check-miniapp": "1.19.3",
"@walmart/redux-store": "3.7.0",
- "@walmart/returns-mini-app": "3.13.0",
+ "@walmart/returns-mini-app": "4.1.0",
"@walmart/roster-mini-app": "1.0.18",
"@walmart/schedule-mini-app": "0.93.0",
"@walmart/shelfavailability-mini-app": "1.5.19",
@@ -9674,9 +9674,9 @@
}
},
"node_modules/@walmart/returns-mini-app": {
- "version": "3.13.0",
- "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-3.13.0.tgz",
- "integrity": "sha512-VBcGBVuBb4mcDyzBe95g98KLFGxAqMwGiTBatXtDh3WE51Gx7vC0T5V7fwAzLGtFuSLnBO3OitkmOfuI/Dgo/Q==",
+ "version": "4.1.0",
+ "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-4.1.0.tgz",
+ "integrity": "sha512-wqCeLJfMoA07KQ6vwxBkYKlkUQOzhvhwlePWZ8KfLm2U4fd4Ahuxbb+YUU6IfptwlwbvUFtpA3QPUAGUs5l45w==",
"dependencies": {
"@walmart/common-utilities-js": "^1.2.10",
"@walmart/virtual-zpl-printer-model": "^0.2.11"
@@ -9875,12 +9875,6 @@
"big-integer": "^1.6.48"
}
},
- "node_modules/@walmart/texting-mini-app": {
- "version": "2.1.5",
- "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.1.5.tgz",
- "integrity": "sha512-2nKMhz2s8u4i3fjkrp6LLuSYr0njLx6YzSUxjijtMoLrnWEYAjP4Madu8bqitrdynx0AqR+HhC31Ly9SeNm+hg==",
- "hasInstallScript": true
- },
"node_modules/@walmart/time-clock-mini-app": {
"version": "2.338.1",
"resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.338.1.tgz",
@@ -33483,9 +33477,9 @@
}
},
"@walmart/returns-mini-app": {
- "version": "3.13.0",
- "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-3.13.0.tgz",
- "integrity": "sha512-VBcGBVuBb4mcDyzBe95g98KLFGxAqMwGiTBatXtDh3WE51Gx7vC0T5V7fwAzLGtFuSLnBO3OitkmOfuI/Dgo/Q==",
+ "version": "4.1.0",
+ "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-4.1.0.tgz",
+ "integrity": "sha512-wqCeLJfMoA07KQ6vwxBkYKlkUQOzhvhwlePWZ8KfLm2U4fd4Ahuxbb+YUU6IfptwlwbvUFtpA3QPUAGUs5l45w==",
"requires": {
"@walmart/common-utilities-js": "^1.2.10",
"@walmart/virtual-zpl-printer-model": "^0.2.11"
@@ -33548,11 +33542,6 @@
"big-integer": "^1.6.48"
}
},
- "@walmart/texting-mini-app": {
- "version": "2.1.5",
- "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.1.5.tgz",
- "integrity": "sha512-2nKMhz2s8u4i3fjkrp6LLuSYr0njLx6YzSUxjijtMoLrnWEYAjP4Madu8bqitrdynx0AqR+HhC31Ly9SeNm+hg=="
- },
"@walmart/time-clock-mini-app": {
"version": "2.338.1",
"resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.338.1.tgz",
--- package.json
@@ -128,7 +128,7 @@
"@walmart/react-native-webex-sdk": "0.1.5",
"@walmart/receipt-check-miniapp": "1.19.3",
"@walmart/redux-store": "3.7.0",
- "@walmart/returns-mini-app": "3.13.0",
+ "@walmart/returns-mini-app": "4.1.0",
"@walmart/roster-mini-app": "1.0.18",
"@walmart/schedule-mini-app": "0.93.0",
"@walmart/shelfavailability-mini-app": "1.5.19",
@@ -338,4 +338,4 @@
"pre-push": "run-p solidarity coverage"
}
}
-}
\ No newline at end of file
+}
| returns drop 20 | returns drop 20
|
1d33a424a541bfa1a6d7ad1bbacaababd80b2a23 | --- ios/AllSpark.xcodeproj/project.pbxproj
@@ -681,7 +681,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LIBRARY_SEARCH_PATHS = (
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
| Fixing ios deployment target | Fixing ios deployment target
|
f92c62ca609bb5bdb8eb5c44f6454511e72d7872 | --- .looper.yml
@@ -23,4 +23,4 @@ flows:
- (name Yarn Version) yarn --version
- yarn install
- yarn run lint
- # - yarn run coverage
\ No newline at end of file
+ - yarn run coverage
\ No newline at end of file
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.18.1",
+ "version": "1.19.0",
"main": "dist/index.js",
"files": [
"dist"
| feat(ui): update myteam mini app version | feat(ui): update myteam mini app version
|
f3bc1cc3398db76778ec0b4556ada1d4b5e5e2ca | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.15.32",
+ "version": "1.15.33",
"main": "dist/index.js",
"files": [
"dist"
| Update my team mini app version | Update my team mini app version
|
6618b2e345146ba5aa6cab382cab62b59c99422d | --- app.config.US.ts
@@ -63,7 +63,11 @@ const CONFIG: ExpoConfig = {
},
assetBundlePatterns: ["**/*"],
// Will be available on Constants.expoConfig.extra
- extra: {},
+ extra: {
+ // eas: {
+ // projectId: "8235a61b-e3eb-4115-8f4b-c41536e33707",
+ // },
+ },
icon: Environment.select({
production: `${__dirname}/assets/images/icon.png`,
beta: `${__dirname}/assets/images/icon-beta.png`,
@@ -72,6 +76,7 @@ const CONFIG: ExpoConfig = {
default: `${__dirname}/assets/images/icon-dev.png`,
}),
ios: {
+ // appleTeamId: "F7HDEWM8SU", // Not supported until SDK 52. Requiring withDevelopmentTeam plugin for now.
appStoreUrl: "https://apps.apple.com/us/app/me-walmart/id1459898418",
buildNumber,
bundleIdentifier,
@@ -215,11 +220,18 @@ const CONFIG: ExpoConfig = {
"Allow $(PRODUCT_NAME) to use your Camera for scanning barcodes",
},
],
+ "./plugins/withActiveArchFix",
"./plugins/withAppAuth",
"./plugins/withBoringSSLFix",
"./plugins/withBuildSupport",
"./plugins/withCompassSDK",
"./plugins/withCopeKeyListener",
+ [
+ "./plugins/withDevelopmentTeam",
+ {
+ appleTeamId: "F7HDEWM8SU",
+ },
+ ],
"./plugins/withGifQuerySupport",
"./plugins/withInAppBrowserReborn",
[
--- package.json
@@ -32,7 +32,7 @@
"start:minified": "expo start --no-dev --minify",
"postinstall": "yarn build",
"start": "ts-node scripts/runWithVariablePrompt 'expo start'",
- "prebuild": "ts-node scripts/runWithVariablePrompt 'expo prebuild --clean' --skipContext",
+ "prebuild": "ts-node scripts/runWithVariablePrompt 'expo prebuild --clean --no-install' --skipContext",
"run:ios": "ts-node scripts/runWithVariablePrompt 'expo run:ios'",
"run:android": "ts-node scripts/runWithVariablePrompt 'expo run:android'",
"test": "echo 'Skipping tests to test native builds' || jest"
--- plugins/withDevelopmentTeam.ts
@@ -0,0 +1,93 @@
+import {
+ ConfigPlugin,
+ withXcodeProject,
+ XcodeProject,
+} from "expo/config-plugins";
+import fs from "node:fs";
+// @ts-ignore - no type definition
+import xcode, { type XCBuildConfiguration } from "xcode";
+
+import { getAllPBXProjectPaths } from "@expo/config-plugins/build/ios/Paths";
+import { getNativeTargets } from "@expo/config-plugins/build/ios/Target";
+import { getBuildConfigurationsForListId } from "@expo/config-plugins/build/ios/utils/Xcodeproj";
+import { trimQuotes } from "@expo/config-plugins/build/ios/utils/string";
+
+/**
+ * Set the Apple development team ID for all build configurations using the first native target.
+ */
+export const withDevelopmentTeam: ConfigPlugin<
+ { appleTeamId?: string } | void
+> = (config, { appleTeamId } = {}) => {
+ return withXcodeProject(config, (config) => {
+ if (appleTeamId) {
+ config.modResults = updateDevelopmentTeamForPbxproj(
+ config.modResults,
+ appleTeamId
+ );
+ }
+
+ return config;
+ });
+};
+
+/** Set the Apple development team ID for an XCBuildConfiguration object */
+export function setDevelopmentTeamForBuildConfiguration(
+ xcBuildConfiguration: XCBuildConfiguration,
+ developmentTeam?: string
+): void {
+ if (developmentTeam) {
+ xcBuildConfiguration.buildSettings.DEVELOPMENT_TEAM =
+ trimQuotes(developmentTeam);
+ } else {
+ delete xcBuildConfiguration.buildSettings.DEVELOPMENT_TEAM;
+ }
+}
+
+/**
+ * Update the Apple development team ID for all XCBuildConfiguration entries, in all native targets.
+ *
+ * A development team is stored as a value in XCBuildConfiguration entry.
+ * Those entries exist for every pair (build target, build configuration).
+ * Unless target name is passed, the first target defined in the pbxproj is used
+ * (to keep compatibility with the inaccurate legacy implementation of this function).
+ */
+export function updateDevelopmentTeamForPbxproj(
+ project: XcodeProject,
+ appleTeamId?: string
+): XcodeProject {
+ const nativeTargets = getNativeTargets(project);
+
+ nativeTargets.forEach(([, nativeTarget]) => {
+ getBuildConfigurationsForListId(
+ project,
+ nativeTarget.buildConfigurationList
+ ).forEach(([, buildConfig]) =>
+ setDevelopmentTeamForBuildConfiguration(buildConfig, appleTeamId)
+ );
+ });
+
+ return project;
+}
+
+/**
+ * Updates the Apple development team ID for pbx projects inside the ios directory of the given project root
+ *
+ * @param {string} projectRoot Path to project root containing the ios directory
+ * @param {[string]} appleTeamId Desired Apple development team ID
+ */
+export function setDevelopmentTeamForPbxproj(
+ projectRoot: string,
+ appleTeamId?: string
+): void {
+ // Get all pbx projects in the ${projectRoot}/ios directory
+ const pbxprojPaths = getAllPBXProjectPaths(projectRoot);
+
+ for (const pbxprojPath of pbxprojPaths) {
+ let project = xcode.project(pbxprojPath);
+ project.parseSync();
+ project = updateDevelopmentTeamForPbxproj(project, appleTeamId);
+ fs.writeFileSync(pbxprojPath, project.writeSync());
+ }
+}
+
+export default withDevelopmentTeam;
| chore: add development team ios plugin | chore: add development team ios plugin
|
f04f52733a62ec5f9a29f5365cd159e7b25be199 | --- package.json
@@ -111,7 +111,7 @@
"@walmart/core-services": "~6.5.2",
"@walmart/core-services-allspark": "6.27.0",
"@walmart/core-widget-registry": "6.26.0",
- "@walmart/counts-component-miniapp": "0.3.4",
+ "@walmart/counts-component-miniapp": "0.3.5",
"@walmart/digital-locks-mini-app": "1.5.8",
"@walmart/emergency-mini-app": "1.32.5",
"@walmart/exception-mini-app": "1.10.3",
@@ -129,7 +129,7 @@
"@walmart/invue-react-native-sdk": "0.1.26-alpha.14",
"@walmart/iteminfo-mini-app": "8.8.11",
"@walmart/learning-mini-app": "21.0.0",
- "@walmart/manager-approvals-miniapp": "0.5.4",
+ "@walmart/manager-approvals-miniapp": "0.5.6",
"@walmart/me-at-walmart-athena-queries": "6.38.0",
"@walmart/me-at-walmart-common": "workspace:^",
"@walmart/me-at-walmart-container": "workspace:^",
@@ -146,7 +146,7 @@
"@walmart/pay-stub-miniapp": "0.26.6",
"@walmart/payrollsolution_miniapp": "0.155.12",
"@walmart/persona-hub": "0.3.3",
- "@walmart/price-changes-mini-app": "1.16.14",
+ "@walmart/price-changes-mini-app": "1.16.16",
"@walmart/profile-feature-app": "2.8.1-UPV2MyWalmart.8",
"@walmart/react-native-barcode-builder": "^1.0.1",
"@walmart/react-native-cookies": "1.0.1",
--- yarn.lock
@@ -7839,11 +7839,11 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/counts-component-miniapp@npm:0.3.4":
- version: 0.3.4
- resolution: "@walmart/counts-component-miniapp@npm:0.3.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcounts-component-miniapp%2F-%2F%40walmart%2Fcounts-component-miniapp-0.3.4.tgz"
+"@walmart/counts-component-miniapp@npm:0.3.5":
+ version: 0.3.5
+ resolution: "@walmart/counts-component-miniapp@npm:0.3.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcounts-component-miniapp%2F-%2F%40walmart%2Fcounts-component-miniapp-0.3.5.tgz"
peerDependencies:
- "@walmart/allspark-foundation": 6.62.5
+ "@walmart/allspark-foundation": "*"
"@walmart/gtp-shared-components-3": "*"
expo: 53.x
expo-image: ">=2.4.x"
@@ -7852,7 +7852,7 @@ __metadata:
react-native: 0.79.x
react-native-safe-area-context: ">=5.4.x"
react-native-web: "*"
- checksum: 10c0/9003e1f7a6ea0f2e4719f29f5e4b4441354bfb69c9cb512653474fd0d9efcc4ec7b7d272723a0b530188c3c01964f86332084efd48512341f3d9717a9431bdf1
+ checksum: 10c0/4dc8a43e78fe8168b4f93001b2bb205f97041c522186ea92d3b4ef8b6c4d6644217414ca24a24206d4cfc819e354b5a1f5b8bc798ad939b11d9191ac8e182e3f
languageName: node
linkType: hard
@@ -8267,9 +8267,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/manager-approvals-miniapp@npm:0.5.4":
- version: 0.5.4
- resolution: "@walmart/manager-approvals-miniapp@npm:0.5.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmanager-approvals-miniapp%2F-%2F%40walmart%2Fmanager-approvals-miniapp-0.5.4.tgz"
+"@walmart/manager-approvals-miniapp@npm:0.5.6":
+ version: 0.5.6
+ resolution: "@walmart/manager-approvals-miniapp@npm:0.5.6::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmanager-approvals-miniapp%2F-%2F%40walmart%2Fmanager-approvals-miniapp-0.5.6.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=6.57.0-beta.5004+6042f645"
"@walmart/gtp-shared-components-3": "*"
@@ -8279,7 +8279,7 @@ __metadata:
react-native: 0.79.x
react-native-circular-progress: ^1.4.1
react-native-safe-area-context: ">=5.4.x"
- checksum: 10c0/db23850222dbe1bdc329b1048a4296c14097ce2d4e0b896848d78b75f45fce6d0ed2cfa2415e7645514200a92534625db8976e8d6aa7d248f2146815b3148b08
+ checksum: 10c0/98043b7bbd53a44da417ad7155f5873767bf117b0a616e2c9a8b727837ce9933d15760ba66f15ceb07c9a6e192425699543b97f2b1357a15c80f88c881f70dbe
languageName: node
linkType: hard
@@ -8452,7 +8452,7 @@ __metadata:
"@walmart/core-services": "npm:~6.5.2"
"@walmart/core-services-allspark": "npm:6.27.0"
"@walmart/core-widget-registry": "npm:6.26.0"
- "@walmart/counts-component-miniapp": "npm:0.3.4"
+ "@walmart/counts-component-miniapp": "npm:0.3.5"
"@walmart/digital-locks-mini-app": "npm:1.5.8"
"@walmart/emergency-mini-app": "npm:1.32.5"
"@walmart/exception-mini-app": "npm:1.10.3"
@@ -8470,7 +8470,7 @@ __metadata:
"@walmart/invue-react-native-sdk": "npm:0.1.26-alpha.14"
"@walmart/iteminfo-mini-app": "npm:8.8.11"
"@walmart/learning-mini-app": "npm:21.0.0"
- "@walmart/manager-approvals-miniapp": "npm:0.5.4"
+ "@walmart/manager-approvals-miniapp": "npm:0.5.6"
"@walmart/me-at-walmart-athena-queries": "npm:6.38.0"
"@walmart/me-at-walmart-common": "workspace:^"
"@walmart/me-at-walmart-container": "workspace:^"
@@ -8487,7 +8487,7 @@ __metadata:
"@walmart/pay-stub-miniapp": "npm:0.26.6"
"@walmart/payrollsolution_miniapp": "npm:0.155.12"
"@walmart/persona-hub": "npm:0.3.3"
- "@walmart/price-changes-mini-app": "npm:1.16.14"
+ "@walmart/price-changes-mini-app": "npm:1.16.16"
"@walmart/profile-feature-app": "npm:2.8.1-UPV2MyWalmart.8"
"@walmart/react-native-barcode-builder": "npm:^1.0.1"
"@walmart/react-native-cookies": "npm:1.0.1"
@@ -8928,9 +8928,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/price-changes-mini-app@npm:1.16.14":
- version: 1.16.14
- resolution: "@walmart/price-changes-mini-app@npm:1.16.14::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fprice-changes-mini-app%2F-%2F%40walmart%2Fprice-changes-mini-app-1.16.14.tgz"
+"@walmart/price-changes-mini-app@npm:1.16.16":
+ version: 1.16.16
+ resolution: "@walmart/price-changes-mini-app@npm:1.16.16::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fprice-changes-mini-app%2F-%2F%40walmart%2Fprice-changes-mini-app-1.16.16.tgz"
peerDependencies:
"@react-navigation/native": ">=7"
"@react-navigation/stack": ">=7"
@@ -8950,7 +8950,7 @@ __metadata:
redux-saga: ^1.1.3
reduxsauce: ^1.2.0
uuid: ^3.3.2
- checksum: 10c0/3af09bda28c343273d8327d29bf84eaaf91c8c2631728488209251fd889469cba126aa16bad103c46673ef3f976a40884eac05a2888a64839eedcf01dfb3cb7e
+ checksum: 10c0/06dc94a989f11b296a297a6d2865e77983d07044afa1cfc2b1e26ec83bd0adb26aed692b082c9939125746ad14644dd2fb88a1dbb845fb218eaaefefb144fb97
languageName: node
linkType: hard
| feat(price-changes-mini-app): PC, Counts, MA drop 35 version bump (#5158) | feat(price-changes-mini-app): PC, Counts, MA drop 35 version bump (#5158)
Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com>
Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com> |
b0066c1420bc0c3b40377e83df4cd09b0a7fba0e | --- package.json
@@ -56,7 +56,7 @@
},
"overrides": {
"@walmart/config-components": {
- "@walmart/core-services": "5.0.0-beta.18",
+ "@walmart/core-services": "5.0.0-beta.20",
"@walmart/core-services-allspark": "5.0.0-beta.18",
"@walmart/core-utils": "5.0.0-beta.18",
"@walmart/redux-store": "5.0.0-beta.18",
--- packages/allspark-foundation/allspark.config.js
@@ -29,20 +29,12 @@ module.exports = {
},
assets: ['./node_modules/@walmart/gtp-shared-components/assets/fonts'],
},
- package: {
- reactNativePermissionsIOS: ['Camera'],
- // expo: {
- // autolinking: {
- // exclude: ['expo-application', 'expo-keep-awake', 'expo-font'],
- // },
- // },
- },
ios: {
sources: [
'https://github.com/CocoaPods/Specs.git',
'git@gecgithub01.walmart.com:ssaeSCTP/CocoaPodSpecs.git',
],
-
+ permissions: ['Camera'],
pods: [
// @todo - Required by Scanner/Sumo, can we remove?
['FirebaseCore', ':modular_headers => true'],
--- packages/core-services/Environment/index.tsx
@@ -1,7 +1,6 @@
import React, {
PropsWithChildren,
forwardRef,
- useEffect,
useImperativeHandle,
} from 'react';
import {
@@ -10,6 +9,7 @@ import {
EnvironmentType,
EnvironmentConfigMap,
useEnvironment as foundationUseEnvironment,
+ useDerivedEnvironment,
} from '@walmart/allspark-foundation/Environment';
import { ConsumerChild } from '@walmart/allspark-utils';
@@ -64,12 +64,13 @@ export const EnvironmentExtensionProvider = forwardRef<
>((props, ref) => {
const { env, children } = props;
- useEffect(() => {
- AllsparkEnvironment.extend(env);
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, []);
+ const derivedEnv = useDerivedEnvironment(env);
+ const combinedEnv = {
+ ...(AllsparkEnvironment.getCurrent() || {}),
+ ...derivedEnv,
+ };
- useImperativeHandle(ref, () => AllsparkEnvironment.getCurrent());
+ useImperativeHandle(ref, () => combinedEnv);
return <>{children}</>;
});
@@ -115,9 +116,8 @@ export const EnvironmentConsumer = forwardRef<
*/
export const BaseEnvInstance = new Proxy({} as BaseAllsparkEnvironment, {
get: (_, prop) => {
- return AllsparkEnvironment.getCurrent()[
- prop as keyof BaseAllsparkEnvironment
- ];
+ const env = AllsparkEnvironment.getCurrent() || {};
+ return env[prop as keyof BaseAllsparkEnvironment];
},
});
--- packages/core-services/Logger/index.tsx
@@ -77,7 +77,7 @@ export const BaseLoggerInstance = LegacyLoggerService;
* const FeatureLogger = MyFeature.createLogger({...});
* FeatureLogger.info(...); // Use scoped logger
*/
-export const getLoggerContext = () => LoggerService.getContainerInstance();
+export const getLoggerContext = () => LegacyLoggerService;
/**
* @deprecated
@@ -99,8 +99,7 @@ export const getLoggerContext = () => LoggerService.getContainerInstance();
* const FeatureLogger = MyFeature.createLogger({...});
* FeatureLogger.info(...); // Use scoped logger
*/
-export const getDeferredLoggerContext = async () =>
- LoggerService.getContainerInstance();
+export const getDeferredLoggerContext = async () => LegacyLoggerService;
// Have to maintain a context for logger for backwards compatability
const LegacyLoggerContext = createContext<LoggerBaseService | undefined>(
@@ -126,12 +125,11 @@ const LegacyLoggerContext = createContext<LoggerBaseService | undefined>(
export const LoggerProvider = forwardRef<LoggerBaseService, any>(
(props, ref) => {
const { children } = props;
- const logger = useMemo(() => LoggerService.getContainerInstance(), []);
- useImperativeHandle(ref, () => logger);
+ useImperativeHandle(ref, () => LegacyLoggerService);
return (
- <LegacyLoggerContext.Provider value={logger}>
+ <LegacyLoggerContext.Provider value={LegacyLoggerService}>
{children}
</LegacyLoggerContext.Provider>
);
@@ -160,7 +158,7 @@ export const LoggerProvider = forwardRef<LoggerBaseService, any>(
*/
export const useLogger = () => {
const value = useContext(LegacyLoggerContext);
- return value ? value : LoggerService.getContainerInstance();
+ return value ? value : LegacyLoggerService;
};
/**
@@ -187,7 +185,7 @@ export const LoggerCloneProvider = forwardRef<
const { fields, config, children } = props;
const logger = useMemo(
- () => LoggerService.createFeatureInstance(fields.id, config),
+ () => LegacyLoggerService.clone(config, fields),
// eslint-disable-next-line react-hooks/exhaustive-deps
[]
);
@@ -220,7 +218,7 @@ export const useLoggerClone = (
fields: { id: string; [key: string]: any }
) => {
const logger = useMemo(
- () => LoggerService.createFeatureInstance(fields.id, config),
+ () => LegacyLoggerService.clone(config, fields),
// eslint-disable-next-line react-hooks/exhaustive-deps
[]
);
--- packages/me-at-walmart-container/allspark.config.js
@@ -35,13 +35,11 @@ module.exports = {
'wifi-store-locator': {},
},
},
- package: {
- reactNativePermissionsIOS: ['LocationWhenInUse', 'Notifications'],
- },
ios: {
sources: [
'git@gecgithub01.walmart.com:store-systems-associate-tech-platform/cocoapods-specs.git',
],
+ permissions: ['LocationWhenInUse', 'Notifications'],
pods: [
['nanopb', ':modular_headers => true'],
['GoogleUtilities', ':modular_headers => true'],
--- packages/me-at-walmart-container/src/services/site.ts
@@ -9,7 +9,7 @@ import { MeAtWalmartLocalStorage } from './localStorage';
const getStorageKey = (storeNumber: string) =>
`storeConfigs-v2-storage-${storeNumber}`;
-const fetchSite = async (storeNumber: string, forceRefresh = false) => {
+export const fetchSite = async (storeNumber: string, forceRefresh = false) => {
const storageKey = getStorageKey(storeNumber);
if (!forceRefresh) {
| fix: various fixes from foundation testing | fix: various fixes from foundation testing
|
9492bf911f80bcd371bfa8637cb4293c44cbf04b | --- package-lock.json
@@ -3254,9 +3254,9 @@
}
},
"@walmart/allspark-home-mini-app": {
- "version": "0.4.21",
- "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.4.21.tgz",
- "integrity": "sha512-GMeDAXzubNkJFyWqxWp/aiLeOhGVIKc7cMb4DnUzMwcfJnMZKe8ENqbsYxe+QLFRSzfDOd3jnKnJuG42zAkJXA==",
+ "version": "0.4.25",
+ "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.4.25.tgz",
+ "integrity": "sha512-8W/enMw7uIjenM9FitLuNhcOwNQscrVx1zrxUJnnTq1gftSl9zUrYnr8PV/HnxzTtvMoxbg9uJd26uwy35DnEg==",
"requires": {
"moment": "^2.29.0",
"uuid": "^8.3.1"
@@ -3936,7 +3936,7 @@
},
"axios-cache-adapter": {
"version": "2.7.3",
- "resolved": "https://npme.walmart.com/axios-cache-adapter/-/axios-cache-adapter-2.7.3.tgz",
+ "resolved": "http://localhost:4873/axios-cache-adapter/-/axios-cache-adapter-2.7.3.tgz",
"integrity": "sha512-A+ZKJ9lhpjthOEp4Z3QR/a9xC4du1ALaAsejgRGrH9ef6kSDxdFrhRpulqsh9khsEnwXxGfgpUuDp1YXMNMEiQ==",
"requires": {
"cache-control-esm": "1.0.0",
@@ -4329,7 +4329,7 @@
},
"cache-control-esm": {
"version": "1.0.0",
- "resolved": "https://npme.walmart.com/cache-control-esm/-/cache-control-esm-1.0.0.tgz",
+ "resolved": "http://localhost:4873/cache-control-esm/-/cache-control-esm-1.0.0.tgz",
"integrity": "sha512-Fa3UV4+eIk4EOih8FTV6EEsVKO0W5XWtNs6FC3InTfVz+EjurjPfDXY5wZDo/lxjDxg5RjNcurLyxEJBcEUx9g=="
},
"caller-callsite": {
@@ -4410,7 +4410,7 @@
},
"charenc": {
"version": "0.0.2",
- "resolved": "https://npme.walmart.com/charenc/-/charenc-0.0.2.tgz",
+ "resolved": "http://localhost:4873/charenc/-/charenc-0.0.2.tgz",
"integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
},
"ci-info": {
@@ -4774,7 +4774,7 @@
},
"crypt": {
"version": "0.0.2",
- "resolved": "https://npme.walmart.com/crypt/-/crypt-0.0.2.tgz",
+ "resolved": "http://localhost:4873/crypt/-/crypt-0.0.2.tgz",
"integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
},
"crypto-js": {
@@ -10785,7 +10785,7 @@
},
"md5": {
"version": "2.3.0",
- "resolved": "https://npme.walmart.com/md5/-/md5-2.3.0.tgz",
+ "resolved": "http://localhost:4873/md5/-/md5-2.3.0.tgz",
"integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
"requires": {
"charenc": "0.0.2",
@@ -12577,7 +12577,7 @@
},
"react-native-linear-gradient": {
"version": "2.5.6",
- "resolved": "https://npme.walmart.com/react-native-linear-gradient/-/react-native-linear-gradient-2.5.6.tgz",
+ "resolved": "http://localhost:4873/react-native-linear-gradient/-/react-native-linear-gradient-2.5.6.tgz",
"integrity": "sha512-HDwEaXcQIuXXCV70O+bK1rizFong3wj+5Q/jSyifKFLg0VWF95xh8XQgfzXwtq0NggL9vNjPKXa016KuFu+VFg=="
},
"react-native-material-menu": {
| updating package lock json | updating package lock json
|
766dfc304a7efbab98a6c4412e6a32d587d158ae | --- package-lock.json
@@ -5279,9 +5279,9 @@
}
},
"@walmart/gtp-shared-components": {
- "version": "1.8.13",
- "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.13.tgz",
- "integrity": "sha512-KsfUmJxHMhtkiX7U6Z3gBq1H1SUjMBaG5MJLnjJUfb1I+kNiwBisgHMOi2sBhQLn9ciL37YOtOdXhsdrDOmgZg==",
+ "version": "1.8.9",
+ "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.9.tgz",
+ "integrity": "sha512-8UOztkTJq08Z7yG3AAPaHztOlnMP0tKeyO6s/yEh3XIPqpmmwREK41sh2ayBnVNmBca4/AzTCwd+MtzXovyTnQ==",
"requires": {
"@livingdesign/tokens": "^0.41.0",
"lodash": "^4.17.15",
| Update package-lock.json | Update package-lock.json |
6d08ccc68a6b9743915e408af1c5e9991eb53a57 | --- package.json
@@ -122,7 +122,7 @@
"@walmart/me-at-walmart-common": "workspace:^",
"@walmart/me-at-walmart-container": "workspace:^",
"@walmart/me-at-walmart-geolocation": "1.2.0",
- "@walmart/metrics-mini-app": "1.29.12",
+ "@walmart/metrics-mini-app": "1.29.14",
"@walmart/mod-flex-mini-app": "1.29.4",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "2.4.3",
--- yarn.lock
@@ -8674,7 +8674,7 @@ __metadata:
"@walmart/me-at-walmart-common": "workspace:^"
"@walmart/me-at-walmart-container": "workspace:^"
"@walmart/me-at-walmart-geolocation": "npm:1.2.0"
- "@walmart/metrics-mini-app": "npm:1.29.12"
+ "@walmart/metrics-mini-app": "npm:1.29.14"
"@walmart/mod-flex-mini-app": "npm:1.29.4"
"@walmart/moment-walmart": "npm:1.0.4"
"@walmart/money-auth-shared-components": "npm:2.4.3"
@@ -8915,9 +8915,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/metrics-mini-app@npm:1.29.12":
- version: 1.29.12
- resolution: "@walmart/metrics-mini-app@npm:1.29.12::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmetrics-mini-app%2F-%2F%40walmart%2Fmetrics-mini-app-1.29.12.tgz"
+"@walmart/metrics-mini-app@npm:1.29.14":
+ version: 1.29.14
+ resolution: "@walmart/metrics-mini-app@npm:1.29.14::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmetrics-mini-app%2F-%2F%40walmart%2Fmetrics-mini-app-1.29.14.tgz"
dependencies:
"@walmart/metrics-common": "npm:1.3.9"
base-64: "npm:^1.0.0"
@@ -8943,7 +8943,7 @@ __metadata:
react-native: 0.73.7
react-redux: ">=8.0.4"
reduxsauce: ">=1.2.0"
- checksum: 10c0/42007d84cf5aa36b49351003272be40fa3528d41c62218b287d50d427b3f304f13140980d013841589c42b275b686fac7f875b762ffe84e8c5c59237099b03e2
+ checksum: 10c0/1129e493834afda8d482b7f11cab64d504eb1ea423ed68b6f169f8a154b87dd41dd7acf3720e9b5865a17b7592acd1a9e35d4c013d7b7230421540a8e0ffda0c
languageName: node
linkType: hard
| feat(metrics): OPIF-262178 version bump (#4534) | feat(metrics): OPIF-262178 version bump (#4534)
* chore(package.json): METRICS-792,902 Fixing filter selection for metrics
* fix(metrics): OPIF-262178 version bump
---------
Co-authored-by: k0f0734 <kevin.foniciello@walmart.com>
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com> |
b950705de0e8cc1a5c0e23aec6bffc69a8513674 | --- src/components/TeamList.tsx
@@ -31,7 +31,7 @@ import {
useStartTeamText,
useUserIsInRoster,
useSiteTranslationContext,
- useIsUserPartOfStoreOrSite,
+ useTotalSiteOrTotalStore,
} from '../hooks';
import {NavigationProp, useNavigation} from '@react-navigation/native';
import {TextingNavParamsMap} from '../navigation';
@@ -226,7 +226,7 @@ const StoreTeamItem = (props: {style?: StyleProp<ViewStyle>}) => {
const startStoreText = useStartStoreText();
const translationContext = useSiteTranslationContext();
- const channelNameSiteOrStore: string = useIsUserPartOfStoreOrSite();
+ const channelNameSiteOrStore: string = useTotalSiteOrTotalStore();
const onViewTeam = () => {
navigation.navigate('myTeam.viewTeam', {teamRoster: rosterData});
--- src/containers/StoreChatCard.tsx
@@ -21,7 +21,7 @@ import {
useStartStoreText,
useUserIsInRoster,
useSiteTranslationContext,
- useIsUserPartOfStoreOrSite,
+ useTotalSiteOrTotalStore,
} from '../hooks';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../translations';
@@ -57,7 +57,7 @@ export const StoreChatCard = (props: {style?: StyleProp<ViewStyle>}) => {
const translationContext = useSiteTranslationContext();
const clockedInCount =
(rosterData as any)?.filter(associateIsClockedIn)?.length ?? 0;
- const channelNameSiteOrStore: string = useIsUserPartOfStoreOrSite();
+ const channelNameSiteOrStore: string = useTotalSiteOrTotalStore();
const onViewTeam = () => {
navigation.navigate('myTeam.viewTeam', {teamRoster: rosterData});
--- src/hooks/messages.ts
@@ -18,7 +18,7 @@ import {
APP_CONTAINER_SCREEN_NAME,
} from '../constants';
import {analytics} from '../logger/Analytics';
-import {useIsUserPartOfStoreOrSite} from './user';
+import {useTotalSiteOrTotalStore} from './user';
export const useStartAssociateText = (replace: boolean = false) => {
const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>();
@@ -77,7 +77,7 @@ export const useStartStoreText = (replace: boolean = false) => {
const site: string | undefined = useSelector(
SiteSelectors.getUserWorkingSite,
);
- const channelNameSiteOrStore: string = useIsUserPartOfStoreOrSite();
+ const channelNameSiteOrStore: string = useTotalSiteOrTotalStore();
return useCallback(
() => {
@@ -173,7 +173,7 @@ export const useTeamTextingFeature = () => {
const siteId: string | undefined = useSelector(
SiteSelectors.getUserWorkingSite,
);
- const channelNameSiteOrStore: string = useIsUserPartOfStoreOrSite();
+ const channelNameSiteOrStore: string = useTotalSiteOrTotalStore();
return useCallback(
(teamId?: string, teamName?: string) => {
--- src/hooks/user.ts
@@ -66,7 +66,7 @@ export const useSiteTranslationContext = () => {
return context;
};
-export const useIsUserPartOfStoreOrSite = (): string => {
+export const useTotalSiteOrTotalStore = (): string => {
const isSiteDC = useSelector(SiteSelectors.isSiteDistributionCenter);
return isSiteDC ? 'Total site' : 'Total store';
};
--- src/components/TeamList.tsx
@@ -31,7 +31,7 @@ import {
useStartTeamText,
useUserIsInRoster,
useSiteTranslationContext,
- useIsUserPartOfStoreOrSite,
+ useTotalSiteOrTotalStore,
} from '../hooks';
import {NavigationProp, useNavigation} from '@react-navigation/native';
import {TextingNavParamsMap} from '../navigation';
@@ -226,7 +226,7 @@ const StoreTeamItem = (props: {style?: StyleProp<ViewStyle>}) => {
const startStoreText = useStartStoreText();
const translationContext = useSiteTranslationContext();
- const channelNameSiteOrStore: string = useIsUserPartOfStoreOrSite();
+ const channelNameSiteOrStore: string = useTotalSiteOrTotalStore();
const onViewTeam = () => {
navigation.navigate('myTeam.viewTeam', {teamRoster: rosterData});
--- src/containers/StoreChatCard.tsx
@@ -21,7 +21,7 @@ import {
useStartStoreText,
useUserIsInRoster,
useSiteTranslationContext,
- useIsUserPartOfStoreOrSite,
+ useTotalSiteOrTotalStore,
} from '../hooks';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../translations';
@@ -57,7 +57,7 @@ export const StoreChatCard = (props: {style?: StyleProp<ViewStyle>}) => {
const translationContext = useSiteTranslationContext();
const clockedInCount =
(rosterData as any)?.filter(associateIsClockedIn)?.length ?? 0;
- const channelNameSiteOrStore: string = useIsUserPartOfStoreOrSite();
+ const channelNameSiteOrStore: string = useTotalSiteOrTotalStore();
const onViewTeam = () => {
navigation.navigate('myTeam.viewTeam', {teamRoster: rosterData});
--- src/hooks/messages.ts
@@ -18,7 +18,7 @@ import {
APP_CONTAINER_SCREEN_NAME,
} from '../constants';
import {analytics} from '../logger/Analytics';
-import {useIsUserPartOfStoreOrSite} from './user';
+import {useTotalSiteOrTotalStore} from './user';
export const useStartAssociateText = (replace: boolean = false) => {
const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>();
@@ -77,7 +77,7 @@ export const useStartStoreText = (replace: boolean = false) => {
const site: string | undefined = useSelector(
SiteSelectors.getUserWorkingSite,
);
- const channelNameSiteOrStore: string = useIsUserPartOfStoreOrSite();
+ const channelNameSiteOrStore: string = useTotalSiteOrTotalStore();
return useCallback(
() => {
@@ -173,7 +173,7 @@ export const useTeamTextingFeature = () => {
const siteId: string | undefined = useSelector(
SiteSelectors.getUserWorkingSite,
);
- const channelNameSiteOrStore: string = useIsUserPartOfStoreOrSite();
+ const channelNameSiteOrStore: string = useTotalSiteOrTotalStore();
return useCallback(
(teamId?: string, teamName?: string) => {
--- src/hooks/user.ts
@@ -66,7 +66,7 @@ export const useSiteTranslationContext = () => {
return context;
};
-export const useIsUserPartOfStoreOrSite = (): string => {
+export const useTotalSiteOrTotalStore = (): string => {
const isSiteDC = useSelector(SiteSelectors.isSiteDistributionCenter);
return isSiteDC ? 'Total site' : 'Total store';
};
| update name for hook | update name for hook
|
6c862491df4344e7f13e44fef758c6795e8ec672 | --- .husky/pre-commit
@@ -1,22 +1,81 @@
#!/bin/sh
-# Run tests with coverage threshold validation
-echo "🧪 Running tests with coverage validation..."
-yarn test
+# Run tests and coverage validation on changed files only
+echo "🧪 Running tests on changed files..."
-if [ $? -ne 0 ]; then
- echo "❌ Tests failed or coverage threshold not met. Commit aborted."
- exit 1
+# Get list of staged source files
+STAGED_SRC_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E '^src/.*\.(js|jsx|ts|tsx)$' | tr '\n' ' ')
+
+# Get list of staged test files
+STAGED_TEST_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E '__tests__/.*\.(test|spec)\.(js|jsx|ts|tsx)$' | tr '\n' ' ')
+
+if [ -n "$STAGED_SRC_FILES" ] || [ -n "$STAGED_TEST_FILES" ]; then
+ echo "Changed source files: $STAGED_SRC_FILES"
+ echo "Changed test files: $STAGED_TEST_FILES"
+
+ # Find related test files for changed source files
+ RELATED_TESTS=""
+ if [ -n "$STAGED_SRC_FILES" ]; then
+ for file in $STAGED_SRC_FILES; do
+ # Convert src file path to potential test file paths
+ base_name=$(basename "$file" | sed 's/\.[^.]*$//')
+ dir_path=$(dirname "$file" | sed 's|^src/||')
+
+ # Look for corresponding test files
+ test_patterns="__tests__/**/${base_name}.test.* __tests__/**/${base_name}.spec.* __tests__/${dir_path}/**/${base_name}.test.* __tests__/${dir_path}/**/${base_name}.spec.*"
+
+ for pattern in $test_patterns; do
+ if ls $pattern 2>/dev/null; then
+ RELATED_TESTS="$RELATED_TESTS $(ls $pattern 2>/dev/null)"
+ fi
+ done
+ done
+ fi
+
+ # Combine staged test files with related test files
+ ALL_TEST_FILES="$STAGED_TEST_FILES $RELATED_TESTS"
+ ALL_TEST_FILES=$(echo $ALL_TEST_FILES | tr ' ' '\n' | sort -u | tr '\n' ' ')
+
+ if [ -n "$ALL_TEST_FILES" ]; then
+ echo "Running tests: $ALL_TEST_FILES"
+ # Run specific test files with coverage for changed source files
+ yarn jest $ALL_TEST_FILES --collectCoverageFrom="$STAGED_SRC_FILES" --coverage --coverageReporters=text
+ else
+ echo "No test files found for changed source files. Running all tests to ensure nothing is broken..."
+ # If no specific tests found, run all tests but only collect coverage for changed files
+ if [ -n "$STAGED_SRC_FILES" ]; then
+ yarn jest --collectCoverageFrom="$STAGED_SRC_FILES" --coverage --coverageReporters=text
+ else
+ yarn jest
+ fi
+ fi
+
+ if [ $? -ne 0 ]; then
+ echo "❌ Tests failed or coverage threshold not met for changed files. Commit aborted."
+ exit 1
+ fi
+else
+ echo "No source or test files changed, skipping test execution."
fi
-# Check Prettier formatting
-echo "💅 Checking Prettier formatting..."
-yarn prettier --check .
+# Check Prettier formatting on staged files only
+echo "💅 Checking Prettier formatting on staged files..."
+
+# Get list of staged files that prettier can format
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E '\.(js|jsx|ts|tsx|json|css|scss|md|html|yaml|yml)$' | tr '\n' ' ')
-if [ $? -ne 0 ]; then
- echo "❌ Code is not formatted according to .prettierrc config."
- echo "Run 'yarn prettier --write .' to fix formatting issues."
- exit 1
+if [ -n "$STAGED_FILES" ]; then
+ echo "Checking formatting for: $STAGED_FILES"
+ yarn prettier --check $STAGED_FILES
+
+ if [ $? -ne 0 ]; then
+ echo "❌ Some staged files are not formatted according to .prettierrc config."
+ echo "Run 'yarn prettier --write $STAGED_FILES' to fix formatting issues."
+ echo "Or run 'yarn prettier --write .' to format all files."
+ exit 1
+ fi
+else
+ echo "No files to check for prettier formatting."
fi
echo "✅ All pre-commit checks passed!"
--- .prettierignore
@@ -0,0 +1,58 @@
+# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
+
+# dependencies
+node_modules/
+
+# Expo
+.expo/
+dist/
+web-build/
+
+coverage/
+test-report.xml
+
+# Native
+*.orig.*
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
+
+# Metro
+.metro-health-check*
+
+# debug
+npm-debug.*
+yarn-debug.*
+yarn-error.*
+
+# macOS
+.DS_Store
+*.pem
+
+# local env files
+.env*.local
+
+# typescript
+*.tsbuildinfo
+
+# expo CNG
+android
+ios
+
+#Yarn
+install-state.gz
+
+build.context.json
+
+# jest
+coverage
+*.log
+test-report.xml
+
+# vscode
+.vscode/
+
+.github/prompts
+.github/copilot-instructions.md
| refactor: SMDV-8201 fixing husky config | refactor: SMDV-8201 fixing husky config
|
8b5f05e3c4157359fe26e3213c222699d351dcf9 | --- package-lock.json
@@ -47,12 +47,12 @@
"@walmart/emergency-mini-app": "1.17.0",
"@walmart/exception-mini-app": "1.0.16",
"@walmart/facilities-management-miniapp": "0.4.2",
- "@walmart/feedback-all-spark-miniapp": "0.9.9",
+ "@walmart/feedback-all-spark-miniapp": "0.9.10",
"@walmart/financial-wellbeing-feature-app": "1.1.2",
"@walmart/functional-components": "2.0.6",
"@walmart/gta-react-native-calendars": "0.0.15",
"@walmart/gtp-shared-components": "2.0.3",
- "@walmart/impersonation-mini-app": "1.10.0",
+ "@walmart/impersonation-mini-app": "1.11.0",
"@walmart/ims-print-services-ui": "1.2.2",
"@walmart/inbox-mini-app": "0.81.7",
"@walmart/iteminfo-mini-app": "5.3.4",
@@ -81,7 +81,7 @@
"@walmart/schedule-mini-app": "0.32.0",
"@walmart/settings-mini-app": "1.12.0",
"@walmart/shelfavailability-mini-app": "1.5.11",
- "@walmart/taskit-mini-app": "0.49.6",
+ "@walmart/taskit-mini-app": "0.49.11",
"@walmart/time-clock-mini-app": "0.30.0",
"@walmart/ui-components": "1.9.0",
"@walmart/welcomeme-mini-app": "0.73.0",
@@ -5199,9 +5199,9 @@
}
},
"node_modules/@walmart/feedback-all-spark-miniapp": {
- "version": "0.9.9",
- "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.9.tgz",
- "integrity": "sha512-zflnSCCc2yaDFeasMBtEuH74oGEZg1E2auhNUZ05C6zzO9yZ+oHun9+0jhnt+ag6zqZDCG1/AbgUJjfzAgY2dA==",
+ "version": "0.9.10",
+ "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.10.tgz",
+ "integrity": "sha512-zqz82og6sfBPi2wYuXT6WiBgENoP8RMv3FUoQ4sb1TjIacOFRuGJbsu1TjG1YtdOz/GDrMty9W9ZH03KyNZLFg==",
"hasInstallScript": true,
"peerDependencies": {
"@react-native-community/async-storage": "^1.12.1",
@@ -5317,9 +5317,9 @@
"license": "UNLICENSED"
},
"node_modules/@walmart/impersonation-mini-app": {
- "version": "1.10.0",
- "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.10.0.tgz",
- "integrity": "sha512-/bnQ0mzIwG00i3aUz27eVqZE0w6I15c8CsxErencSBbDrx/uQFPNUYl45/Z/Y0XLYLRmothQ9zQHmp4I7km6RQ==",
+ "version": "1.11.0",
+ "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.11.0.tgz",
+ "integrity": "sha512-jytXe4i0C9GXvPCm6nB26ILZVkcSsBmcdykmGmlFKB4Q/d5i9imtLmFHLfhd6gxU7ZeBoKMJvymF5tWQbI6QoQ==",
"peerDependencies": {
"@react-native-community/masked-view": ">=0.1.10",
"@react-native-community/picker": ">=1.8.1",
@@ -6117,9 +6117,9 @@
}
},
"node_modules/@walmart/taskit-mini-app": {
- "version": "0.49.6",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.49.6.tgz",
- "integrity": "sha512-uIOdjSxp9dB/x036dC8bnRom0hkr+FqvXT0GdrX69M+dVEV0rrHGARrBOVqQZIN1U2tg/EhyDh3Et1avL+ZJLw==",
+ "version": "0.49.11",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.49.11.tgz",
+ "integrity": "sha512-D0Oi1XUgIvxIVjQL2wl0nyeTJr0Sqcvtezbag3ZG0tMlwxGJMXNB2PvkQ5n8JBuAV1YRlggsGtIp+yLz+slgCQ==",
"peerDependencies": {
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@types/lodash": ">=4.14.176",
@@ -25485,9 +25485,9 @@
}
},
"@walmart/impersonation-mini-app": {
- "version": "1.10.0",
- "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.10.0.tgz",
- "integrity": "sha512-/bnQ0mzIwG00i3aUz27eVqZE0w6I15c8CsxErencSBbDrx/uQFPNUYl45/Z/Y0XLYLRmothQ9zQHmp4I7km6RQ=="
+ "version": "1.11.0",
+ "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.11.0.tgz",
+ "integrity": "sha512-jytXe4i0C9GXvPCm6nB26ILZVkcSsBmcdykmGmlFKB4Q/d5i9imtLmFHLfhd6gxU7ZeBoKMJvymF5tWQbI6QoQ=="
},
"@walmart/ims-print-services-ui": {
"version": "1.2.2",
--- package.json
@@ -94,7 +94,7 @@
"@walmart/functional-components": "2.0.6",
"@walmart/gta-react-native-calendars": "0.0.15",
"@walmart/gtp-shared-components": "2.0.3",
- "@walmart/impersonation-mini-app": "1.10.0",
+ "@walmart/impersonation-mini-app": "1.11.0",
"@walmart/ims-print-services-ui": "1.2.2",
"@walmart/inbox-mini-app": "0.81.7",
"@walmart/iteminfo-mini-app": "5.3.4",
| version bump | version bump
|
d668ba8515615a449a00beb07e29feab45e1d933 | --- package.json
@@ -182,7 +182,7 @@
"@walmart/timesheet-feature-app": "0.2.0",
"@walmart/topstock-mini-app": "1.28.19",
"@walmart/translator-mini-app": "1.8.14",
- "@walmart/ui-components": "1.28.0",
+ "@walmart/ui-components": "1.28.1",
"@walmart/walmart-fiscal-week": "^0.3.6",
"@walmart/welcomeme-mini-app": "^1.0.15",
"@walmart/wfm-ui": "4.1.0",
@@ -462,7 +462,7 @@
"@walmart/me-at-walmart-common": "workspace:^",
"@walmart/me-at-walmart-container": "workspace:^",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/ui-components": "1.28.0",
+ "@walmart/ui-components": "1.28.1",
"axios-cache-adapter": "patch:axios-cache-adapter@npm%3A2.7.3#~/.yarn/patches/axios-cache-adapter-npm-2.7.3-26c357b785.patch",
"axios-cache-interceptor": "patch:axios-cache-interceptor@npm%3A1.5.1#~/.yarn/patches/axios-cache-interceptor-npm-1.5.1-c84dd3f9ed.patch",
"axios": "~1.11.0",
--- yarn.lock
@@ -8915,7 +8915,7 @@ __metadata:
"@walmart/timesheet-feature-app": "npm:0.2.0"
"@walmart/topstock-mini-app": "npm:1.28.19"
"@walmart/translator-mini-app": "npm:1.8.14"
- "@walmart/ui-components": "npm:1.28.0"
+ "@walmart/ui-components": "npm:1.28.1"
"@walmart/walmart-fiscal-week": "npm:^0.3.6"
"@walmart/welcomeme-mini-app": "npm:^1.0.15"
"@walmart/wfm-ui": "npm:4.1.0"
@@ -10212,9 +10212,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/ui-components@npm:1.28.0":
- version: 1.28.0
- resolution: "@walmart/ui-components@npm:1.28.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fui-components%2F-%2F%40walmart%2Fui-components-1.28.0.tgz"
+"@walmart/ui-components@npm:1.28.1":
+ version: 1.28.1
+ resolution: "@walmart/ui-components@npm:1.28.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fui-components%2F-%2F%40walmart%2Fui-components-1.28.1.tgz"
peerDependencies:
"@react-navigation/stack": ">=6.1.0"
"@walmart/allspark-foundation": "*"
@@ -10234,7 +10234,7 @@ __metadata:
react-native-safe-area-context: ">=3.1.3"
react-native-vector-icons: ">=7.0.0"
react-native-webview: ">=10.10.2"
- checksum: 10c0/ea83adc96d9cf975b826823787e6557d4de804cbd6efa14a97034b66260d8cdcc15fa59730296410969884729db9b69df100273ef043216c941a370aea66c017
+ checksum: 10c0/45cff63ee0572f57dc78c2b843a30f3ab28ab94e9889b92dfefab5d17c51dacc79fb59a96167903dfe4dbb49c795a4e4adbd9e769a0562bfdf25bcc0e7a5b528
languageName: node
linkType: hard
| fix: navigation icon visibility fix | fix: navigation icon visibility fix
|
b63911f929624bb4c17da37aeafa895c6dbb10e3 | --- __tests__/__mocks__/@walmart/ui-components.js
@@ -9,4 +9,5 @@ module.exports = {
LockScreen: 'LockScreen',
DrawerButton: 'DrawerButton',
Modal: 'Modal',
+ ClockOutOverlay: 'ClockOutOverlay',
};
--- __tests__/navigation/ClockOutGuardTest.tsx
@@ -2,8 +2,8 @@ import React from 'react';
import {Text} from 'react-native';
import {useSelector} from 'react-redux';
import {create} from 'react-test-renderer';
-import {useIsFocused, useNavigation} from '@react-navigation/native';
-import {Modal} from '@walmart/ui-components';
+import {useNavigation} from '@react-navigation/native';
+import {ClockOutOverlay} from '@walmart/ui-components';
import {
ClockOutGuard,
withClockOutGuard,
@@ -16,36 +16,22 @@ const mockNavigation = {
describe('ClockOutGuard', () => {
(useSelector as jest.Mock).mockReturnValueOnce(true); // isClockedOut
- (useIsFocused as jest.Mock).mockReturnValueOnce(true);
const component = create(
<ClockOutGuard appName='App Name'>
<Text>Children</Text>
</ClockOutGuard>,
);
- it('matches snapshot when focused and clocked out; navigates home on button press', () => {
+ it('matches snapshot when clocked out; navigates home on button press', () => {
expect(component.toJSON()).toMatchSnapshot();
- const ClockOutModal = component.root.findByType(Modal);
- ClockOutModal.props.primaryButton.onPress();
+ const ClockOutModal = component.root.findByType(ClockOutOverlay);
+ ClockOutModal.props.onButtonPress();
expect(mockNavigation.navigate).toHaveBeenCalledWith('home');
});
- it('matches snapshot when not focused and clocked out', () => {
- (useSelector as jest.Mock).mockReturnValueOnce(true); // isClockedOut
- (useIsFocused as jest.Mock).mockReturnValueOnce(false);
-
- component.update(
- <ClockOutGuard appName='App Name'>
- <Text>Children</Text>
- </ClockOutGuard>,
- );
- expect(component.toJSON()).toMatchSnapshot();
- });
-
it('matches snapshot when clocked in', () => {
(useSelector as jest.Mock).mockReturnValueOnce(false); // isClockedOut
- (useIsFocused as jest.Mock).mockReturnValueOnce(true);
component.update(
<ClockOutGuard appName='App Name'>
@@ -64,7 +50,6 @@ describe('withClockOutGuard', () => {
);
(useSelector as jest.Mock).mockReturnValueOnce(false); // isClockedOut
- (useIsFocused as jest.Mock).mockReturnValueOnce(true);
const component = create(<GuardedComponent />);
expect(component.toJSON()).toMatchSnapshot();
--- __tests__/navigation/__snapshots__/ClockOutGuardTest.tsx.snap
@@ -6,31 +6,12 @@ exports[`ClockOutGuard matches snapshot when clocked in 1`] = `
</Text>
`;
-exports[`ClockOutGuard matches snapshot when focused and clocked out; navigates home on button press 1`] = `
-<Modal
+exports[`ClockOutGuard matches snapshot when clocked out; navigates home on button press 1`] = `
+<ClockOutOverlay
+ buttonTitle="Me@Walmart home"
content="You must be clocked in to use App Name"
- primaryButton={
- Object {
- "onPress": [Function],
- "title": "Me@Walmart home",
- }
- }
+ onButtonPress={[Function]}
title="Must be clocked in"
- visible={true}
-/>
-`;
-
-exports[`ClockOutGuard matches snapshot when not focused and clocked out 1`] = `
-<Modal
- content="You must be clocked in to use App Name"
- primaryButton={
- Object {
- "onPress": [Function],
- "title": "Me@Walmart home",
- }
- }
- title="Must be clocked in"
- visible={false}
/>
`;
--- src/navigation/ClockOutGuard.tsx
@@ -1,26 +1,22 @@
import React from 'react';
import {useSelector} from 'react-redux';
-import {useIsFocused, useNavigation} from '@react-navigation/native';
-import {Modal} from '@walmart/ui-components';
+import {useNavigation} from '@react-navigation/native';
+import {ClockOutOverlay} from '@walmart/ui-components';
import {getIsClockedOut} from '../redux/SharedSelectors';
export const ClockOutGuard = (props: any) => {
const {appName, children} = props;
const navigation = useNavigation();
- const focused = useIsFocused();
const isClockedOut = useSelector(getIsClockedOut);
const onGoHome = () => navigation.navigate('home');
return isClockedOut ? (
- <Modal
- visible={focused}
+ <ClockOutOverlay
title='Must be clocked in'
content={`You must be clocked in to use ${appName}`}
- primaryButton={{
- title: 'Me@Walmart home',
- onPress: onGoHome,
- }}
+ buttonTitle='Me@Walmart home'
+ onButtonPress={onGoHome}
/>
) : (
children
--- src/types/ui-components.d.ts
@@ -8,6 +8,7 @@ declare module '@walmart/ui-components' {
import type {LockScreenProps} from '@walmart/ui-components/components/LockScreen/types';
import type {DrawerButtonProps} from '@walmart/ui-components/components/DrawerButton/types';
import type {ModalProps} from '@walmart/ui-components/components/Modal/types';
+ import type {ClockOutOverlayProps} from '@walmart/ui-components/components/ClockOutOverlay/types';
export const Header: React.FC<StackHeaderProps>;
export const Dialog: React.FC<DialogProps>;
export const ActivityMonitor: React.FC<ActivityMonitorProps>;
@@ -16,6 +17,7 @@ declare module '@walmart/ui-components' {
export const Modal: React.FC<PropsWithChildren<
PartialBy<ModalProps, 'secondaryButton'>
>>;
+ export const ClockOutOverlay: React.FC<ClockOutOverlayProps>;
}
declare module '@walmart/ui-components/containers' {
| Replacing Modal with ClockOutOveraly | Replacing Modal with ClockOutOveraly
|
47ab62410d2b5fea79d090b6174ee15b0f41adfb | --- __tests__/channels/components/AssociateRosterItem.test.tsx
@@ -5,7 +5,6 @@ import {
AssociateRosterItem,
renderAssociateRosterItem,
} from '../../../src/components';
-import React from 'react';
import {initialStateMock} from '../../harness/redux/mockState';
import {UserSelectors} from '@walmart/allspark-foundation/User';
@@ -16,6 +15,9 @@ jest.mock('react-redux', () => ({
jest.mock('@walmart/me-at-walmart-common', () => ({
HOME_HEADER_RIGHT_KEY: 'header_right',
+ CORE_CONTAINERS: {
+ HOME_HEADER_RIGHT: 'header_right',
+ },
}));
afterEach(() => {
--- __tests__/components/NewMessageHeader.test.tsx
@@ -1,5 +1,4 @@
import {fireEvent, render} from '@testing-library/react-native';
-import React from 'react';
import {MessagesHeader, NewMessageHeader} from '../../src/components';
import {analytics} from '../../src/logger/Analytics';
import {UserSelectors} from '@walmart/allspark-foundation/User';
@@ -19,6 +18,9 @@ jest.mock('@walmart/allspark-foundation/Navigation', () => ({
jest.mock('@walmart/me-at-walmart-common', () => ({
HOME_HEADER_RIGHT_KEY: 'header_right',
+ CORE_CONTAINERS: {
+ HOME_HEADER_RIGHT: 'header_right',
+ },
}));
describe('NewMessageHeader', () => {
--- __tests__/components/__snapshots__/ChatWidgetComponent.test.tsx.snap
@@ -41,15 +41,8 @@ exports[`ChatWidget component test renders correctly when enabled 1`] = `
testID="wmConnectHeaderIcon"
>
<View
- UNSAFE_style={
- {
- "height": 22,
- "maxHeight": 22,
- "top": 4,
- "width": 22,
- }
- }
color="white"
+ size="medium"
testID="Icons.ChatBubbleIcon"
/>
</View>
--- __tests__/index-test.tsx
@@ -1,6 +1,5 @@
import 'react-native-get-random-values';
-import React from 'react';
import {WMConnectMiniApp} from '../src/screens';
import {renderWithProviders} from './harness';
@@ -88,7 +87,10 @@ jest.mock('@walmart/me-at-walmart-common', () => ({
FeatureTags: {
associate: 'associate',
manager: 'manager'
- }
+ },
+ CORE_CONTAINERS: {
+ HOME_HEADER_RIGHT: 'header_right',
+ },
}));
describe.skip('WMConnectMiniApp', () => {
--- __tests__/screens/MessageTimeSectionHeader/messageTimeSectionHeader.test.tsx
@@ -1,9 +1,11 @@
-import React from 'react';
import {MessageTimeSectionHeader} from '../../../src/components';
import {renderWithProviders} from '../../harness';
jest.mock('@walmart/me-at-walmart-common', () => ({
HOME_HEADER_RIGHT_KEY: 'header_right',
+ CORE_CONTAINERS: {
+ HOME_HEADER_RIGHT: 'header_right',
+ },
}));
describe('MessageTimeSectionHeader', () => {
--- __tests__/screens/NewMessageScreen/NewMessageScreenTest.tsx
@@ -6,6 +6,9 @@ const {renderWithProviders} = require('../../harness');
jest.mock('@walmart/me-at-walmart-common', () => ({
HOME_HEADER_RIGHT_KEY: 'header_right',
+ CORE_CONTAINERS: {
+ HOME_HEADER_RIGHT: 'header_right',
+ },
}));
jest.mock('../../../src/hooks/roster', () => ({
...jest.requireActual('../../../src/hooks/roster'),
--- src/components/ChatWidget/ChatWidgetComponent.tsx
@@ -55,7 +55,7 @@ export const ChatWidget = (props: HeaderButtonProps) => {
accessibilityRole='button'
accessibilityLabel='View Messages'>
<Icons.ChatBubbleIcon
- UNSAFE_style={styles.headerIcon}
+ size='medium'
color={tintColor}
/>
{badgeCountEnabled && !isClockedOut && (
--- src/components/index.ts
@@ -1,4 +1,4 @@
-import {HOME_HEADER_RIGHT_KEY} from '@walmart/me-at-walmart-common';
+import {CORE_CONTAINERS} from '@walmart/me-at-walmart-common';
import {DNDStatusChip} from './DND';
import {GroupMessageButton} from './GroupMessageButton';
import {NewMessageButton} from './NewMessageButton';
@@ -31,7 +31,7 @@ export const wmConnectComponents = {
},
'wmConnect.ChatIcon': {
component: ChatWidget,
- containerId: HOME_HEADER_RIGHT_KEY,
+ containerId: CORE_CONTAINERS.HOME_HEADER_RIGHT,
shared: true,
},
};
| fix(ui): chat bubble size and unread message count | fix(ui): chat bubble size and unread message count
|
070706fbfb8741ce36d9428d0241eb4317e895ea | --- package-lock.json
@@ -39,7 +39,7 @@
"@walmart/attendance-mini-app": "0.190.2",
"@walmart/compass-sdk-rn": "4.0.0",
"@walmart/config-components": "4.1.0-rc.4",
- "@walmart/copilot-mini-app": "^1.55.2",
+ "@walmart/copilot-mini-app": "^1.56.0",
"@walmart/core-services": "~2.0.19",
"@walmart/core-services-allspark": "~2.11.0",
"@walmart/core-utils": "~2.0.5",
@@ -4935,9 +4935,9 @@
}
},
"node_modules/@walmart/copilot-mini-app": {
- "version": "1.55.2",
- "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.55.2.tgz",
- "integrity": "sha512-M0N69VNkT9V9tkLDclF//nUioEVxZ8dgo+giHdYwh1s3Z7CbzQCVtjuRSAf4csQp0+AKOY4fofvGaqr2S6FOQQ==",
+ "version": "1.56.0",
+ "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.56.0.tgz",
+ "integrity": "sha512-QHEbhfIHUXLREz7kCVxWau8oppiUfumeeAR6Uu9wIeduEFN1LlpxC0Io3cupBKjZzqmGMSkz4ZFNhdPahFNQ+Q==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -25130,9 +25130,9 @@
}
},
"@walmart/copilot-mini-app": {
- "version": "1.55.2",
- "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.55.2.tgz",
- "integrity": "sha512-M0N69VNkT9V9tkLDclF//nUioEVxZ8dgo+giHdYwh1s3Z7CbzQCVtjuRSAf4csQp0+AKOY4fofvGaqr2S6FOQQ=="
+ "version": "1.56.0",
+ "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.56.0.tgz",
+ "integrity": "sha512-QHEbhfIHUXLREz7kCVxWau8oppiUfumeeAR6Uu9wIeduEFN1LlpxC0Io3cupBKjZzqmGMSkz4ZFNhdPahFNQ+Q=="
},
"@walmart/core-services": {
"version": "2.0.19",
--- package.json
@@ -81,7 +81,7 @@
"@walmart/attendance-mini-app": "0.190.2",
"@walmart/compass-sdk-rn": "4.0.0",
"@walmart/config-components": "4.1.0-rc.4",
- "@walmart/copilot-mini-app": "^1.55.2",
+ "@walmart/copilot-mini-app": "^1.56.0",
"@walmart/core-services": "~2.0.19",
"@walmart/core-services-allspark": "~2.11.0",
"@walmart/core-utils": "~2.0.5",
| chore: bump version | chore: bump version
|
17b1c5aff2e0e65daa96d22e21c944c61407bd2d | --- docs/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [1.30.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.29.0...v1.30.0) (2025-05-01)
+
+
+### Features
+
+* **ui:** update roster version ([c5b892f](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/c5b892f3b1df5a45b5bc733334305984d413a29f))
+
# [1.29.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.28.0...v1.29.0) (2025-05-01)
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.29.0",
+ "version": "1.30.0",
"main": "dist/index.js",
"files": [
"dist/"
| chore(release): 1.30.0 [skip ci] | chore(release): 1.30.0 [skip ci]
# [1.30.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.29.0...v1.30.0) (2025-05-01)
### Features
* **ui:** update roster version ([c5b892f](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/c5b892f3b1df5a45b5bc733334305984d413a29f))
|
2224295f91a27d4fff91460e2be11a5fe88431dc | --- src/auth/SectionCard.tsx
@@ -3,7 +3,6 @@ import {View, ImageSourcePropType, ViewStyle} from 'react-native';
import {Image} from 'expo-image';
import {Heading, Button, Body, Card} from '@walmart/gtp-shared-components';
-import {createImageErrorHandler} from '../core/Logger';
import styles from './styles';
interface SectionCardProps {
| lint fix | lint fix
|
3607b8081a020861171c8d2e7ab8032ded71151a | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "3.6.11",
+ "version": "3.6.12",
"main": "dist/index.js",
"files": [
"dist",
@@ -90,7 +90,7 @@
"@walmart/react-native-logger": "1.35.0",
"@walmart/react-native-scanner-3.0": "0.10.4",
"@walmart/react-native-sumo-sdk": "2.8.0",
- "@walmart/roster-mini-app": "3.8.11",
+ "@walmart/roster-mini-app": "3.8.12",
"@walmart/ui-components": "1.15.1",
"@walmart/wmconnect-mini-app": "3.7.8",
"babel-jest": "^29.6.3",
--- yarn.lock
@@ -7410,7 +7410,7 @@ __metadata:
"@walmart/react-native-logger": "npm:1.35.0"
"@walmart/react-native-scanner-3.0": "npm:0.10.4"
"@walmart/react-native-sumo-sdk": "npm:2.8.0"
- "@walmart/roster-mini-app": "npm:3.8.11"
+ "@walmart/roster-mini-app": "npm:3.8.12"
"@walmart/ui-components": "npm:1.15.1"
"@walmart/wmconnect-mini-app": "npm:3.7.8"
babel-jest: "npm:^29.6.3"
@@ -7518,9 +7518,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/roster-mini-app@npm:3.8.11":
- version: 3.8.11
- resolution: "@walmart/roster-mini-app@npm:3.8.11::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.8.11.tgz"
+"@walmart/roster-mini-app@npm:3.8.12":
+ version: 3.8.12
+ resolution: "@walmart/roster-mini-app@npm:3.8.12::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.8.12.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=7.12.0"
"@walmart/gtp-shared-components-3": "*"
@@ -7532,7 +7532,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/dd70fce57c58a8b92bc82e05193866457798e3b4210840d124ae6ef1d3528bfd70aa4234fdd1e8f0b389d89a88868e5dc5def808e4c7f54ae0d799a53140f0bf
+ checksum: 10c0/9ece6120235f82cb95248ddb2ac1aaf9a2649deb075c810f672864dcd9e8fece6ce27fe5de171b53edaab3c89dbb316b1a32d20ca28e460cc9c72841f17932b2
languageName: node
linkType: hard
| feat(ui): update package version | feat(ui): update package version
|
d84fcf6cc6d71fe0801ca1df11192ed3b541fe74 | --- packages/allspark-foundation-hub/src/Store/Modules/TeamSelection/Component/TeamSelectionList.tsx
@@ -54,6 +54,10 @@ export const TeamSelectionList = ({
StoreManagerExperienceSelectors.getUserIsAlreadyOnboarded
);
+ const selectedTeamPreference: string = useSelector(
+ StoreManagerExperienceSelectors.getSelectedTeamPreference
+ );
+
const userOnboardingInProgress = useSelector(
StoreManagerExperienceSelectors.getUserOnboardingInProgress
);
@@ -161,6 +165,16 @@ export const TeamSelectionList = ({
})) as TeamPreference[],
},
});
+
+ const isSelectedTeamAvailable = selectedTeams.includes(
+ selectedTeamPreference
+ );
+ dispatch(
+ StoreManagerExperienceCreators.updateSelectedTeamPreference(
+ isSelectedTeamAvailable ? selectedTeamPreference : ''
+ )
+ );
+
//TODO: Add confirmation screen navigation
logger.info('Save teams event', {
message: 'Save teams event triggered',
--- packages/allspark-foundation-hub/src/Store/Modules/TeamSwitcher/index.tsx
@@ -115,7 +115,7 @@ export const TeamSwitcher = ({
const flatListRef = useRef<FlatList<any>>(null);
const selectedTeamIndex = teamSwitcherList.findIndex(
- (item) => item.teamLabel === selectedTeamPreference
+ (item) => item.teamLabel === (selectedTeamPreference || selectedTeam)
);
const handleScrollToIndex = useMemo(() => {
| feat(ui): selection bug fix | feat(ui): selection bug fix
|
791b6d74c777a76fdf10e8ae1215753cd3e6d545 | --- __tests__/components/__snapshots__/ListEmptyComponentTest.tsx.snap
@@ -28,7 +28,7 @@ exports[`ListEmptyComponent renders all components 1`] = `
},
]
}
- testID="Alert"
+ testID="rosterScreenErrorAlert"
>
<View
style={
--- __tests__/managerExperience/components/AssociateList.test.tsx
@@ -115,4 +115,32 @@ describe('AssociateList', () => {
mockAssociateId,
);
});
+
+ it('displays ListEmptyComponent loading screen when data is loading', () => {
+ const {getByTestId} = renderWithProviders(
+ <AssociateList {...props} associates={[]} isLoading />,
+ );
+ const loadingSpinner = getByTestId('rosterScreenLoadingSpinner');
+ expect(loadingSpinner).toBeDefined();
+ });
+
+ it('displays ListEmptyComponent error screen when there is an error', () => {
+ const {getByTestId} = renderWithProviders(
+ <AssociateList {...props} associates={[]} hasError />,
+ );
+ const errorAlert = getByTestId('rosterScreenErrorAlert');
+ expect(errorAlert).toBeDefined();
+ });
+
+ it('displays ListEmptyComponent "No users found" screen when associates list is empty', () => {
+ const {getByTestId} = renderWithProviders(
+ <AssociateList
+ {...props}
+ associates={[]}
+ selectedFilter={FilterValue.all}
+ />,
+ );
+ const emptyText = getByTestId('rosterScreenEmptyText');
+ expect(emptyText.props.children).toEqual('No users found');
+ });
});
--- __tests__/managerExperience/components/__snapshots__/AssociateList.test.tsx.snap
@@ -15,7 +15,11 @@ exports[`AssociateList renders associate list with given props 1`] = `
error="There has been an error"
hasError={false}
isLoading={false}
- selectedFilter="all"
+ selectedFilter={
+ {
+ "current": "all",
+ }
+ }
/>
}
applyWindowCorrection={[Function]}
@@ -310,7 +314,11 @@ exports[`AssociateList renders associate list with given props 1`] = `
error="There has been an error"
hasError={false}
isLoading={false}
- selectedFilter="all"
+ selectedFilter={
+ {
+ "current": "all",
+ }
+ }
/>,
"contentContainerStyle": {
"backgroundColor": "#fff",
--- src/components/Roster/ListEmptyComponent.tsx
@@ -36,6 +36,7 @@ export const ListEmptyComponent: React.FC<ListEmptyComponentProps> = ({
variant='warning'
children={'Error fetching daily roster'}
UNSAFE_style={styles.error}
+ testID={'rosterScreenErrorAlert'}
/>
);
}
@@ -46,7 +47,7 @@ export const ListEmptyComponent: React.FC<ListEmptyComponentProps> = ({
{selectedFilter.current !== FilterValue.all ? (
<Body testID='selectedValue'>{`No ${selectedFilter.current} users found`}</Body>
) : (
- <Body>No users found</Body>
+ <Body testID='rosterScreenEmptyText'>No users found</Body>
)}
</View>
);
--- src/managerExperience/components/AssociateList/AssociateList.tsx
@@ -30,7 +30,7 @@ export const AssociateList = ({
isLoading={isLoading}
hasError={hasError}
error={errorMessage}
- selectedFilter={selectedFilter}
+ selectedFilter={{current: selectedFilter}}
/>
}
data={associates}
| test: added tests for list empty component | test: added tests for list empty component
|
0c430dc6071c48557a05151b706e076f0ac427e4 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "2.16.0",
+ "version": "2.17.0",
"main": "dist/index.js",
"files": [
"dist"
@@ -85,7 +85,7 @@
"@typescript-eslint/parser": "^5.37.0",
"@walmart/allspark-authentication": "6.1.4",
"@walmart/allspark-foundation": "6.27.4",
- "@walmart/allspark-foundation-hub": "1.2.19",
+ "@walmart/allspark-foundation-hub": "1.2.20",
"@walmart/allspark-graphql-client": "^1.4.6",
"@walmart/allspark-http-client": "6.1.4",
"@walmart/config-components": "4.4.0",
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx
@@ -4,7 +4,6 @@ import {RefreshControl, View} from 'react-native';
import {
ErrorScreen,
TeamShiftSwitcher,
- supplyChainManagerExperienceSlice,
SC_ManagerExperienceSelectors as supplyChainSelector,
TOTAL_SITE_TEAM_LABEL,
EMP_TYPE_SALARIED,
@@ -70,13 +69,8 @@ import {RosterDetailScreenDisabled} from './RosterDetailScreenDisabled';
import {RosterDetailScreenProps} from './types';
import {WarningBanner} from '../../components/WarningBanner';
import {UserDomain} from '@walmart/me-at-walmart-common';
-import {AllsparkReduxStore} from '@walmart/allspark-foundation';
import {SupplyChainTeam} from '../../queries/schema.types';
-AllsparkReduxStore.addReducer(
- 'supplyChainManagerExperience',
- supplyChainManagerExperienceSlice.reducer,
-);
//Todo: Refactor some functionalities in this component
export const SupplyChainRosterDetailScreen = ({
route,
--- yarn.lock
@@ -5914,9 +5914,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/allspark-foundation-hub@npm:1.2.19":
- version: 1.2.19
- resolution: "@walmart/allspark-foundation-hub@npm:1.2.19"
+"@walmart/allspark-foundation-hub@npm:1.2.20":
+ version: 1.2.20
+ resolution: "@walmart/allspark-foundation-hub@npm:1.2.20"
dependencies:
"@reduxjs/toolkit": "npm:^1.9.7"
"@shopify/flash-list": "npm:~1.6.4"
@@ -5932,7 +5932,7 @@ __metadata:
react: "*"
react-native: "*"
react-native-safe-area-context: 4.x
- checksum: 10c0/5264b54a010b6c2096d9a17b23c9b2c7e43a89ad8b8b157a31a939b71b9084f70bd2beeabffad6c14ee92eb6ae5165960fd9febaffc9e0347c3e6a25513052ec
+ checksum: 10c0/4939a9fdccde36fa3f96736dec128f6e17ec759ffb920b4b6c7fa1190d05970073f5045846e69fdbcb85d2b46cccea4c0a64eca5385c48fe9c37aae712469a4a
languageName: node
linkType: hard
@@ -6383,7 +6383,7 @@ __metadata:
"@typescript-eslint/parser": "npm:^5.37.0"
"@walmart/allspark-authentication": "npm:6.1.4"
"@walmart/allspark-foundation": "npm:6.27.4"
- "@walmart/allspark-foundation-hub": "npm:1.2.19"
+ "@walmart/allspark-foundation-hub": "npm:1.2.20"
"@walmart/allspark-graphql-client": "npm:^1.4.6"
"@walmart/allspark-http-client": "npm:6.1.4"
"@walmart/config-components": "npm:4.4.0"
| Update roster mini app version | Update roster mini app version
|
08791019c32730702788b5e3fe73597abf7f8553 | --- .looper.multibranch.yml
@@ -63,8 +63,8 @@ flows:
- call: sonar-scan-pr
- parallel(failsafe):
- (name Scanning Walmart Packages) npm run lint:changed-walmart-libs ${GITHUB_PR_TARGET_BRANCH}
- - (name Scanning Deperecated Packages In Core) export GITHUB_REPOSITORY="${GITHUB_REPOSITORY}" && export GITHUB_PR_NUMBER="${GITHUB_PR_NUMBER}" && export GITHUB_PR_TARGET_BRANCH="${GITHUB_PR_TARGET_BRANCH:-main}" && export GITHUB_PR_SOURCE_BRANCH="${GITHUB_PR_SOURCE_BRANCH}" && npx tsx scripts/mini-app-scan/package-deprecation/core-check/main.ts "${GITHUB_PR_TARGET_BRANCH:-main}"
- - (name Scanning Deperecated Packages In Mini App) export GITHUB_REPOSITORY="${GITHUB_REPOSITORY}" && export GITHUB_PR_NUMBER="${GITHUB_PR_NUMBER}" && export GITHUB_PR_TARGET_BRANCH="${GITHUB_PR_TARGET_BRANCH:-main}" && export GITHUB_PR_SOURCE_BRANCH="${GITHUB_PR_SOURCE_BRANCH}" && npx tsx scripts/mini-app-scan/package-deprecation/mini-app-check/main.ts "${GITHUB_PR_TARGET_BRANCH:-main}"
+ - (name Scanning Deprecated Packages In Core) export GITHUB_REPOSITORY="${GITHUB_REPOSITORY}" && export GITHUB_PR_NUMBER="${GITHUB_PR_NUMBER}" && export GITHUB_PR_TARGET_BRANCH="${GITHUB_PR_TARGET_BRANCH:-main}" && export GITHUB_PR_SOURCE_BRANCH="${GITHUB_PR_SOURCE_BRANCH}" && yarn install --frozen-lockfile && npx tsx scripts/mini-app-scan/package-deprecation/core-check/main.ts "${GITHUB_PR_TARGET_BRANCH:-main}"
+ - (name Scanning Deprecated Packages In Mini App) export GITHUB_REPOSITORY="${GITHUB_REPOSITORY}" && export GITHUB_PR_NUMBER="${GITHUB_PR_NUMBER}" && export GITHUB_PR_TARGET_BRANCH="${GITHUB_PR_TARGET_BRANCH:-main}" && export GITHUB_PR_SOURCE_BRANCH="${GITHUB_PR_SOURCE_BRANCH}" && yarn install --frozen-lockfile && npx tsx scripts/mini-app-scan/package-deprecation/mini-app-check/main.ts "${GITHUB_PR_TARGET_BRANCH:-main}"
- call: slack-notification-pr(slack-pr)
mini-pr: # overridden for new bundle js command
| feat(lib): modify looper | feat(lib): modify looper
|
6ba316bea771bbf491ea301ec73a1e3c1a415ac6 | --- package-lock.json
@@ -5488,9 +5488,9 @@
"integrity": "sha512-Tz8PRLTpf4goLTBXayZxsBRuy/8+fnxjt+m7g3kfu0NRG58n/MgKi9krclf+LSLBhYTJcL5sKg8ckhA90dHlYQ=="
},
"@walmart/receipt-check-miniapp": {
- "version": "1.7.0",
- "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.7.0.tgz",
- "integrity": "sha512-2ugtKF2BijGrr2QleRwpuUbEDIhodbMLdaQzUuQM8cFTY791sdTo5/1OLB5LUQC/aSBWec3l1NIC/LPLvbTOiA==",
+ "version": "1.7.2",
+ "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.7.2.tgz",
+ "integrity": "sha512-6H+HQ7MBN9W7tMpvpGSNtrIh48NzOxJGbNxeO8VykToPdUsx+DaSqRcnph2biNAwlrqJlGNs7+/37cxl1dOOVA==",
"requires": {
"@walmart/tcnumber": "^2.3.1",
"@xstate/react": "^3.0.1",
--- package.json
@@ -112,7 +112,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "^0.3.7",
"@walmart/react-native-sumo-sdk": "2.2.2-beta.2",
- "@walmart/receipt-check-miniapp": "1.7.0",
+ "@walmart/receipt-check-miniapp": "1.7.2",
"@walmart/redux-store": "2.0.4",
"@walmart/refrigeration-alarms-mini-app": "1.35.0",
"@walmart/schedule-mini-app": "0.24.0",
| Bump receipt check for store id | Bump receipt check for store id
|
0584f59c2634d1b4180adcb7916531014f569b88 | --- src/channels/provider.tsx
@@ -27,6 +27,7 @@ import {fetchChannelName, fetchChannelLastMessage} from './services';
import {logger} from '../logger/Logger';
import {textingSlice} from '../redux/reducer';
import {SEVEN_DAYS_AGO_TIMESTAMP} from '../constants';
+import {getChannelIdFromChannelPath} from '../../dist/channels/transforms';
/**
* @description Maintains list of channels current user is participant in for the
@@ -67,13 +68,14 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => {
.where('lastMessageTime', '>', SEVEN_DAYS_AGO_TIMESTAMP)
.orderBy('lastMessageTime', 'desc')
.onSnapshot((snapshot) => {
- /**
- * Store and Team Channel Injection
- * 1. For each doc.ref.path in snapshots.docs
- * 2. If STORE_ALL does not exist in any of the paths, query firestore for the document and normalize it
- * 3. If TEAM_ID does not exist in any of the paths, query firestore for the document and normalize it
- * 4. Update the channel State accordingly after normalization
- */
+ const channelShortIds = snapshot?.docs.map((channelDoc) => {
+ const channelPath = channelDoc.ref.path;
+ return getChannelIdFromChannelPath(channelPath);
+ });
+
+ //TODO: If STORE_ALL channelId not in channelPath, query it from firestore, normalize and set state
+
+ //TODO: If TEAM_ID not in channelPath, query it from firestore, normalize and set state
setChannelState((previous) => ({
...previous,
--- src/channels/provider.tsx
@@ -27,6 +27,7 @@ import {fetchChannelName, fetchChannelLastMessage} from './services';
import {logger} from '../logger/Logger';
import {textingSlice} from '../redux/reducer';
import {SEVEN_DAYS_AGO_TIMESTAMP} from '../constants';
+import {getChannelIdFromChannelPath} from '../../dist/channels/transforms';
/**
* @description Maintains list of channels current user is participant in for the
@@ -67,13 +68,14 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => {
.where('lastMessageTime', '>', SEVEN_DAYS_AGO_TIMESTAMP)
.orderBy('lastMessageTime', 'desc')
.onSnapshot((snapshot) => {
- /**
- * Store and Team Channel Injection
- * 1. For each doc.ref.path in snapshots.docs
- * 2. If STORE_ALL does not exist in any of the paths, query firestore for the document and normalize it
- * 3. If TEAM_ID does not exist in any of the paths, query firestore for the document and normalize it
- * 4. Update the channel State accordingly after normalization
- */
+ const channelShortIds = snapshot?.docs.map((channelDoc) => {
+ const channelPath = channelDoc.ref.path;
+ return getChannelIdFromChannelPath(channelPath);
+ });
+
+ //TODO: If STORE_ALL channelId not in channelPath, query it from firestore, normalize and set state
+
+ //TODO: If TEAM_ID not in channelPath, query it from firestore, normalize and set state
setChannelState((previous) => ({
...previous,
| create array of channelShortIds | create array of channelShortIds
|
8a8f8c2af3ba76d1b490f22b2ed23cdced33c1c9 | --- package-lock.json
@@ -43,7 +43,7 @@
"@walmart/attendance-mini-app": "0.190.4",
"@walmart/compass-sdk-rn": "4.2.0",
"@walmart/config-components": "4.2.1",
- "@walmart/copilot-mini-app": "1.77.5",
+ "@walmart/copilot-mini-app": "^1.77.6",
"@walmart/core-services": "~2.1.1",
"@walmart/core-services-allspark": "~2.11.1",
"@walmart/core-utils": "~2.0.5",
@@ -7030,9 +7030,9 @@
}
},
"node_modules/@walmart/copilot-mini-app": {
- "version": "1.77.5",
- "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.5.tgz",
- "integrity": "sha512-HH6Yo6XW8cNYLaaeKrqWuNFWh6OlfoQIr3DBkH+JiWS8QzteQEzc/Dycvz7wy5F12SyNTwtHEqO39NiNmOu83Q==",
+ "version": "1.77.6",
+ "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.6.tgz",
+ "integrity": "sha512-/xIMiOFDYzCS/pmLL28O9fJS8WO1wsS4+qLjYeo5bjJVSxxtV1rDZHdqNc8BJmGV9Lh7A79REyKoFKSKNsZMvQ==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -30415,9 +30415,9 @@
}
},
"@walmart/copilot-mini-app": {
- "version": "1.77.5",
- "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.5.tgz",
- "integrity": "sha512-HH6Yo6XW8cNYLaaeKrqWuNFWh6OlfoQIr3DBkH+JiWS8QzteQEzc/Dycvz7wy5F12SyNTwtHEqO39NiNmOu83Q=="
+ "version": "1.77.6",
+ "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.6.tgz",
+ "integrity": "sha512-/xIMiOFDYzCS/pmLL28O9fJS8WO1wsS4+qLjYeo5bjJVSxxtV1rDZHdqNc8BJmGV9Lh7A79REyKoFKSKNsZMvQ=="
},
"@walmart/core-services": {
"version": "2.1.1",
--- package.json
@@ -84,7 +84,7 @@
"@walmart/attendance-mini-app": "0.190.4",
"@walmart/compass-sdk-rn": "4.2.0",
"@walmart/config-components": "4.2.1",
- "@walmart/copilot-mini-app": "1.77.5",
+ "@walmart/copilot-mini-app": "1.77.6",
"@walmart/core-services": "~2.1.1",
"@walmart/core-services-allspark": "~2.11.1",
"@walmart/core-utils": "~2.0.5",
| chore: bump copilot @1.77.6 | chore: bump copilot @1.77.6
|
a841b3d67a12425200de9c82876e54b539dbc887 | --- .looper-pr.yml
@@ -15,4 +15,4 @@ envs:
MONO_REPO: allspark/allspark-core
MONO_REPO_BASE_BRANCH: develop
AUTHOR: temp
- SLACK_CHANNEL: "smdv-miniapp"
\ No newline at end of file
+ SLACK_CHANNEL: "smdv-miniapp"
--- sonar-project.properties
@@ -1,5 +1,5 @@
-sonar.projectKey=com.walmart.stores.allspark.texting
-sonar.projectName=TextingMiniApp
+sonar.projectKey=com.walmart.stores.allspark.roster
+sonar.projectName=RosterMiniApp
sonar.projectVersion=1.0.0
sonar.host.url=http://sonar.looper.prod.walmartlabs.com
@@ -8,4 +8,4 @@ sonar.tests=__tests__
sonar.exclusions=src/images
sonar.sourceEncoding=UTF-8
sonar.typescript.lcov.reportPaths=coverage/lcov.info
-sonar.testExecutionReportPaths=test-report.xml
+sonar.testExecutionReportPaths=roster-test-report.xml
| fix(ui): sonar property update SMDV-5648 | fix(ui): sonar property update SMDV-5648
|
903a3c1224ad2909762b1656a77061207dab6ae1 | --- package-lock.json
@@ -53,7 +53,7 @@
"@walmart/gta-react-native-calendars": "0.0.16",
"@walmart/gtp-shared-components": "2.0.6",
"@walmart/impersonation-mini-app": "1.19.1",
- "@walmart/ims-print-services-ui": "2.4.1",
+ "@walmart/ims-print-services-ui": "3.0.0",
"@walmart/inbox-mini-app": "0.84.1",
"@walmart/iteminfo-mini-app": "7.3.4",
"@walmart/manager-approvals-miniapp": "0.2.4",
@@ -5284,7 +5284,9 @@
}
},
"node_modules/@walmart/ims-print-services-ui": {
- "version": "2.4.1",
+ "version": "3.0.0",
+ "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-3.0.0.tgz",
+ "integrity": "sha512-T0qhz0aAfAzh+iTYW8T+ki/hEYma/SnYGVx3IJGQmVLYdos0DToLlrNlcrfwAs6QkmiPkRQ77a1SrLeAr869yw==",
"peerDependencies": {
"@react-native-firebase/analytics": ">=10.5.1",
"@react-native-firebase/app": ">=10.5.0",
@@ -25215,7 +25217,9 @@
"version": "1.19.1"
},
"@walmart/ims-print-services-ui": {
- "version": "2.4.1"
+ "version": "3.0.0",
+ "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-3.0.0.tgz",
+ "integrity": "sha512-T0qhz0aAfAzh+iTYW8T+ki/hEYma/SnYGVx3IJGQmVLYdos0DToLlrNlcrfwAs6QkmiPkRQ77a1SrLeAr869yw=="
},
"@walmart/inbox-mini-app": {
"version": "0.84.1",
--- package.json
@@ -95,7 +95,7 @@
"@walmart/gta-react-native-calendars": "0.0.16",
"@walmart/gtp-shared-components": "2.0.6",
"@walmart/impersonation-mini-app": "1.19.1",
- "@walmart/ims-print-services-ui": "2.4.1",
+ "@walmart/ims-print-services-ui": "3.0.0",
"@walmart/inbox-mini-app": "0.84.1",
"@walmart/iteminfo-mini-app": "7.3.4",
"@walmart/manager-approvals-miniapp": "0.2.4",
| updated print version with fact tag change | updated print version with fact tag change
|
2fe0378498780173c7026a0e7ecaad178c353e1e | --- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx
@@ -473,7 +473,7 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [
clockCheckEnabled: false,
},
{
- featureId: FEEDBACK_ME,
+ featureId: MINI_APPS.FEEDBACK_ME,
name: 'FeedbackDialogScreen',
component: FeedbackDialogScreen,
options: {
| fixed app crash | fixed app crash
|
f1b70871069ac81db6c7436a6e20b7fb963db4ca | --- src/screens/index.tsx
@@ -10,8 +10,8 @@ import {WarningBanner} from '../components/WarningBanner';
export const RosterMiniApp = () => {
return (
<ClockGuard>
- <WarningBanner />
- <RosterNavigation />
+ <WarningBanner />
+ <RosterNavigation />
</ClockGuard>
);
};
| feat(ui): remove wmconnect mini app and add DND status chip from wmconnect shared component | feat(ui): remove wmconnect mini app and add DND status chip from wmconnect shared component
|
2f16bc63ea839f421e322c440702453a4ace3aef | --- docs/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.18.1](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.18.0...v1.18.1) (2025-03-13)
+
+
+### Bug Fixes
+
+* **ui:** remove the .npmrc file ([52f23a3](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/52f23a36c783be5c52aedb013d2e9e57f18290e5))
+
# [1.18.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.17.1...v1.18.0) (2025-03-07)
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.18.0",
+ "version": "1.18.1",
"main": "dist/index.js",
"files": [
"dist"
| chore(release): 1.18.1 [skip ci] | chore(release): 1.18.1 [skip ci]
## [1.18.1](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.18.0...v1.18.1) (2025-03-13)
### Bug Fixes
* **ui:** remove the .npmrc file ([52f23a3](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/52f23a36c783be5c52aedb013d2e9e57f18290e5))
|
43f0860027f9d44102b0228f1153321e11abaef0 | --- Allspark_MeAtWM_Beta_InHouse_Profile.mobileprovision
Binary files a/Allspark_MeAtWM_Beta_InHouse_Profile.mobileprovision and /dev/null differ
| deleting provisioning file from root | deleting provisioning file from root |
e24bc72db0937db9f1f788e22e98babcef19ccea | --- container/index.tsx
@@ -16,11 +16,14 @@ import {
import {useAuth} from '@walmart/core-services/Auth';
import {AllsparkCoreServices} from '@walmart/core-services-allspark';
+// @ts-ignore
import {AuthenticatorView} from './AuthenticatorView';
+// @ts-ignore
import {UserView} from './UserInfo';
+// @ts-ignore
import env from './env';
-import {TextingMiniApp, initialize} from '../src';
+import {RosterMiniApp, initialize} from '../src';
import {
APP_CONTAINER_SCREEN_NAME,
ROOT_CONTAINER_SCREEN_NAME,
@@ -117,7 +120,7 @@ const MyTeamStackNav = () => {
<MyTeam.Navigator screenOptions={{headerMode: 'float', headerShown: false}}>
<MyTeam.Screen
name={APP_CONTAINER_SCREEN_NAME}
- component={TextingMiniApp}
+ component={RosterMiniApp}
options={{headerShown: false}}
/>
</MyTeam.Navigator>
| update ts | update ts
|
b63f0856f35551628aedecd6903029a12a1f2c1d | --- .looper.multibranch.yml
@@ -37,12 +37,11 @@ cache:
envs:
global:
variables:
+ RUBY_PATH: '/Users/jenkinspan/.rbenv/shims'
CI: true
LOOPER_NODES: '((osx||stable_osx)&&!dualcore)'
GITHUB_TOKEN: "%{credentials.secret('GITHUB_TOKEN')}"
-
TMPDIR: /tmp
-
ANDROID_TOOLS:
- tools
- platform-tools
@@ -295,14 +294,14 @@ flows:
# Setup the fastlane library to increment versionCode and build number
setup-fastlane:
- - shell: ruby --version
- - shell: gem --version
- - (name Bundle) https_proxy=http://sysproxy.wal-mart.com:8080 http_proxy=http://sysproxy.wal-mart.com:8080 bundle
+ - shell: $RUBY_PATH/ruby --version
+ - shell: $RUBY_PATH/gem --version
+ - (name Bundle) https_proxy=http://sysproxy.wal-mart.com:8080 http_proxy=http://sysproxy.wal-mart.com:8080 $RUBY_PATH/bundle
# Set the version code and build number of the native project
increment-version-code:
- (name Check Versioning) git clone https://${GITHUB_TOKEN}@gecgithub01.walmart.com/allspark/allspark-core-version.git -b main
- - (set version code) bundle exec fastlane set_build
+ - (set version code) $RUBY_PATH/bundle exec fastlane set_build
- exposeVars(./fastlane/fastlane-session.json)
- var(BUILD_NUMBER): echo "${fastlane-session.android_version_code}"
- echo "Android version code ${BUILD_NUMBER}"
@@ -314,7 +313,6 @@ flows:
git push origin main
cd ..
rm -rf ${GIT_DIRECTORY}
-
# verify that the JS bundle can be built
build-js-bundle:
- (name build JS bundle) ./node_modules/.bin/react-native bundle --entry-file ./index.js --bundle-output ./bundle.js --reset-cache
@@ -372,7 +370,6 @@ flows:
- call: build-release(beta)
- group("$os prod"):
- call: build-release(prod)
-
# this is for producing builds that will get uploaded to proximity as snapshot
build-snapshot:
@@ -387,10 +384,10 @@ flows:
- if: |
%{os == "ios"}
then:
- - (set version code) bundle exec fastlane set_ios build_number:${BUILD_NUMBER}
+ - (set version code) $RUBY_PATH/bundle exec fastlane set_ios build_number:${BUILD_NUMBER}
- call: ios-process
else:
- - (set version code) bundle exec fastlane set_android version_code:${BUILD_NUMBER}
+ - (set version code) $RUBY_PATH/bundle exec fastlane set_android version_code:${BUILD_NUMBER}
- call: android-process
- try:
- echo "uploading aab build for android"
@@ -431,10 +428,10 @@ flows:
- if: |
%{os == "ios"}
then:
- - (set version code) bundle exec fastlane set_ios build_number:${BUILD_NUMBER}
+ - (set version code) $RUBY_PATH/bundle exec fastlane set_ios build_number:${BUILD_NUMBER}
- call: ios-process
else:
- - (set version code) bundle exec fastlane set_android version_code:${BUILD_NUMBER}
+ - (set version code) $RUBY_PATH/bundle exec fastlane set_android version_code:${BUILD_NUMBER}
- call: android-process
- (name create release tag) sh scripts/releaseTagging.sh "${version}"
- try:
@@ -459,13 +456,13 @@ flows:
ruby-configuration:
- echo ${WORKSPACE}
- - (name Ruby/Gem version) ruby -v; gem -v
- - (name gem environment) gem environment
- - (name Gem dependencies) gem dependency
- - (name Remove RubyGems HTTP) gem sources --remove "http://rubygems.org"
- - (name Remove RubyGems HTTPS) gem sources --remove "https://rubygems.org"
- - (name Add repository source) gem sources --add "https://repository.walmart.com/content/repositories/rubygems/"
- - (name Clear cache) gem sources -c
+ - (name Ruby/Gem version) $RUBY_PATH/ruby -v; $RUBY_PATH/gem -v
+ - (name gem environment) $RUBY_PATH/gem environment
+ - (name Gem dependencies) $RUBY_PATH/gem dependency
+ - (name Remove RubyGems HTTP) $RUBY_PATH/gem sources --remove "http://rubygems.org"
+ - (name Remove RubyGems HTTPS) $RUBY_PATH/gem sources --remove "https://rubygems.org"
+ - (name Add repository source) $RUBY_PATH/gem sources --add "https://repository.walmart.com/content/repositories/rubygems/"
+ - (name Clear cache) $RUBY_PATH/gem sources -c
# sets variables and performs steps for making an ios build
ios-process:
@@ -548,7 +545,6 @@ flows:
java -jar ${BUNDLE_TOOL_LOCATION} build-apks --mode=universal --bundle=${relativeRootAabPath} --output=bundle.apks --ks=./walmartAirwatchEnroller --ks-pass=pass:${ANDROID_AAB_STORE_PASSWORD} --ks-key-alias=${ANDROID_AAB_KEY_ALIAS} --key-pass=pass:${ANDROID_AAB_KEY_PASSWORD}
unzip -p bundle.apks universal.apk > ${relativeUniversalApkPath}
echo "apk & aab generated"
-
# uploads build artifact to maven and MS App Center
#
# @param env - environment the build was produced for (deployment, i.e. dev, beta, prod)
@@ -567,14 +563,13 @@ flows:
- echo "Skipping uploading AppStore/PlayStore builds to MS App Center and publishing to Slack."
else:
- call: appcenter-upload
-
# uploads iOS and android builds to MS App Center
#
# @param APPCENTER_API_TOKEN - Encrypted API token to leverage MS APIs
# @param APPCENTER_APP_NAME - AllSpark-Me-Walmart or AllSpark-Android
#
appcenter-upload:
- - (name Uploading build to App Center) bundle exec fastlane submit_to_appcenter BUILD_OUTPUT:${buildOutput}
+ - (name Uploading build to App Center) $RUBY_PATH/bundle exec fastlane submit_to_appcenter BUILD_OUTPUT:${buildOutput}
# sends success message to slack channel
#
@@ -686,7 +681,6 @@ flows:
- echo "INSTALL_LINK ${fastlane-session.release_url}"
- |
#!/bin/sh -x
-
cd ./scripts
node sendToTeams.js --webhookUrl "${teamsWebhookUrl}" \
--success true \
@@ -709,11 +703,9 @@ flows:
--jobNbr "${BUILD_NUMBER}" \
--jobUrl "${JOB_URL}" \
--downloadUrl "${fastlane-session.release_url}" \
-
msteams-failure:
- |
#!/bin/sh -x
-
cd ./scripts
node sendToTeams.js --webhookUrl "${teamsWebhookUrl}" \
--success false \
@@ -736,7 +728,6 @@ flows:
--jobBranch "${TRIGGER_BRANCH}" \
--jobNbr "${BUILD_NUMBER}" \
--jobUrl "${JOB_URL}"
-
set-buildOutput:
- echo "about to set Build Output variable"
- var(buildOutput = "./ios/build/${ARCHIVE_TYPE}/Artifacts/${ARCHIVE_TYPE}-${XC_SCHEME}.ipa")
| fix(looper): ruby bundle issue fix looper | fix(looper): ruby bundle issue fix looper
|
9d453f6b0cb165d6bac3d1a24a1eff3e9fac9e1e | --- android/app/build.gradle
@@ -134,7 +134,7 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 26
+ versionCode 27
versionName "1.0.1"
}
splits {
--- ios/AllSpark/Info.plist
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>26</string>
+ <string>27</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>invmgmt</string>
--- ios/AllSparkTests/Info.plist
@@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>26</string>
+ <string>27</string>
</dict>
</plist>
| Incrementing build number | Incrementing build number
|
5a879335f6226c11a8708fe7c97aa5129fa1a3ae | --- packages/allspark-foundation/src/FeatureRunner/screens/Login.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import React, { useState } from 'react';
import { useSelector } from 'react-redux';
import { StyleSheet, View } from 'react-native';
import { StackScreenProps } from '@react-navigation/stack';
import { Button } from '@walmart/gtp-shared-components';
-import { AuthSelectors } from '../../Auth';
+import { AuthConfiguration, AuthSelectors } from '../../Auth';
import { useContainerService } from '../../Container';
import { FeatureRunnerScreenParams } from './types';
@@ -29,14 +29,21 @@ export const Login = (props: NavigationProps) => {
const auth = useContainerService('auth');
const signingIn = useSelector(AuthSelectors.getSigningIn);
+ const [loadingClientId, setLoadingClientId] = useState<string>();
+
+ const onSignIn = (config: AuthConfiguration) => {
+ setLoadingClientId(config.clientId);
+ auth.signIn(config);
+ };
+
return (
<View style={styles.container}>
{authConfigs.map((config) => (
<Button
variant='primary'
- isLoading={signingIn}
+ isLoading={signingIn && config.clientId === loadingClientId}
key={config.clientId}
- onPress={() => auth.signIn(config)}
+ onPress={() => onSignIn(config)}
UNSAFE_style={styles.button}
>
Sign In ({config.clientId})
| fix: feature runner sign in loading state effecting all sign in buttons | fix: feature runner sign in loading state effecting all sign in buttons
|
b600928f32925eebad0e300d797001b1c203b8f5 | --- src/core/versionsInit.ts
@@ -24,6 +24,7 @@ const miniApps = [
'react-native-ssmp-sso-allspark',
'@walmart/counts-component-miniapp',
'@walmart/manager-approvals-miniapp',
+ '@walmart/metrics-mini-app',
];
export async function initAppVersions() {
| Adding metrics mini app to versions list | Adding metrics mini app to versions list
|
d8120a075552da2d33290f1500ae1f33b8759e1b | --- package-lock.json
@@ -84,7 +84,7 @@
"@walmart/schedule-mini-app": "0.37.0",
"@walmart/settings-mini-app": "1.19.1",
"@walmart/shelfavailability-mini-app": "1.5.16",
- "@walmart/taskit-mini-app": "2.47.2",
+ "@walmart/taskit-mini-app": "2.47.3",
"@walmart/texting-mini-app": "2.0.29",
"@walmart/time-clock-mini-app": "2.111.3",
"@walmart/topstock-mini-app": "1.0.13",
@@ -9142,9 +9142,9 @@
}
},
"node_modules/@walmart/taskit-mini-app": {
- "version": "2.47.2",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.47.2.tgz",
- "integrity": "sha512-lT5ruhBru1ojKQN292IBcBv3qxSjoUxP/ilZ6r9SpwdvjQFlamE4jN8BTH0ZxrE5lyXH6Cb3XqoO7I0NtH2coA==",
+ "version": "2.47.3",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.47.3.tgz",
+ "integrity": "sha512-LrbUehf++YXiDFxFYaIjaoFrELCueeVDH9ZRKtOiH5QTRSctJthTLfgPqf6zgywZ5BjTZR+OuuH4mvAAxtL+TQ==",
"peerDependencies": {
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@types/lodash": ">=4.14.176",
@@ -33828,9 +33828,9 @@
"version": "1.5.16"
},
"@walmart/taskit-mini-app": {
- "version": "2.47.2",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.47.2.tgz",
- "integrity": "sha512-lT5ruhBru1ojKQN292IBcBv3qxSjoUxP/ilZ6r9SpwdvjQFlamE4jN8BTH0ZxrE5lyXH6Cb3XqoO7I0NtH2coA=="
+ "version": "2.47.3",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.47.3.tgz",
+ "integrity": "sha512-LrbUehf++YXiDFxFYaIjaoFrELCueeVDH9ZRKtOiH5QTRSctJthTLfgPqf6zgywZ5BjTZR+OuuH4mvAAxtL+TQ=="
},
"@walmart/tcnumber": {
"version": "2.3.3",
--- package.json
@@ -125,7 +125,7 @@
"@walmart/schedule-mini-app": "0.37.0",
"@walmart/settings-mini-app": "1.19.1",
"@walmart/shelfavailability-mini-app": "1.5.16",
- "@walmart/taskit-mini-app": "2.47.2",
+ "@walmart/taskit-mini-app": "2.47.3",
"@walmart/texting-mini-app": "2.0.29",
"@walmart/time-clock-mini-app": "2.111.3",
"@walmart/topstock-mini-app": "1.0.13",
| chore: bump taskit@2.47.3 | chore: bump taskit@2.47.3
|
6631ec2fd7027fa114b646e9e830202b2f49fcad | --- packages/allspark-foundation/package.json
@@ -98,7 +98,6 @@
"@types/node-fetch": "^2.6.9",
"@types/react-redux": "^7.1.9",
"@walmart/gtp-shared-components": "^2.2.2",
- "@walmart/me-at-walmart-athena-queries": "6.4.2",
"@walmart/react-native-scanner-3.0": "0.6.3",
"@walmart/react-native-sumo-sdk": "^2.7.0",
"react": "^18.2.0",
@@ -128,7 +127,6 @@
"@walmart/core-utils": ">=6",
"@walmart/functional-components": ">=6",
"@walmart/gtp-shared-components": ">=2",
- "@walmart/me-at-walmart-athena-queries": "6.4.2",
"@walmart/react-native-env": ">=6",
"@walmart/react-native-scanner-3.0": ">=0.6.3",
"@walmart/react-native-shared-navigation": ">=6",
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Screens/TeamSelection.tsx
@@ -6,6 +6,7 @@ import { createSections } from '../Utils/sectionListData';
import {
groupTeamsByWorkgroupTransform,
sortTeamsAscComparator,
+ sortAreas,
} from '../Utils/teams';
import { useSelector } from 'react-redux';
import { UserSelectors } from '../../../../User';
@@ -37,19 +38,12 @@ export const TeamSelection = ({
},
onCompleted: () => {
//TODO: Add telemetry
- console.log(
- 'useGetTeamsByStoreQuery completed successfully from TeamSelection'
- );
},
- onError: (e) => {
+ onError: () => {
//TODO: Add telemetry
- console.log(
- 'Error occured in useGetTeamsByStoreQuery from TeamSelection',
- e
- );
},
});
- const allAllTeams = data?.getTeamsByStore || ([] as TeamType[]);
+ const allTeamsData: TeamType[] = data?.getTeamsByStore || ([] as TeamType[]);
const teamsByWorkgroup = useMemo(() => {
const allTeams = (data?.getTeamsByStore || []) as TeamType[];
const groupedTeams = groupTeamsByWorkgroupTransform(
@@ -72,17 +66,9 @@ export const TeamSelection = ({
return null;
}, [teamsByWorkgroup, primaryTeamName]);
const areas = useMemo(() => {
- return Object.keys(teamsByWorkgroup);
- }, [teamsByWorkgroup]);
- areas.sort((a, b) => {
- if (a === myArea) {
- return -1;
- }
- if (b === myArea) {
- return 1;
- }
- return a.localeCompare(b);
- });
+ const unsortedAreas = Object.keys(teamsByWorkgroup);
+ return unsortedAreas.sort(sortAreas(myArea));
+ }, [myArea, teamsByWorkgroup]);
const areaTeamMap = Object.keys(teamsByWorkgroup).reduce((acc: any, key) => {
acc[key] = teamsByWorkgroup[key].map((team) => team?.teamName);
return acc;
@@ -122,7 +108,7 @@ export const TeamSelection = ({
}
};
const selectedTeamIds = selectedTeams?.reduce((acc, selectedTeamName) => {
- const foundTeam = allAllTeams.find(
+ const foundTeam = allTeamsData.find(
(team) => team?.teamName === selectedTeamName
);
if (foundTeam) {
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Utils/sectionListData.ts
@@ -1,21 +1,25 @@
-import { Area } from '../types';
+import { Area, MyAreaType, AreaTeamMap } from '../types';
export function createSections(
- myArea: any,
- areas: any,
- areaTeamMapNew: any
-): { title: Area; data: any[]; isPrimaryArea: boolean }[] {
+ myArea: MyAreaType,
+ areas: Area,
+ areaTeamMap: AreaTeamMap
+): { title: MyAreaType; data: string[]; isPrimaryArea: boolean }[] {
const sections = [
- {
- title: myArea,
- data: areaTeamMapNew[myArea],
- isPrimaryArea: true,
- },
+ ...(myArea
+ ? [
+ {
+ title: myArea,
+ data: areaTeamMap[myArea],
+ isPrimaryArea: true,
+ },
+ ]
+ : []),
...areas
- .filter((area: Area) => area !== myArea)
- .map((area: Area) => ({
+ .filter((area: string) => area !== myArea)
+ .map((area: string) => ({
title: area,
- data: areaTeamMapNew[area],
+ data: areaTeamMap[area],
isPrimaryArea: false,
})),
];
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Utils/teams.tsx
@@ -72,3 +72,13 @@ export const sortTeamsAscComparator = (teamA: Team, teamB: Team) => {
return NO_SORT;
}
};
+
+export const sortAreas = (myArea: any) => (area1: any, area2: any) => {
+ if (area1 === myArea) {
+ return -1;
+ }
+ if (area2 === myArea) {
+ return 1;
+ }
+ return area1.localeCompare(area2);
+};
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/types.ts
@@ -12,19 +12,9 @@ export type Team = {
workgroupId?: string | null;
} | null;
-export type Area =
- | 'Admin & Support'
- | 'Digital'
- | 'Food & Consumables'
- | 'Front End'
- | 'Fuel'
- | 'General Merchandise'
- | 'Management'
- | 'Pharmacy'
- | 'Stocking'
- | 'GM'
- | 'Vision Center';
-
+export type Area = string[];
+export type MyAreaType = string | null;
+export type AreaTeamMap = { [key: string]: string[] };
export interface TeamSelectionProps {
handleCancel: () => void;
handleSave: () => void;
| Addressing PR comments | Addressing PR comments
|
804768d7fd36caf9e1d80671e8de3ec23d8012ef | --- package-lock.json
@@ -3611,9 +3611,9 @@
}
},
"@walmart/time-clock-mini-app": {
- "version": "0.4.21",
- "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.4.21.tgz",
- "integrity": "sha512-nxchtjmd0QDeCp+XE2GP1319/wwi53Cd2NhcCkL9WvDIcmyqkZTUb5dmAaF3yTC0QBew3Ydjz4g/+j04hRXWOg==",
+ "version": "0.4.22",
+ "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.4.22.tgz",
+ "integrity": "sha512-6t8Ze8mWCJ4B+XrChgWswLhFr8PGclCMD9lbz84/EW5fFlUkr0j4qhoL/804ElH60PIGqOkYMYBAVGTD9+1ZvA==",
"requires": {
"@react-native-community/datetimepicker": "3.0.9",
"@react-native-picker/picker": "^1.16.1",
@@ -13207,9 +13207,9 @@
"integrity": "sha512-PKaL0MFy+VjTT4wcx/v90BlvlRXgdWGUU8Sz/760A2Esj175A8w/vFQCtZhUer5FVxmpYVKk7nHzoewii4ygRw=="
},
"react-query": {
- "version": "3.29.1",
- "resolved": "https://npme.walmart.com/react-query/-/react-query-3.29.1.tgz",
- "integrity": "sha512-EKhI4YokmB1Ccnv1vu8w5L9VpKUnznzLLpaMgaJx1xEnBvGTdUrpNFFxuGiDuiQOg3hi6TvSHVTfo/Nws3kTpg==",
+ "version": "3.34.0",
+ "resolved": "https://npme.walmart.com/react-query/-/react-query-3.34.0.tgz",
+ "integrity": "sha512-g6L90FeCLzz6+53CbVKYJALBiZR5icOYPjqGGiNgHNeufcnddLZaQGE9wheclk10k6g+o+Dd4/jAtswhjVblXw==",
"requires": {
"@babel/runtime": "^7.5.5",
"broadcast-channel": "^3.4.1",
--- package.json
@@ -97,7 +97,7 @@
"@walmart/schedule-mini-app": "0.3.2",
"@walmart/settings-mini-app": "1.3.7",
"@walmart/shelfavailability-mini-app": "0.3.90",
- "@walmart/time-clock-mini-app": "0.4.21",
+ "@walmart/time-clock-mini-app": "0.4.22",
"@walmart/ui-components": "1.1.57",
"@walmart/welcomeme-mini-app": "0.30.4",
"@walmart/wfm-ui": "^0.1.50",
| Update time-clock-mini-app version | Update time-clock-mini-app version |
c1888901bad0fbfd4110b6a4c1342f1cd012aa0c | --- ios/Podfile.lock
@@ -479,6 +479,8 @@ PODS:
- React
- RNSketchCanvas (0.8.0):
- React
+ - RNSoundPlayer (0.10.9):
+ - React
- RNSVG (12.1.0):
- React
- RNVectorIcons (7.1.0):
@@ -568,6 +570,7 @@ DEPENDENCIES:
- RNScreens (from `../node_modules/react-native-screens`)
- RNSha256 (from `../node_modules/react-native-sha256`)
- "RNSketchCanvas (from `../node_modules/@terrylinla/react-native-sketch-canvas`)"
+ - RNSoundPlayer (from `../node_modules/react-native-sound-player`)
- RNSVG (from `../node_modules/react-native-svg`)
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
- RNWMSSOLibrary (from `../node_modules/react-native-ssmp-sso-allspark`)
@@ -742,6 +745,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-sha256"
RNSketchCanvas:
:path: "../node_modules/@terrylinla/react-native-sketch-canvas"
+ RNSoundPlayer:
+ :path: "../node_modules/react-native-sound-player"
RNSVG:
:path: "../node_modules/react-native-svg"
RNVectorIcons:
@@ -844,6 +849,7 @@ SPEC CHECKSUMS:
RNScreens: 0e91da98ab26d5d04c7b59a9b6bd694124caf88c
RNSha256: 22383f4a1ed2b38da9d642c608892a3ab4cad80a
RNSketchCanvas: 6939b18677cd1794151cc3d8eb5a0a2158a4a05b
+ RNSoundPlayer: e7f72cf262c8de4f1427b5f29cc47aebadd1d872
RNSVG: ce9d996113475209013317e48b05c21ee988d42e
RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
RNWMSSOLibrary: 3103d2f05e6c559dfab7da9ca82c07472b0d0d6b
| adding Podfile.lock | adding Podfile.lock
|
4baee5b72ccbc9cb9ce879417688d7ccfa5e1596 | --- src/impersonation/sagas.ts
@@ -1,8 +1,10 @@
-import {all, call, put, takeLatest} from 'redux-saga/effects';
+import {all, call, put, select, takeLatest} from 'redux-saga/effects';
import {
IUserActions,
+ User,
UserActionCreators,
UserActionTypes,
+ UserSelectors,
} from '@walmart/allspark-foundation/User';
import {
ClockActionCreators,
@@ -12,7 +14,11 @@ import {ClockAppActions, PunchActions} from '@walmart/time-clock-mini-app';
import {createRestartableSagas} from '@walmart/allspark-utils';
import {Logger} from '../core/Logger';
-import {addImpersonationBanner, getImpersonationCache} from './utils';
+import {
+ addImpersonationBanner,
+ cacheImpersonationData,
+ getImpersonationCache,
+} from './utils';
export function* onStartImpersonation(
action: IUserActions['START_IMPERSONATION'],
@@ -66,12 +72,28 @@ export function* checkPreviousImpersonation() {
}
}
+/**
+ * When user info is updated, if impersonating we'll need to update the cache
+ * value of the impersonated user.
+ */
+export function* onUpdateUser(action: IUserActions['UPDATE']) {
+ const {payload: userInfo} = action;
+
+ const impersonated: boolean = yield select(UserSelectors.getImpersonated);
+ const impersonatee: User | null = yield select(UserSelectors.getData);
+
+ if (impersonated && impersonatee) {
+ yield call(cacheImpersonationData, {...impersonatee, ...userInfo});
+ }
+}
+
export function* impersonationSagas() {
yield all(
createRestartableSagas(
[
takeLatest(UserActionTypes.START_IMPERSONATION, onStartImpersonation),
takeLatest(UserActionTypes.EXIT_IMPERSONATION, onExitImpersonation),
+ takeLatest(UserActionTypes.UPDATE, onUpdateUser),
],
Logger.error,
),
| fix: cached user info was not updated when preferences are changed | fix: cached user info was not updated when preferences are changed
|
49d9e3ca0a7d41e683346eec2b0df0bfc7396dd9 | --- .looper.yml
@@ -1,4 +1,3 @@
-
tools:
nodejs:
- 20.5.1
@@ -8,6 +7,11 @@ updateTaskStatusOnGit: true
scheduling: concurrent
+envs:
+ global:
+ variables:
+ ALLOW_NPM_PUSH_TO_AF: true
+
triggers:
- manual:
name: PR
@@ -104,7 +108,7 @@ flows:
- call: coverage
- sonar("Sonar"): sonar-scanner -X -Dproject.settings=sonar-project.properties -Dsonar.pullrequest.github.repository=allspark/allspark -Dsonar.pullrequest.key=${GITHUB_PR_NUMBER} -Dsonar.pullrequest.branch=${GITHUB_PR_SOURCE_BRANCH} -Dsonar.pullrequest.base=${GITHUB_PR_TARGET_BRANCH} -Dsonar.scm.revision=${GITHUB_PR_HEAD_SHA}
- sonar-fetch-remote-fix-ref:
+ sonar-fetch-remote-fix-ref:
shell: |
#!/bin/bash
git fetch --no-tags --all
@@ -114,4 +118,3 @@ flows:
git checkout -b remotes/origin/pr/${GITHUB_PR_NUMBER}
git branch -D ${GITHUB_PR_TARGET_BRANCH}
fi
-
\ No newline at end of file
--- .yarnrc.yml
@@ -8,4 +8,6 @@ logFilters:
nodeLinker: node-modules
-npmRegistryServer: "https://npme.walmart.com/"
+# Add the following in your Local Mac's ~/.zshrc file
+# export REPOSOLNS_NPM_REPO=https://npm.ci.artifacts.walmart.com/artifactory/api/npm/npme-npm
+npmRegistryServer: ${REPOSOLNS_NPM_REPO}
| chore: changes for proximity to artifactory npm migration | chore: changes for proximity to artifactory npm migration
|
c5b3bda4b548244270707acb4f4f6362127735d3 | --- package-lock.json
@@ -3323,9 +3323,9 @@
"integrity": "sha512-GIK3yOpMOShJylR3pFnCnQhNOCknzhcpSE+qW51mUXrnVkOxUBK8ENtYurUc2GumOROfh+728tCHyXoY7yB+NQ=="
},
"@walmart/counts-component-miniapp": {
- "version": "0.0.15",
- "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.0.15.tgz",
- "integrity": "sha512-EQAXiiNzF4D/LqiAH06fsC9PjtCLgi1XKJhK9wbKf0UPlJvIRruy6lO5mrqVNGo1RdkeuY7Kv/jaQ5bCmOBeUQ=="
+ "version": "0.0.17",
+ "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.0.17.tgz",
+ "integrity": "sha512-5cla0k4tS7an8zHF5Fn8udmss3AsWs1UXPV/QwC0W49L/BD6SK+I6TcuPnEnGugOS718JTgMSG32iPED/yOSIA=="
},
"@walmart/exception-mini-app": {
"version": "0.28.0-rc.9",
--- package.json
@@ -68,7 +68,7 @@
"@walmart/allspark-me-mini-app": "0.2.2",
"@walmart/ask-sam-mini-app": "0.30.12",
"@walmart/config-components": "^1.0.28",
- "@walmart/counts-component-miniapp": "0.0.15",
+ "@walmart/counts-component-miniapp": "0.0.17",
"@walmart/exception-mini-app": "0.28.0-rc.9",
"@walmart/feedback-all-spark-miniapp": "0.0.55",
"@walmart/functional-components": "1.0.31",
| Counts version bump | Counts version bump
|
b4da15e28b231d507dd576641ebf57b6965294e5 | --- ios/Podfile.lock
@@ -1287,4 +1287,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 5d9ba60be3dfb87f4278eff1d4ebb95b0c7dbcf4
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
| updating pods to 1.12.0 | updating pods to 1.12.0
|
b7a158fcfd2a73da5591fd411c1270292af93acf | --- package-lock.json
@@ -4475,9 +4475,9 @@
}
},
"@walmart/taskit-mini-app": {
- "version": "0.260.0-rc.0",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.260.0-rc.0.tgz",
- "integrity": "sha512-nmV3GNJLugjrbeacp10vvrm+Vi6m2JwJh9+rffMiCFmQKwNDJxwss658KJvkOp4lDtHZ+s7rsnvaUuDNvovtKw=="
+ "version": "0.0.262",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.0.262.tgz",
+ "integrity": "sha512-cm+qipWHlYdZm4suG9cnSnOei8SybNZr3Y2N6quAcOJYXnRgSFrTAMxYbc6Rfkwxffw0HsCcK5ztrYELewDlQQ=="
},
"@walmart/time-clock-mini-app": {
"version": "0.4.33",
--- package.json
@@ -101,7 +101,7 @@
"@walmart/schedule-mini-app": "0.12.0",
"@walmart/settings-mini-app": "1.6.0",
"@walmart/shelfavailability-mini-app": "0.8.3",
- "@walmart/taskit-mini-app": "0.260.0-rc.0",
+ "@walmart/taskit-mini-app": "0.0.262",
"@walmart/time-clock-mini-app": "0.4.33",
"@walmart/ui-components": "1.3.0-rc.14",
"@walmart/welcomeme-mini-app": "0.47.0",
| Updating taskIt version | Updating taskIt version
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.