commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
831cc622da200c0b2e80b8545254b1759593d780
--- src/components/AssociateRosterItem/index.tsx @@ -46,7 +46,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { ); const currentUser = useSelector(UserSelectors.getUser) as Associate; const isWeeklyScheduleVisible: boolean = useRbacConfigWithJobCode(); - const isHourlyAssociate: boolean = isWeeklyScheduleVisible; + const isSalariedAssociate: boolean = isWeeklyScheduleVisible; const userIsInRoster = useUserIsInRoster(); const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled); const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); @@ -83,7 +83,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { } trailing={ <> - {isHourlyAssociate && ( + {isSalariedAssociate && ( <StatusChip associate={associate} encryptedId={encryptedId} --- src/components/AssociateRosterItem/index.tsx @@ -46,7 +46,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { ); const currentUser = useSelector(UserSelectors.getUser) as Associate; const isWeeklyScheduleVisible: boolean = useRbacConfigWithJobCode(); - const isHourlyAssociate: boolean = isWeeklyScheduleVisible; + const isSalariedAssociate: boolean = isWeeklyScheduleVisible; const userIsInRoster = useUserIsInRoster(); const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled); const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); @@ -83,7 +83,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { } trailing={ <> - {isHourlyAssociate && ( + {isSalariedAssociate && ( <StatusChip associate={associate} encryptedId={encryptedId}
Changing variable name
Changing variable name
ea8175747ddc4a17a07f36f6bc764e2e5d9fcad3
--- packages/allspark-foundation-hub/src/Container/AllsparkHubContainer.tsx @@ -145,7 +145,7 @@ export class AllsparkHubContainer { {!this.isSite ? ( <OnboardingProvider> <HubDashboard - name={this.containerName} + containerName={this.containerName} widgets={this.validWidgets} componentOverrides={this.componentOverrides} /> @@ -153,7 +153,7 @@ export class AllsparkHubContainer { ) : ( <SupplyChainOnboardingProvider> <SiteHubDashboard - name={this.containerName} + containerName={this.containerName} widgets={this.validWidgets} componentOverrides={this.componentOverrides} /> --- packages/allspark-foundation-hub/src/Store/Modules/Hub/HubDashboard.tsx @@ -44,7 +44,7 @@ import { TeamSwitcher } from '../TeamSwitcher'; import { ManagerExperienceSelectors } from '../../../Container/Redux'; export const HubDashboard = ({ - name, + containerName, widgets, componentOverrides, }: HubDashboardProps) => { @@ -55,6 +55,9 @@ export const HubDashboard = ({ const [allowedWidgetsList, setAllowedWidgetsList] = useState<LayoutConfig>( [] ); + const selectedTeamPreference = useSelector( + StoreManagerExperienceSelectors.getSelectedTeamPreference + ); const selectedTeamIds = useSelector( StoreManagerExperienceSelectors.getSelectedTeamIDs @@ -162,12 +165,12 @@ export const HubDashboard = ({ useEffect(() => { const widgetkeys = Object.keys(widgets); - const hasWigets = + const hasWidgets = widgetkeys.includes(teamState.teamLabel) || widgetkeys.includes(teamState.teamIds[0]); const mappedWidgets = widgets[teamState.teamLabel] || widgets[teamState.teamIds[0]]; - const allowedWidgets = hasWigets + const allowedWidgets = hasWidgets ? mappedWidgets.widgets?.map((widgetData: string) => { let layoutConfig = { componentId: '' }; let layoutConfigList: [] = []; @@ -278,7 +281,7 @@ export const HubDashboard = ({ )} {showHubHeader ? ( <AllsparkComponentContainers.Component - container={name} + container={containerName} id={componentOverrides?.Header.id || ''} props={componentOverrides?.Header?.props || {}} /> @@ -295,11 +298,12 @@ export const HubDashboard = ({ /> ) : null} <AllsparkComponentContainers.Layout - container={name} + container={containerName} layout={allowedWidgetsList} props={{ ...containerComponentProps, - selectedTeamPreference: teamState.teamLabel, + selectedTeamPreference: + selectedTeamPreference || teamState.teamLabel, selectedTeamIds: selectedTeamIds || teamState.teamIds, }} /> @@ -307,7 +311,7 @@ export const HubDashboard = ({ {!!componentOverrides?.FloatingButton?.id && ( <View style={styles.floatingButtonStyle}> <AllsparkComponentContainers.Component - container={name} + container={containerName} id={componentOverrides.FloatingButton.id} props={{ ...componentOverrides.FloatingButton?.props, --- packages/allspark-foundation-hub/src/Store/Modules/Hub/types.ts @@ -4,7 +4,7 @@ import { } from '../../../Container/types'; export type HubDashboardProps = { - name: string; + containerName: string; widgets: ValidatedTeamWidgetMapping; componentOverrides?: ComponentOverrides; }; --- packages/allspark-foundation-hub/src/Store/Modules/TeamSwitcher/index.tsx @@ -297,6 +297,9 @@ export const TeamSwitcher = ({ selectedTeamPreference ) ); + dispatch( + StoreManagerExperienceCreators.updateSelectedTeamData(selectedTeamData) + ); } }, [selectedTeamPreference, dispatch]); @@ -312,28 +315,33 @@ export const TeamSwitcher = ({ userOnboardingComplete, ]); - const handlePress = (teamId: string, teamLabel: string) => { + const handlePress = (team: TeamSwitcherTypes) => { teamSwitcherTelemetry.logEvent('team_switch_event', { message: 'Team switch event triggered', - teamId: teamId, - teamLabel: teamLabel, + teamId: team.teamId, + teamLabel: team.teamLabel, personaType: personaType, }); - setSelectedTeam(teamLabel); + setSelectedTeam(team.teamLabel); dispatch( - StoreManagerExperienceCreators.updateSelectedTeamPreference(teamLabel) + StoreManagerExperienceCreators.updateSelectedTeamPreference( + team.teamLabel + ) ); - if (teamId === MY_TEAMS_TEAM_ID) { + dispatch(StoreManagerExperienceCreators.updateSelectedTeamData(team)); + if (team.teamId === MY_TEAMS_TEAM_ID) { const selectedTeamsList = teamData .filter((team: TeamSwitcherTypes) => team.teamLabel) .map((team: TeamSwitcherTypes) => team.teamId); dispatch( StoreManagerExperienceCreators.updateSelectedTeamIDs(selectedTeamsList) ); - onTeamChange(teamLabel, selectedTeamsList); + onTeamChange(team.teamLabel, selectedTeamsList); } else { - dispatch(StoreManagerExperienceCreators.updateSelectedTeamIDs([teamId])); - onTeamChange(teamLabel, [teamId]); + dispatch( + StoreManagerExperienceCreators.updateSelectedTeamIDs([team.teamId]) + ); + onTeamChange(team.teamLabel, [team.teamId]); } }; @@ -375,7 +383,7 @@ export const TeamSwitcher = ({ accessibilityRole='image' accessibilityLabel={`team-image-${item.teamLabel}`} testID='Hub.TeamSwitcher.Container' - onPress={() => handlePress(item.teamId, item.teamLabel)} + onPress={() => handlePress(item)} style={styles.teamItem} > <TeamImage --- packages/allspark-foundation-hub/src/SupplyChain/Hub/SiteHubDashboard.tsx @@ -45,7 +45,10 @@ import { ManagerExperienceSelectors } from '../../Container'; import { styles } from './styles'; import { WarningAlert } from '../../Shared/Components/WarningAlert/WarningAlert'; -export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { +export const SiteHubDashboard = ({ + containerName: name, + widgets, +}: HubDashboardProps) => { const { loading, showOnboarding,
fix(ui): update container selected teams
fix(ui): update container selected teams
d7be57682e81714f415f837ae0237e0e7ec19412
--- package-lock.json @@ -15,6 +15,7 @@ "@react-native-community/art": "^1.2.0", "@react-native-community/clipboard": "^1.5.1", "@react-native-community/datetimepicker": "6.7.5", + "@react-native-community/geolocation": "3.1.0", "@react-native-community/hooks": "^2.8.0", "@react-native-community/netinfo": "9.3.6", "@react-native-firebase/analytics": "17.4.2", @@ -6317,6 +6318,19 @@ "invariant": "^2.2.4" } }, + "node_modules/@react-native-community/geolocation": { + "version": "3.1.0", + "resolved": "https://npme.walmart.com/@react-native-community/geolocation/-/geolocation-3.1.0.tgz", + "integrity": "sha512-Aj76wMeCLz9kczpe7W2IXxSRNj+hRR7sqyfXq9ZaJIWNH23jeJfzMpovclg+e1uM8Vr8jCYEcZyD4rKub6Vc/Q==", + "license": "MIT", + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/@react-native-community/hooks": { "version": "2.8.1", "license": "ISC", @@ -31925,6 +31939,11 @@ "invariant": "^2.2.4" } }, + "@react-native-community/geolocation": { + "version": "3.1.0", + "resolved": "https://npme.walmart.com/@react-native-community/geolocation/-/geolocation-3.1.0.tgz", + "integrity": "sha512-Aj76wMeCLz9kczpe7W2IXxSRNj+hRR7sqyfXq9ZaJIWNH23jeJfzMpovclg+e1uM8Vr8jCYEcZyD4rKub6Vc/Q==" + }, "@react-native-community/hooks": { "version": "2.8.1" }, --- package.json @@ -56,6 +56,7 @@ "@react-native-community/art": "^1.2.0", "@react-native-community/clipboard": "^1.5.1", "@react-native-community/datetimepicker": "6.7.5", + "@react-native-community/geolocation": "3.1.0", "@react-native-community/hooks": "^2.8.0", "@react-native-community/netinfo": "9.3.6", "@react-native-firebase/analytics": "17.4.2",
Add react native community geolocation
Add react native community geolocation
44a680a5e77f192017aa39cc177159af8e314583
--- package.json @@ -176,7 +176,7 @@ "@walmart/talent-performance-mini-app": "1.2.7", "@walmart/talent-preboarding-mini-app": "1.0.63", "@walmart/talent-preboarding-shared-utils": "^0.1.114", - "@walmart/taskit-mini-app": "5.52.7", + "@walmart/taskit-mini-app": "5.52.10", "@walmart/time-clock-feature-app": "1.0.0", "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A3.19.13#~/.yarn/patches/@walmart-time-clock-mini-app-npm-3.19.13-d3039974f6.patch", "@walmart/timesheet-feature-app": "0.2.0", --- yarn.lock @@ -8945,7 +8945,7 @@ __metadata: "@walmart/talent-performance-mini-app": "npm:1.2.7" "@walmart/talent-preboarding-mini-app": "npm:1.0.63" "@walmart/talent-preboarding-shared-utils": "npm:^0.1.114" - "@walmart/taskit-mini-app": "npm:5.52.7" + "@walmart/taskit-mini-app": "npm:5.52.10" "@walmart/time-clock-feature-app": "npm:1.0.0" "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A3.19.13#~/.yarn/patches/@walmart-time-clock-mini-app-npm-3.19.13-d3039974f6.patch" "@walmart/timesheet-feature-app": "npm:0.2.0" @@ -9968,13 +9968,13 @@ __metadata: languageName: node linkType: hard -"@walmart/taskit-mini-app@npm:5.52.7": - version: 5.52.7 - resolution: "@walmart/taskit-mini-app@npm:5.52.7::__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.52.7.tgz" +"@walmart/taskit-mini-app@npm:5.52.10": + version: 5.52.10 + resolution: "@walmart/taskit-mini-app@npm:5.52.10::__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.52.10.tgz" peerDependencies: "@walmart/allspark-foundation": "*" "@walmart/gtp-shared-components-3": "*" - checksum: 10c0/003ca3c552b879097545eee701e300f2620990a40cd21805eec4cf04a3a7178849dc74a899289faf84ef609b2d3a65aa1b39be044471563ca5981c6bbb46c114 + checksum: 10c0/80a517949f1ef8d5b79a2a0f53d35a1f74c5e82fa7ac6c51ed2dceff43dcc7a45a0b8fb63e52631b801aa4325e8c97b17fee81c9e7f5846f74877c1aad1110a3 languageName: node linkType: hard
fix(notes): taskit mini app my walmart 2.0 bug fixes TASKIT-8041 (#5324)
fix(notes): taskit mini app my walmart 2.0 bug fixes TASKIT-8041 (#5324) Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com> Co-authored-by: Hariharan Sundaram <121838+h0s0em0@users.noreply.gecgithub01.walmart.com>
d14724ef6e6d0ba499da09a7668b11cb27014b40
--- __tests__/screens/RosterScreen/__snapshots__/AssociateListTest.tsx.snap @@ -252,7 +252,10 @@ exports[`AssociateList RosterFilters should filter for all associates 1`] = ` <View style={ Object { + "alignItems": "flex-start", "backgroundColor": "white", + "flex": 1, + "paddingLeft": 8, "paddingVertical": 16, } } --- __tests__/screens/RosterScreen/__snapshots__/AssociateListTest.tsx.snap @@ -252,7 +252,10 @@ exports[`AssociateList RosterFilters should filter for all associates 1`] = ` <View style={ Object { + "alignItems": "flex-start", "backgroundColor": "white", + "flex": 1, + "paddingLeft": 8, "paddingVertical": 16, } }
fix snapshot
fix snapshot
4cda5ac167f6a86a2fff3efc7654d0c56c15e71c
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.1.1", + "version": "1.1.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/myteam-mini-app", - "version": "1.1.1", + "version": "1.1.2", "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.1", + "@walmart/roster-mini-app": "1.1.2", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.1.1", + "@walmart/wmconnect-mini-app": "1.1.2", "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.1", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.1.1.tgz", - "integrity": "sha512-Ft39Q68yIm3yezbg7S+bzkTsJLOoiI1mA9H+sYax2XQcmPhYGxHCZo4EKcFPChnPrEer2j7x1ZfaC/Fzg3T5kA==", + "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==", "dev": true, "hasInstallScript": true }, @@ -11846,9 +11846,9 @@ } }, "node_modules/@walmart/wmconnect-mini-app": { - "version": "1.1.1", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.1.1.tgz", - "integrity": "sha512-r7Gkf2L57LcmDea/T9bQ2oWNsKnUFGQQzXT5MytFhf8eI47UmHtG9IfPODIMICz0ld+VvXLGiFLPNsaQ7JvA4Q==", + "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==", "dev": true, "hasInstallScript": true }, @@ -40901,9 +40901,9 @@ } }, "@walmart/roster-mini-app": { - "version": "1.1.1", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.1.1.tgz", - "integrity": "sha512-Ft39Q68yIm3yezbg7S+bzkTsJLOoiI1mA9H+sYax2XQcmPhYGxHCZo4EKcFPChnPrEer2j7x1ZfaC/Fzg3T5kA==", + "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==", "dev": true }, "@walmart/ui-components": { @@ -40918,9 +40918,9 @@ } }, "@walmart/wmconnect-mini-app": { - "version": "1.1.1", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.1.1.tgz", - "integrity": "sha512-r7Gkf2L57LcmDea/T9bQ2oWNsKnUFGQQzXT5MytFhf8eI47UmHtG9IfPODIMICz0ld+VvXLGiFLPNsaQ7JvA4Q==", + "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==", "dev": true }, "@whatwg-node/events": { --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.1.1", + "version": "1.1.2", "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.1", - "@walmart/roster-mini-app": "1.1.1", + "@walmart/wmconnect-mini-app": "1.1.2", + "@walmart/roster-mini-app": "1.1.2", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0",
Update version
Update version
d1aa113a03d5e8619f5d0a0853c768a3b3b8bdcf
--- __tests__/core/appConfigInitTest.ts @@ -1,6 +1,11 @@ import {call, all, select, take, takeLeading} from 'redux-saga/effects'; -import {addSagas, appConfigActions, getStore} from '@walmart/redux-store'; +import { + addSagas, + appConfigActions, + getStore, + UserSelectors, +} from '@walmart/redux-store'; import { AppConfig, AppConfigCallbackHandlerResult, @@ -138,6 +143,7 @@ describe('getAppConfigScope', () => { const deviceType = 'COPIUM'; const model = 'ZYA'; const osVersion = '11'; + const teamIds = ['SUP_US_5431785', 'SUP_US_5431785']; it('gets scope and params for app config', () => { const iterator = getAppConfigScope(); @@ -154,6 +160,7 @@ describe('getAppConfigScope', () => { select(getDeviceType), call(DeviceInfo.getModel), call(DeviceInfo.getSystemVersion), + select(UserSelectors.getUserTeamIds), ]), ); @@ -169,6 +176,7 @@ describe('getAppConfigScope', () => { deviceType, model, osVersion, + teamIds, ]); expect(value).toEqual({ appId, @@ -183,6 +191,7 @@ describe('getAppConfigScope', () => { deviceType, model, osVersion, + teamIds: '[SUP_US_5431785,SUP_US_5431785]', }, }); expect(done).toEqual(true); --- package-lock.json @@ -3495,10 +3495,11 @@ "integrity": "sha512-NSK68YKfA95rH9x90qwCNYORlTShIyVoJ2iysN6/OPWKiy59gK6P1yTrg6hAaysWSm/r90fWTkIuukzdSu99+A==" }, "@walmart/redux-store": { - "version": "1.1.6", - "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-1.1.6.tgz", - "integrity": "sha512-/3IGzmOEszGfd8lObB5bFHcjGJC1enhD1TcHSEb6JBu2lPPTtMhRninSV6Co6nqpyaVQAglC0QF3MVtyF3YLwQ==", + "version": "1.1.14", + "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-1.1.14.tgz", + "integrity": "sha512-iZK42o0tsHmcWFs4JPiDiC4uHtTEnVDhcxorJQ8e3b/NuUDEefN2839G3qXyI5IpWjmw9/957vLO0lPR+F3Jpw==", "requires": { + "namecase": "^1.1.2", "reduxsauce": "^1.2.1" }, "dependencies": { --- package.json @@ -93,7 +93,7 @@ "@walmart/react-native-logger": "^1.28.0", "@walmart/react-native-shared-navigation": "^0.4.0", "@walmart/react-native-sumo-sdk": "2.1.0-alpha.3", - "@walmart/redux-store": "^1.1.6", + "@walmart/redux-store": "^1.1.14", "@walmart/schedule-mini-app": "0.4.4", "@walmart/settings-mini-app": "1.3.8", "@walmart/shelfavailability-mini-app": "0.5.0", --- src/core/appConfigInit.ts @@ -5,6 +5,7 @@ import { appConfigActions, getStore, GlobalState, + UserSelectors, } from '@walmart/redux-store'; import { AppConfig, @@ -85,6 +86,7 @@ export function* getAppConfigScope(): any { deviceType, model, osVersion, + teamIds, ] = yield all([ select(getSiteConfigCountry), select(getSiteConfigDivisonCode), @@ -97,6 +99,7 @@ export function* getAppConfigScope(): any { select(getDeviceType), call(DeviceInfo.getModel), call(DeviceInfo.getSystemVersion), + select(UserSelectors.getUserTeamIds), ]); return { @@ -112,6 +115,7 @@ export function* getAppConfigScope(): any { model, siteId: `${siteId}`, deviceType, + teamIds: `[${teamIds.join(',')}]`, }, } as AppConfigFetchParams; }
passing team id info app config calls
passing team id info app config calls
d2bed36fb1529e7a394846798a72fca27b8c8da4
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.43.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.42.1...v2.43.0) (2025-06-23) + + +### Features + +* **ui:** updating wmconnect version ([bdf0c52](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/bdf0c5297a04ca1dab350f6d4ed761ed2bee1ec2)) + ## [2.42.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.42.0...v2.42.1) (2025-06-05) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.42.1", + "version": "2.43.0", "main": "dist/index.js", "files": [ "dist",
chore(release): 2.43.0 [skip ci]
chore(release): 2.43.0 [skip ci] # [2.43.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.42.1...v2.43.0) (2025-06-23) ### Features * **ui:** updating wmconnect version ([bdf0c52](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/bdf0c5297a04ca1dab350f6d4ed761ed2bee1ec2))
5b8c6f80d2f358bfb7356c79e86aecc640444c84
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.3.1](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.3.0...v1.3.1) (2024-06-13) + + +### Bug Fixes + +* **looperCoverage:** added var for looper coverage ([49bbeaf](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/49bbeaf0b22b6b7b4ebf16a0e23517bfc3f82be0)) + # [1.3.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.2.0...v1.3.0) (2024-06-11) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.3.0", + "version": "1.3.1", "main": "dist/index.js", "files": [ "dist"
chore(release): 1.3.1 [skip ci]
chore(release): 1.3.1 [skip ci] ## [1.3.1](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.3.0...v1.3.1) (2024-06-13) ### Bug Fixes * **looperCoverage:** added var for looper coverage ([49bbeaf](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/49bbeaf0b22b6b7b4ebf16a0e23517bfc3f82be0))
24670fcb64fd879bc3b4fbc39f20a352f5198b58
--- package-lock.json @@ -56,7 +56,7 @@ "@walmart/inbox-mini-app": "0.75.0", "@walmart/iteminfo-mini-app": "5.3.2", "@walmart/manager-approvals-miniapp": "0.1.2", - "@walmart/me-field-mini-app": "1.1.35", + "@walmart/me-field-mini-app": "1.1.36", "@walmart/metrics-mini-app": "0.9.33", "@walmart/mod-flex-mini-app": "1.3.11", "@walmart/moment-walmart": "1.0.4", @@ -5298,9 +5298,9 @@ } }, "node_modules/@walmart/me-field-mini-app": { - "version": "1.1.35", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.35.tgz", - "integrity": "sha512-ERQVQCZSYCKEZwgSAlPgAx0qKtqGudUA53rfxZ3RgDznTDqoaxmXG6aA3iCtfZpoF2RKr7CAKc/RYABitQdt4g==", + "version": "1.1.36", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.36.tgz", + "integrity": "sha512-MbuwFAfzl+LjNffFJUNvP7Ay7kx9sri1Haia4t/p6linZT3HxOaCotJbu0fRVqMr4tXX1ZVCeB2JmSpjsE0UsA==", "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", "@react-native-firebase/analytics": "14.11.0", @@ -24904,9 +24904,9 @@ "integrity": "sha512-zOmvEEul9aMoJhNbE2Hz1FxxeXGovIwPojGjvjyhHBDcHTQGWHJVX5d2WpxgRk7M81jBnEzluDU5dJHK9bf3oQ==" }, "@walmart/me-field-mini-app": { - "version": "1.1.35", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.35.tgz", - "integrity": "sha512-ERQVQCZSYCKEZwgSAlPgAx0qKtqGudUA53rfxZ3RgDznTDqoaxmXG6aA3iCtfZpoF2RKr7CAKc/RYABitQdt4g==" + "version": "1.1.36", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-1.1.36.tgz", + "integrity": "sha512-MbuwFAfzl+LjNffFJUNvP7Ay7kx9sri1Haia4t/p6linZT3HxOaCotJbu0fRVqMr4tXX1ZVCeB2JmSpjsE0UsA==" }, "@walmart/metrics-mini-app": { "version": "0.9.33", @@ -27886,7 +27886,7 @@ "version": "2.1.6", "dev": true, "requires": { - "axios": "^0.26.1" + "axios": "^0.21.4" } }, "chalk": { @@ -31508,7 +31508,7 @@ "is-wsl": "^2.2.0", "semver": "^7.3.2", "shellwords": "^0.1.1", - "uuid": "^3.3.2", + "uuid": "^8.3.0", "which": "^2.0.2" }, "dependencies": { @@ -35284,7 +35284,7 @@ "version": "3.0.1", "requires": { "simple-plist": "^1.1.0", - "uuid": "^3.3.2" + "uuid": "^7.0.3" }, "dependencies": { "uuid": { --- package.json @@ -99,7 +99,7 @@ "@walmart/inbox-mini-app": "0.75.0", "@walmart/iteminfo-mini-app": "5.3.2", "@walmart/manager-approvals-miniapp": "0.1.2", - "@walmart/me-field-mini-app": "1.1.35", + "@walmart/me-field-mini-app": "1.1.36", "@walmart/metrics-mini-app": "0.9.33", "@walmart/mod-flex-mini-app": "1.3.11", "@walmart/moment-walmart": "1.0.4",
:package: Feat bumping learning mini app version for drop 8.3
:package: Feat bumping learning mini app version for drop 8.3
f8f96e8c457971690e69f016c4aa4f8ad779a881
--- .looper.multibranch.yml @@ -255,16 +255,16 @@ flows: - echo "buildType ${buildType}" - echo "workspace is ${WORKSPACE}" - - var(stuff): - webhookUrl: "https://walmart.webhook.office.com/webhookb2/f0470775-130f-4a42-9531-d0511cf632aa@3cbcc3d3-094d-4006-9849-0d11d61f484d/IncomingWebhook/16391a60331c4d4999f112e40a0b2db1/f02e8323-deff-42c4-85df-613f84ca35ff" - $root: - title: "stuff" - vesion: "1.10" - commit: - message: ${GIT_COMMIT_MESSAGE} - author: ${GIT_COMMIT_AUTHOR} - date: ${GIT_COMMIT_DATE} - url: ${BUILD_URL} + - var(stuff = '{{ $root = {title = "stuff", version = "1.10"}, webhookUrl = "https://walmart.webhook.office.com/webhookb2/f0470775-130f-4a42-9531-d0511cf632aa@3cbcc3d3-094d-4006-9849-0d11d61f484d/IncomingWebhook/16391a60331c4d4999f112e40a0b2db1/f02e8323-deff-42c4-85df-613f84ca35ff"}}') + # webhookUrl: "https://walmart.webhook.office.com/webhookb2/f0470775-130f-4a42-9531-d0511cf632aa@3cbcc3d3-094d-4006-9849-0d11d61f484d/IncomingWebhook/16391a60331c4d4999f112e40a0b2db1/f02e8323-deff-42c4-85df-613f84ca35ff" + # $root: + # title: "stuff" + # vesion: "1.10" + # commit: + # message: ${GIT_COMMIT_MESSAGE} + # author: ${GIT_COMMIT_AUTHOR} + # date: ${GIT_COMMIT_DATE} + # url: ${BUILD_URL} - var(encoded): toJson(stuff) - echo ${encoded} |tee scripts/teamsSuccessData.json
testing out something
testing out something
8d544f08390e597ca2e82810455321ab2602eb5b
--- __tests__/navigation/SideMenuContentTest.tsx @@ -24,6 +24,8 @@ import {Linking, Platform} from 'react-native'; type Selector = (state: any) => any; +jest.useFakeTimers(); + describe('SideMenuContent', () => { it('renders', () => { const props = { @@ -105,6 +107,7 @@ describe('SideMenuContent', () => { DrawerActions.closeDrawer(), ); globalNav.props.onSignOut(); + jest.runAllTimers(); expect(connectedSSO.signOut).toHaveBeenCalledWith( expect.any(String), false, --- package-lock.json @@ -1911,9 +1911,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.6.25", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.6.25.tgz", - "integrity": "sha512-sDCVbOCwiYDrxRWa+3YX4fYTY7PmiL6Kqwl7fTgu5TV6S7sw72jCwu633z0DTAGPGsZEAATAZm+ZnElf/TaOWQ==", + "version": "0.6.27", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.6.27.tgz", + "integrity": "sha512-CjLbww3p5HABITQQxLiZhlBdWbYMnz3+nPBGvPN1/zETOFtP4AaNuRJ/FakGoQEzsYs+YYkpMBlRFPBS0sZQ/Q==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", --- package.json @@ -44,7 +44,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.10", "@walmart/allspark-home-mini-app": "0.1.4", "@walmart/allspark-me-mini-app": "0.0.13", - "@walmart/ask-sam-mini-app": "0.6.25", + "@walmart/ask-sam-mini-app": "0.6.27", "@walmart/config-components": "1.0.8", "@walmart/feedback-all-spark-miniapp": "0.0.29", "@walmart/functional-components": "^1.0.22", --- src/navigation/SideMenuContent.tsx @@ -62,8 +62,9 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< const onSignOut = () => { onDrawerClose(); - connectedSSO.signOut(activityName, false); + setTimeout(() => connectedSSO.signOut(activityName, false)); }; + const {updateAvailable, updateInfo} = useSelector( (state: any) => state.updateChecks, );
Ask Sam increment and side menu close fix (#184)
Ask Sam increment and side menu close fix (#184) * Ask Sam increment and side menu close fix * version fix * Test fix Co-authored-by: rlane1 <rlane1@walmart.com> Co-authored-by: Anthony Helms - awhelms <awhelms@wal-mart.com>
fc179244be102d087165bc63e09cbeafa6cf5aaf
--- packages/allspark-graphql-client/package.json @@ -1,5 +1,5 @@ { - "name": "allspark-graphql-client", + "name": "@walmart/allspark-graphql-client", "version": "0.0.1", "description": "> TODO: description", "license": "ISC",
chore: update graphql client package name
chore: update graphql client package name
e6109dbd50e2daa0def238ca9fb385ea1c545ebf
--- packages/allspark-foundation/src/Components/Onboarding/OnBoardingFlow.tsx @@ -0,0 +1,63 @@ +import React from 'react'; +import { View } from 'react-native'; +import { TeamOnboardingScreen } from '../../HubFeature/Onboarding/TeamOnboarding/Screens/TeamOnboardingScreen'; +import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigation'; +import { Icons } from '@walmart/gtp-shared-components/dist'; +import { useSelector } from 'react-redux'; +import { UserSelectors } from '@walmart/allspark-foundation/User'; +import { SiteSelectors } from '@walmart/allspark-foundation/Site'; +import { useGetAssociatePreferencesQuery } from '@walmart/me-at-walmart-athena-queries'; +import { isNil } from 'lodash'; + +export const OnBoardingFlow = () => { + const { data: siteData } = useSelector(SiteSelectors.getWorkingSite); + const site: number | undefined = siteData?.siteId; + const win: string | undefined = useSelector(UserSelectors.getWin); + const isPeopleLead: boolean = useSelector(UserSelectors.getIsUserPeopleLead); + const isTeamLead: boolean = useSelector(UserSelectors.getIsUserTeamLead); + const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried); + const { data } = useGetAssociatePreferencesQuery({ + variables: { + site: site as number, + win: win as string, + }, + fetchPolicy: 'network-only', + }); + const myTeamData = + data?.associatePreferences?.meAtWalmartPreferences + ?.managerExperiencePreferences?.myTeams; + const isUserOnboarded = + (isTeamLead || isSalaried || isPeopleLead) && isNil(myTeamData); + const teamOnboardingCardsData = [ + { + icon: <Icons.AssociateIcon size='medium' color='#0071DC' />, + title: 'Centralized information', + description: + 'Easily manage team attendance, assignments, and work progress', + }, + { + icon: <Icons.AssociateIcon size='medium' color='#0071DC' />, + title: 'Insights and recommended actions', + description: + 'Get smart guidance to help you keep your team and the shift on track', + }, + ]; + const handleNavigation = () => { + AllsparkNavigationClient.navigate('teamHub.teamSelection'); + }; + return ( + <> + {isUserOnboarded ? ( + <TeamOnboardingScreen + heading='A new way to manage your Team and Work' + description='Get started by selecting your teams' + teamOnboardingCardsInfo={teamOnboardingCardsData} + buttonText='Choose teams' + handlePressButton={handleNavigation} + /> + ) : ( + <View></View> + )} + </> + ); +};
Adding wrapper
Adding wrapper
30884eb84ee890580599230db0d71ba43383132b
--- package.json @@ -72,7 +72,7 @@ "@sharcoux/slider": "^6.1.1", "@shopify/flash-list": "1.6.4", "@terrylinla/react-native-sketch-canvas": "patch:@terrylinla/react-native-sketch-canvas@npm%3A0.8.0#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch", - "@walmart/allspark-authentication": "~6.4.7", + "@walmart/allspark-authentication": "~6.4.9", "@walmart/allspark-cope-key-listener": "0.0.18", "@walmart/allspark-foundation": "6.32.0", "@walmart/allspark-foundation-hub": "1.4.2", --- yarn.lock @@ -5871,9 +5871,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-authentication@npm:~6.4.7": - version: 6.4.8 - resolution: "@walmart/allspark-authentication@npm:6.4.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-authentication%2F-%2F%40walmart%2Fallspark-authentication-6.4.8.tgz" +"@walmart/allspark-authentication@npm:~6.4.9": + version: 6.4.9 + resolution: "@walmart/allspark-authentication@npm:6.4.9::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-authentication%2F-%2F%40walmart%2Fallspark-authentication-6.4.9.tgz" dependencies: "@walmart/allspark-utils": "npm:^6.5.4" lodash: "npm:~4.17.21" @@ -5883,7 +5883,7 @@ __metadata: react: "*" react-native: "*" react-native-app-auth: ">=6" - checksum: 10c0/8c65f0de5facabf025f135b0db26285a05bf818834d2b9621c32fa2dbc931ee9b4775ef9d99aa5c78cbcdaffc4e8a24979d495a61cac0b8615991aae3c66f392 + checksum: 10c0/54465578fbc8397e3a27ab4ae5a756515957156e964d4700869b3a77634370d8fd8f962bc4fa785ad8b06c87ded25dfdae771086cfe340a62cb5aca26efc4376 languageName: node linkType: hard @@ -7099,7 +7099,7 @@ __metadata: "@types/react": "npm:~18.2.45" "@types/react-native-vector-icons": "npm:6.4.18" "@types/react-test-renderer": "npm:^18.0.7" - "@walmart/allspark-authentication": "npm:~6.4.7" + "@walmart/allspark-authentication": "npm:~6.4.9" "@walmart/allspark-cope-key-listener": "npm:0.0.18" "@walmart/allspark-foundation": "npm:6.32.0" "@walmart/allspark-foundation-hub": "npm:1.4.2"
update allspark-auth t0 6.4.9
update allspark-auth t0 6.4.9
2965db8783a31ff136ca408adc621ebfab56d050
--- package.json @@ -451,7 +451,8 @@ "react-native-pdf": "6.7.5", "typescript": "~5.3.3", "uuid": "^3.3.2", - "wfm-allspark-data-library": "^6.0.0" + "wfm-allspark-data-library": "^6.0.0", + "react-server-dom-webpack": "~19.0.1" }, "config": { "commitizen": { --- yarn.lock @@ -21228,17 +21228,18 @@ __metadata: languageName: node linkType: hard -"react-server-dom-webpack@npm:19.0.0-rc-6230622a1a-20240610": - version: 19.0.0-rc-6230622a1a-20240610 - resolution: "react-server-dom-webpack@npm:19.0.0-rc-6230622a1a-20240610::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-server-dom-webpack%2F-%2Freact-server-dom-webpack-19.0.0-rc-6230622a1a-20240610.tgz" +"react-server-dom-webpack@npm:~19.0.1": + version: 19.0.1 + resolution: "react-server-dom-webpack@npm:19.0.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-server-dom-webpack%2F-%2Freact-server-dom-webpack-19.0.1.tgz" dependencies: acorn-loose: "npm:^8.3.0" neo-async: "npm:^2.6.1" + webpack-sources: "npm:^3.2.0" peerDependencies: - react: 19.0.0-rc-6230622a1a-20240610 - react-dom: 19.0.0-rc-6230622a1a-20240610 + react: ^19.0.1 + react-dom: ^19.0.1 webpack: ^5.59.0 - checksum: 10c0/e70b28b5783b79a017e2b652cec0bc1e45d87719a7f869bfbd22ff5402d1d331ded401cf3c978798a3f020757c3e6616a3317081d6d6fda2e1bd7c8d0c528a03 + checksum: 10c0/19833a18466e24f36857bdc85da64b32e5140e866215fbd4f59f915470446a2cb064ef4f594952ac480c13d8c4b54d1385e9b19de726c88c5580bbcde707b26a languageName: node linkType: hard @@ -24812,6 +24813,13 @@ __metadata: languageName: node linkType: hard +"webpack-sources@npm:^3.2.0": + version: 3.3.3 + resolution: "webpack-sources@npm:3.3.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fwebpack-sources%2F-%2Fwebpack-sources-3.3.3.tgz" + checksum: 10c0/ab732f6933b513ba4d505130418995ddef6df988421fccf3289e53583c6a39e205c4a0739cee98950964552d3006604912679c736031337fb4a9d78d8576ed40 + languageName: node + linkType: hard + "websocket-driver@npm:>=0.5.1": version: 0.7.4 resolution: "websocket-driver@npm:0.7.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fwebsocket-driver%2F-%2Fwebsocket-driver-0.7.4.tgz"
fix(ci): bumped react server dom packages
fix(ci): bumped react server dom packages
3279c7fb496c4aeb1f4a1754f4a549e6205de7fc
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/roster-mini-app", - "version": "1.1.2", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/roster-mini-app", - "version": "1.1.2", + "version": "1.1.3", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", @@ -67,7 +67,7 @@ "@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/wmconnect-mini-app": "1.1.3", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11836,9 +11836,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 }, @@ -41047,9 +41047,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/roster-mini-app", - "version": "1.1.2", + "version": "1.1.3", "private": false, "main": "dist/index.js", "files": [ @@ -90,7 +90,7 @@ "@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/wmconnect-mini-app": "1.1.3", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0",
Update version
Update version
9ee11da12c4a00ac3de683b74932d741c1de75b7
--- src/screens/MessagesScreen.tsx @@ -293,8 +293,8 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { ); } catch (e) { const err = e as Error; - logger.error('Error sending push notification', { - message: `Error sending push notification: ${err.message}`, + logger.error('PushNotifErr', { + message: `PushNotifErr: ${err.message}`, }); } } --- src/screens/MessagesScreen.tsx @@ -293,8 +293,8 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { ); } catch (e) { const err = e as Error; - logger.error('Error sending push notification', { - message: `Error sending push notification: ${err.message}`, + logger.error('PushNotifErr', { + message: `PushNotifErr: ${err.message}`, }); } }
shortening error message
shortening error message
3262989ef52138f1f796d10e42996d68cbfaae39
--- targets/US/package.json @@ -87,7 +87,7 @@ "@walmart/ask-sam-mini-app": "1.24.7", "@walmart/associate-listening-mini-app": "1.2.7", "@walmart/attendance-mini-app": "3.44.0", - "@walmart/avp-feature-app": "0.10.3", + "@walmart/avp-feature-app": "0.10.4", "@walmart/avp-shared-library": "0.10.1", "@walmart/backroom-mini-app": "1.5.15", "@walmart/calling-mini-app": "0.5.17", --- yarn.lock @@ -6035,9 +6035,9 @@ __metadata: languageName: node linkType: hard -"@walmart/avp-feature-app@npm:0.10.3": - version: 0.10.3 - resolution: "@walmart/avp-feature-app@npm:0.10.3" +"@walmart/avp-feature-app@npm:0.10.4": + version: 0.10.4 + resolution: "@walmart/avp-feature-app@npm:0.10.4" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -6046,7 +6046,7 @@ __metadata: react-native: ">=0.72.10" react-redux: ">=8.0.4" redux: ">=4.2.1" - checksum: 10c0/4dac620b1e3ac22a5759c16bc044ab91d7c64aa4882439b197fc8b0c02091bdd8069a527b3724fdd50c7195feb62ddc60abb1f8a4599facf62ef42a9bebf5964 + checksum: 10c0/800dc9f5858a90465039110cfd1fc0662e982fd68db04a2031869c4bdbf7566fe82db23467b6a51b7c5f9dc8b0521f5e58f3df4f47758e23680ec4acab20b006 languageName: node linkType: hard @@ -6992,7 +6992,7 @@ __metadata: "@walmart/ask-sam-mini-app": "npm:1.24.7" "@walmart/associate-listening-mini-app": "npm:1.2.7" "@walmart/attendance-mini-app": "npm:3.44.0" - "@walmart/avp-feature-app": "npm:0.10.3" + "@walmart/avp-feature-app": "npm:0.10.4" "@walmart/avp-shared-library": "npm:0.10.1" "@walmart/backroom-mini-app": "npm:1.5.15" "@walmart/calling-mini-app": "npm:0.5.17"
bumped avp
bumped avp
92372129d1597cfe314cfacd94aa51da85a8370d
--- package-lock.json @@ -44,7 +44,7 @@ "@walmart/core-widget-registry": "~1.2.2", "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.19.0", - "@walmart/exception-mini-app": "1.1.11", + "@walmart/exception-mini-app": "1.2.4", "@walmart/facilities-management-miniapp": "0.5.42", "@walmart/feedback-all-spark-miniapp": "0.9.10", "@walmart/financial-wellbeing-feature-app": "1.3.1", @@ -5065,7 +5065,9 @@ } }, "node_modules/@walmart/exception-mini-app": { - "version": "1.1.11", + "version": "1.2.4", + "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-1.2.4.tgz", + "integrity": "sha512-uxyacpEGANBI5Q/n66btF+N6d4Gd2Wh6kArOcna3SOmuH+W0GTTiwXGRbzx2E10ZWAvrHbko3wFvUoBCod5lKw==", "peerDependencies": { "@walmart/functional-components": ">=2.0.6", "@walmart/gtp-shared-components": "2.0.2", @@ -25068,7 +25070,9 @@ } }, "@walmart/exception-mini-app": { - "version": "1.1.11" + "version": "1.2.4", + "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-1.2.4.tgz", + "integrity": "sha512-uxyacpEGANBI5Q/n66btF+N6d4Gd2Wh6kArOcna3SOmuH+W0GTTiwXGRbzx2E10ZWAvrHbko3wFvUoBCod5lKw==" }, "@walmart/facilities-management-miniapp": { "version": "0.5.42" --- package.json @@ -86,7 +86,7 @@ "@walmart/core-widget-registry": "~1.2.2", "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.19.0", - "@walmart/exception-mini-app": "1.1.11", + "@walmart/exception-mini-app": "1.2.4", "@walmart/facilities-management-miniapp": "0.5.42", "@walmart/feedback-all-spark-miniapp": "0.9.10", "@walmart/financial-wellbeing-feature-app": "1.3.1",
exception-mini-app-1.2.4-develop
exception-mini-app-1.2.4-develop
8728a552bd67577cc5f4d32754992d22eb7a29e3
--- __tests__/harness/redux/mockState/mockUsers/peopleLead.ts @@ -1,2 +1,49 @@ -//TODO: Impersonate salaried user and hydrate data fields -export const peopleLeadUserData = {}; +export const peopleLeadUserData = { + userId: 'm0g0610', + domain: 'Store', + countryCode: 'US', + employeeType: 'H', + win: '219956138', + fullTimePartTime: undefined, + division: '1', + displayName: 'MICKY GREEN', + email: 'm0g0610.s00100@stores.us.wal-mart.com', + emailId: 'm0g0610.s00100@stores.us.wal-mart.com', + siteId: '100', + title: 'ACADEMY TRAINER', + regionNumber: '72', + jobCode: '["1@990@07310@"]', + secondaryJobCode: undefined, + homeSite: '100', + workingSite: '100', + streetAddress: undefined, + city: undefined, + state: 'AR', + postalCode: undefined, + hireDate: '2014-04-24', + jobDescription: undefined, + mdseDivNumber: '1', + geographicCategoryCode: 'FL', + employeeID: undefined, + userType: 'Associate', + dateOfBirth: '1986-01-21', + jobCategoryCode: '007310', + department: '990', + userInfoVersion: undefined, + fullyQualifiedUserID: 'M0G0610.S04686', + memberOf: [ + 'test-membership-one', + 'test-membership-two', + 'test-membership-three', + ], + preferredFirstName: 'Micky', + preferredLastName: 'Green', + preferredMiddleName: null, + preferredNameTitle: null, + preferredNameSocialSuffix: null, + preferredFullName: 'Micky Green', + clockStatus: '1', + teams: [], + employmentStatus: 'A', + upn: undefined, +}; --- __tests__/harness/redux/mockState/mockUsers/peopleLead.ts @@ -1,2 +1,49 @@ -//TODO: Impersonate salaried user and hydrate data fields -export const peopleLeadUserData = {}; +export const peopleLeadUserData = { + userId: 'm0g0610', + domain: 'Store', + countryCode: 'US', + employeeType: 'H', + win: '219956138', + fullTimePartTime: undefined, + division: '1', + displayName: 'MICKY GREEN', + email: 'm0g0610.s00100@stores.us.wal-mart.com', + emailId: 'm0g0610.s00100@stores.us.wal-mart.com', + siteId: '100', + title: 'ACADEMY TRAINER', + regionNumber: '72', + jobCode: '["1@990@07310@"]', + secondaryJobCode: undefined, + homeSite: '100', + workingSite: '100', + streetAddress: undefined, + city: undefined, + state: 'AR', + postalCode: undefined, + hireDate: '2014-04-24', + jobDescription: undefined, + mdseDivNumber: '1', + geographicCategoryCode: 'FL', + employeeID: undefined, + userType: 'Associate', + dateOfBirth: '1986-01-21', + jobCategoryCode: '007310', + department: '990', + userInfoVersion: undefined, + fullyQualifiedUserID: 'M0G0610.S04686', + memberOf: [ + 'test-membership-one', + 'test-membership-two', + 'test-membership-three', + ], + preferredFirstName: 'Micky', + preferredLastName: 'Green', + preferredMiddleName: null, + preferredNameTitle: null, + preferredNameSocialSuffix: null, + preferredFullName: 'Micky Green', + clockStatus: '1', + teams: [], + employmentStatus: 'A', + upn: undefined, +};
add mock people lead user
add mock people lead user
fe4cdc895847404a53a2d5e0ede3cddfd5a3476f
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/EditSavedTeamModal/EditSavedTeamsModal.tsx @@ -25,6 +25,7 @@ import { modalStyles } from './styles'; import { AllTeamsSections } from './types'; import { ModalErrorScreen } from '../../Components/ModalErrorScreen'; import ModalHeader from '../../Components/ModalHeader'; +import { filterTeamsBySearchInput } from '../../Utils/SearchInput'; export interface ModalProps { modal: { @@ -67,18 +68,19 @@ export const EditSavedTeamsModal = ({ modal: { closeModal } }: any) => { const [selectedTeams, setSelectedTeams] = useState<string[]>(teamPreferenceData); - const [sections, setSearchedsections] = + const [sections, setSearchedSections] = useState<AllTeamsSections[]>(allSiteTeamsSections); const handleSearchInput = useCallback( - (inp: string) => { - if (inp.length > 2) { - const searched = allSiteTeamsSections.filter((t: AllTeamsSections) => - t.title.toLowerCase().includes(inp.toLowerCase()) + (searchInput: string) => { + if (searchInput.length > 2) { + const searchApplied = filterTeamsBySearchInput( + allSiteTeamsSections, + searchInput ); - setSearchedsections(searched); + setSearchedSections(searchApplied); } else { - setSearchedsections(allSiteTeamsSections); + setSearchedSections(allSiteTeamsSections); } }, [allSiteTeamsSections] --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/UpdateTeamsModal/UpdateTeamsModal.tsx @@ -29,6 +29,7 @@ import { AlertBanner } from '../../../Shared/Components'; import { AllTeamsSections } from '../EditSavedTeamModal/types'; import { ModalErrorScreen } from '../../Components/ModalErrorScreen'; import ModalHeader from '../../Components/ModalHeader'; +import { filterTeamsBySearchInput } from '../../Utils/SearchInput'; export interface ModalProps { modal: { closeModal: () => void; @@ -68,7 +69,7 @@ export const UpdateTeamsModal = ({ modal: { closeModal } }: ModalProps) => { const shiftData = shiftPreferenceData.length === 0 ? ['A1'] : shiftPreferenceData; const [selectedShift, setSelectedShifts] = useState<string[]>(shiftData); - const [sections, setSearchedsections] = useState(allSiteTeamsSections); + const [sections, setSearchedSections] = useState(allSiteTeamsSections); const isShiftUpsertError = useSelector( ManagerExperienceSelectors.getIsShiftUpsertError ); @@ -100,14 +101,15 @@ export const UpdateTeamsModal = ({ modal: { closeModal } }: ModalProps) => { [selectedShift, setSelectedShifts] ); const handleSearchInput = useCallback( - (input: string) => { - if (input.length > 2) { - const searched = allSiteTeamsSections?.filter( - (t) => t?.title.toLowerCase().includes(input.toLowerCase()) + (searchInput: string) => { + if (searchInput.length > 2) { + const searchApplied = filterTeamsBySearchInput( + allSiteTeamsSections, + searchInput ); - setSearchedsections(searched); + setSearchedSections(searchApplied); } else { - setSearchedsections(allSiteTeamsSections); + setSearchedSections(allSiteTeamsSections); } }, [allSiteTeamsSections] --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Utils/SearchInput.tsx @@ -1,21 +1,23 @@ -import { SectionType } from '../../Store/TeamSelection'; +import { AllTeamsSections } from '../Screens/EditSavedTeamModal/types'; export const filterTeamsBySearchInput = ( - sections: SectionType[], + sections: AllTeamsSections[], searchInput: string ) => { - return sections - .map((section) => { - const filteredData = section.data.filter( - (team) => - team?.teamName?.toLowerCase().includes(searchInput.toLowerCase()) + return sections.reduce( + (accumulator: AllTeamsSections[], section: AllTeamsSections) => { + const filteredTeams = section.data.filter((team) => + team.teamName.toLowerCase().includes(searchInput.toLowerCase()) ); - if (filteredData.length > 0) { - return { - ...section, - data: filteredData, - }; + if (filteredTeams.length === 0) { + return accumulator; } - return null; - }) - .filter((section) => section !== null); + const filteredSection = { + ...section, + data: filteredTeams, + }; + accumulator.push(filteredSection); + return accumulator; + }, + [] as AllTeamsSections[] + ); }; --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/ccmFallbacks.ts @@ -23,7 +23,7 @@ export const CCMFallbacks = { showShiftFilterIcon: true, showShiftFilterGroup: true, showSearchIcon: true, - showMicrophoneIcon: true, + showMicrophoneIcon: false, showStarIcon: true, showLoadShiftsAlert: true, showLoadTeamsAlert: true,
feat: updated search input
feat: updated search input
1ade0d0af9328f0a5b7c8cb6819f58a93f75158d
--- packages/me-at-walmart-container/src/redux/config.ts @@ -49,49 +49,60 @@ export function* getAppConfigScope() { const [ country, divisionNbr, - siteId, state, + isDCUser, + + siteId, payType, + employmentStatus, + appVersion, appBuildNumber, - appId, deviceType, model, osVersion, - employmentStatus, - isDCUser, + + appId, ]: (string | undefined)[] = yield all([ select(SiteSelectors.getWorkingSiteCountry), select(SiteSelectors.getWorkingSiteDivisionCode), - select(SiteSelectors.getWorkingSiteSiteId), select(SiteSelectors.getWorkingSiteState), + select(SiteSelectors.getWorkingSiteIsDC), + + select(UserSelectors.getWorkingSite), select(UserSelectors.getEmployeeType), + select(UserSelectors.getEmploymentStatus), + select(DeviceSelectors.getAppVersion), select(DeviceSelectors.getBuildNumber), - call(getBundleId), select(DeviceSelectors.getType), select(DeviceSelectors.getModel), select(DeviceSelectors.getOs), - select(UserSelectors.getEmploymentStatus), - select(SiteSelectors.getWorkingSiteIsDC), + + call(getBundleId), ]); + const division = `${divisionNbr || 1}`; + return { appId, - scope: `${env.deployment}/${country || 'US'}/${divisionNbr || 1}`, + scope: `${env.deployment}/${country || 'US'}/${division}`, params: { - state, + division, + state: `${state}`, + isDCUser, + + siteId: `${siteId}`, payType: `${payType}`, + employmentStatus: `${employmentStatus}`, + appVersion, appBuildNumber, - os: Platform.OS, - osVersion, - model, - siteId: `${siteId}`, deviceType, - division: divisionNbr, - employmentStatus: `${employmentStatus}`, - isDCUser, + model, + osVersion, + + os: Platform.OS, }, }; }
fix: app config scope did not properly default in case of user and site failures
fix: app config scope did not properly default in case of user and site failures
a6fe984a3a65f007dd98264f1fe99a9dd4ebc635
--- package.json @@ -43,6 +43,7 @@ "@testing-library/react-hooks": "^8.0.1", "@testing-library/react-native": "^12.8.0", "eslint": "^8.19.0", + "expo": "^53.0.20", "graphql": "^16.8.1", "husky": "^9.1.7", "jest": "~29.7.0", --- yarn.lock @@ -7984,6 +7984,7 @@ __metadata: "@testing-library/react-hooks": "npm:^8.0.1" "@testing-library/react-native": "npm:^12.8.0" eslint: "npm:^8.19.0" + expo: "npm:^53.0.20" graphql: "npm:^16.8.1" husky: "npm:^9.1.7" jest: "npm:~29.7.0"
feat: update the container
feat: update the container
d6309fd1fe3047f60e2f16646832e9c6fe317919
--- package.json @@ -145,9 +145,9 @@ "@walmart/online-w4-mini-app": "0.10.3", "@walmart/pay-stub-miniapp": "0.26.7", "@walmart/payrollsolution_miniapp": "0.155.14", - "@walmart/persona-hub": "0.3.3", + "@walmart/persona-hub": "0.8.1", "@walmart/price-changes-mini-app": "1.16.17", - "@walmart/profile-feature-app": "2.8.1-UPV2MyWalmart.8", + "@walmart/profile-feature-app": "2.157.1-UPV2MyWalmart.0", "@walmart/react-native-barcode-builder": "^1.0.1", "@walmart/react-native-cookies": "1.0.1", "@walmart/react-native-encrypted-storage": "~1.1.3", --- yarn.lock @@ -8515,9 +8515,9 @@ __metadata: "@walmart/online-w4-mini-app": "npm:0.10.3" "@walmart/pay-stub-miniapp": "npm:0.26.7" "@walmart/payrollsolution_miniapp": "npm:0.155.14" - "@walmart/persona-hub": "npm:0.3.3" + "@walmart/persona-hub": "npm:0.8.1" "@walmart/price-changes-mini-app": "npm:1.16.17" - "@walmart/profile-feature-app": "npm:2.8.1-UPV2MyWalmart.8" + "@walmart/profile-feature-app": "npm:2.157.1-UPV2MyWalmart.0" "@walmart/react-native-barcode-builder": "npm:^1.0.1" "@walmart/react-native-cookies": "npm:1.0.1" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" @@ -8952,10 +8952,10 @@ __metadata: languageName: node linkType: hard -"@walmart/persona-hub@npm:0.3.3": - version: 0.3.3 - resolution: "@walmart/persona-hub@npm:0.3.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fpersona-hub%2F-%2F%40walmart%2Fpersona-hub-0.3.3.tgz" - checksum: 10c0/72e6e49dc0cd61d8d517633e513f383fbe2049a1d568b045c0c3a25f3057f59802da11ce27b64efa23fed378b7dd35ca24f07a6fa7d0faeb947aa558090235c2 +"@walmart/persona-hub@npm:0.8.1": + version: 0.8.1 + resolution: "@walmart/persona-hub@npm:0.8.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fpersona-hub%2F-%2F%40walmart%2Fpersona-hub-0.8.1.tgz" + checksum: 10c0/eb22a51ae269b5548058938b654774d6d20cc1e33f2acc9f00197bd0e47242b9a58da07d908f6512c9d4d131645c773fcf2c6b70ea100b5b6f3cb978c49ac308 languageName: node linkType: hard @@ -8985,39 +8985,56 @@ __metadata: languageName: node linkType: hard -"@walmart/profile-feature-app@npm:2.8.1-UPV2MyWalmart.8": - version: 2.8.1-UPV2MyWalmart.8 - resolution: "@walmart/profile-feature-app@npm:2.8.1-UPV2MyWalmart.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fprofile-feature-app%2F-%2F%40walmart%2Fprofile-feature-app-2.8.1-UPV2MyWalmart.8.tgz" +"@walmart/profile-feature-app@npm:2.157.1-UPV2MyWalmart.0": + version: 2.157.1-UPV2MyWalmart.0 + resolution: "@walmart/profile-feature-app@npm:2.157.1-UPV2MyWalmart.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fprofile-feature-app%2F-%2F%40walmart%2Fprofile-feature-app-2.157.1-UPV2MyWalmart.0.tgz" peerDependencies: - "@react-navigation/material-top-tabs": ">=6.0.0" - "@react-navigation/native": ">=6.0.8" - "@react-navigation/stack": ">=6.1.1" - "@shopify/flash-list": ">=1.6.3" + "@apollo/client": "*" + "@livingdesign/tokens-next": "*" + "@react-navigation/native": "*" + "@react-navigation/stack": "*" + "@reduxjs/toolkit": "*" "@walmart/allspark-foundation": "*" - "@walmart/allspark-foundation-hub": "*" + "@walmart/attendance-mini-app": "*" "@walmart/avp-feature-app": "*" - "@walmart/financial-wellbeing-feature-app": "*" + "@walmart/gtp-shared-components-3": "*" "@walmart/learning-mini-app": "*" - "@walmart/money-auth-shared-components": 2.0.32 - "@walmart/nudge-ui-platform": 0.70.0 - "@walmart/pay-stub-miniapp": "*" - "@walmart/payrollsolution_miniapp": "*" - date-fns: ^3.6.0 - expo-brightness: "*" - i18n-iso-countries: ">=7.5.0" - immer: 9.0.16 + "@walmart/persona-hub": "*" + expo: "*" + expo-clipboard: "*" + expo-image: "*" + expo-image-manipulator: "*" + expo-image-picker: "*" + i18next: "*" + jwt-decode: "*" lodash: "*" - react: ">=18.2.0" + luxon: "*" + moment: "*" + react: "*" react-hook-form: "*" - react-native: ">=0.72.10" - react-native-modal-datetime-picker: ^17.1.0 - react-native-new-snap-carousel: ^3.9.3 - react-native-pell-rich-editor: ^1.8.8 - react-native-reanimated-carousel: ^3.5.1 - react-redux: ">=8.0.4" - redux: ">=4.2.1" - wfm-allspark-data-library: ^3.3.0 - checksum: 10c0/bdc6becff578b5b9150508f994b42b0ae0158781f28fced9e22cb3b5e83044d346526868aa150360dee41fad123367f0a9fd610036d727c965c1c2cbe97098d5 + react-i18next: "*" + react-native: "*" + react-native-gesture-handler: "*" + react-native-modal: "*" + react-native-pager-view: "*" + react-native-safe-area-context: "*" + react-native-svg: "*" + react-redux: "*" + react-router-dom: "*" + redux: "*" + redux-saga: "*" + reselect: "*" + dependenciesMeta: + "@walmart/attendance-mini-app": + built: false + "@walmart/avp-feature-app": + built: false + "@walmart/learning-mini-app": + built: false + peerDependenciesMeta: + react-router-dom: + optional: true + checksum: 10c0/d82875d9ff2da83308a29fd09d8349aaab653a02bbecdb918b38579c3e35e6005fa77a5c84c3c19627d30ba6f04744722da68158b6fd384267e45fdb42383326 languageName: node linkType: hard
feat: unified profile v2/drop 35 (#5188)
feat: unified profile v2/drop 35 (#5188) Co-authored-by: Cal Wilson <Cal.Wilson@walmart.com> Co-authored-by: sridhar Parwathareddy <sridhar.parwathareddy0@walmart.com> Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> Co-authored-by: Rakshanda Reddy Parwath - r0p09gy <Rakshandareddy.Parwa@walmart.com> Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com> Co-authored-by: Hariharan Sundaram <121838+h0s0em0@users.noreply.gecgithub01.walmart.com> Co-authored-by: Hariharan Sundaram <hariharan.sundaram0@walmart.com> Co-authored-by: Vishesh Hiremath - v0h00hj <Vishesh.Hiremath@walmart.com> Co-authored-by: Pavan Lingamallu <pavan.lingamallu@walmart.com> Co-authored-by: SVC-ciad-prod1 <SVC-ciad-prod1@walmart.com> Co-authored-by: Talia Andrews - t0a07tn <Talia.Andrews@walmart.com> Co-authored-by: DAIVANSH JAIN - d0j0fly <DAIVANSH.JAIN@walmart.com> Co-authored-by: Rashad Ahmed - r0a03gb <rashad.ahmed@walmart.com> Co-authored-by: Sowmya Munaganuri <Sowmya.Munaganuri@walmart.com> Co-authored-by: Sowmya Munaganuri <Sowmya.Munaganuri+walmart@walmart.com> Co-authored-by: Jingyi Zhao - j0z09av <Jingyi.Zhao0@walmart.com> Co-authored-by: Dana McFarlane - d0m05kl <Dana.Mcfarlane@walmart.com> Co-authored-by: Yarien Mendez Suarez - y0m07dz <Yarien.Mendez.Suarez@walmart.com> Co-authored-by: Purnima Ratakonda - pratako <Purnima.Ratakonda@walmart.com> Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com> Co-authored-by: Pravesh Kumar - p0k04aj <PRAVESH.KUMAR@walmart.com> Co-authored-by: Rajkiran Vadla - r0v01p4 <Rajkiran.Vadla@walmart.com> Co-authored-by: Madhusudhanan Vridhagiri - m0v069r <Madhusudhanan.Vridha@walmart.com> Co-authored-by: Pavel Lyubich <pavel.lyubich@walmart.com> Co-authored-by: Nikhil Pullorammal <nikhil.pullorammal@walmart.com>
32b0b98759b18b8789eecd99a7a69f5ebb3abc6d
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/styles.ts @@ -74,13 +74,13 @@ export const teamSelectionListStyles = StyleSheet.create({ justifyContent: 'space-between', paddingTop: 16, paddingBottom: 16, - paddingLeft: 16, - paddingRight: 16, + marginLeft: 16, + marginRight: 16, + marginBottom: 24, borderBottomColor: colors.gray['20'], borderBottomWidth: 1, borderTopColor: colors.gray['20'], borderTopWidth: 1, - marginBottom: 24, }, selectTeamsText: { fontFamily: 'Bogle-Regular',
Adding ui update
Adding ui update
6991d7bd3f131e6011825574e281ee2b14ae8ebf
--- __tests__/screens/ChannelsScreen/__snapshots__/ChannelsScreenTest.tsx.snap @@ -47,6 +47,7 @@ Array [ } > <RCTScrollView + ItemSeparatorComponent={[Function]} ListEmptyComponent={[Function]} ListHeaderComponent={<ErrorComponent />} applyWindowCorrection={[Function]} @@ -139,6 +140,7 @@ Array [ "span": undefined, }, "props": Object { + "ItemSeparatorComponent": [Function], "ListEmptyComponent": [Function], "ListHeaderComponent": <ErrorComponent />, "contentContainerStyle": Object { --- __tests__/screens/MeganavScreen/__snapshots__/MeganavScreenTest.tsx.snap @@ -168,6 +168,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` } > <RCTScrollView + ItemSeparatorComponent={[Function]} ListEmptyComponent={[Function]} ListHeaderComponent={<ErrorComponent />} applyWindowCorrection={[Function]} @@ -260,6 +261,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` "span": undefined, }, "props": Object { + "ItemSeparatorComponent": [Function], "ListEmptyComponent": [Function], "ListHeaderComponent": <ErrorComponent />, "contentContainerStyle": Object { --- __tests__/screens/TabsScreen/__snapshots__/TabsScreenTest.tsx.snap @@ -224,12 +224,21 @@ exports[`TabScreenTest should render tabs screen with expected elements 1`] = ` </View> </View> <Text + accessibilityRole="text" style={ - Object { - "fontFamily": "Bogle-Regular", - "marginTop": 5, - } + Array [ + Object { + "color": "#2e2f32", + "fontFamily": "Bogle", + "fontSize": 14, + "fontStyle": "normal", + "fontWeight": "400", + "lineHeight": 20, + }, + Object {}, + ] } + testID="Body" > Do not disturb </Text> --- __tests__/screens/ViewTeamScreen/__snapshots__/ViewTeamScreenTest.tsx.snap @@ -3339,7 +3339,10 @@ exports[`ViewTeamScreen should render view team screen with expected elements 1` <View style={ Object { + "alignItems": "flex-start", "backgroundColor": "white", + "flex": 1, + "paddingLeft": 8, "paddingVertical": 16, } } --- __tests__/screens/ChannelsScreen/__snapshots__/ChannelsScreenTest.tsx.snap @@ -47,6 +47,7 @@ Array [ } > <RCTScrollView + ItemSeparatorComponent={[Function]} ListEmptyComponent={[Function]} ListHeaderComponent={<ErrorComponent />} applyWindowCorrection={[Function]} @@ -139,6 +140,7 @@ Array [ "span": undefined, }, "props": Object { + "ItemSeparatorComponent": [Function], "ListEmptyComponent": [Function], "ListHeaderComponent": <ErrorComponent />, "contentContainerStyle": Object { --- __tests__/screens/MeganavScreen/__snapshots__/MeganavScreenTest.tsx.snap @@ -168,6 +168,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` } > <RCTScrollView + ItemSeparatorComponent={[Function]} ListEmptyComponent={[Function]} ListHeaderComponent={<ErrorComponent />} applyWindowCorrection={[Function]} @@ -260,6 +261,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` "span": undefined, }, "props": Object { + "ItemSeparatorComponent": [Function], "ListEmptyComponent": [Function], "ListHeaderComponent": <ErrorComponent />, "contentContainerStyle": Object { --- __tests__/screens/TabsScreen/__snapshots__/TabsScreenTest.tsx.snap @@ -224,12 +224,21 @@ exports[`TabScreenTest should render tabs screen with expected elements 1`] = ` </View> </View> <Text + accessibilityRole="text" style={ - Object { - "fontFamily": "Bogle-Regular", - "marginTop": 5, - } + Array [ + Object { + "color": "#2e2f32", + "fontFamily": "Bogle", + "fontSize": 14, + "fontStyle": "normal", + "fontWeight": "400", + "lineHeight": 20, + }, + Object {}, + ] } + testID="Body" > Do not disturb </Text> --- __tests__/screens/ViewTeamScreen/__snapshots__/ViewTeamScreenTest.tsx.snap @@ -3339,7 +3339,10 @@ exports[`ViewTeamScreen should render view team screen with expected elements 1` <View style={ Object { + "alignItems": "flex-start", "backgroundColor": "white", + "flex": 1, + "paddingLeft": 8, "paddingVertical": 16, } }
updating snapshots
updating snapshots
93b0438cd92022a240dabc37201452cba64efcc8
--- ios/Podfile.lock @@ -1279,7 +1279,7 @@ PODS: - React-jsi (= 0.70.8) - React-logger (= 0.70.8) - React-perflogger (= 0.70.8) - - RNCAsyncStorage (1.12.1): + - RNCAsyncStorage (1.19.3): - React-Core - RNCPicker (2.4.8): - React-Core @@ -1480,7 +1480,7 @@ DEPENDENCIES: - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)" + - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCPicker (from `../node_modules/@react-native-picker/picker`)" - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)" - RNDeviceInfo (from `../node_modules/react-native-device-info`) @@ -1669,7 +1669,7 @@ EXTERNAL SOURCES: ReactCommon: :path: "../node_modules/react-native/ReactCommon" RNCAsyncStorage: - :path: "../node_modules/@react-native-community/async-storage" + :path: "../node_modules/@react-native-async-storage/async-storage" RNCPicker: :path: "../node_modules/@react-native-picker/picker" RNDateTimePicker: @@ -1814,7 +1814,7 @@ SPEC CHECKSUMS: React-RCTVibration: 19d21a3ed620352180800447771f68a101f196e9 React-runtimeexecutor: f795fd426264709901c09432c6ce072f8400147e ReactCommon: c440e7f15075e81eb29802521c58a1f38b1aa903 - RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398 + RNCAsyncStorage: c913ede1fa163a71cea118ed4670bbaaa4b511bb RNCPicker: 0bf8ef8f7800524f32d2bb2a8bcadd53eda0ecd1 RNDateTimePicker: 1dd15d7ed1ab7d999056bc77879a42920d139c12 RNDeviceInfo: 4701f0bf2a06b34654745053db0ce4cb0c53ada7 @@ -1850,4 +1850,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 19041a0b15ea56169be1b7de8fef76935dfda876 -COCOAPODS: 1.12.1 +COCOAPODS: 1.12.0 --- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.37.alpha.0.1", + "version": "2.0.39.alpha.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/texting-mini-app", - "version": "2.0.37.alpha.0.1", + "version": "2.0.39.alpha.0.1", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.8.4", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.37.alpha.0.1", + "version": "2.0.39.alpha.0.1", "private": false, "main": "dist/index.js", "files": [ --- ios/Podfile.lock @@ -1279,7 +1279,7 @@ PODS: - React-jsi (= 0.70.8) - React-logger (= 0.70.8) - React-perflogger (= 0.70.8) - - RNCAsyncStorage (1.12.1): + - RNCAsyncStorage (1.19.3): - React-Core - RNCPicker (2.4.8): - React-Core @@ -1480,7 +1480,7 @@ DEPENDENCIES: - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)" + - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCPicker (from `../node_modules/@react-native-picker/picker`)" - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)" - RNDeviceInfo (from `../node_modules/react-native-device-info`) @@ -1669,7 +1669,7 @@ EXTERNAL SOURCES: ReactCommon: :path: "../node_modules/react-native/ReactCommon" RNCAsyncStorage: - :path: "../node_modules/@react-native-community/async-storage" + :path: "../node_modules/@react-native-async-storage/async-storage" RNCPicker: :path: "../node_modules/@react-native-picker/picker" RNDateTimePicker: @@ -1814,7 +1814,7 @@ SPEC CHECKSUMS: React-RCTVibration: 19d21a3ed620352180800447771f68a101f196e9 React-runtimeexecutor: f795fd426264709901c09432c6ce072f8400147e ReactCommon: c440e7f15075e81eb29802521c58a1f38b1aa903 - RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398 + RNCAsyncStorage: c913ede1fa163a71cea118ed4670bbaaa4b511bb RNCPicker: 0bf8ef8f7800524f32d2bb2a8bcadd53eda0ecd1 RNDateTimePicker: 1dd15d7ed1ab7d999056bc77879a42920d139c12 RNDeviceInfo: 4701f0bf2a06b34654745053db0ce4cb0c53ada7 @@ -1850,4 +1850,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 19041a0b15ea56169be1b7de8fef76935dfda876 -COCOAPODS: 1.12.1 +COCOAPODS: 1.12.0 --- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.37.alpha.0.1", + "version": "2.0.39.alpha.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/texting-mini-app", - "version": "2.0.37.alpha.0.1", + "version": "2.0.39.alpha.0.1", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.8.4", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.37.alpha.0.1", + "version": "2.0.39.alpha.0.1", "private": false, "main": "dist/index.js", "files": [
update version
update version
b05817f6316f81d45bfead8ed194fb176a04fa87
--- core/__tests__/permissions/__snapshots__/PermissionsSagaTest.ts.snap @@ -1,13 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`getPermissionsUnset returns true if location permission is unset 1`] = ` -{ - "@@redux-saga/IO": true, - "combinator": false, - "payload": { - "args": [], - "selector": [Function], - }, - "type": "SELECT", -} -`;
update files
update files
bd6996c8e4521523b045178cb5d17837dafd81a0
--- src/containers/ChatInput/index.tsx @@ -137,7 +137,7 @@ export const ChatInput = (props: { }; const sendTextAndImagesDisabled = - (!text && !imageAssets.length) || uploadingResource || disabled; + (!text.trim() && !imageAssets.length) || uploadingResource || disabled; const onSendTextOrImage = () => { if (imageAssets.length) { @@ -275,7 +275,7 @@ export const ChatInput = (props: { <TextInput value={text} maxLength={250} - multiline={true} + multiline={false} blurOnSubmit={false} placeholder={t('messageScreen.chatInputPlaceholder') || ''} placeholderTextColor={colors.gray[100]} --- src/containers/ChatInput/index.tsx @@ -137,7 +137,7 @@ export const ChatInput = (props: { }; const sendTextAndImagesDisabled = - (!text && !imageAssets.length) || uploadingResource || disabled; + (!text.trim() && !imageAssets.length) || uploadingResource || disabled; const onSendTextOrImage = () => { if (imageAssets.length) { @@ -275,7 +275,7 @@ export const ChatInput = (props: { <TextInput value={text} maxLength={250} - multiline={true} + multiline={false} blurOnSubmit={false} placeholder={t('messageScreen.chatInputPlaceholder') || ''} placeholderTextColor={colors.gray[100]}
SMBLV-4279: Disable button on white space input
SMBLV-4279: Disable button on white space input And remove multiline on input
dc1f91a7229b32ea22ccb25408ba294f7110bcc5
--- package-lock.json @@ -41,7 +41,7 @@ "@walmart/amp-mini-app": "1.1.72", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", - "@walmart/attendance-mini-app": "3.10.1", + "@walmart/attendance-mini-app": "3.10.2", "@walmart/avp-feature-app": "0.0.35", "@walmart/avp-shared-library": "0.0.54", "@walmart/calling-mini-app": "0.1.10", @@ -8497,9 +8497,9 @@ } }, "node_modules/@walmart/attendance-mini-app": { - "version": "3.10.1", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.10.1.tgz", - "integrity": "sha512-ntT8i6z6JZWfbEi87epPT6QxRoH5Lo8daGmDP65NsF8qRYR/G3W3fD61MTg1Nc3vd2eGTa7CkUGX9eCUDbAiPw==", + "version": "3.10.2", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.10.2.tgz", + "integrity": "sha512-mHWJNBiqGiURo8zTapBQnCpzQX8gOqBnRetbO2aSZhucsbicEIDTCxZhrpgTMe2qjpJdYd7aHW6dxLxMMHcbxg==", "hasInstallScript": true, "dependencies": { "@walmart/wfm-ui": "^0.2.26", @@ -33227,9 +33227,9 @@ } }, "@walmart/attendance-mini-app": { - "version": "3.10.1", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.10.1.tgz", - "integrity": "sha512-ntT8i6z6JZWfbEi87epPT6QxRoH5Lo8daGmDP65NsF8qRYR/G3W3fD61MTg1Nc3vd2eGTa7CkUGX9eCUDbAiPw==", + "version": "3.10.2", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.10.2.tgz", + "integrity": "sha512-mHWJNBiqGiURo8zTapBQnCpzQX8gOqBnRetbO2aSZhucsbicEIDTCxZhrpgTMe2qjpJdYd7aHW6dxLxMMHcbxg==", "requires": { "@walmart/wfm-ui": "^0.2.26", "moment-timezone": "0.5.40", --- package.json @@ -82,7 +82,7 @@ "@walmart/amp-mini-app": "1.1.72", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", - "@walmart/attendance-mini-app": "3.10.1", + "@walmart/attendance-mini-app": "3.10.2", "@walmart/avp-feature-app": "0.0.35", "@walmart/avp-shared-library": "0.0.54", "@walmart/calling-mini-app": "0.1.10",
update attendance mini app to 3.10.2 with unit test bump
update attendance mini app to 3.10.2 with unit test bump
16a1e0b9125d48aee90b3d0088d4848ffc10da05
--- package-lock.json @@ -68,7 +68,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.13.2", - "@walmart/payrollsolution_miniapp": "0.134.2", + "@walmart/payrollsolution_miniapp": "0.134.3", "@walmart/price-changes-mini-app": "1.10.1", "@walmart/profile-feature-app": "0.334.0", "@walmart/react-native-encrypted-storage": "1.1.3", @@ -8858,9 +8858,9 @@ } }, "node_modules/@walmart/payrollsolution_miniapp": { - "version": "0.134.2", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.134.2.tgz", - "integrity": "sha512-kWGE2BmJxACBJRmANG4ZO4gQmH1A2I7uasnGdTLeAVLB1P/KaV1LwIZ7tzrguHOhkDFpiq0AnF0TElvCN3GGLw==", + "version": "0.134.3", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.134.3.tgz", + "integrity": "sha512-cLJ3UG8dEUZ3aK3HK/UxW3OPNctajdujSDOJ/7N25ektG9fScwPWJwFkkZ+2jfrF0atP2AW8PFGKfIrBtijPYw==", "hasInstallScript": true, "dependencies": { "crypto-js": "^3.3.0", @@ -34449,9 +34449,9 @@ } }, "@walmart/payrollsolution_miniapp": { - "version": "0.134.2", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.134.2.tgz", - "integrity": "sha512-kWGE2BmJxACBJRmANG4ZO4gQmH1A2I7uasnGdTLeAVLB1P/KaV1LwIZ7tzrguHOhkDFpiq0AnF0TElvCN3GGLw==", + "version": "0.134.3", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.134.3.tgz", + "integrity": "sha512-cLJ3UG8dEUZ3aK3HK/UxW3OPNctajdujSDOJ/7N25ektG9fScwPWJwFkkZ+2jfrF0atP2AW8PFGKfIrBtijPYw==", "requires": { "crypto-js": "^3.3.0", "expo-sharing": "~11.5.0" --- package.json @@ -109,7 +109,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.13.2", - "@walmart/payrollsolution_miniapp": "0.134.2", + "@walmart/payrollsolution_miniapp": "0.134.3", "@walmart/price-changes-mini-app": "1.10.1", "@walmart/profile-feature-app": "0.334.0", "@walmart/react-native-encrypted-storage": "1.1.3",
bump version
bump version
8b777abce002962542e3c5ad3de30d66d2ac1a4a
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/SelectionBannerFooterButtons.tsx @@ -14,21 +14,6 @@ export const SelectionBannerFooterButtons = ({ return ( <View style={styles.buttonContainer}> - {/* <View> - <Button - variant='tertiary' - size='small' - testID='cancel-button' - onPress={onCancelButtonPress} - accessibilityLabel={CancelButton} - accessibilityRole='button' - accessibilityActions={[ - { name: CancelButton, label: 'cancel button' }, - ]} - > - {t('teamSelection.cancel')} - </Button> - </View> */} <View style={styles.saveTeamButtons}> <Button variant='primary'
Update the team selection for removing the Cancel button
Update the team selection for removing the Cancel button
7a6a2f1d01f7b2e0fc2c4517ad22bfae98989d0b
--- core/__tests__/navigation/USHallway/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -613,6 +613,56 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects TranslatorScreens AskSamScreens ModFlexScreens + <Screen + component={[Function]} + name="DigitalLocksMiniApp" + options={ + { + "headerShown": false, + "headerTitle": "Digital Key", + } + } + /> + <Screen + component={[Function]} + name="digitalKey.OnboardingScreen" + options={ + { + "headerShown": false, + "headerTitle": "Onboarding", + } + } + /> + <Screen + component={[Function]} + name="digitalKey.PermissionsScreen" + options={ + { + "headerShown": false, + "headerTitle": "Permission Check", + } + } + /> + <Screen + component={[Function]} + name="digitalKey.AccessDeniedScreen" + options={ + { + "headerShown": false, + "headerTitle": "Access Denied", + } + } + /> + <Screen + component={[Function]} + name="digitalKey.UnlockDeviceScreen" + options={ + { + "headerShown": false, + "headerTitle": "Unlock Device", + } + } + /> <Screen component={[Function]} name="managerExperience.teamSelection" @@ -1243,6 +1293,56 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects TranslatorScreens AskSamScreens ModFlexScreens + <Screen + component={[Function]} + name="DigitalLocksMiniApp" + options={ + { + "headerShown": false, + "headerTitle": "Digital Key", + } + } + /> + <Screen + component={[Function]} + name="digitalKey.OnboardingScreen" + options={ + { + "headerShown": false, + "headerTitle": "Onboarding", + } + } + /> + <Screen + component={[Function]} + name="digitalKey.PermissionsScreen" + options={ + { + "headerShown": false, + "headerTitle": "Permission Check", + } + } + /> + <Screen + component={[Function]} + name="digitalKey.AccessDeniedScreen" + options={ + { + "headerShown": false, + "headerTitle": "Access Denied", + } + } + /> + <Screen + component={[Function]} + name="digitalKey.UnlockDeviceScreen" + options={ + { + "headerShown": false, + "headerTitle": "Unlock Device", + } + } + /> <Screen component={[Function]} name="managerExperience.teamSelection"
test snapshot update
test snapshot update
3a94391a3a786ca067448053ec0c207f84c08c82
--- packages/allspark-foundation/src/Components/ComponentContainers.tsx @@ -17,6 +17,10 @@ type ComponentLayoutConfig<P extends AnyObject> = Omit< 'config' >; +export type ComponentContainerConfig = { + private: boolean; +}; + /** * A component container manages a set of components with a given set of props. * @@ -45,6 +49,13 @@ export class ComponentContainer<Props extends AnyObject> { change: string; }>(['change']); + constructor(id: string, config?: ComponentContainerConfig) { + // If private, do not add to AllsparkComponentContainers + if (!config?.private) { + AllsparkComponentContainers.addContainer(id, this); + } + } + /** * @deprecated - Use the Component property to directly render a specific component. **/ @@ -87,8 +98,7 @@ export class ComponentContainer<Props extends AnyObject> { */ public addMultiple = (components: [string, ComponentType<Props>][]) => { components.forEach(([id, Component]) => { - this._components.set(id, Component); - this._eventManager.runEvent('change', id); + this.add(id, Component); }); }; @@ -126,8 +136,8 @@ export class ComponentContainer<Props extends AnyObject> { return null; } - // @ts-ignore - Typing is off here, need to figure out how to resolve - return <Component {...rest} />; + // Typing for props is off here. Need to work out casting. + return <Component {...(rest as any)} />; }; /** @@ -204,7 +214,7 @@ export class ComponentContainer<Props extends AnyObject> { */ class ComponentContainerManager { private _containers = {} as { - [key: string]: ComponentContainer<AnyObject>; + [key: string]: ComponentContainer<any>; }; private _addQueue = new DynamicQueue(); private _addMultipleQueue = new DynamicQueue(); @@ -244,6 +254,16 @@ class ComponentContainerManager { return this._containers[containerId]?.hasComponent(id); }; + /** + * Adds a ComponentContainer instance to the manager. For those created not by the manager + */ + public addContainer = <T extends AnyObject>( + containerId: string, + container: ComponentContainer<T> + ) => { + this._containers[containerId] = container; + }; + /** * Creates an ComponentContainer instance. * @@ -254,11 +274,19 @@ class ComponentContainerManager { * // Use Component * <MyContainer.Container {...props} /> */ - public create = <T extends AnyObject>(containerId: string) => { - const container = new ComponentContainer<T>(); - // @ts-ignore - this._containers[containerId] = container; - this._flushQueueForContainer(containerId.toString()); + public create = <T extends AnyObject>( + containerId: string, + config?: ComponentContainerConfig + ) => { + const container = new ComponentContainer<T>(containerId); + + // If private, do not add to manager + if (!config?.private) { + // @ts-ignore + this._containers[containerId] = container; + this._flushQueueForContainer(containerId.toString()); + } + return container; };
feat(component containers): add option to make container private. add name requirement
feat(component containers): add option to make container private. add name requirement
24846b59a98565524077d2c2827cb4c7cec37ed0
--- docs/docs/_category_.json --- docs/docs/allspark foundation/_category_.json --- docs/docs/allspark foundation/clients/_category_.json --- docs/docs/allspark foundation/clients/foundation-graphQL.md --- docs/docs/allspark foundation/clients/foundation-http.md --- docs/docs/allspark foundation/clients/foundation-navigation.md --- docs/docs/allspark foundation/clients/foundation-network.md --- docs/docs/allspark foundation/clients/foundation-notification.md --- docs/docs/allspark foundation/clients/foundation-permissions.md --- docs/docs/allspark foundation/clients/foundation-translation.md --- docs/docs/allspark foundation/components/_category_.json --- docs/docs/allspark foundation/components/foundation-component-containers.md --- docs/docs/allspark foundation/components/foundation-dynamic-components.md --- docs/docs/allspark foundation/components/foundation-shared-components.md --- docs/docs/allspark foundation/core/_category_.json --- docs/docs/allspark foundation/core/foundation-allspark-config.md --- docs/docs/allspark foundation/core/foundation-allspark-namespace.md --- docs/docs/allspark foundation/core/foundation-graphQL-code-gen.md --- docs/docs/allspark foundation/core/foundation-native-setup.md --- docs/docs/allspark foundation/core/foundation-onboarding.md --- docs/docs/allspark foundation/core/foundation-version-compatibility.md --- docs/docs/allspark foundation/core/foundation-whats-changing.md --- docs/docs/allspark foundation/core/images/add_new_app.png --- docs/docs/allspark foundation/core/images/add_new_app_err.png --- docs/docs/allspark foundation/core/images/add_new_app_fend.png --- docs/docs/allspark foundation/core/images/add_new_app_note.png --- docs/docs/allspark foundation/core/images/add_new_app_note1.png --- docs/docs/allspark foundation/core/images/add_new_app_submit.png --- docs/docs/allspark foundation/core/images/add_new_save.png --- docs/docs/allspark foundation/core/images/add_new_toaster.png --- docs/docs/allspark foundation/core/images/app_page0.png --- docs/docs/allspark foundation/core/images/app_page_meta.png --- docs/docs/allspark foundation/core/images/app_page_meta_edit.png --- docs/docs/allspark foundation/core/images/image-1.png --- docs/docs/allspark foundation/core/images/image-2.png --- docs/docs/allspark foundation/core/images/image-3.png --- docs/docs/allspark foundation/core/images/image-4.png --- docs/docs/allspark foundation/core/images/image-5.png --- docs/docs/allspark foundation/core/images/image.png --- docs/docs/allspark foundation/core/images/start_onb.png --- docs/docs/allspark foundation/core/images/timeline.png --- docs/docs/allspark foundation/foundation-container.md --- docs/docs/allspark foundation/foundation-environment.md --- docs/docs/allspark foundation/foundation-feature.md --- docs/docs/allspark foundation/foundation-featureRunner.md --- docs/docs/allspark foundation/foundation-intro.md --- docs/docs/allspark foundation/foundation-redux.md --- docs/docs/allspark foundation/foundation-scanner.md --- docs/docs/allspark foundation/migration guides/_category_.json --- docs/docs/allspark foundation/migration guides/foundation-migration-phase1.md --- docs/docs/allspark foundation/migration guides/foundation-migration-phase2.md --- docs/docs/allspark foundation/migration guides/foundation-migration-phase3.md --- docs/docs/allspark foundation/migration guides/foundation-migration-phase4.md --- docs/docs/allspark foundation/migration guides/foundation-migration-phase5.md --- docs/docs/allspark foundation/migration guides/foundation-migration-phase6.md --- docs/docs/allspark foundation/migration guides/foundation-migration.md --- docs/docs/allspark foundation/migration guides/images/image-6.png --- docs/docs/allspark foundation/migration guides/images/image-7.png --- docs/docs/allspark foundation/services/_category_.json --- docs/docs/allspark foundation/services/foundation-auth.md --- docs/docs/allspark foundation/services/foundation-clock.md --- docs/docs/allspark foundation/services/foundation-config.md --- docs/docs/allspark foundation/services/foundation-device.md --- docs/docs/allspark foundation/services/foundation-localStorage.md --- docs/docs/allspark foundation/services/foundation-logger.md --- docs/docs/allspark foundation/services/foundation-site.md --- docs/docs/allspark foundation/services/foundation-telemetry.md --- docs/docs/allspark foundation/services/foundation-user.md --- docs/docs/allspark images/_category_.json --- docs/docs/allspark images/allspark-images.md --- docs/docs/hub framework/_category_.json --- docs/docs/hub framework/examples-tutorials/_category_.json --- docs/docs/hub framework/examples-tutorials/tutorial-1.md --- docs/docs/hub framework/examples-tutorials/tutorials-2.md --- docs/docs/hub framework/examples-tutorials/tutorials-3.md --- docs/docs/hub framework/examples-tutorials/tutorials-4.md --- docs/docs/hub framework/feature-flags.md --- docs/docs/hub framework/hub-architecture.md --- docs/docs/hub framework/hub-associate-dashboard.md --- docs/docs/hub framework/hub-ccm-management.md --- docs/docs/hub framework/hub-concepts.md --- docs/docs/hub framework/hub-intro.md --- docs/docs/hub framework/hub-onboarding.md --- docs/docs/hub framework/hub-team-switcher.md --- docs/docs/hub framework/hub-telemetry.md --- docs/docs/hub framework/hub-widget.md --- docs/docs/icons/_category_.json --- docs/docs/icons/icons-core-owned.md --- docs/docs/icons/icons-gtp-owned.md --- docs/docs/icons/images/Android-stock-icons.png --- docs/docs/icons/images/AppLogo.png --- docs/docs/icons/images/ap-team-f1dbc5c1e0.webp --- docs/docs/icons/images/beta-ios.png --- docs/docs/icons/images/close-icon-5acb3f778e.webp --- docs/docs/icons/images/default-team-8b23f41d6a.webp --- docs/docs/icons/images/dev-ios.png --- docs/docs/icons/images/goal-icon-black-a0e7c43f5c.webp --- docs/docs/icons/images/ic_notification_small.png --- docs/docs/icons/images/icon-feature-payment-currency-2ee3c00eb6.webp --- docs/docs/icons/images/icon-first-day-0c62d9067a.webp --- docs/docs/icons/images/icon-wear-75891d28dc.webp --- docs/docs/icons/images/icons-1.png --- docs/docs/icons/images/icons-2.png --- docs/docs/icons/images/icons-3.png --- docs/docs/icons/images/icons-4.png --- docs/docs/icons/images/inbox-icon-b097d22db6.webp --- docs/docs/icons/images/map-b06f1d5ac3.webp --- docs/docs/icons/images/more-237144689e.webp --- docs/docs/icons/images/pallet-full-289a7a972a.webp --- docs/docs/icons/images/payment-icon-9dfe045850.webp --- docs/docs/icons/images/prod-ios.png --- docs/docs/icons/images/remaining-days-afb333036d.webp --- docs/docs/icons/images/spark.png --- docs/docs/icons/images/teflon-ios.png --- docs/docs/icons/images/vest-icon-46a089a713.webp --- docs/docs/sounds/_category_.json --- docs/docs/sounds/sounds-allspark-core.md
Update doc locations
Update doc locations
ffd72edcf239065b1e4b49bac304a46c68d5744f
--- package-lock.json @@ -42,7 +42,7 @@ "@walmart/ask-sam-mini-app": "1.15.4", "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.7.4", - "@walmart/config-components": "4.2.7", + "@walmart/config-components": "4.2.8", "@walmart/copilot-mini-app": "2.3.19", "@walmart/core-services": "~2.2.1", "@walmart/core-services-allspark": "~2.12.8", @@ -8094,9 +8094,9 @@ } }, "node_modules/@walmart/config-components": { - "version": "4.2.7", - "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.2.7.tgz", - "integrity": "sha512-2Hdsj2EVvzuLvcXhqYxvOM2Cg3bplF0HznT7JYd6QIS9tU7lwPumAKJTNECPRWcl5ZvyAG+UfMuNpkNGG8+Zsg==", + "version": "4.2.8", + "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.2.8.tgz", + "integrity": "sha512-2x/PnYOXtGx5I57CA3mitC9FsVahCyzsuqEnUFghIck1na7vGL3+5PGl4StvMIeq9th5Rxnx64AtMPTYHR9nIQ==", "dependencies": { "reduxsauce": "^1.2.1", "reselect": "^4.1.5" @@ -34214,9 +34214,9 @@ "integrity": "sha512-WGJN/dMzvEH8IDK6PLI2CDY3QHyOwA7jMGMxNMnN68RE7jFo7h4BsYttL1VRgmnwxt6UP/ZmlV4vRT7pC7RXUg==" }, "@walmart/config-components": { - "version": "4.2.7", - "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.2.7.tgz", - "integrity": "sha512-2Hdsj2EVvzuLvcXhqYxvOM2Cg3bplF0HznT7JYd6QIS9tU7lwPumAKJTNECPRWcl5ZvyAG+UfMuNpkNGG8+Zsg==", + "version": "4.2.8", + "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.2.8.tgz", + "integrity": "sha512-2x/PnYOXtGx5I57CA3mitC9FsVahCyzsuqEnUFghIck1na7vGL3+5PGl4StvMIeq9th5Rxnx64AtMPTYHR9nIQ==", "requires": { "reduxsauce": "^1.2.1", "reselect": "^4.1.5" --- package.json @@ -83,7 +83,7 @@ "@walmart/ask-sam-mini-app": "1.15.4", "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.7.4", - "@walmart/config-components": "4.2.7", + "@walmart/config-components": "4.2.8", "@walmart/copilot-mini-app": "2.3.19", "@walmart/core-services": "~2.2.1", "@walmart/core-services-allspark": "~2.12.8",
Gloabal Nav Fallback Snapshot Changed
Gloabal Nav Fallback Snapshot Changed
a71750ebd5acfee99ca70e0746b71fb791764bea
--- ios/AllSpark/Info.plist @@ -109,7 +109,7 @@ <string>remote-notification</string> </array> <key>UILaunchStoryboardName</key> - <string>LaunchScreen-Beta</string> + <string>LaunchScreen-Dev</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string>
Update ios/AllSpark/Info.plist
Update ios/AllSpark/Info.plist
5d8f062034e1342d1372a6f19f6f2ef447fb9f86
--- __tests__/managerExperience/components/FilterChipGroup.test.tsx @@ -30,9 +30,9 @@ describe('FilterChipGroup', () => { const clockedInCount = getByTestId('clockedInFilterChip'); const tardyCount = getByTestId('tardyFilterChip'); expect(chips.length).toEqual(3); - expect(absentCount).toBeTruthy(); - expect(clockedInCount).toBeTruthy(); - expect(tardyCount).toBeTruthy(); + expect(absentCount).toStrictEqual(12); + expect(clockedInCount).toStrictEqual(135); + expect(tardyCount).toStrictEqual(7); }); it('selects appropriate filter chip when pressed', () => { --- src/managerExperience/components/FilterChipGroup/FilterChipGroup.tsx @@ -1,6 +1,6 @@ import React, {useState} from 'react'; -import {FilterChipGroupProps, FilterType} from './types'; - +import {FilterChipGroupProps} from './types'; +import {FilterValue} from '../../../containers/RosterFilters'; import {filterChipGroupStyles as styles} from './styles'; import {ROSTER_I18N_NAMESPACE} from '../../../translations'; import {useTranslation} from 'react-i18next'; @@ -15,40 +15,40 @@ export const FilterChipGroup = ({ }: FilterChipGroupProps) => { const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); const [selectedFilter, setSelectedFilter] = useState< - FilterType | undefined + FilterValue | undefined >(); - const handleFilterPress = (filterType: FilterType) => { - if (selectedFilter === filterType) { + const handleFilterPress = (filterValue: FilterValue) => { + if (selectedFilter === filterValue) { setSelectedFilter(undefined); } else { - setSelectedFilter(filterType); + setSelectedFilter(filterValue); } - handleFilter(filterType); + handleFilter(filterValue); }; return ( <View style={styles.filterChipGroupContainer}> <FilterChip - isApplied={selectedFilter === FilterType.clockedIn} - id={FilterType.clockedIn} + isApplied={selectedFilter === FilterValue.clockedIn} + id={FilterValue.clockedIn} testID='clockedInFilterChip' label={`${clockedInCount} ${t('rosterScreen.filters.clockedIn')}`} - onPress={() => handleFilterPress(FilterType.clockedIn)} + onPress={() => handleFilterPress(FilterValue.clockedIn)} /> <FilterChip - id={FilterType.tardy} - isApplied={selectedFilter === FilterType.tardy} + id={FilterValue.tardy} + isApplied={selectedFilter === FilterValue.tardy} testID='tardyFilterChip' label={`${tardyCount} ${t('rosterScreen.filters.tardy')}`} - onPress={() => handleFilterPress(FilterType.tardy)} + onPress={() => handleFilterPress(FilterValue.tardy)} /> <FilterChip - id={FilterType.absent} - isApplied={selectedFilter === FilterType.absent} + id={FilterValue.absent} + isApplied={selectedFilter === FilterValue.absent} testID='absentFilterChip' label={`${absentCount} ${t('rosterScreen.filters.absent')}`} - onPress={() => handleFilterPress(FilterType.absent)} + onPress={() => handleFilterPress(FilterValue.absent)} /> </View> ); --- src/managerExperience/components/FilterChipGroup/types.ts @@ -1,12 +1,8 @@ -export enum FilterType { - clockedIn = 'clockedIn', - tardy = 'tardy', - absent = 'absent', -} +import {FilterValue} from '../../../containers/RosterFilters'; export interface FilterChipGroupProps { absentCount: number | null; clockedInCount: number | null; tardyCount: number | null; - handleFilter: (FilterType: FilterType) => void; + handleFilter: (filterValue: FilterValue) => void; }
feat: applied PR comments
feat: applied PR comments
4b72f26a4cf1971a994fa641fe381be6abb385a8
--- package-lock.json @@ -3032,9 +3032,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.10.21", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.10.21.tgz", - "integrity": "sha512-BV9PYMtq+xMLOs0fEaSqE+bgI75hA+GEqgRiCJEMepMOU3HufunPsLKj/JgjiL5CceMFNvxxVNfmsipCd7Wmzg==", + "version": "0.10.22", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.10.22.tgz", + "integrity": "sha512-22JJSU8iMew0PFrTb+XMahFipexcxqjkJKSS6EcPtZ0+v3HU9A8xWFe2doe27edhaRj3JN3KVv4xD//y4A5n5w==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", @@ -3125,9 +3125,9 @@ } }, "@walmart/push-to-talk-mini-app": { - "version": "0.2.4", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.2.4.tgz", - "integrity": "sha512-v8SuCsZNhQRjRPJxbTzSLplUkJpf3DDxj3NaKo39C9xoE9V/dLI9hIPXvyORgAE+RZnyfVv6ajTqxkoVuWpplQ==" + "version": "0.2.6", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.2.6.tgz", + "integrity": "sha512-rc1cY+B0SrickTaQF50aen6fGqSZUjxC/M7JL8BA/R486CFvYGMVh7m1OHgewlmQ+F2/5WcHr5cBZxiVhlMuAg==" }, "@walmart/react-native-collapsible": { "version": "1.5.3", --- package.json @@ -50,7 +50,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.24", "@walmart/allspark-home-mini-app": "0.1.10", "@walmart/allspark-me-mini-app": "0.0.22", - "@walmart/ask-sam-mini-app": "0.10.21", + "@walmart/ask-sam-mini-app": "0.10.22", "@walmart/config-components": "1.0.12", "@walmart/feedback-all-spark-miniapp": "0.0.37", "@walmart/functional-components": "1.0.23", @@ -58,7 +58,7 @@ "@walmart/impersonation-mini-app": "1.0.12", "@walmart/inbox-mini-app": "0.0.53", "@walmart/moment-walmart": "1.0.4", - "@walmart/push-to-talk-mini-app": "0.2.4", + "@walmart/push-to-talk-mini-app": "0.2.6", "@walmart/react-native-env": "^0.1.0", "@walmart/react-native-logger": "^1.22.0", "@walmart/react-native-shared-navigation": "^0.3.0",
version update for AskSam and PTT dependencies (#356)
version update for AskSam and PTT dependencies (#356)
0942206266a3bfca82209f743892406e7c8b362e
--- .looper-native-common.yml @@ -15,6 +15,7 @@ envs: XC_TARGET: 'AllSpark' TARGET_XCODE: "11.5" GITHUB_TOKEN: ENC[CGMhL3M/PKGSd9JmVpyMSAxGD/ZNRzJbf6v6/VuJBIWoj226WrPkQe5i7DIFJjTR] + NO_PROXY: "*.walmart.com, chromium.googlesource.com, apps.betacrash.com" #BetaCrash BETACRASH_TOKEN: ENC[iHTVp1f+Zsd1SDXzxbQNqv82W/567khXD0AuBEt5dfrbR1EdM15ThlelIUrJkH6V]
Added betacrash to looper yml file.
Added betacrash to looper yml file.
c987f46d0a1cd7f635e5fede930a6c6e43f61753
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 9 + versionCode 10 versionName "1.0.1" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>9</string> + <string>10</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>9</string> + <string>10</string> </dict> </plist>
Incrementing build number
Incrementing build number
26f9bc2c334643909be4ca369404d890c59e9b17
--- package-lock.json @@ -3283,9 +3283,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.30.8", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.30.8.tgz", - "integrity": "sha512-LoHF4ijLrggmKHNzamdySGf/pz93Ejp94x3WMuFh53c2bQ2IU4QwVBppX8/YnEG1AOxZY8qrna5YDBh+6OYkSg==", + "version": "0.30.9", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.30.9.tgz", + "integrity": "sha512-yiLrQ91DdPnCYLEgcJ0V7GBUjt+GBnGd7PwmcKBDc+Fk3L4rj1gB8J2o8MAY29Rww9e8BcFeYS3FsLJMwj2/nw==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", --- package.json @@ -67,7 +67,7 @@ "@walmart/allspark-home-mini-app": "0.4.21", "@walmart/metrics-mini-app": "0.0.27", "@walmart/allspark-me-mini-app": "0.1.0", - "@walmart/ask-sam-mini-app": "0.30.8", + "@walmart/ask-sam-mini-app": "0.30.9", "@walmart/config-components": "^1.0.26", "@walmart/counts-component-miniapp": "0.0.14", "@walmart/exception-mini-app": "0.28.0",
Incrementing ask sam
Incrementing ask sam
bc45c871faa006e9fe9397043212673f9f6e92e6
--- docs/CHANGELOG.md @@ -1,3 +1,13 @@ +# [3.1.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v3.0.2...v3.1.0) (2025-07-22) + + +### Features + +* **ui:** reverting version ([ef7dc81](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/ef7dc816e1c1439a4cf5f30320485a7eaf80364d)) +* **ui:** update myteam develop with main ([f4be891](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/f4be8918937db0b1036c23c4a0480f7238946a81)) +* **ui:** updating roster wmconnect and myteam version ([712353e](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/712353ea266d9fe947466aed4359ae4d13f336f3)) +* **ui:** updating roster wmconnect for drop 32 ([fc4c7f5](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/fc4c7f560737a844716b214a273003b8f9194e56)) + ## [3.0.2](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v3.0.1...v3.0.2) (2025-07-01) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "3.0.2", + "version": "3.1.0", "main": "dist/index.js", "files": [ "dist",
chore(release): 3.1.0 [skip ci]
chore(release): 3.1.0 [skip ci] # [3.1.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v3.0.2...v3.1.0) (2025-07-22) ### Features * **ui:** reverting version ([ef7dc81](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/ef7dc816e1c1439a4cf5f30320485a7eaf80364d)) * **ui:** update myteam develop with main ([f4be891](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/f4be8918937db0b1036c23c4a0480f7238946a81)) * **ui:** updating roster wmconnect and myteam version ([712353e](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/712353ea266d9fe947466aed4359ae4d13f336f3)) * **ui:** updating roster wmconnect for drop 32 ([fc4c7f5](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/fc4c7f560737a844716b214a273003b8f9194e56))
5dba29c6fd680836aa30be9a6220f058ae8867fb
--- packages/allspark-foundation/__tests__/Hub/TeamOnboardingCards.test.tsx @@ -4,7 +4,7 @@ import { TeamOnboardingCards } from '../../src/Components/TeamOnboarding/Compone import { teamOnboardingCardsMockData } from '../../__mocks__/data/teamOnboardingCards'; const props = { - cards: { ...teamOnboardingCardsMockData }, + cards: [...teamOnboardingCardsMockData], }; describe('TeamOnboardingCards', () => { --- packages/allspark-foundation/__tests__/Hub/__snapshots__/TeamOnboardingCard.test.tsx.snap @@ -29,7 +29,7 @@ exports[`TeamOnboardingCard renders card correctly with given props 1`] = ` }, ] } - testID="SpotIcon" + testID="onboarding-card-icon" > <Image accessibilityRole="image" @@ -51,7 +51,7 @@ exports[`TeamOnboardingCard renders card correctly with given props 1`] = ` }, ] } - testID="onboarding-card-icon" + testID="AssociateIcon" /> </View> <View @@ -73,7 +73,7 @@ exports[`TeamOnboardingCard renders card correctly with given props 1`] = ` } } > - Insights and recommended actions + Centralized information </Text> <Text style={ @@ -84,7 +84,7 @@ exports[`TeamOnboardingCard renders card correctly with given props 1`] = ` } } > - Get smart guidance to help you keep your team and the shift on track + Easily manage team attendance, assignments, and work progress </Text> </View> </View> --- packages/allspark-foundation/__tests__/Hub/__snapshots__/TeamOnboardingCards.test.tsx.snap @@ -37,7 +37,7 @@ exports[`TeamOnboardingCards should render snapshot 1`] = ` }, ] } - testID="SpotIcon" + testID="onboarding-card-icon" > <Image accessibilityRole="image" @@ -59,7 +59,7 @@ exports[`TeamOnboardingCards should render snapshot 1`] = ` }, ] } - testID="onboarding-card-icon" + testID="AssociateIcon" /> </View> <View @@ -124,7 +124,7 @@ exports[`TeamOnboardingCards should render snapshot 1`] = ` }, ] } - testID="SpotIcon" + testID="onboarding-card-icon" > <Image accessibilityRole="image" @@ -146,7 +146,7 @@ exports[`TeamOnboardingCards should render snapshot 1`] = ` }, ] } - testID="onboarding-card-icon" + testID="AssociateIcon" /> </View> <View --- packages/allspark-foundation/__tests__/Hub/__snapshots__/TeamOnboardingScreen.test.tsx.snap @@ -21,7 +21,6 @@ exports[`TeamOnboardingScreen renders screen correctly 1`] = ` "marginTop": 24, } } - testID="textingDisabledScreenContainer" > <View style={ @@ -109,7 +108,7 @@ exports[`TeamOnboardingScreen renders screen correctly 1`] = ` }, ] } - testID="SpotIcon" + testID="onboarding-card-icon" > <Image accessibilityRole="image" @@ -196,7 +195,7 @@ exports[`TeamOnboardingScreen renders screen correctly 1`] = ` }, ] } - testID="SpotIcon" + testID="onboarding-card-icon" > <Image accessibilityRole="image" --- packages/allspark-foundation/src/Components/TeamOnboarding/Component/TeamOnboardingCard.tsx @@ -16,7 +16,9 @@ export const TeamOnboardingCard = ({ }: TeamOnboardingCardInfo) => { return ( <View style={styles.container}> - <SpotIcon UNSAFE_style={styles.icon}>{icon}</SpotIcon> + <SpotIcon UNSAFE_style={styles.icon} testID='onboarding-card-icon'> + {icon} + </SpotIcon> <View style={styles.content}> <Text style={styles.title}>{title}</Text> <Text style={styles.description}>{description}</Text>
feat: updated failing tests
feat: updated failing tests
3eb76f40edd0b6c93c1bd6c9e921dbdf5e1cdbfb
--- package-lock.json @@ -8074,9 +8074,9 @@ } }, "node_modules/@walmart/compass-sdk-rn": { - "version": "4.2.0", - "resolved": "https://npme.walmart.com/@walmart/compass-sdk-rn/-/compass-sdk-rn-4.2.0.tgz", - "integrity": "sha512-Jry5LjJzfOEK+byFR2MDl04P8JDJi/Vh4OKTz+w5VU3s4jyy6xBgDFb5016sqoZmRtZ/NTn7v6O7eQNgby38Vg==", + "version": "5.5.0", + "resolved": "https://npme.walmart.com/@walmart/compass-sdk-rn/-/compass-sdk-rn-5.5.0.tgz", + "integrity": "sha512-T1QnXeSvzmo8jCIVOFN5Ms7C12b12sPU0eiOnu+0SomElhl/izPhgjdAIwVcq36MfwRJwrtag4aHw5e4O94s5g==", "license": "MIT", "peerDependencies": { "react": "*", @@ -8282,12 +8282,12 @@ } }, "node_modules/@walmart/facilities-management-miniapp": { - "version": "0.6.67", - "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.6.67.tgz", - "integrity": "sha512-vAn11SgL6thiZdZLdAe1EvJ+gYGSDJa2HBrLPXlTFQgUHtf2+fnnj4SG9bX8mg9/Ax3Hg7IQaiKle3GsdgN2ww==", + "version": "0.6.76", + "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.6.76.tgz", + "integrity": "sha512-n8nLexIpfBxvbp6NocwpBnQa9LgyRZ0lfla8SUy2lqDHV1G5L6D98lqRx+ZVJ8ID8uMrjqdjbkuRbEpHeX5NfA==", "hasInstallScript": true, "peerDependencies": { - "@react-native-community/cameraroll": "^4.1.2", + "@react-native-camera-roll/camera-roll": "5.6.0", "@react-native-community/datetimepicker": "^5.1.0", "@react-native-firebase/analytics": "15.1.1", "@react-native-firebase/app": "15.1.1", @@ -8304,7 +8304,7 @@ "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/core-services": "~2.1.0", "@walmart/core-utils": "~1.3.0", - "@walmart/gtp-shared-components": "2.0.4", + "@walmart/gtp-shared-components": "2.0.10", "@walmart/impersonation-mini-app": "1.2.0", "@walmart/moment-walmart": "1.0.4", "@walmart/react-native-encrypted-storage": "1.1.3", @@ -33605,9 +33605,9 @@ } }, "@walmart/compass-sdk-rn": { - "version": "4.2.0", - "resolved": "https://npme.walmart.com/@walmart/compass-sdk-rn/-/compass-sdk-rn-4.2.0.tgz", - "integrity": "sha512-Jry5LjJzfOEK+byFR2MDl04P8JDJi/Vh4OKTz+w5VU3s4jyy6xBgDFb5016sqoZmRtZ/NTn7v6O7eQNgby38Vg==" + "version": "5.5.0", + "resolved": "https://npme.walmart.com/@walmart/compass-sdk-rn/-/compass-sdk-rn-5.5.0.tgz", + "integrity": "sha512-T1QnXeSvzmo8jCIVOFN5Ms7C12b12sPU0eiOnu+0SomElhl/izPhgjdAIwVcq36MfwRJwrtag4aHw5e4O94s5g==" }, "@walmart/config-components": { "version": "4.2.5", --- src/hooks/useCanImpersonate.ts @@ -2,7 +2,10 @@ import {useSelector} from 'react-redux'; import {User, UserSelectors} from '@walmart/redux-store'; import {getCoreAppConfigValue} from '../redux/SharedSelectors'; -const getImpersonatorGroups = getCoreAppConfigValue('impersonatorGroups', []); +const getImpersonatorGroups = getCoreAppConfigValue('impersonatorGroups', [ + 'allspark-impersonation-test', + 'allspark-impersonation-prod', +]); export const useCanImpersonate = () => { const user: User | null = useSelector(UserSelectors.getOriginalUser);
chore: update lock file and impersonator group defaults
chore: update lock file and impersonator group defaults
5570e70ecb74e8874ceb8a2cc233f02444ce72ba
--- src/channels/components/ChannelRow.tsx @@ -61,6 +61,11 @@ const styles = StyleSheet.create({ marginTop: 8, marginRight: 8, }, + timestamp: { + flex: 1, + justifyContent: 'flex-start', + marginRight: -16, + }, }); export type ChannelRowProps = { @@ -145,7 +150,13 @@ export const ChannelRow = (props: ChannelRowProps) => { )} </View> } - trailing={<Caption>{lastMessage?.timestamp}</Caption>}> + trailing={ + <View style={styles.timestamp}> + <Caption UNSAFE_style={{lineHeight: 13}}> + {lastMessage?.timestamp} + </Caption> + </View> + }> <Body weight={unread ? '700' : '400'} numberOfLines={1}> {lastMessage?.message} </Body> --- src/channels/components/ChannelRow.tsx @@ -61,6 +61,11 @@ const styles = StyleSheet.create({ marginTop: 8, marginRight: 8, }, + timestamp: { + flex: 1, + justifyContent: 'flex-start', + marginRight: -16, + }, }); export type ChannelRowProps = { @@ -145,7 +150,13 @@ export const ChannelRow = (props: ChannelRowProps) => { )} </View> } - trailing={<Caption>{lastMessage?.timestamp}</Caption>}> + trailing={ + <View style={styles.timestamp}> + <Caption UNSAFE_style={{lineHeight: 13}}> + {lastMessage?.timestamp} + </Caption> + </View> + }> <Body weight={unread ? '700' : '400'} numberOfLines={1}> {lastMessage?.message} </Body>
Added channel screen timestamp alignment changes
Added channel screen timestamp alignment changes
f4a4f25813b5554d86a8e53cc45d551e320c4dbe
--- package-lock.json @@ -4260,9 +4260,9 @@ "integrity": "sha512-7nXe02E/AOFtT1u6/tVerIskwWvSoJcMgYN2DNH7vMgbb0YIFOsqwzX+nbRh/AcaZhC7YX5H2irVCc6/5/HjJw==" }, "@walmart/metrics-mini-app": { - "version": "0.4.14", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.4.14.tgz", - "integrity": "sha512-coNlVhH5hMBbA7OCU663IRb/dXPp42V8dy04vHaaWTBWGXdno11jw2voiIq2qLYRWl6VaJ0j6kiRW929GpZNYQ==", + "version": "0.5.1", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.5.1.tgz", + "integrity": "sha512-OmTIEe5xQUs5ECdHynK1AdXNgeGQ9bWWx/vwKY+xUzIu/NGH1QJunEt84ijXGulaC5zZpAiyBT5243z73jhcWA==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "^1.1.2", --- package.json @@ -86,7 +86,7 @@ "@walmart/inbox-mini-app": "0.18.0", "@walmart/iteminfo-mini-app": "2.0.16", "@walmart/manager-approvals-miniapp": "0.0.58", - "@walmart/metrics-mini-app": "0.4.15", + "@walmart/metrics-mini-app": "0.5.1", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.39", "@walmart/react-native-env": "^0.2.0", --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -48,6 +48,13 @@ import { } from '../NavigationConstants'; import {MainTabsNav} from './MainTabsNav'; import {withClockOutGuard} from '../ClockOutGuard'; +import { + SalesItemizedScreen, + PresubItemizedScreen, + MetricsPreSubInfoModalScreen, + MetricsFtprInfoModalScreen, + MetricsFtprTabNavigation, +} from '@walmart/metrics-mini-app/dist/screens'; const DEFAULT_INACTIVITY_TIME = 300000; const DEFAULT_BACKGROUND_IDLE_TIME = 14400000; @@ -293,6 +300,41 @@ export const MainStackNav = () => { options={{headerShown: false}} /> {WorkMiniAppScreens} + <MainStack.Screen + name='metricsSalesDrilldown' + options={{ + title: translate('navigation.salesDrilldownTitle'), + }}> + {() => <SalesItemizedScreen />} + </MainStack.Screen> + <MainStack.Screen + name='metricsPreSubDrilldown' + options={{ + title: translate('navigation.presubDrilldownTitle'), + }}> + {() => <PresubItemizedScreen />} + </MainStack.Screen> + <MainStack.Screen + component={MetricsPreSubInfoModalScreen} + name='metricsPreSubInfoModal' + options={{ + title: translate('navigation.presubInfoModalTitle'), + }} + /> + <MainStack.Screen + component={MetricsFtprInfoModalScreen} + name='metricsFtprInfoModal' + options={{ + title: translate('navigation.ftprInfoModalTitle'), + }} + /> + <MainStack.Screen + name='metricsFTPDrilldown' + options={{ + title: translate('navigation.ftprDrilldownTitle'), + }}> + {() => <MetricsFtprTabNavigation />} + </MainStack.Screen> </MainStack.Navigator> {/* PTT Notifications Container */} --- src/translations/en-US.ts @@ -31,6 +31,11 @@ export const enUS = { featureRestrictions: 'Feature restrictions', whatsNew: "What's New", signInFailed: 'Sign in failed', + presubDrilldownTitle: 'Pre-substitution', + ftprDrilldownTitle: 'First Time Pick Percentage', + salesDrilldownTitle: 'Sales', + presubInfoModalTitle: 'What is Pre-substitution?', + ftprInfoModalTitle: 'What is First Time Pick Percentage?', }, updates: { timeToUpdateApp: "It's time to update your Me@Walmart beta app!", --- src/translations/es-MX.ts @@ -31,6 +31,11 @@ export const esMX = { featureRestrictions: 'Restricciones', whatsNew: 'Novedades en la app', signInFailed: 'Error al iniciar sesión', + presubDrilldownTitle: 'Pre-Sustitución', + ftprDrilldownTitle: 'Pick de Primera Vez', + salesDrilldownTitle: 'Ventas', + presubInfoModalTitle: '¿Qué es Pre-sustitución?', + ftprInfoModalTitle: '¿Qué es Pick de Primera Vez?', }, updates: { timeToUpdateApp: 'Actualiza Me@Walmart beta app!',
addind drilldown screens and translations for titles
addind drilldown screens and translations for titles
fe19fe8372c8ca150b7b4143ca394c5a7987c9b3
--- lerna.json @@ -1,5 +1,5 @@ { - "version": "6.0.14", + "version": "6.1.0", "npmClient": "npm", "changelogPreset": "angular", "command": { --- package-lock.json @@ -8965,25 +8965,6 @@ "react-native": "*" } }, - "node_modules/@react-navigation/bottom-tabs": { - "version": "6.5.11", - "resolved": "https://npme.walmart.com/@react-navigation/bottom-tabs/-/bottom-tabs-6.5.11.tgz", - "integrity": "sha512-CBN/NOdxnMvmjw+AJQI1kltOYaClTZmGec5pQ3ZNTPX86ytbIOylDIITKMfTgHZcIEFQDymx1SHeS++PIL3Szw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@react-navigation/elements": "^1.3.21", - "color": "^4.2.3", - "warn-once": "^0.1.0" - }, - "peerDependencies": { - "@react-navigation/native": "^6.0.0", - "react": "*", - "react-native": "*", - "react-native-safe-area-context": ">= 3.0.0", - "react-native-screens": ">= 3.0.0" - } - }, "node_modules/@react-navigation/core": { "version": "6.4.10", "resolved": "https://npme.walmart.com/@react-navigation/core/-/core-6.4.10.tgz", @@ -32953,7 +32934,6 @@ "@react-native-community/netinfo": "^9.4.1", "@react-native-firebase/analytics": "~17.4.2", "@react-native-firebase/app": "~17.4.2", - "@react-navigation/bottom-tabs": "^6.5.11", "@react-navigation/drawer": "^6.6.4", "@react-navigation/native": "^6.1.6", "@react-navigation/stack": "^6.3.17", @@ -32983,7 +32963,6 @@ "@react-native-community/netinfo": "9.x", "@react-native-firebase/analytics": "17.x", "@react-native-firebase/app": "17.x", - "@react-navigation/bottom-tabs": "6.x", "@react-navigation/drawer": "6.x", "@react-navigation/native": "6.x", "@react-navigation/stack": "6.x",
chore: package lock update and minor version bump
chore: package lock update and minor version bump
2de73591d3e3f4669717fea0f38c48027012d865
--- package-lock.json @@ -66,7 +66,7 @@ "@walmart/metrics-mini-app": "0.15.14", "@walmart/mod-flex-mini-app": "1.11.6", "@walmart/moment-walmart": "1.0.4", - "@walmart/money-auth-shared-components": "0.0.10", + "@walmart/money-auth-shared-components": "0.0.12", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.10.15", "@walmart/payrollsolution_miniapp": "0.131.15", @@ -8820,14 +8820,10 @@ } }, "node_modules/@walmart/money-auth-shared-components": { - "version": "0.0.10", - "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.0.10.tgz", - "integrity": "sha512-BtEihPouPzT7GMbxAAp+cCfF/E3NDOqfiQra/ZwioEVDTzf73LWWoT2RPYdezfHr3DmH9AmnYG0Zk9djwyQPRw==", + "version": "0.0.12", + "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.0.12.tgz", + "integrity": "sha512-Y9K7SnrS/c0bERFFguXMFJ2NsMDXHOsVErYy3tqkva2S4VMGssmwWkSK5TFT5t9h5R5UEnuCK9F8u6aXG1+uZg==", "hasInstallScript": true, - "dependencies": { - "crypto-js": "^3.3.0", - "react-native-drop-shadow": "^0.0.6" - }, "peerDependencies": { "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", @@ -23111,18 +23107,6 @@ "react-native": "*" } }, - "node_modules/react-native-drop-shadow": { - "version": "0.0.6", - "resolved": "https://npme.walmart.com/react-native-drop-shadow/-/react-native-drop-shadow-0.0.6.tgz", - "integrity": "sha512-eIFZoU7yhr90xB0/Gfuolt/Eelk0F+ohy3piutuYFA+xJx1xtJ/t9xWaaTPwTGXK+56CTnp8mAX4VPDz464NZg==", - "license": "MIT", - "dependencies": { - "logkitty": "^0.7.1" - }, - "peerDependencies": { - "react-native": ">=0.61.5" - } - }, "node_modules/react-native-elements": { "version": "3.4.2", "hasInstallScript": true, @@ -34458,13 +34442,9 @@ "version": "1.0.4" }, "@walmart/money-auth-shared-components": { - "version": "0.0.10", - "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.0.10.tgz", - "integrity": "sha512-BtEihPouPzT7GMbxAAp+cCfF/E3NDOqfiQra/ZwioEVDTzf73LWWoT2RPYdezfHr3DmH9AmnYG0Zk9djwyQPRw==", - "requires": { - "crypto-js": "^3.3.0", - "react-native-drop-shadow": "^0.0.6" - } + "version": "0.0.12", + "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.0.12.tgz", + "integrity": "sha512-Y9K7SnrS/c0bERFFguXMFJ2NsMDXHOsVErYy3tqkva2S4VMGssmwWkSK5TFT5t9h5R5UEnuCK9F8u6aXG1+uZg==" }, "@walmart/onewalmart-miniapp": { "version": "1.0.16", @@ -44449,14 +44429,6 @@ "react-native-device-info": { "version": "10.3.0" }, - "react-native-drop-shadow": { - "version": "0.0.6", - "resolved": "https://npme.walmart.com/react-native-drop-shadow/-/react-native-drop-shadow-0.0.6.tgz", - "integrity": "sha512-eIFZoU7yhr90xB0/Gfuolt/Eelk0F+ohy3piutuYFA+xJx1xtJ/t9xWaaTPwTGXK+56CTnp8mAX4VPDz464NZg==", - "requires": { - "logkitty": "^0.7.1" - } - }, "react-native-elements": { "version": "3.4.2", "requires": { --- package.json @@ -107,7 +107,7 @@ "@walmart/metrics-mini-app": "0.15.14", "@walmart/mod-flex-mini-app": "1.11.6", "@walmart/moment-walmart": "1.0.4", - "@walmart/money-auth-shared-components": "0.0.10", + "@walmart/money-auth-shared-components": "0.0.12", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.10.15", "@walmart/payrollsolution_miniapp": "0.131.15",
bump version
bump version
0244d2e2e0d382c662c579e2418010394f4cc88f
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen/useSupplyChainRosterDetails.ts @@ -82,28 +82,22 @@ export const useSupplyChainRosterDetails = ({ ); const getCurrentTeamName = useCallback(() => { - if (isSalariedOrLead) { - if (switcherTeamState.teamIds.includes(TOTAL_SITE_TEAM_ID)) { + const getTeamLabelOrDefault = (teamIds: string[], teamLabel: string | string[] | null) => { + if (teamIds.includes(TOTAL_SITE_TEAM_ID)) { return siteTranslationContext; - } else if (switcherTeamState?.teamLabel) { - return switcherTeamState?.teamLabel; + } else if (teamLabel) { + return teamLabel; } return t('rosterScreen.teamWorkgroup.myTeam', { defaultValue: 'My team', lng: 'en-US', }); - } else { - if (teamState.teamIds.includes(TOTAL_SITE_TEAM_ID)) { - return siteTranslationContext; - } else if (teamState?.teamLabel) { - return teamState?.teamLabel; - } - return t('rosterScreen.teamWorkgroup.myTeam', { - defaultValue: 'My team', - lng: 'en-US', - }); - } - // eslint-disable-next-line react-hooks/exhaustive-deps + }; + + return isSalariedOrLead + ? getTeamLabelOrDefault(switcherTeamState.teamIds, switcherTeamState?.teamLabel) + : getTeamLabelOrDefault(teamState.teamIds, teamState?.teamLabel); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [teamState.teamIds, teamState.teamLabel, switcherTeamState]); return { --- src/utils/rosterDetail.tsx @@ -41,7 +41,7 @@ import { translationClient, } from '../common'; import {isEqual} from 'lodash'; -import {SupplyChainTeam} from '../queries/schema.types'; +import {Maybe, SupplyChainTeam, SupplyChainTeamAssociateMembership} from '../queries/schema.types'; import {GetSupplyChainShiftsQuery} from '../queries/getSupplyChainShifts'; export const generateTeamSwitcherData = (allTeams: Team[]) => { @@ -93,6 +93,28 @@ export const getShiftLabel = (shiftCode: number) => { } }; +export const getCombinedTeamRoster = ( + dailyRoster: any[], + userTeamIds: string[], + allTeams: any, +) => { + const userTeams = allTeams?.filter((team: any) => + userTeamIds.includes(team?.teamId ?? ''), + ); + const combinedTeamMembers = userTeams?.reduce( + (accumulator: any, team: any) => { + if (!team?.members) return accumulator; + return [...accumulator, ...team.members]; + }, + [] as (string | null)[], + ); + return dailyRoster.filter((associate) => + associate?.associateId + ? combinedTeamMembers?.includes(associate.associateId) + : false, + ); +}; + export const generateTeamRoster = ( currentTeamIds: string[], rosterData: GetDailyRosterQuery | undefined, @@ -102,7 +124,7 @@ export const generateTeamRoster = ( ) => { const dailyRoster = rosterData?.getDailyRoster; - if (dailyRoster === null || dailyRoster === undefined) { + if (!dailyRoster) { logger.warn('generateTeamRoster Warning: ', { message: 'roster is null or undefined', }); @@ -123,22 +145,7 @@ export const generateTeamRoster = ( } if (isEqual(currentTeamIds, userTeamIds)) { - const userTeams = allTeams?.filter((team: any) => - userTeamIds.includes(team?.teamId ?? ''), - ); - const combinedTeamMembers = userTeams?.reduce( - (accumulator: any, team: any) => { - if (!team?.members) return accumulator; - return [...accumulator, ...team.members]; - }, - [] as (string | null)[], - ); - const combinedTeamRoster = dailyRoster.filter((associate) => - associate?.associateId - ? combinedTeamMembers?.includes(associate.associateId) - : false, - ); - return combinedTeamRoster; + return getCombinedTeamRoster(dailyRoster, userTeamIds, allTeams); } const teamMembers = currentTeam?.members ?? []; @@ -495,32 +502,45 @@ export const getFilterCountForHourlyUser = ( const totalSite = state.teamIds?.[0] === TOTAL_SITE_TEAM_ID || state.teamIds?.[0] === ''; - const hourlyTotalSiteCount = ( - checkAssociate: Function, - checkAssociateWithShiftForTotal: Function, - ) => { - return teamRoster?.filter((associate) => { - if (shiftSelected === undefined || shiftSelected === 'all') { - return checkAssociate(associate); - } else { - return checkAssociateWithShiftForTotal(associate, shiftSelected); - } - }).length; - }; - - const hourlyTeamCount = ( - checkAssociate: Function, - checkAssociateWithShift: Function, - teamData: SupplyChainTeam, - ) => { - return teamData?.membership?.filter((team) => { - if (shiftSelected === undefined || shiftSelected === 'all') { - return checkAssociate(team?.associate); - } else { - return checkAssociateWithShift(team, shiftSelected); - } - })?.length as number; - }; + const filterByShift = ( + items: Associate[] | Maybe<SupplyChainTeamAssociateMembership>[], + checkFunction: Function, + checkFunctionWithShift: Function, + shiftSelected: string | undefined, + ) => { + return items.filter((item) => { + if (shiftSelected === undefined || shiftSelected === 'all') { + return checkFunction(item); + } else { + return checkFunctionWithShift(item, shiftSelected); + } + }).length as number; + }; + + const hourlyTotalSiteCount = ( + checkAssociate: Function, + checkAssociateWithShiftForTotal: Function, + ) => { + return filterByShift( + teamRoster, + checkAssociate, + checkAssociateWithShiftForTotal, + shiftSelected, + ); + }; + + const hourlyTeamCount = ( + checkAssociate: Function, + checkAssociateWithShift: Function, + teamData: SupplyChainTeam, + ) => { + return filterByShift( + teamData?.membership ?? [], + (team: SupplyChainTeamAssociateMembership) => checkAssociate(team?.associate), + checkAssociateWithShift, + shiftSelected, + ); + }; if (totalSite) { return {
fix(ui): sonar vulnerabilities in roster details
fix(ui): sonar vulnerabilities in roster details
e69eab3109cc5618ee25ae020722a1fd37c22b9a
--- __tests__/startup/SsoSagaTest.ts @@ -69,6 +69,7 @@ jest.mock('../../src/redux', () => ({ jest.mock('../../src/services/Logger', () => ({ logger: { + info: jest.fn(), error: jest.fn(), warn: jest.fn(), },
Test fix
Test fix
929857966bfbbeab56c63edc4a64b0478fd9b5f8
--- targets/US/package.json @@ -111,7 +111,7 @@ "@walmart/inbox-mini-app": "0.96.6", "@walmart/iteminfo-mini-app": "7.16.2", "@walmart/learning-mini-app": "20.0.35", - "@walmart/manager-approvals-miniapp": "0.3.1", + "@walmart/manager-approvals-miniapp": "0.3.2", "@walmart/me-at-walmart-athena-queries": "6.26.1", "@walmart/me-at-walmart-common": "workspace:^", "@walmart/me-at-walmart-container": "workspace:^", --- yarn.lock @@ -6682,9 +6682,9 @@ __metadata: languageName: node linkType: hard -"@walmart/manager-approvals-miniapp@npm:0.3.1": - version: 0.3.1 - resolution: "@walmart/manager-approvals-miniapp@npm:0.3.1" +"@walmart/manager-approvals-miniapp@npm:0.3.2": + version: 0.3.2 + resolution: "@walmart/manager-approvals-miniapp@npm:0.3.2" peerDependencies: "@react-navigation/native": ^6.0.8 "@react-navigation/stack": ^6.2.0 @@ -6699,7 +6699,7 @@ __metadata: react-native-wm-telemetry: 0.3.0 react-redux: ^8.0.4 reselect: ^4.1.0 - checksum: 10c0/2ebfc051d8eb9a3d0e571ed01cd951779782ad5aa06c052a4d0d148a4fac806e0e7f542e377a999e662304fb09aabb3fa2b5b4ac661890ff9a61fd084dcd3c50 + checksum: 10c0/4cf2b7f41aa49aa434cd04f963cc8a87cd886125a268574ad201b7ff93133436e0bb92ef79cd96585496da2a4332f4f6a253a00849b64095d473096eca8b0373 languageName: node linkType: hard @@ -7027,7 +7027,7 @@ __metadata: "@walmart/inbox-mini-app": "npm:0.96.6" "@walmart/iteminfo-mini-app": "npm:7.16.2" "@walmart/learning-mini-app": "npm:20.0.35" - "@walmart/manager-approvals-miniapp": "npm:0.3.1" + "@walmart/manager-approvals-miniapp": "npm:0.3.2" "@walmart/me-at-walmart-athena-queries": "npm:6.26.1" "@walmart/me-at-walmart-common": "workspace:^" "@walmart/me-at-walmart-container": "workspace:^"
Update Manager approvals version to 0.3.2
Update Manager approvals version to 0.3.2
6acab17c37e8deb1eb91314970039948018e03cb
--- targets/US/src/App.tsx @@ -9,6 +9,7 @@ import {MeAtWalmartContainer} from '@walmart/me-at-walmart-container'; import {ENV, ENV_OVERRIDES} from '../env'; import {withCodePush} from './codePush'; +import {MeAtWalmartComponents} from './components'; import {setupVersions} from './versions'; /** @@ -26,7 +27,7 @@ export const createApp = () => { */ return withCodePush(() => { return ( - <MeAtWalmartContainer.Provider> + <MeAtWalmartContainer.Provider components={MeAtWalmartComponents}> <MeAtWalmartContainer.FeatureGuard getFeatures={getRootFeatures}> <CoreNavigation /> </MeAtWalmartContainer.FeatureGuard> --- targets/US/src/components.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import {Image as ExpoImage} from 'expo-image'; + +/** + * Components set on the container provider. + * These can also be configured when the container is created, which is preferred. + * Image is configured through the provider to avoid Expo being a dependency of the container package. + */ +export const MeAtWalmartComponents = { + Image: (props: any) => <ExpoImage {...props} />, +};
feat: add expo image to container provider so its used with allspark components
feat: add expo image to container provider so its used with allspark components
ec9ec3ba9580023b76422c3b7058036b967a480a
--- __tests__/screens/ViewTeamScreen/__snapshots__/ViewTeamScreenTest.tsx.snap @@ -5,6 +5,7 @@ exports[`ViewTeamScreen should render view team screen with expected elements 1` style={ { "flex": 1, + "padding": 20, } } > @@ -17,6 +18,20 @@ exports[`ViewTeamScreen should render view team screen with expected elements 1` } > <RCTScrollView + ListEmptyComponent={ + <View + style={ + { + "alignItems": "center", + "marginTop": 24, + } + } + > + <Body> + No undefined users found + </Body> + </View> + } ListHeaderComponent={ <React.Fragment> <RosterFilters @@ -1987,6 +2002,18 @@ exports[`ViewTeamScreen should render view team screen with expected elements 1` "span": undefined, }, "props": { + "ListEmptyComponent": <View + style={ + { + "alignItems": "center", + "marginTop": 24, + } + } + > + <Body> + No undefined users found + </Body> + </View>, "ListHeaderComponent": <React.Fragment> <RosterFilters absentCount={0}
Update filter change associate update
Update filter change associate update
68479b430d92cc7ee9275914f3215dd2c0e36017
--- packages/core-services-allspark/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.12.8](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.12.7...@walmart/core-services-allspark@2.12.8) (2023-09-25) + + +### Bug Fixes + +* add try catch to app config fetch saga ([7562dab](https://gecgithub01.walmart.com/allspark/allspark-core-services/commit/7562dab4d03b8379d10cbb789f37c6aaea3684c8)) + + + + + ## [2.12.7](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.12.6...@walmart/core-services-allspark@2.12.7) (2023-09-21) --- packages/core-services-allspark/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.12.7", + "version": "2.12.8", "lockfileVersion": 1, "requires": true, "packages": { --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.12.7", + "version": "2.12.8", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/core-services-allspark@2.12.8
3741ba2d7d55a2cf1cc1280ceb9fe85040c1012c
--- package-lock.json @@ -5606,9 +5606,9 @@ "integrity": "sha512-vX4PWvt7QJvyd8cTmuBpITXVmHgCJ4ifkSsRSzFpK1fGZyfJaJn+pTP+h7XfQivQYCsIiB3Nm+tF12EXFJPBzg==" }, "@walmart/shelfavailability-mini-app": { - "version": "1.3.2-SNAPSHOT.0", - "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.3.2-SNAPSHOT.0.tgz", - "integrity": "sha512-7TS5qVt2j/FX8gWf4Lwg5V97i/78OfbKvq8goaYB+CrrJ2zoRBpYPrTedJEvjg5pxSn6WyP3APkHXE/0/0kJSA==" + "version": "1.3.2", + "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-1.3.2.tgz", + "integrity": "sha512-A1Pon+FypfP4s56YOn2HuxM54b4h6EJjSvuvuiWvrVAY0Bb9ee3uq2Hl9xxHe/bM4lCoNqeVxHH0zghaAEuxHg==" }, "@walmart/taskit-mini-app": { "version": "0.34.5-beta.9", --- package.json @@ -119,7 +119,7 @@ "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/schedule-mini-app": "0.26.0", "@walmart/settings-mini-app": "1.10.0", - "@walmart/shelfavailability-mini-app": "1.3.2-SNAPSHOT.0", + "@walmart/shelfavailability-mini-app": "1.3.2", "@walmart/taskit-mini-app": "0.34.5-beta.9", "@walmart/time-clock-mini-app": "0.22.1", "@walmart/ui-components": "1.5.0",
SA-264 upped SA to v1.3.2
SA-264 upped SA to v1.3.2
0dad245eda8482a380ca07d28069debee608e21f
--- src/home/components/TaskCard/index.tsx @@ -40,6 +40,7 @@ export const TaskCard: FC<TaskCardProps> = (props) => { style={[ styles.container, style, + // eslint-disable-next-line react-native/no-inline-styles {display: copilot.enabled ? 'none' : 'flex'}, ]} testID='taskCard'> --- src/home/containers/HomeScreen/index.tsx @@ -13,7 +13,6 @@ import {TimeClockWidget, Toast} from '@walmart/time-clock-mini-app'; import {SurveySaysCard} from '@walmart/feedback-all-spark-miniapp'; import {MetricsHomeScreen} from '@walmart/metrics-mini-app'; -import {useHomeAppConfig} from '../../../hooks/useAppConfig'; import {Layout} from '../../components/Layout'; import {DataSaverWidget} from '../../components/DataSaverWidget'; import {LinkCard} from '../../components/LinkCard'; --- src/navigation/AssociateHallwayNav/Tabs/index.tsx @@ -32,7 +32,6 @@ import CopilotMiniApp, {useWorkBadgeCount} from '@walmart/copilot-mini-app'; import InboxMiniApp, {getInboxBadgeCount} from '@walmart/inbox-mini-app'; import {colors} from '@walmart/gtp-shared-components'; - import {Telemetry} from '../../../core/Telemetry'; import {getBottomNavConfigMap} from '../../../navConfig/NavConfigRedux'; import {getValueForCurrentLanguage} from '../../../transforms/language';
fix: lint
fix: lint
dd4468c58a5be4b9fffa15dd01ce6d777c0628a8
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/TeamShiftSwitcher/TeamShiftSwitcher.tsx @@ -37,7 +37,7 @@ export const TeamShiftSwitcher = ({ /> <View style={styles.shiftInfo}> <Body numberOfLines={1}> - <Body color='white' weight='700'> + <Body color='white' weight='700' size='small'> {teamName} </Body> {shiftText && ( @@ -45,7 +45,7 @@ export const TeamShiftSwitcher = ({ <View style={styles.spacer} /> <Body color='white'>|</Body> <View style={styles.spacer} /> - <Body color='white' weight='700'> + <Body color='white' weight='700' size='small'> {shiftText} </Body> </>
feat: updated font size
feat: updated font size
37dadf49c99a1c84a0589a3dee5441b359494163
--- package-lock.json @@ -4398,9 +4398,9 @@ } }, "@walmart/refrigeration-alarms-mini-app": { - "version": "1.16.0", - "resolved": "https://npme.walmart.com/@walmart/refrigeration-alarms-mini-app/-/refrigeration-alarms-mini-app-1.16.0.tgz", - "integrity": "sha512-ZRB25nnUaTuclufSpbqj+Kd5BUR+djkk87XjaPET+02BpFNF1bg60EgLSC0NtxGkghXJdIMkbdIjjEUuLokkBg==" + "version": "1.20.0", + "resolved": "https://npme.walmart.com/@walmart/refrigeration-alarms-mini-app/-/refrigeration-alarms-mini-app-1.20.0.tgz", + "integrity": "sha512-0hZjK8AK3wh3t0K6gF9fgczgiXoDxRiv60+Xk/m3WTaZrLIgIOAfJSeERf4hDG4V16UM5pk5QsekU7VF4th6pw==" }, "@walmart/schedule-mini-app": { "version": "0.6.0", --- package.json @@ -95,7 +95,7 @@ "@walmart/react-native-logger": "^1.28.0", "@walmart/react-native-shared-navigation": "^0.4.0", "@walmart/react-native-sumo-sdk": "2.1.0", - "@walmart/refrigeration-alarms-mini-app": "1.19.0", + "@walmart/refrigeration-alarms-mini-app": "1.20.0", "@walmart/redux-store": "1.1.25", "@walmart/schedule-mini-app": "0.6.0", "@walmart/settings-mini-app": "1.3.9",
version bump for minor sonar fixes and navigation update
version bump for minor sonar fixes and navigation update
de57b9036da15d76e3e1747840c9d21553f2986f
--- core/__tests__/impersonation/__snapshots__/impersonationScreenTest.tsx.snap @@ -1,3 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`ImpersonationScreen renders component with props 1`] = `null`;
update snapshots
update snapshots
f8175648995cbd13439bc79d49883bec74302bdd
--- package.json @@ -77,7 +77,7 @@ "@types/react-test-renderer": "^18.0.7", "@walmart/allspark-authentication": "6.4.10", "@walmart/allspark-foundation": "7.12.0", - "@walmart/allspark-foundation-hub": "1.22.0", + "@walmart/allspark-foundation-hub": "1.23.0", "@walmart/allspark-utils": "7.1.0", "@walmart/associate-exp-hub-hub": "2.6.1", "@walmart/associate-exp-hub-mini-app": "1.4.0-alpha.30", @@ -86,10 +86,10 @@ "@walmart/expo-config-plugins": "0.7.0", "@walmart/gtp-shared-components": "2.3.0-rc.0", "@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.7", - "@walmart/me-at-walmart-athena-queries": "6.34.0", + "@walmart/me-at-walmart-athena-queries": "6.37.0", "@walmart/me-at-walmart-common": "6.36.0-alpha.7", "@walmart/me-at-walmart-container": "6.29.0-alpha.0", - "@walmart/my-walmart-hub": "1.2.0", + "@walmart/my-walmart-hub": "1.4.0", "@walmart/react-native-encrypted-storage": "~1.1.3", "@walmart/react-native-logger": "1.38.1", "@walmart/react-native-scanner-3.0": "patch:@walmart/react-native-scanner-3.0@npm%3A0.15.8#~/.yarn/patches/@walmart-react-native-scanner-3.0-npm-0.15.8-6fb92a01bb.patch", --- yarn.lock @@ -7943,9 +7943,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.22.0": - version: 1.22.0 - resolution: "@walmart/allspark-foundation-hub@npm:1.22.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.22.0.tgz" +"@walmart/allspark-foundation-hub@npm:1.23.0": + version: 1.23.0 + resolution: "@walmart/allspark-foundation-hub@npm:1.23.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.23.0.tgz" peerDependencies: "@react-navigation/native": 7.x "@walmart/allspark-foundation": 7.x @@ -7955,7 +7955,7 @@ __metadata: react: 19.x react-native: 0.79.x react-native-safe-area-context: ^5.4.0 - checksum: 10c0/9e1d30a5f2d413ac1d2603ad77e31a79084c3a2c7aca1dd8b797d15a3801af869fd83e72760e6b32ab33eb81d6120d8e66e9f61f6147771c0db00ff08d001913 + checksum: 10c0/bdbef3262c79b7ca452f458932033e993c65e37656ae987fd3af462b67ec3e613c2ce39ce80cbbd2ad281db53cd6baf13cc463899d363278a2e1a58796fa053c languageName: node linkType: hard @@ -8266,12 +8266,12 @@ __metadata: languageName: node linkType: hard -"@walmart/me-at-walmart-athena-queries@npm:6.34.0": - version: 6.34.0 - resolution: "@walmart/me-at-walmart-athena-queries@npm:6.34.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fme-at-walmart-athena-queries%2F-%2F%40walmart%2Fme-at-walmart-athena-queries-6.34.0.tgz" +"@walmart/me-at-walmart-athena-queries@npm:6.37.0": + version: 6.37.0 + resolution: "@walmart/me-at-walmart-athena-queries@npm:6.37.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fme-at-walmart-athena-queries%2F-%2F%40walmart%2Fme-at-walmart-athena-queries-6.37.0.tgz" peerDependencies: "@apollo/client": "*" - checksum: 10c0/2d302557bb02741b877d72c457e9ec19044e25e0c25fcaccea028b16902e9c7e87f88fe02a07c9f3f1c4157fcaaf1adf14315a41ec4f9e49077cb52149bef003 + checksum: 10c0/fd452d06c26f9a732d7971693abb0f985211a7e2a7b80e0521d997ebd5ac9b0598e3d02f2c83f156fbbeb6000266d24444b728f623476cf425beb6e7205ff9ba languageName: node linkType: hard @@ -8326,9 +8326,9 @@ __metadata: languageName: node linkType: hard -"@walmart/my-walmart-hub@npm:1.2.0": - version: 1.2.0 - resolution: "@walmart/my-walmart-hub@npm:1.2.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmy-walmart-hub%2F-%2F%40walmart%2Fmy-walmart-hub-1.2.0.tgz" +"@walmart/my-walmart-hub@npm:1.4.0": + version: 1.4.0 + resolution: "@walmart/my-walmart-hub@npm:1.4.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmy-walmart-hub%2F-%2F%40walmart%2Fmy-walmart-hub-1.4.0.tgz" peerDependencies: "@react-navigation/native": 7.x "@walmart/allspark-foundation": 7.x @@ -8338,7 +8338,7 @@ __metadata: react: 19.x react-native: 0.79.x react-native-safe-area-context: ^5.4.0 - checksum: 10c0/dc95bf938f509c64f0399998bdc705895e29e25bbcd8b896cf0a3d2a11433b8a296878deaa33ee575676b5cdb093097d71f5c9582c8f99785bab0a511a2d587d + checksum: 10c0/97e2c56af03ae84632af624ffaf3245635291c72e3ae0d4db61f1c3442b021d3cb3fbfd08525654107f11204c6bfa8d331a2628f676340c33e3dda2fbd54154f languageName: node linkType: hard @@ -8447,7 +8447,7 @@ __metadata: "@types/react-test-renderer": "npm:^18.0.7" "@walmart/allspark-authentication": "npm:6.4.10" "@walmart/allspark-foundation": "npm:7.12.0" - "@walmart/allspark-foundation-hub": "npm:1.22.0" + "@walmart/allspark-foundation-hub": "npm:1.23.0" "@walmart/allspark-utils": "npm:7.1.0" "@walmart/associate-exp-hub-hub": "npm:2.6.1" "@walmart/associate-exp-hub-mini-app": "npm:1.4.0-alpha.30" @@ -8456,10 +8456,10 @@ __metadata: "@walmart/expo-config-plugins": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.3.0-rc.0" "@walmart/gtp-shared-components-3": "npm:@walmart/gtp-shared-components@3.0.0-beta.7" - "@walmart/me-at-walmart-athena-queries": "npm:6.34.0" + "@walmart/me-at-walmart-athena-queries": "npm:6.37.0" "@walmart/me-at-walmart-common": "npm:6.36.0-alpha.7" "@walmart/me-at-walmart-container": "npm:6.29.0-alpha.0" - "@walmart/my-walmart-hub": "npm:1.2.0" + "@walmart/my-walmart-hub": "npm:1.4.0" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" "@walmart/react-native-logger": "npm:1.38.1" "@walmart/react-native-scanner-3.0": "patch:@walmart/react-native-scanner-3.0@npm%3A0.15.8#~/.yarn/patches/@walmart-react-native-scanner-3.0-npm-0.15.8-6fb92a01bb.patch"
feat(ui): update package versions
feat(ui): update package versions
5d87c43e6402ff32b0d82b038a9e1ffa0e5860d8
--- src/components/Roster/AssociateListItem.tsx @@ -57,7 +57,7 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo( } = props; const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); - const siteId = useSelector(SiteSelectors.getWorkingSiteSiteId); + const siteId = useSelector(SiteSelectors.getWorkingSiteSiteId)?.toString(); const countryCode: string | undefined = useSelector( SiteSelectors.getWorkingSiteCountry, );
feat(ci): type fix
feat(ci): type fix
c18e38a15f893572879bb168d245e278352e187e
--- package-lock.json @@ -3362,9 +3362,9 @@ } }, "@walmart/manager-approvals-miniapp": { - "version": "0.0.39", - "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.39.tgz", - "integrity": "sha512-5tNPpYopYZjFfERj8hPmblRwWTvls/2BSpjA9aRm/wz7zS9KCHWjFmeLg3Kk91spof6/nKDHqj7aj/8TjyYkow==" + "version": "0.0.40", + "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.40.tgz", + "integrity": "sha512-3igehSnzBIMZlvb7VuuSvW5W6yzDn3H4US+Syu04aG8DsZspGXCeXM9OSSyRCOEF2R2TpkqjN+dat+aNCNbO8A==" }, "@walmart/moment-walmart": { "version": "1.0.4", --- package.json @@ -77,7 +77,7 @@ "@walmart/ims-print-services-ui": "0.0.19", "@walmart/inbox-mini-app": "0.0.96", "@walmart/iteminfo-mini-app": "1.0.17", - "@walmart/manager-approvals-miniapp": "0.0.39", + "@walmart/manager-approvals-miniapp": "0.0.40", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.21", "@walmart/react-native-env": "^0.1.0",
Update price change version
Update price change version
0ff49e205d93253770b6e5ad853224dd4f1171dc
--- packages/allspark-build-cache-provider/CHANGELOG.md @@ -0,0 +1,10 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# 1.1.0 (2025-12-17) + +### Features + +- add build cache provider plugin ([#537](https://gecgithub01.walmart.com/allspark/allspark/issues/537)) ([00167f8](https://gecgithub01.walmart.com/allspark/allspark/commit/00167f8548cf94a02a8c491489cdd7e0ca08c097)) --- packages/allspark-build-cache-provider/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-build-cache-provider", - "version": "1.0.0", + "version": "1.1.0", "main": "provider.plugin.js", "scripts": { "build": "tsc", --- packages/expo-config-plugins/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.9.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/expo-config-plugins@0.8.3...@walmart/expo-config-plugins@0.9.0) (2025-12-17) + +### Features + +- add build cache provider plugin ([#537](https://gecgithub01.walmart.com/allspark/allspark/issues/537)) ([00167f8](https://gecgithub01.walmart.com/allspark/allspark/commit/00167f8548cf94a02a8c491489cdd7e0ca08c097)) + ## [0.8.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/expo-config-plugins@0.8.2...@walmart/expo-config-plugins@0.8.3) (2025-12-16) ### Bug Fixes --- packages/expo-config-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/expo-config-plugins", - "version": "0.8.3", + "version": "0.9.0", "description": "Expo config plugins for me@apps", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-build-cache-provider@1.1.0 - @walmart/expo-config-plugins@0.9.0
f60a09a7ef4dfaec12355b07c6bdc3c59731a3d6
--- package-lock.json @@ -50,7 +50,7 @@ "@walmart/financial-wellbeing-feature-app": "1.0.64", "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", - "@walmart/gtp-shared-components": "1.8.17", + "@walmart/gtp-shared-components": "1.8.18", "@walmart/impersonation-mini-app": "1.4.0", "@walmart/ims-print-services-ui": "1.2.0", "@walmart/inbox-mini-app": "0.74.0", @@ -5123,9 +5123,9 @@ } }, "node_modules/@walmart/gtp-shared-components": { - "version": "1.8.17", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.17.tgz", - "integrity": "sha512-18TzmxpASOM8V+KlCBC8XK+yCIb62Wvg9Z8tgXBzjpcT8sYUxuHAxRzFDOAYKvoTBIpOfs/RsONnY1kvgZ74lg==", + "version": "1.8.18", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.18.tgz", + "integrity": "sha512-zqS4CO+Q8AtwlOp2sTq70Lq3I0xgDK+P/Myrx1oimnMUh/nn1cvDy0M8dDbKCnWYeYAQjk6gCKv4gpJoQL1pDA==", "license": "Apache-2.0", "dependencies": { "@livingdesign/tokens": "^0.41.0", @@ -24891,9 +24891,9 @@ } }, "@walmart/gtp-shared-components": { - "version": "1.8.17", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.17.tgz", - "integrity": "sha512-18TzmxpASOM8V+KlCBC8XK+yCIb62Wvg9Z8tgXBzjpcT8sYUxuHAxRzFDOAYKvoTBIpOfs/RsONnY1kvgZ74lg==", + "version": "1.8.18", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.18.tgz", + "integrity": "sha512-zqS4CO+Q8AtwlOp2sTq70Lq3I0xgDK+P/Myrx1oimnMUh/nn1cvDy0M8dDbKCnWYeYAQjk6gCKv4gpJoQL1pDA==", "requires": { "@livingdesign/tokens": "^0.41.0", "lodash": "^4.17.15", --- package.json @@ -93,7 +93,7 @@ "@walmart/financial-wellbeing-feature-app": "1.0.64", "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", - "@walmart/gtp-shared-components": "1.8.17", + "@walmart/gtp-shared-components": "1.8.18", "@walmart/impersonation-mini-app": "1.4.0", "@walmart/ims-print-services-ui": "1.2.0", "@walmart/inbox-mini-app": "0.74.0",
Bumping up gtp version to fix android fonts
Bumping up gtp version to fix android fonts
9207a7e997b4530ad1b50f6bc94b8db1eb11eacc
--- src/translations/es-MX.ts @@ -5,6 +5,8 @@ export const esMX = { userHeader: { onlinePresence: 'Online', offlinePresence: 'Offline', + clockedIn: 'Disponible', + dndPresence: 'Do not disturb', }, tabsScreen: { rosterTab: 'Lista', --- src/translations/es-MX.ts @@ -5,6 +5,8 @@ export const esMX = { userHeader: { onlinePresence: 'Online', offlinePresence: 'Offline', + clockedIn: 'Disponible', + dndPresence: 'Do not disturb', }, tabsScreen: { rosterTab: 'Lista',
adding spanish file
adding spanish file
26ba1ec05a2f6ee8c0262902d2d2fc4e79b20e0d
--- src/components/AssociateList/AssociateListItem.tsx @@ -81,11 +81,16 @@ export const AssociateListItem = ({ return translated; })(); - const shiftTimeText = showManagerSchedule && isWfmScheduleValid - ? `${t('rosterScreen.associateRosterItem.shiftTime')} ${associateManagerSchedule}` - : ''; + const shiftTimeText = + showManagerSchedule && isWfmScheduleValid + ? `${t( + 'rosterScreen.associateRosterItem.shiftTime' + )} ${associateManagerSchedule}` + : ''; - const readTogetherAccessibilityLabel = `${associateName}, ${associateJobDescription} ${clockStatusText} ${shiftTimeText}${status ? ` ${status}` : ''} ${t('rosterScreen.associateRosterItem.viewScheduleFor', { + const readTogetherAccessibilityLabel = `${associateName}, ${associateJobDescription} ${clockStatusText} ${shiftTimeText}${ + status ? ` ${status}` : '' + } ${t('rosterScreen.associateRosterItem.viewScheduleFor', { associateName: associateName, })}`; @@ -99,13 +104,15 @@ export const AssociateListItem = ({ : showStatusChipAndViewSchedule; return ( - <View testID='associate-list-item-container' style={styles.container}> + <View testID="associate-list-item-container" style={styles.container}> <View style={styles.readTogetherContainer}> <View accessible - accessibilityRole='text' - importantForAccessibility='yes' - accessibilityLabel={readTogetherAccessibilityLabel}> + accessibilityRole="text" + importantForAccessibility="yes" + style={{flexDirection: 'row', flex: 1}} + accessibilityLabel={readTogetherAccessibilityLabel} + > {showAssociateAvatar && ( <AssociateAvatar associateName={associateName} @@ -116,9 +123,10 @@ export const AssociateListItem = ({ )} <View style={styles.associateInfoContainer}> <Body - testID='associate-list-item-name' - size='medium' - UNSAFE_style={[styles.associateName, {fontWeight: '700'}]}> + testID="associate-list-item-name" + size="medium" + UNSAFE_style={[styles.associateName, {fontWeight: '700'}]} + > {associateName} </Body> {showJobDescription && ( @@ -128,28 +136,35 @@ export const AssociateListItem = ({ )} {showManagerSchedule && isWfmScheduleValid && ( <View - testID='manager-schedule-info' - style={styles.associateSchedule}> + testID="manager-schedule-info" + style={styles.associateSchedule} + > <Icons.ClockIcon color={colors.gray['160']} /> <Body UNSAFE_style={styles.plainText}> {associateManagerSchedule} </Body> </View> )} + {isStatusChipVisible && handleViewSchedule ? ( + <Link + onPress={handleViewSchedule} + testID={`view-schedule-btn-${associate.associateId}`} + accessibilityRole="button" + accessibilityLabel={t( + 'rosterScreen.associateRosterItem.viewScheduleFor', + { + associateName: associateName, + } + )} + UNSAFE_style={styles.viewScheduleButton} + > + <Body> + {t('rosterScreen.associateRosterItem.viewSchedule')} + </Body> + </Link> + ) : null} </View> </View> - {isStatusChipVisible && handleViewSchedule ? ( - <Link - onPress={handleViewSchedule} - testID={`view-schedule-btn-${associate.associateId}`} - accessibilityRole='button' - accessibilityLabel={t('rosterScreen.associateRosterItem.viewScheduleFor', { - associateName: associateName, - })} - UNSAFE_style={styles.viewScheduleButton}> - <Body>{t('rosterScreen.associateRosterItem.viewSchedule')}</Body> - </Link> - ) : null} </View> <View style={styles.tagAndButtonContainer}> <>
fix(ui): Associate List Item Updates
fix(ui): Associate List Item Updates
8c4b741f1f9eed58b18bb29c755732fbfe06de45
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Screens/TeamSelection.tsx @@ -62,6 +62,8 @@ export const TeamSelection = () => { }, }); + const navigateBack = () => AllsparkNavigationClient.goBack(); + useEffect(() => { const myTeamsData = preferenceData?.associatePreferences?.meAtWalmartPreferences @@ -96,7 +98,7 @@ export const TeamSelection = () => { refetch(); } }} - handleSecondaryButtonPress={() => AllsparkNavigationClient.goBack()} + handleSecondaryButtonPress={navigateBack} /> ); }
Add cancel button for error screen
Add cancel button for error screen
aaa34eb4a6c3988659b23e210766a881d88c7696
--- packages/allspark-foundation/src/Feature/README.md @@ -207,7 +207,7 @@ MyFeatureHttpClient.useRequest({method: 'post', url: '/some/path', data: 'some d Creates an `AllsparkGraphqlClient` instance that is scoped to the feature. -See [AllsparkGraphqlClient: Feature Client Config](../GraphQL/README.md#feature-client-config) for configuration details and [AllsparkGraphqlClient: API](../GraphQL/README.md#api) for usage details respectively. +See [Allspark GraphQL Client: Feature Client Config](../GraphQL/README.md#feature-client-config) for configuration details and [Allspark GraphQL Client: API](../GraphQL/README.md#feature-client-api) for usage details respectively. ```typescript const MyFeatureGraphqlClient = MyFeature.createGraphQLClient({
Update README.md
Update README.md
093050cae367b327dcc764598e8159d218066fc4
--- .looper.multibranch.yml @@ -24,7 +24,7 @@ envs: ANDROID_BASE_PATH: targets/US/android branches: - - spec: feature/drop24 + - spec: feature/drop25 triggers: - manual: name: Publish Packages (Pre-Release)
chore: fix looper branch spec for drop 25
chore: fix looper branch spec for drop 25
929083c73d8bb70670d1d61bc7d477d47a62e33c
--- src/components/Roster/Roster.tsx @@ -4,7 +4,7 @@ import { AssociateRosterItem, RosterProps, } from './types'; -import {RefreshControl, View} from 'react-native'; +import {RefreshControl} from 'react-native'; import {styles} from './styles'; import {FlashList, ListRenderItem} from '@shopify/flash-list'; import { @@ -50,13 +50,6 @@ export const Roster: React.FC<RosterProps> = (props) => { const currentUserSite: string = useSelector(UserSelectors.getUserSite); const userIsInRoster = useUserIsInRoster(); const selectedFilter = useRef<FilterValue>(FilterValue.all); - const onFilter = ( - filteredAssociates: AssociateRosterItem[], - filterId: FilterValue, - ) => { - selectedFilter.current = filterId; - setAssociates(sortedAssociateList(filteredAssociates, teamLeads)); - }; const {bottom: bottomInset} = useSafeAreaInsets(); const flashListRef: any = useRef(null); const { @@ -71,6 +64,14 @@ export const Roster: React.FC<RosterProps> = (props) => { //TODO: teamLeads should not be controlled by CCM. This list should be controlled bt RBAC. Reconsider impl for teamLead check const teamLeads = useSelector(teamLeadJobDescriptions) as string[]; + const onFilter = ( + filteredAssociates: AssociateRosterItem[], + filterId: FilterValue, + ) => { + selectedFilter.current = filterId; + setAssociates(sortedAssociateList(filteredAssociates, teamLeads)); + }; + const onRefreshHandler = useCallback(async () => { setIsRefreshing(true); if (!shouldSkipQuery) { @@ -166,7 +167,7 @@ export const Roster: React.FC<RosterProps> = (props) => { } ListEmptyComponent={ <ListEmptyComponent - isloading={loadingDailyRoster} + isLoading={loadingDailyRoster} hasError={!!rosterDataFetchError} error={rosterDataFetchError} selectedFilter={selectedFilter}
fix method sig order
fix method sig order
d5bfe6002343bd00569927b60754fdea6049cf7b
--- .looper.multibranch.yml @@ -273,7 +273,7 @@ flows: - call: increment-version-code - node(label=$LOOPER_NODES, ws="exclusive"): - parallel(failsafe): - # - call: build-native(ios) + - call: build-native(ios) - call: build-native(android) - call: run-sonar-analysis - call: publish-to-hygieia @@ -339,8 +339,8 @@ flows: then: - node(label=$LOOPER_NODES, ws="exclusive"): - parallel(failsafe): - # - group("$os dev"): - # - call: build-snapshot(dev) + - group("$os dev"): + - call: build-snapshot(dev) - group("$os beta"): - call: build-snapshot(beta) - if: $buildGABuilds
added iOS flow
added iOS flow
9b489c64499b5599e5a39dcb2a9a6cd283b425f6
--- targets/US/package.json @@ -147,7 +147,7 @@ "@walmart/shop-gnfr-mini-app": "1.0.137", "@walmart/sidekick-mini-app": "4.84.9", "@walmart/store-feature-orders": "1.27.1", - "@walmart/taskit-mini-app": "4.17.21", + "@walmart/taskit-mini-app": "4.25.0", "@walmart/time-clock-mini-app": "2.419.0", "@walmart/topstock-mini-app": "1.17.11", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.17.1#~/.yarn/patches/@walmart-ui-components-npm-1.17.1-4a29feac03.patch", --- yarn.lock @@ -7063,7 +7063,7 @@ __metadata: "@walmart/shop-gnfr-mini-app": "npm:1.0.137" "@walmart/sidekick-mini-app": "npm:4.84.9" "@walmart/store-feature-orders": "npm:1.27.1" - "@walmart/taskit-mini-app": "npm:4.17.21" + "@walmart/taskit-mini-app": "npm:4.25.0" "@walmart/time-clock-mini-app": "npm:2.419.0" "@walmart/topstock-mini-app": "npm:1.17.11" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.17.1#~/.yarn/patches/@walmart-ui-components-npm-1.17.1-4a29feac03.patch" @@ -7990,12 +7990,12 @@ __metadata: languageName: node linkType: hard -"@walmart/taskit-mini-app@npm:4.17.21": - version: 4.17.21 - resolution: "@walmart/taskit-mini-app@npm:4.17.21" +"@walmart/taskit-mini-app@npm:4.25.0": + version: 4.25.0 + resolution: "@walmart/taskit-mini-app@npm:4.25.0" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/58a740e7178f549c8692b511fb947f46ef3935c0d8c28df56922d557f3d9619835f0891b98c988c8f96cf9644e22b784945425420a6b90fbb3a8e6d7367695ca + checksum: 10c0/9735a264dbbb7b1d5e08041af2183cbdb723108e46e18cabdbcc96b892ba095726983ecd9f0190e1bc585801fa7c5b2e91ec12d4ba7fd04a3f3a0655d875b84f languageName: node linkType: hard
chore: bump taskit version
chore: bump taskit version
77ba4b93d0100162be65a633674fe44b36b29013
--- jest.config.js @@ -18,7 +18,7 @@ module.exports = { coverageThreshold: { global: { statements: 87.22, - branches: 75.18, + branches: 75.09, functions: 85.22, lines: 87.31, },
updated coverage thresh
updated coverage thresh
63257817d595d4724e87314b6141b45cc5735af0
--- packages/allspark-foundation/src/Navigation/Elements/index.ts @@ -1,2 +1,3 @@ export * from './global'; export * from './hooks'; +export * from './types'; --- packages/core-widget-registry/package.json @@ -19,6 +19,7 @@ }, "dependencies": { "@walmart/allspark-foundation": "^5.0.0-alpha.13", + "@walmart/allspark-utils": "5.0.0-alpha.13", "@walmart/me-at-walmart-container": "^5.0.0-alpha.13" } } --- packages/core-widget-registry/src/Core.ts @@ -1,7 +1,10 @@ +import { FC } from 'react'; import { useStackElements, AllsparkStackElements, -} from '@walmart/allspark-foundation'; + BannerRegistryProps, +} from '@walmart/allspark-foundation/Navigation'; +import { WidgetRegistry } from '@walmart/allspark-utils'; /** * @deprecated - use AllsparkStackElements from "@walmart/allspark-foundation/Navigation" instead @@ -10,7 +13,9 @@ import { * AllsparkStackElements.addBanner(...); <-- add banner to be rendered * AllsparkStackElements.removeBanner(...); <-- remove banner from render */ -export const NavigationBannerRegistry = AllsparkStackElements.banners; +export const NavigationBannerRegistry: WidgetRegistry< + Record<string, FC<BannerRegistryProps>> +> = AllsparkStackElements.banners; /** * @deprecated - use useStackElements from "@walmart/allspark-foundation/Navigation" instead @@ -22,7 +27,7 @@ export const NavigationBannerRegistry = AllsparkStackElements.banners; */ export const useNavigationBanners = () => { const elements = useStackElements(); - return elements.renderBanners(); + return elements.renderBanners; }; /**
chore: type fixes
chore: type fixes
87411f1bcbccf8c2127f2645228c4e512af906f8
--- src/components/RosterWidget/RosterWidget.tsx @@ -29,7 +29,9 @@ export const RosterWidget = (props: TeamHubWidgetProps) => { isPartialRosterError || isPartialGetTeamsByStoreError || isPartialSupplyChainTeamsError) && ( - <CustomWarningBanner messageContent={'Something went wrong!'} /> + <CustomWarningBanner + messageContent={t('rosterScreen.allTeamsScreen.somethingWentWrong')} + /> )} <HubWidget variant='content-only' --- src/components/ShiftSwitcherModal/ShiftSwitcherModal.tsx @@ -58,7 +58,9 @@ export const ShiftSwitcherModal = ({ return ( <View style={styles.container}> {partialSupplyChainShiftsError && ( - <CustomWarningBanner messageContent={'Something went wrong!'} /> + <CustomWarningBanner + messageContent={t('rosterScreen.allTeamsScreen.somethingWentWrong')} + /> )} <View style={styles.header}> <Body weight='700' UNSAFE_style={styles.headerText}> --- src/hooks/teams.ts @@ -53,6 +53,7 @@ export const useSupplyChainTeamById = (teamId: string) => { teamId, includeProxyMembers: true, }, + errorPolicy: 'all', skip: !storeNbr || !countryCode || @@ -100,6 +101,7 @@ export const useSupplyChainTeamsByBusinessUnit = () => { siteNbr: Number(businessUnitNumber)!, date: moment().format('YYYY-MM-DD'), }, + errorPolicy: 'all', skip: !countryCode || !businessUnitNumber, notifyOnNetworkStatusChange: true, context: getGraphQLConfig(envConfig), @@ -145,6 +147,7 @@ export const useGetTeamById = (teamId: string) => { teamId, countryCode: countryCode!, }, + errorPolicy: 'all', skip: !storeNbr || !countryCode || @@ -192,6 +195,7 @@ export const useGetTeamsByStore = () => { date: moment().format('YYYY-MM-DD'), countryCode: countryCode!, }, + errorPolicy: 'all', skip: !storeNbr || !countryCode, notifyOnNetworkStatusChange: true, context: getGraphQLConfig(envConfig), --- src/screens/AllTeamsScreen/StoreAllTeamsScreen.tsx @@ -183,7 +183,9 @@ export const StoreAllTeamsScreen = () => { <> <WarningBanner /> {(isPrimaryTeamError || isGetTeamsByStoreError) && ( - <CustomWarningBanner messageContent='Something went wrong!' /> + <CustomWarningBanner + messageContent={t('rosterScreen.allTeamsScreen.somethingWentWrong')} + /> )} <SectionList testID='store-allTeams' --- src/screens/AllTeamsScreen/SupplyChainAllTeamsScreen.tsx @@ -180,7 +180,9 @@ export const SupplyChainAllTeamsScreen = () => { <> <WarningBanner /> {(partialRosterError || isPartialSupplyChainTeamsError) && ( - <CustomWarningBanner messageContent={'Something went wrong!'} /> + <CustomWarningBanner + messageContent={t('rosterScreen.allTeamsScreen.somethingWentWrong')} + /> )} <SectionList testID='supplyChain-allTeams' --- src/screens/RosterDetailScreen/StoreRosterDetailScreen.tsx @@ -475,7 +475,9 @@ export const StoreRosterDetailScreen = ({route}: RosterDetailScreenProps) => { {(isPartialTeamError || isPartialRosterError || isPartialGetTeamsByStoreError) && ( - <CustomWarningBanner messageContent='Something went wrong!' /> + <CustomWarningBanner + messageContent={t('rosterScreen.allTeamsScreen.somethingWentWrong')} + /> )} {isSalariedOrLead ? ( <TeamSwitcher --- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -788,7 +788,9 @@ export const SupplyChainRosterDetailScreen = ({ partialRosterError || isPartialSupplyChainTeamsError || isPartialSupplyChainTeamsByIdError) && ( - <CustomWarningBanner messageContent={'Something went wrong!'} /> + <CustomWarningBanner + messageContent={t('rosterScreen.allTeamsScreen.somethingWentWrong')} + /> )} {isSalariedOrLead ? ( <View style={styles.switcherContainer}>
feat(ui): updated errorPolicy and translations
feat(ui): updated errorPolicy and translations
2684392b75f5629bcd5888ca0c1d9fcd612f85b9
--- .looper-pr.yml @@ -22,7 +22,7 @@ envs: STAGES_TO_RUN: LINT: true UNITTEST: true - BUILD: true + BUILD: false SONAR_SCAN: true ARTIFACT_PUBLISH: true AUTO_PR_MONO: false --- package.json @@ -96,7 +96,7 @@ "@walmart/react-native-sumo-sdk": "2.7.4", "@walmart/redux-store": "6.3.29", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "2.36.1", + "@walmart/wmconnect-mini-app": "2.36.2", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0", @@ -194,10 +194,5 @@ "skipScope": false, "jiraPrefix": "JIRA_PROJECT" } - }, - "dependencies": { - "expo": "~51.0.28", - "react": "18.2.0", - "react-native": "0.74.5" } } --- yarn.lock @@ -6653,7 +6653,7 @@ __metadata: "@walmart/react-native-sumo-sdk": "npm:2.7.4" "@walmart/redux-store": "npm:6.3.29" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.36.1" + "@walmart/wmconnect-mini-app": "npm:2.36.2" babel-jest: "npm:^29.6.3" chance: "npm:^1.1.11" crypto-js: "npm:~4.2.0" @@ -6736,13 +6736,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.36.1": - version: 2.36.1 - resolution: "@walmart/wmconnect-mini-app@npm:2.36.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.36.1.tgz" - dependencies: - expo: "npm:~51.0.28" - react: "npm:18.2.0" - react-native: "npm:0.74.5" +"@walmart/wmconnect-mini-app@npm:2.36.2": + version: 2.36.2 + resolution: "@walmart/wmconnect-mini-app@npm:2.36.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.36.2.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ^51.0.0 @@ -6753,7 +6749,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/e710862dd8549760f31df74c79fdb22bad54d3d2dcda2027a90370621821973d0c7c1e62942cdf863518772c15112cae9674a6d0e486e7c31b31eeb5c90acf04 + checksum: 10c0/d715fd08c3fcf74b3480896159cfb93b05e2100feac6c2e1773c66013015b1e515367c6fd30184c224edf6ccad5e22658a914e87d0403818cf0de011bd1dea47 languageName: node linkType: hard @@ -10025,7 +10021,7 @@ __metadata: languageName: node linkType: hard -"expo@npm:^51.0.0, expo@npm:~51.0.28": +"expo@npm:^51.0.0": version: 51.0.39 resolution: "expo@npm:51.0.39::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo%2F-%2Fexpo-51.0.39.tgz" dependencies:
fix(ui): update package
fix(ui): update package
4f28eb11c15b9d7fca55c5abe401fbf8d214f364
--- packages/allspark-foundation-hub/src/SupplyChain/Hooks/useGetSupplyChainTeamsByStore.ts @@ -12,7 +12,6 @@ import { AllTeamsSections, SupplyChainTeam, } from '../Modals/EditSavedTeamModal/types'; -import namecase from 'namecase'; import { SC_ManagerExperienceCreators, SC_ManagerExperienceSelectors, @@ -21,7 +20,7 @@ import { const createTeamsSectionsByOpsArea = (supplyChainTeams: SupplyChainTeam[]) => { const groupedTeams = supplyChainTeams.reduce( (acc: Record<string, SupplyChainTeam[]>, team: SupplyChainTeam) => { - const opsareaName = namecase(team.opsareaName) || 'Others'; + const opsareaName = team.opsareaName || 'Others'; if (!acc[opsareaName]) { acc[opsareaName] = []; } @@ -35,7 +34,7 @@ const createTeamsSectionsByOpsArea = (supplyChainTeams: SupplyChainTeam[]) => { title: opsareaName, data: teams.map((team: SupplyChainTeam) => ({ ...team, - teamName: namecase(team.teamName), + teamName: team.teamName, workareaName: team.workareaName, })), })); @@ -92,7 +91,7 @@ export const useGetSupplyChainAllTeamsBySite = () => { const sanitizeTeamData = response.supplyChainTeamsByBusinessUnit?.teams?.map((team) => ({ ...team, - teamName: namecase(team?.teamName!), + teamName: team?.teamName!, })); dispatch( SC_ManagerExperienceCreators.setAllSiteTeamsSections(
Removing name casing from team names
Removing name casing from team names
e402911bb9ca04c06c8c97b70505de4cc07dddc4
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.8.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.7.0...v2.8.0) (2024-07-09) + + +### Features + +* **ui:** update version SMDV-5955 ([7783eab](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/7783eabd91206747d98bdc7ba928b3caf3fd67a5)) + # [2.7.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.6.0...v2.7.0) (2024-07-08) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.7.0", + "version": "2.8.0", "main": "dist/index.js", "files": [ "dist"
chore(release): 2.8.0 [skip ci]
chore(release): 2.8.0 [skip ci] # [2.8.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.7.0...v2.8.0) (2024-07-09) ### Features * **ui:** update version SMDV-5955 ([7783eab](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/7783eabd91206747d98bdc7ba928b3caf3fd67a5))
42778160788bc49b7f8469d05433dc52fdc18021
--- package-lock.json @@ -34,7 +34,7 @@ "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/allspark-graphql-client": "^1.4.5", "@walmart/allspark-neon-core": "0.1.31", - "@walmart/amp-mini-app": "1.1.41", + "@walmart/amp-mini-app": "1.1.42", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.12.2", "@walmart/attendance-mini-app": "0.190.2", @@ -4792,9 +4792,9 @@ } }, "node_modules/@walmart/amp-mini-app": { - "version": "1.1.41", - "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.41.tgz", - "integrity": "sha512-zWn/M5oqQG12tepbwfSPTCgisktTr4u0JcxQZr1iysMonhDdc/1rlfT10+M3QooW+8273R/raPMAyoPgmABI5Q==", + "version": "1.1.42", + "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.42.tgz", + "integrity": "sha512-pXTSVA92bcyIwwvLeY1brwDduIhkaePSYmS9clkz2JdCPfutJAnBVSp/3fQ5xnM5icBmPOM9oOK5gSJQVFvesA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -25117,9 +25117,9 @@ } }, "@walmart/amp-mini-app": { - "version": "1.1.41", - "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.41.tgz", - "integrity": "sha512-zWn/M5oqQG12tepbwfSPTCgisktTr4u0JcxQZr1iysMonhDdc/1rlfT10+M3QooW+8273R/raPMAyoPgmABI5Q==" + "version": "1.1.42", + "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.42.tgz", + "integrity": "sha512-pXTSVA92bcyIwwvLeY1brwDduIhkaePSYmS9clkz2JdCPfutJAnBVSp/3fQ5xnM5icBmPOM9oOK5gSJQVFvesA==" }, "@walmart/ask-sam-chat-components": { "version": "0.2.13", --- package.json @@ -76,7 +76,7 @@ "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/allspark-graphql-client": "^1.4.5", "@walmart/allspark-neon-core": "0.1.31", - "@walmart/amp-mini-app": "1.1.41", + "@walmart/amp-mini-app": "1.1.42", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.12.2", "@walmart/attendance-mini-app": "0.190.2",
AMP version bump
AMP version bump
d9f8c0137b68fa688ba45ea445ba5fd800f9594a
--- __tests__/__mocks__/@walmart/config-components.js @@ -24,4 +24,5 @@ module.exports = { isEmulator: Promise.resolve(true), isTablet: false, }, + useRbacConfig: jest.fn(), }; --- env.dev.js @@ -29,4 +29,5 @@ export default { bffService: '/api-proxy/service/store/systems-bff/v1', allsparkService: 'https://developer.api.stg.walmart.com/api-proxy/service/allspark/api/v1', + rbacAppId:'ec9f5c40-88be-4e90-8807-a4f15f11e84c' }; --- env.prod.js @@ -27,4 +27,5 @@ export default { bffService: '/api-proxy/service/store/systems-bff/v1', allsparkService: 'https://developer.api.walmart.com/api-proxy/service/allspark/api/v1', + rbacAppId:'ec9f5c40-88be-4e90-8807-a4f15f11e84c' }; --- src/core/envInit.ts @@ -8,6 +8,7 @@ export const initialState = { externalBffUrl: Config.externalBffUrl, internalBffUrl: Config.internalBffUrl, bffService: Config.bffService, + rbacAppId: Config.rbacAppId, }; export const envReducer = (state: any = initialState) => state; @@ -19,6 +20,7 @@ export const initEnv = () => { externalBffUrl: Config.externalBffUrl, internalBffUrl: Config.internalBffUrl, bffService: Config.bffService, + rbacAppId: Config.rbacAppId, } as SharedConfig); reducerManager.addReducer('envConfig', envReducer); --- src/navigation/AssociateHallwayNav/MainTabsNav.tsx @@ -12,7 +12,7 @@ import {MeMiniApp} from '@walmart/allspark-me-mini-app'; import InboxMiniApp, {useBadgesCount} from '@walmart/inbox-mini-app'; import {PushToTalkMiniApp, Hooks} from '@walmart/push-to-talk-mini-app'; import {BottomTabs} from '@walmart/ui-components'; - +import {useRbacConfig} from '@walmart/config-components'; interface Tab { title: string; id: string; @@ -37,7 +37,7 @@ export const TabBar = (props: BottomTabBarProps<BottomTabBarOptions>) => { const [translate] = useTranslation(); const [badgesCount] = useBadgesCount(0); const [pttBadgeCount] = Hooks.useVMBadgesCount(0); - + useRbacConfig(); const tabsConfig: BottomTabsConfig = { centerTab: 'askSam', navList: [
SSMP-282
SSMP-282
18f7d1fbc4ff502271aaf3ffc2dba1a33cf3966f
--- targets/US/package.json @@ -91,7 +91,7 @@ "@walmart/avp-shared-library": "0.10.1", "@walmart/backroom-mini-app": "1.5.20", "@walmart/calling-mini-app": "0.5.17", - "@walmart/checkout-mini-app": "3.26.0", + "@walmart/checkout-mini-app": "3.30.0", "@walmart/compass-sdk-rn": "5.19.15", "@walmart/config-components": "4.4.5", "@walmart/core-services": "~6.4.1", --- yarn.lock @@ -6153,9 +6153,9 @@ __metadata: languageName: node linkType: hard -"@walmart/checkout-mini-app@npm:3.26.0": - version: 3.26.0 - resolution: "@walmart/checkout-mini-app@npm:3.26.0" +"@walmart/checkout-mini-app@npm:3.30.0": + version: 3.30.0 + resolution: "@walmart/checkout-mini-app@npm:3.30.0" dependencies: "@stomp/stompjs": "npm:^7.0.0" cpc-input: "npm:^1.7.28" @@ -6197,7 +6197,7 @@ __metadata: react-native-wm-telemetry: ">=6" react-redux: ^8.1.3 redux: ^4.0.5 - checksum: 10c0/b62f2b5264e72447b1b8a5138eb496334e9584cc0df5bf3389b884df09a7aa1f7ccff61a48717b12e9a4a840c158dc2b41fa732e3c9305ab1d3bf4bc19246882 + checksum: 10c0/f1368a7801c8b2c5ff4e5cb1b899a6bd6398d203c8f281d0e5b51803193967407454f1f05539a7c0a4f9c5051df618b073d061186aceb0ceb38fdcb8e6b69454 languageName: node linkType: hard @@ -6998,7 +6998,7 @@ __metadata: "@walmart/avp-shared-library": "npm:0.10.1" "@walmart/backroom-mini-app": "npm:1.5.20" "@walmart/calling-mini-app": "npm:0.5.17" - "@walmart/checkout-mini-app": "npm:3.26.0" + "@walmart/checkout-mini-app": "npm:3.30.0" "@walmart/compass-sdk-rn": "npm:5.19.15" "@walmart/config-components": "npm:4.4.5" "@walmart/core-services": "npm:~6.4.1"
update co version with drop26 qa bug fixes
update co version with drop26 qa bug fixes
53e29790d406be239429e40de245ea0c3c7d6d3a
--- src/components/RosterDetailPageHeader/RosterDetailPageHeader.tsx @@ -1,12 +1,17 @@ +// @ts-nocheck import React from 'react'; import {RosterDetailPageHeaderProps} from './types'; import {Text, View} from 'react-native'; import {Heading, Link} from '@walmart/gtp-shared-components'; import {getRosterDetailPageHeaderStyles} from './style'; import {useAllsparkImage} from '@walmart/allspark-foundation/Components/context'; -import {Images as teamImageIcon} from '@walmart/allspark-foundation-hub'; +import { + Images as teamImageIcon, + SupplyChainImages, +} from '@walmart/allspark-foundation-hub'; import {useSelector} from 'react-redux'; import {displayViewOtherTeams} from '../../redux/selectors'; +import {SiteSelectors} from '@walmart/allspark-foundation/Site'; export const RosterDetailPageHeader = ({ header, @@ -19,6 +24,8 @@ export const RosterDetailPageHeader = ({ const styles = getRosterDetailPageHeaderStyles(subText); const showViewOtherTeams = useSelector(displayViewOtherTeams); + const siteIsDC = useSelector(SiteSelectors.getWorkingSiteIsDC); + return ( <View style={styles.container}> <View style={styles.contentWrapper}> @@ -33,12 +40,21 @@ export const RosterDetailPageHeader = ({ )} </View> <View> - <TeamImage - style={styles.teamImage} - source={{uri: teamImageIcon[teamId]?.uri}} - placeholder={teamImageIcon[teamId]?.blurhash} - testID={`team-image-${teamId}`} - /> + {siteIsDC ? ( + <TeamImage + style={styles.teamImage} + source={{uri: SupplyChainImages[teamId]?.uri}} + placeholder={SupplyChainImages[teamId]?.blurhash} + testID={`team-image-${teamId}`} + /> + ) : ( + <TeamImage + style={styles.teamImage} + source={{uri: teamImageIcon[teamId]?.uri}} + placeholder={teamImageIcon[teamId]?.blurhash} + testID={`team-image-${teamId}`} + /> + )} </View> </View> ); --- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -75,14 +75,13 @@ import {UserDomain} from '@walmart/me-at-walmart-common'; export const SupplyChainRosterDetailScreen = ({ route, }: RosterDetailScreenProps) => { - const dummyTeamId = ''; - const dummyTeamName = ''; - const initialTeamId = route.params?.teamId - ? route.params?.teamId - : dummyTeamId; - const initialTeamName = route.params?.teamName - ? route.params?.teamName - : dummyTeamName; + const [userLoggedInData] = useState({ + teamName: 'RSR - Staple Stock', + teamId: '7000110', + shiftCode: 4, + }); + const initialTeamId = route.params?.teamId || userLoggedInData.teamId; + const initialTeamName = route.params?.teamName || userLoggedInData.teamName; const {t} = translationClient.useTranslation(); const {bottom: bottomInset} = useSafeAreaInsets(); const navigation = useNavigation<StackNavigationProp<RosterNavParamsMap>>(); @@ -108,8 +107,8 @@ export const SupplyChainRosterDetailScreen = ({ const showRoster = useSelector(displayRoster); const showSearchInput = useSelector(displaySearchInput); const showTeamHub: boolean = useSelector(showManagerTeamsHub); - const isSalariedOrLead = false; - // showTeamHub && (isTeamLead || isSalaried || isPeopleLead || isHomeOffice); + const isSalariedOrLead = + showTeamHub && (isTeamLead || isSalaried || isPeopleLead || isHomeOffice); const defaultTeamLabel = isSalariedOrLead ? selectedTeamPreference : initialTeamName; @@ -124,7 +123,8 @@ export const SupplyChainRosterDetailScreen = ({ teamLabel: defaultTeamLabel, teamIds: defaultTeamIds, }); - const isPrimaryTeam = dummyTeamId === teamState.teamIds?.[0]; + + const isPrimaryTeam = userLoggedInData.teamId === teamState.teamIds?.[0]; // const showStatusChipAndViewSchedule: boolean | undefined = // useRbacConfigWithJobCode(); @@ -206,16 +206,18 @@ export const SupplyChainRosterDetailScreen = ({ }, [teamState, siteTranslationContext, isPrimaryTeam, currentTeam]); const getCurrentTeamName = useCallback(() => { - if (currentTeam?.teamName) { - return currentTeam?.teamName; + if (isPrimaryTeam) { + return t('rosterScreen.primaryTeamRosterName', { + teamName: `${userLoggedInData.teamName} | ${ + availableShifts?.supplyChainShifts.filter( + (shift) => shift.number === userLoggedInData.shiftCode, + )[0].name + }`, + }); } else { - if (teamState.teamIds.includes(TOTAL_STORE_TEAM_ID)) { - return siteTranslationContext; - } else { - return t('rosterScreen.teamWorkgroup.myTeam'); - } + return t('rosterScreen.rosterName'); } - }, [teamState]); + }, [teamState, availableShifts]); const currentTeamName = getCurrentTeamName(); const headerAndSubtext = getHeaderAndSubtext(); @@ -294,6 +296,22 @@ export const SupplyChainRosterDetailScreen = ({ count: filterCount.clockedInCount ?? 0, isApplied: selectedFilter === FilterValue.clockedIn, }, + ...(isSalariedOrLead + ? [ + { + label: t('rosterScreen.filters.absent'), + id: FilterValue.absent, + count: filterCount.absentCount ?? 0, + isApplied: selectedFilter === FilterValue.absent, + }, + { + label: t('rosterScreen.filters.tardy'), + id: FilterValue.tardy, + count: filterCount.tardyCount ?? 0, + isApplied: selectedFilter === FilterValue.tardy, + }, + ] + : []), ]; }, [ isSalariedOrLead, @@ -537,7 +555,7 @@ export const SupplyChainRosterDetailScreen = ({ totalScheduleCount={filterCount.scheduledCount} associates={filteredAssociates} filterChips={filterChips} - headerText={`${currentTeamName} | A1`} + headerText={dataLoading ? '' : currentTeamName} loading={dataLoading} teamName={currentTeamName} handleFilter={(
fix: Primary Team and Images
fix: Primary Team and Images
9220f3b1fe23734516e5aeac93491fb7a0b76d2e
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart", - "version": "1.29.0", + "version": "1.30.0", "main": "index.js", "private": true, "workspaces": [
chore: bump package version
chore: bump package version
545f63651f14fb808d73811cabba324b256d904c
--- src/containers/RosterFilters.tsx @@ -4,13 +4,7 @@ import {Chip, ChipGroup} from '@walmart/gtp-shared-components'; import {noop} from 'lodash'; import {useSelector} from 'react-redux'; import {SiteSelectors} from '@walmart/redux-store'; -import { - GetDailyRosterLazyQueryHookResult, - useGetDailyRosterLazyQuery, - useGetDailyRosterQuery -} from '../queries/getDailyRoster'; -import moment from 'moment-timezone'; -import {Associate} from "../types"; +import {Associate} from '../types'; const styles = StyleSheet.create({ container: { @@ -21,7 +15,7 @@ const styles = StyleSheet.create({ export const RosterFilters = (props: { onFilter?: (filters: string[]) => void; - rosterData?: Associate[] //TODO: Give this the correct type + rosterData?: (Associate | null)[]; }) => { const {onFilter = noop, rosterData} = props; @@ -42,6 +36,13 @@ export const RosterFilters = (props: { (accm, associate) => { if (associate?.punch?.clockStatus !== '2') { accm.clockedIn++; + accm.available++; + } + if (associate?.absentData?.absenceTypeCode === 1) { + accm.absent++; + } + if (associate?.absentData?.absenceTypeCode === 2) { + accm.tardy++; } return accm; }, --- src/containers/RosterFilters.tsx @@ -4,13 +4,7 @@ import {Chip, ChipGroup} from '@walmart/gtp-shared-components'; import {noop} from 'lodash'; import {useSelector} from 'react-redux'; import {SiteSelectors} from '@walmart/redux-store'; -import { - GetDailyRosterLazyQueryHookResult, - useGetDailyRosterLazyQuery, - useGetDailyRosterQuery -} from '../queries/getDailyRoster'; -import moment from 'moment-timezone'; -import {Associate} from "../types"; +import {Associate} from '../types'; const styles = StyleSheet.create({ container: { @@ -21,7 +15,7 @@ const styles = StyleSheet.create({ export const RosterFilters = (props: { onFilter?: (filters: string[]) => void; - rosterData?: Associate[] //TODO: Give this the correct type + rosterData?: (Associate | null)[]; }) => { const {onFilter = noop, rosterData} = props; @@ -42,6 +36,13 @@ export const RosterFilters = (props: { (accm, associate) => { if (associate?.punch?.clockStatus !== '2') { accm.clockedIn++; + accm.available++; + } + if (associate?.absentData?.absenceTypeCode === 1) { + accm.absent++; + } + if (associate?.absentData?.absenceTypeCode === 2) { + accm.tardy++; } return accm; },
adding more condition to update filter count
adding more condition to update filter count
2692f5c9ebe1858166cac40ac99be97e3211998c
--- packages/me-at-walmart-athena-queries/src/schema.graphql @@ -796,7 +796,6 @@ input AssociatePublicSearchInput { } type AssociateRetailBusinessUnitAssignment { - baseAlignment: BaseAlignment baseDivision: BaseDivision businessUnitNumber: Int countryCode: String @@ -912,7 +911,6 @@ type AssociateSearchTalentResponse { } type AssociateSupplyChainBusinessUnitAssignment { - baseAlignment: BaseAlignment baseDivision: BaseDivision businessUnitNumber: Int countryCode: String @@ -2170,13 +2168,6 @@ type CourseProgress { storeNum: Int version: Int - """Role of associate""" - role: RosterRole - rosterType: VIEW_TYPE - storeEntity: StoreEntity - storeNum: Int - version: Int - """ View type to fetch the ILT trainings either for self or for direct reportees. example: SELF, DIRECT_REPORTEE etc """ @@ -6944,7 +6935,6 @@ type ReportsTo { } type RetailBusinessUnit { - baseAlignment: BaseAlignment baseDivision: BaseDivision businessUnitNumber: Int countryCode: String @@ -7745,7 +7735,6 @@ type SupplierReference { } type SupplyChainBusinessUnit { - baseAlignment: BaseAlignment baseDivision: BaseDivision businessUnitNumber: Int countryCode: String --- packages/me-at-walmart-athena-queries/src/schema.types.ts @@ -762,7 +762,6 @@ export type AssociatePublicSearchInput = { export type AssociateRetailBusinessUnitAssignment = { __typename?: 'AssociateRetailBusinessUnitAssignment'; - baseAlignment?: Maybe<BaseAlignment>; baseDivision?: Maybe<BaseDivision>; businessUnitNumber?: Maybe<Scalars['Int']>; countryCode?: Maybe<Scalars['String']>; @@ -856,7 +855,6 @@ export type AssociateSearchTalentResponse = { export type AssociateSupplyChainBusinessUnitAssignment = { __typename?: 'AssociateSupplyChainBusinessUnitAssignment'; - baseAlignment?: Maybe<BaseAlignment>; baseDivision?: Maybe<BaseDivision>; businessUnitNumber?: Maybe<Scalars['Int']>; countryCode?: Maybe<Scalars['String']>; @@ -6401,7 +6399,6 @@ export type ReportsTo = { export type RetailBusinessUnit = { __typename?: 'RetailBusinessUnit'; - baseAlignment?: Maybe<BaseAlignment>; baseDivision?: Maybe<BaseDivision>; businessUnitNumber?: Maybe<Scalars['Int']>; countryCode?: Maybe<Scalars['String']>; @@ -7152,7 +7149,6 @@ export type SupplierReference = { export type SupplyChainBusinessUnit = { __typename?: 'SupplyChainBusinessUnit'; - baseAlignment?: Maybe<BaseAlignment>; baseDivision?: Maybe<BaseDivision>; businessUnitNumber?: Maybe<Scalars['Int']>; countryCode?: Maybe<Scalars['String']>; --- packages/me-at-walmart-athena-queries/src/upsertSupplyChainAssociatePreference.graphql @@ -0,0 +1,22 @@ +mutation upsertSupplyChainAssociatePreference($associatePreferencesInput: AssociatePreferencesInput!, $businessUnitNumber: Int!) { + upsertAssociatePreference(associatePreferencesInput: $associatePreferencesInput) { + __typename + meAtWalmartPreferences { + __typename + managerExperiencePreferences { + __typename + mySupplyChainTeams(businessUnitNumber: $businessUnitNumber) { + __typename + shiftCodePreference + supplyChainTeamPreference { + __typename + businessUnitNumber + countryCode + teamId + } + } + } + } + walmartIdentificationNumber + } +} \ No newline at end of file --- packages/me-at-walmart-athena-queries/src/upsertSupplyChainAssociatePreference.ts @@ -0,0 +1,106 @@ +import * as Types from './schema.types'; + +import { gql } from '@apollo/client'; +import * as Apollo from '@apollo/client'; +import * as ApolloReactHooks from '@apollo/client'; +const defaultOptions = {} as const; +export type UpsertSupplyChainAssociatePreferenceMutationVariables = + Types.Exact<{ + associatePreferencesInput: Types.AssociatePreferencesInput; + businessUnitNumber: Types.Scalars['Int']; + }>; + +export type UpsertSupplyChainAssociatePreferenceMutation = { + __typename?: 'Mutation'; + upsertAssociatePreference?: { + __typename?: 'AssociatePreferences'; + walmartIdentificationNumber: string; + meAtWalmartPreferences?: { + __typename?: 'MeAtWalmartPreferences'; + managerExperiencePreferences?: { + __typename?: 'ManagerExperiencePreferences'; + mySupplyChainTeams?: Array<{ + __typename?: 'ManagerExperienceSupplyChain'; + shiftCodePreference?: Array<string | null> | null; + supplyChainTeamPreference?: Array<{ + __typename?: 'SupplyChainTeam'; + teamId?: string | null; + countryCode?: string | null; + businessUnitNumber?: number | null; + } | null> | null; + } | null> | null; + } | null; + } | null; + } | null; +}; + +export const UpsertSupplyChainAssociatePreferenceDocument = gql` + mutation upsertSupplyChainAssociatePreference( + $associatePreferencesInput: AssociatePreferencesInput! + $businessUnitNumber: Int! + ) { + upsertAssociatePreference( + associatePreferencesInput: $associatePreferencesInput + ) { + walmartIdentificationNumber + meAtWalmartPreferences { + managerExperiencePreferences { + mySupplyChainTeams(businessUnitNumber: $businessUnitNumber) { + shiftCodePreference + supplyChainTeamPreference { + teamId + countryCode + businessUnitNumber + } + } + } + } + } + } +`; +export type UpsertSupplyChainAssociatePreferenceMutationFn = + Apollo.MutationFunction< + UpsertSupplyChainAssociatePreferenceMutation, + UpsertSupplyChainAssociatePreferenceMutationVariables + >; + +/** + * __useUpsertSupplyChainAssociatePreferenceMutation__ + * + * To run a mutation, you first call `useUpsertSupplyChainAssociatePreferenceMutation` within a React component and pass it any options that fit your needs. + * When your component renders, `useUpsertSupplyChainAssociatePreferenceMutation` returns a tuple that includes: + * - A mutate function that you can call at any time to execute the mutation + * - An object with fields that represent the current status of the mutation's execution + * + * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2; + * + * @example + * const [upsertSupplyChainAssociatePreferenceMutation, { data, loading, error }] = useUpsertSupplyChainAssociatePreferenceMutation({ + * variables: { + * associatePreferencesInput: // value for 'associatePreferencesInput' + * businessUnitNumber: // value for 'businessUnitNumber' + * }, + * }); + */ +export function useUpsertSupplyChainAssociatePreferenceMutation( + baseOptions?: ApolloReactHooks.MutationHookOptions< + UpsertSupplyChainAssociatePreferenceMutation, + UpsertSupplyChainAssociatePreferenceMutationVariables + > +) { + const options = { ...defaultOptions, ...baseOptions }; + return ApolloReactHooks.useMutation< + UpsertSupplyChainAssociatePreferenceMutation, + UpsertSupplyChainAssociatePreferenceMutationVariables + >(UpsertSupplyChainAssociatePreferenceDocument, options); +} +export type UpsertSupplyChainAssociatePreferenceMutationHookResult = ReturnType< + typeof useUpsertSupplyChainAssociatePreferenceMutation +>; +export type UpsertSupplyChainAssociatePreferenceMutationResult = + Apollo.MutationResult<UpsertSupplyChainAssociatePreferenceMutation>; +export type UpsertSupplyChainAssociatePreferenceMutationOptions = + Apollo.BaseMutationOptions< + UpsertSupplyChainAssociatePreferenceMutation, + UpsertSupplyChainAssociatePreferenceMutationVariables + >;
Adding upsertSupplyChainAssociatePreference query
Adding upsertSupplyChainAssociatePreference query
2eea0e388521b06fa7cec38085d42a83a57bb46a
--- graphql.yml @@ -104,3 +104,4 @@ applications: tags: - "v1" +
Update graphql.yml
Update graphql.yml
9d7168a82f42e714586959818ec401015011770c
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.12.1-alpha.8", + "version": "2.12.1-alpha.9", "main": "dist/index.js", "files": [ "dist"
Update roster mini app version
Update roster mini app version
521e8cb74bce731112fbcc97bbbb9a3864d3047e
--- package-lock.json @@ -4530,9 +4530,9 @@ } }, "@walmart/ui-components": { - "version": "1.3.0-rc.12", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-rc.12.tgz", - "integrity": "sha512-9T1x+x9OZaVXqR24Qb6JzjaysUjHOs8npqtcZb8qDbfSfBFbQQpkXuaABsxGFnTKtWyTXWRqzyLm3Fm7kr/t3g==", + "version": "1.3.0-rc.13", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-rc.13.tgz", + "integrity": "sha512-ubDpjm/XMVOYJ6RBnOrBjdurxfLB5fS+Gso3P08NKOX8BPdWdKv4LiM5MSb5v7DMmjrjv02jePO0H4cSbE225Q==", "requires": { "react-native-calendars": "1.299.0" } --- package.json @@ -103,7 +103,7 @@ "@walmart/shelfavailability-mini-app": "0.8.3", "@walmart/taskit-mini-app": "^0.200.0-rc.1", "@walmart/time-clock-mini-app": "0.4.27", - "@walmart/ui-components": "1.3.0-rc.12", + "@walmart/ui-components": "1.3.0-rc.13", "@walmart/welcomeme-mini-app": "0.44.0", "@walmart/wfm-ui": "0.2.11", "axios-cache-adapter": "2.7.3",
version update
version update
642cb1b9b9a5e355de097f386d84d455911641ac
--- .yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.33-alpha1-8e1df08388.patch @@ -1,13 +0,0 @@ -diff --git a/dist/common/header/NavHeader.js b/dist/common/header/NavHeader.js -index 24162c23b8e93c5a3b8191e6f462baea193a6b43..d829172dc9f3dde611c04c60043d7929f9f5689b 100644 ---- a/dist/common/header/NavHeader.js -+++ b/dist/common/header/NavHeader.js -@@ -87,7 +87,7 @@ const NavHeader = (props) => { - {!isManualSearch && (<react_native_1.View style={styles.iconTextContainer}> - <react_native_1.TouchableOpacity accessible={true} accessibilityLabel={isDrawerBtnRequired - ? t('Common.mainHamburgerButton') -- : t('Common.prevScreenButton')} accessibilityRole={'button'} testID='iconText-touchable-item' style={!expandSearch ? styles.iconContainer : headerStyles.expanded} onPress={onBackPress ? () => onBackPress(true) : handleBack}> -+ : t('Common.prevScreenButton')} accessibilityRole={'button'} testID='iconText-touchable-item' style={!expandSearch ? styles.iconContainer : headerStyles.expanded} onPress={isDrawerBtnRequired? () => navigation?.toggleDrawer?.(): (onBackPress ? () => onBackPress(true) : handleBack)}> - {isDrawerBtnRequired ? <ui_components_1.DrawerButton /> : renderBackIcon()} - </react_native_1.TouchableOpacity> - {!expandSearch && (<react_native_1.Text --- package.json @@ -116,7 +116,7 @@ "@walmart/emergency-mini-app": "1.32.5", "@walmart/exception-mini-app": "1.10.3", "@walmart/expo-config-plugins": "0.8.0", - "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.18.33-alpha1#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.33-alpha1-8e1df08388.patch", + "@walmart/facilities-management-miniapp": "0.18.40", "@walmart/feedback-all-spark-miniapp": "0.9.82", "@walmart/financial-wellbeing-feature-app": "1.31.6", "@walmart/functional-components": "~6.3.28", --- yarn.lock @@ -7959,25 +7959,11 @@ __metadata: languageName: node linkType: hard -"@walmart/facilities-management-miniapp@npm:0.18.33-alpha1": - version: 0.18.33-alpha1 - resolution: "@walmart/facilities-management-miniapp@npm:0.18.33-alpha1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ffacilities-management-miniapp%2F-%2F%40walmart%2Ffacilities-management-miniapp-0.18.33-alpha1.tgz" - peerDependencies: - expo: ~52.0.46 - react: "*" - react-native: "*" - react-native-wm-config: 0.1.1 - dependenciesMeta: - "@walmart/me-at-walmart": - built: false - checksum: 10c0/49eeee565137a1cb6b5fc30b574ed4db48f2d2f8901ae83cfc2237e50cc7c57ce96e8796f111eb9f7e93516b7b7e1ffb97da334a53a110ee6d02e7b69b0b4725 - languageName: node - linkType: hard - -"@walmart/facilities-management-miniapp@patch:@walmart/facilities-management-miniapp@npm%3A0.18.33-alpha1#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.33-alpha1-8e1df08388.patch": - version: 0.18.33-alpha1 - resolution: "@walmart/facilities-management-miniapp@patch:@walmart/facilities-management-miniapp@npm%3A0.18.33-alpha1%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540walmart%252Ffacilities-management-miniapp%252F-%252F%2540walmart%252Ffacilities-management-miniapp-0.18.33-alpha1.tgz#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.33-alpha1-8e1df08388.patch::version=0.18.33-alpha1&hash=8344b0" +"@walmart/facilities-management-miniapp@npm:0.18.40": + version: 0.18.40 + resolution: "@walmart/facilities-management-miniapp@npm:0.18.40::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ffacilities-management-miniapp%2F-%2F%40walmart%2Ffacilities-management-miniapp-0.18.40.tgz" peerDependencies: + "@walmart/gtp-shared-components-3": "*" expo: ~52.0.46 react: "*" react-native: "*" @@ -7985,7 +7971,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/a8281dab4d8a35c14ead32a43f34dc0a946aa6dad2e61606658b088f5f4b57fbcab5c71d9d5cb1d52c7f2ae87def686b16382eab337c20534c2a43e97848d97a + checksum: 10c0/7e7fbf56689879d96cff829b72f703c16019126c02126c37b78bf17962a252171bc29487a247c480604803025a4fea087695014e265f150c01c16ca8f198aa60 languageName: node linkType: hard @@ -8486,7 +8472,7 @@ __metadata: "@walmart/emergency-mini-app": "npm:1.32.5" "@walmart/exception-mini-app": "npm:1.10.3" "@walmart/expo-config-plugins": "npm:0.8.0" - "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.18.33-alpha1#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.33-alpha1-8e1df08388.patch" + "@walmart/facilities-management-miniapp": "npm:0.18.40" "@walmart/feedback-all-spark-miniapp": "npm:0.9.82" "@walmart/financial-wellbeing-feature-app": "npm:1.31.6" "@walmart/functional-components": "npm:~6.3.28"
feat(facilities-management): Walmart 2.0 (#5084)
feat(facilities-management): Walmart 2.0 (#5084)
8053f77ad24952b98acadc0556924d45a6a73433
--- .looper.multibranch.yml @@ -4,7 +4,7 @@ inherit: "job:///metropolis/metroloop/metroloop-parent" ## Whenever you update the nodes, please update it at the two-place, below line & the global variable LOOPER_NODES ## -node: ((osx||stable_osx)&&!MAC-LAB-MINI29&&!MAC-LAB-MINI39&&!MAC-LAB-MINI32&&!MAC-LAB-MINI22&&!MAC-DRFQLAB-MINI22) +node: ((osx||stable_osx)&&!MAC-LAB-MINI29&&!MAC-LAB-MINI39&&!MAC-LAB-MINI32&&!MAC-LAB-MINI22&&!MAC-DRFQLAB-MINI22&&!MAC-DRFQLAB-MINI29) tools: @@ -47,7 +47,7 @@ cache: envs: global: variables: - LOOPER_NODES: "((osx||stable_osx)&&!MAC-LAB-MINI29&&!MAC-LAB-MINI39&&!MAC-LAB-MINI32&&!MAC-LAB-MINI22&&!MAC-DRFQLAB-MINI22)" + LOOPER_NODES: "((osx||stable_osx)&&!MAC-LAB-MINI29&&!MAC-LAB-MINI39&&!MAC-LAB-MINI32&&!MAC-LAB-MINI22&&!MAC-DRFQLAB-MINI22&&!MAC-DRFQLAB-MINI29)" GITHUB_TOKEN: "%{credentials.secret('GITHUB_TOKEN')}" TMPDIR: /tmp
excluding bad node
excluding bad node
eb014ea4639b18a662e9b68055b311f41511695b
--- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -231,7 +231,7 @@ export const MainStackNav = () => { </MainStack.Group> {/* Dynamically render the feature screens on the active container tagged with ScreenTags.AssociateStack */} - {ActiveAllsparkContainer.Screens({ + {ActiveAllsparkContainer.features.Screens({ screenTag: ScreenTags.AssociateStack, builder: {Navigator: MainStack as any}, })} --- core/src/navigation/USHallway/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -33,7 +33,7 @@ export const HomeStackNav = (_: MainTabsScreenProps<'home'>) => { <HomeStack.Navigator initialRouteName='home.root' screenOptions={{headerShown: true, header: Header}}> - {ActiveAllsparkContainer.Screens({ + {ActiveAllsparkContainer.features.Screens({ screenTag: ScreenTags.HomeTab, builder: {Navigator: HomeStack as any}, })} --- core/src/navigation/index.tsx @@ -46,7 +46,7 @@ export const RootStackNavigation = () => { /> {/* Dynamic feature screens based on screen tag */} - {ActiveAllsparkContainer.Screens({ + {ActiveAllsparkContainer.features.Screens({ screenTag: ScreenTags.RootStack, builder: {Navigator: RootStack as any}, })} --- lerna.json @@ -1,5 +1,5 @@ { - "version": "independent", + "version": "6.25.0", "npmClient": "yarn", "changelogPreset": "angular", "command": { --- package.json @@ -114,7 +114,7 @@ "resolutions": { "@react-native-community/datetimepicker": "^7.6.2", "@walmart/allspark-utils": "~6.5.0", - "@walmart/allspark-foundation": "6.15.1", + "@walmart/allspark-foundation": "6.17.0-alpha.0", "@walmart/me-at-walmart-athena-queries": "6.5.0", "@walmart/me-at-walmart-common": "workspace:^", "@walmart/me-at-walmart-container": "workspace:^", --- packages/me-at-walmart-common/src/allspark-extension.types.ts @@ -0,0 +1,17 @@ +import { + MeAtWalmartComponentContainers, + MeAtWalmartDynamicComponents, +} from './components'; +import {IMeAtWalmartEnvironment} from './environment'; + +declare global { + namespace Allspark { + interface Environment extends IMeAtWalmartEnvironment {} + + interface ComponentContainers extends MeAtWalmartComponentContainers {} + + interface DynamicComponents extends MeAtWalmartDynamicComponents {} + } +} + +export {}; --- packages/me-at-walmart-common/src/index.ts @@ -5,4 +5,6 @@ export * from './redux'; export * from './types'; export * from './utils'; +export * from './allspark-extension.types'; + export const ME_AT_WALMART = 'Me@Walmart' as const; --- packages/me-at-walmart-common/src/types.ts @@ -1,9 +1,3 @@ -import { - MeAtWalmartComponentContainers, - MeAtWalmartDynamicComponents, -} from './components'; -import {IMeAtWalmartEnvironment} from './environment'; - export enum UserDomain { dc = 'distribution center', candidate = 'candidate', @@ -17,13 +11,3 @@ export enum UserType { } export type IMeAtWalmartSetupTypes = 'root' | 'associate' | 'pre_hire'; - -declare global { - namespace Allspark { - interface Environment extends IMeAtWalmartEnvironment {} - - interface ComponentContainers extends MeAtWalmartComponentContainers {} - - interface DynamicComponents extends MeAtWalmartDynamicComponents {} - } -} --- targets/US/package.json @@ -77,7 +77,7 @@ "@terrylinla/react-native-sketch-canvas": "patch:@terrylinla/react-native-sketch-canvas@npm%3A0.8.0#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch", "@walmart/allspark-authentication": "~6.4.1", "@walmart/allspark-cope-key-listener": "0.0.17", - "@walmart/allspark-foundation": "6.15.1", + "@walmart/allspark-foundation": "6.17.0-alpha.0", "@walmart/allspark-graphql-client": "~6.3.20", "@walmart/allspark-http-client": "~6.3.20", "@walmart/allspark-neon-core": "0.1.31", --- yarn.lock @@ -5403,9 +5403,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation@npm:6.15.1": - version: 6.15.1 - resolution: "@walmart/allspark-foundation@npm:6.15.1" +"@walmart/allspark-foundation@npm:6.17.0-alpha.0": + version: 6.17.0-alpha.0 + resolution: "@walmart/allspark-foundation@npm:6.17.0-alpha.0" dependencies: "@apollo/client": "npm:^3.8.6" "@graphql-codegen/cli": "npm:^5.0.0" @@ -5490,13 +5490,15 @@ __metadata: optional: true "@walmart/redux-store": optional: true + react-native-apollo-devtools-client: + optional: true react-native-flipper: optional: true bin: allspark-generate-graphql: cli/generate.js allspark-link: cli/link.js allspark-setup: cli/setup.js - checksum: 10c0/6dfb53fc68837204f0a3f5ced9969b41704de96b0aa18cf7a4af7fa5b40e5226694d065b2c3163877c3a74395a6079d4b3b08f8647ebde31ac9965e9382ee6bb + checksum: 10c0/6f4bf6e4fac5db80ea2ce459f61c092f772db259c737c7107e045c4f8187c0fde3b07b7a77a543585f8142234ed90e4de935f98ebd0b2522796309a62cd07e8b languageName: node linkType: hard @@ -6803,7 +6805,7 @@ __metadata: "@types/uuid": "npm:^8.3.0" "@walmart/allspark-authentication": "npm:~6.4.1" "@walmart/allspark-cope-key-listener": "npm:0.0.17" - "@walmart/allspark-foundation": "npm:6.15.1" + "@walmart/allspark-foundation": "npm:6.17.0-alpha.0" "@walmart/allspark-graphql-client": "npm:~6.3.20" "@walmart/allspark-http-client": "npm:~6.3.20" "@walmart/allspark-neon-core": "npm:0.1.31"
chore: bump foundation version and align packages to single version
chore: bump foundation version and align packages to single version
20f9fa6ad7c846e38d670891f6084cd62b09fe9a
--- saucelabs/.looper-native-common-saucelabs.yml @@ -9,6 +9,7 @@ envs: RCT_NO_LAUNCH_PACKAGER: true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true KEYCHAIN_PW: "%{credentials.secret('ios-sign-keychain-pw')}" + KEYCHAIN_NAME: "enterprise-app-signing.keychain-db" XCODE_CONFIG: 'Release' PROVISIONING_PROFILE: ./BuildSupport/MeAtWMBeta_InHouse_Provision.mobileprovision ENTITLEMENTS: './BuildSupport/ExportOptions.plist'
adding keychain name for saucelabs
adding keychain name for saucelabs
1d2dc0b5b60dfb9d0f28639bde52af04bae50378
--- __tests__/screens/ChannelsScreen/__snapshots__/ChannelsScreenTest.tsx.snap @@ -49,7 +49,7 @@ Array [ <RCTScrollView ItemSeparatorComponent={[Function]} ListEmptyComponent={[Function]} - ListHeaderComponent={false} + ListHeaderComponent={<ErrorComponent />} applyWindowCorrection={[Function]} canChangeSize={true} contentContainerStyle={ @@ -142,7 +142,7 @@ Array [ "props": Object { "ItemSeparatorComponent": [Function], "ListEmptyComponent": [Function], - "ListHeaderComponent": false, + "ListHeaderComponent": <ErrorComponent />, "contentContainerStyle": Object { "paddingBottom": 0, "paddingTop": 16, @@ -229,7 +229,7 @@ Array [ "value": Object { "endCorrection": 0, "startCorrection": 0, - "windowShift": -0, + "windowShift": -1, }, } } --- __tests__/screens/MeganavScreen/__snapshots__/MeganavScreenTest.tsx.snap @@ -170,7 +170,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` <RCTScrollView ItemSeparatorComponent={[Function]} ListEmptyComponent={[Function]} - ListHeaderComponent={false} + ListHeaderComponent={<ErrorComponent />} applyWindowCorrection={[Function]} canChangeSize={true} contentContainerStyle={ @@ -263,7 +263,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` "props": Object { "ItemSeparatorComponent": [Function], "ListEmptyComponent": [Function], - "ListHeaderComponent": false, + "ListHeaderComponent": <ErrorComponent />, "contentContainerStyle": Object { "paddingBottom": 0, "paddingTop": 0, @@ -350,7 +350,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` "value": Object { "endCorrection": 0, "startCorrection": 0, - "windowShift": -0, + "windowShift": -1, }, } } --- __tests__/screens/ChannelsScreen/__snapshots__/ChannelsScreenTest.tsx.snap @@ -49,7 +49,7 @@ Array [ <RCTScrollView ItemSeparatorComponent={[Function]} ListEmptyComponent={[Function]} - ListHeaderComponent={false} + ListHeaderComponent={<ErrorComponent />} applyWindowCorrection={[Function]} canChangeSize={true} contentContainerStyle={ @@ -142,7 +142,7 @@ Array [ "props": Object { "ItemSeparatorComponent": [Function], "ListEmptyComponent": [Function], - "ListHeaderComponent": false, + "ListHeaderComponent": <ErrorComponent />, "contentContainerStyle": Object { "paddingBottom": 0, "paddingTop": 16, @@ -229,7 +229,7 @@ Array [ "value": Object { "endCorrection": 0, "startCorrection": 0, - "windowShift": -0, + "windowShift": -1, }, } } --- __tests__/screens/MeganavScreen/__snapshots__/MeganavScreenTest.tsx.snap @@ -170,7 +170,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` <RCTScrollView ItemSeparatorComponent={[Function]} ListEmptyComponent={[Function]} - ListHeaderComponent={false} + ListHeaderComponent={<ErrorComponent />} applyWindowCorrection={[Function]} canChangeSize={true} contentContainerStyle={ @@ -263,7 +263,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` "props": Object { "ItemSeparatorComponent": [Function], "ListEmptyComponent": [Function], - "ListHeaderComponent": false, + "ListHeaderComponent": <ErrorComponent />, "contentContainerStyle": Object { "paddingBottom": 0, "paddingTop": 0, @@ -350,7 +350,7 @@ exports[`MeganavScreen renders meganav screen with expected elements 1`] = ` "value": Object { "endCorrection": 0, "startCorrection": 0, - "windowShift": -0, + "windowShift": -1, }, } }
fix snapshots
fix snapshots
6b7d57b0e4eaa677bca9a2fe4dc55b12db8b89cd
--- src/channels/hooks.ts @@ -65,7 +65,7 @@ export const useUnread = () => { export const useChannelUnread = () => { const unreadChannelsCount = useSelector(getUnreadChannelsCount); - return unreadChannelsCount; + return unreadChannelsCount > 0 ? unreadChannelsCount : null; }; export const useChannelDetails = (id: string) => { --- src/channels/hooks.ts @@ -65,7 +65,7 @@ export const useUnread = () => { export const useChannelUnread = () => { const unreadChannelsCount = useSelector(getUnreadChannelsCount); - return unreadChannelsCount; + return unreadChannelsCount > 0 ? unreadChannelsCount : null; }; export const useChannelDetails = (id: string) => {
use null value if count is not positive and nonzero
use null value if count is not positive and nonzero
9b44883291d07b1afc4a139743473bdc302fc461
--- targets/US/android/app/src/teflon/res/drawable-xxxhdpi/ic_notification_icon-19.png Binary files a/targets/US/android/app/src/teflon/res/drawable-xxxhdpi/ic_notification_icon-19.png and /dev/null differ --- targets/US/android/app/src/teflon/res/drawable-xxxhdpi/ic_notification_icon.png Binary files a/targets/US/android/app/src/teflon/res/drawable-xxxhdpi/ic_notification_icon.png and b/targets/US/android/app/src/teflon/res/drawable-xxxhdpi/ic_notification_icon.png differ
android teflon Icon name renamed
android teflon Icon name renamed
dbd8caf29d8372701c400fd83aa431f1ac9dce21
--- packages/allspark-foundation/namecase.d.ts @@ -0,0 +1,4 @@ +declare module 'namecase' { + type NameCase = <T extends string | undefined>(value: T) => T; + export default (() => {}) as NameCase; +} --- packages/allspark-foundation/src/Auth/index.tsx @@ -13,5 +13,6 @@ export const { connectToRedux: connectAuthServiceToRedux, }); -export * from './redux'; +export { AuthActionTypes, AuthActionCreators, AuthSelectors } from './redux'; +export type { IAuthActions, AuthState } from './redux'; export * from './types'; --- packages/allspark-foundation/src/Clock/index.ts @@ -13,3 +13,7 @@ export const { connectToRedux: connectClockServiceToRedux, setupHook: useConfigSetup, }); + +export { ClockActionTypes, ClockActionCreators, ClockSelectors } from './redux'; +export type { IClockActions, ClockState } from './redux'; +export * from './types'; --- packages/allspark-foundation/src/Config/index.tsx @@ -14,5 +14,10 @@ export const { setupHook: useConfigSetup, }); -export * from './redux'; +export { + ConfigActionCreators, + ConfigActionTypes, + ConfigSelectors, +} from './redux'; +export type { IConfigActions, ConfigState } from './redux'; export * from './types'; --- packages/allspark-foundation/src/Config/redux.ts @@ -69,6 +69,8 @@ export const { Selectors: GeneratedSelectors, } = createSliceUtilities(configSlice); +export type IConfigActions = typeof ConfigActionCreators; + export const ConfigSelectors = { ...GeneratedSelectors, createFeatureConfigSelector: (feature: string) => --- packages/allspark-foundation/src/Environment/index.tsx @@ -67,5 +67,14 @@ export { dangerouslyGetEnvironment, }; -export * from './redux'; -export * from './types'; +export { + EnvironmentActionCreators, + EnvironmentActionTypes, + EnvironmentSelectors, +} from './redux'; +export type { IEnvironmentActions, EnvironmentState } from './redux'; +export type { + EnvironmentType, + AllsparkEnvironment, + EnvironmentConfigMap, +} from './types'; --- packages/allspark-foundation/src/GraphQL/index.ts @@ -4,3 +4,4 @@ export { getGraphQLClient } from './global'; export * from './client'; export * from './hooks'; export * from './provider'; +export * from './types'; --- packages/allspark-foundation/src/Navigation/index.ts @@ -1,6 +1,6 @@ -export * from './Root'; export * from './Elements'; -export * from './constants'; export * from './components'; +export * from './Root'; +export * from './constants'; export * from './provider'; export * from './Modals'; --- packages/allspark-foundation/src/Network/index.ts @@ -14,5 +14,10 @@ export const { connectToRedux: connectNetworkServiceToRedux, }); -export * from './redux'; +export { + NetworkActionCreators, + NetworkActionTypes, + NetworkSelectors, +} from './redux'; +export type { INetworkActions, NetworkState } from './redux'; export * from './types'; --- packages/allspark-foundation/src/Notification/index.tsx @@ -21,5 +21,11 @@ export const { setupHook: useNotificationSetup, }); -export * from './redux'; +export * from './events'; +export { + NotificationActionCreators, + NotificationActionTypes, + NotificationSelectors, +} from './redux'; +export type { INotificationActions, NotificationState } from './redux'; export * from './types'; --- packages/allspark-foundation/src/Permissions/index.ts @@ -32,5 +32,10 @@ export const usePermission = (permission: PermissionType) => { }; export * from './permissions'; -export * from './redux'; +export { + PermissionActionCreators, + PermissionActionTypes, + PermissionSelectors, +} from './redux'; +export type { IPermissionActions, PermissionsState } from './redux'; export * from './types'; --- packages/allspark-foundation/src/Redux/index.ts @@ -1,7 +1,7 @@ -export * from './global'; +export { getAllsparkReduxStore } from './global'; export * from './hooks'; -export * from './reducers'; export * from './utils'; export * from './store'; export * from './types'; export * from './provider'; +export type { IAllsparkReduxState } from './reducers'; --- packages/allspark-foundation/src/Redux/reducers.ts @@ -1,21 +1,27 @@ import { StateFromReducersMapObject } from 'redux'; -import { authSlice } from '../Auth'; -import { configSlice } from '../Config'; -import { environmentSlice } from '../Environment'; -import { networkSlice } from '../Network'; -import { notificationSlice } from '../Notification'; -import { permissionSlice } from '../Permissions'; +import { authSlice } from '../Auth/redux'; +import { clockSlice } from '../Clock/redux'; +import { configSlice } from '../Config/redux'; +import { environmentSlice } from '../Environment/redux'; +import { networkSlice } from '../Network/redux'; +import { notificationSlice } from '../Notification/redux'; +import { permissionSlice } from '../Permissions/redux'; +import { siteSlice } from '../Site/redux'; +import { userSlice } from '../User/redux'; // --- Reducers --- // // using dynamic name for keys here doesn't translate through types correctly export const BaseAllsparkReducers = { - config: configSlice.reducer, auth: authSlice.reducer, + clock: clockSlice.reducer, + config: configSlice.reducer, environment: environmentSlice.reducer, network: networkSlice.reducer, notification: notificationSlice.reducer, permissions: permissionSlice.reducer, + site: siteSlice.reducer, + user: userSlice.reducer, }; export type BaseAllsparkReduxState = StateFromReducersMapObject< --- packages/allspark-foundation/src/Site/index.tsx @@ -13,6 +13,7 @@ export const { connectToRedux: connectSiteServiceToRedux, }); -export * from './types'; -export * from './redux'; +export { SiteActionCreators, SiteActionTypes } from './redux'; +export type { ISiteActions, SiteState } from './redux'; export * from './selectors'; +export * from './types'; --- packages/allspark-foundation/src/User/index.ts @@ -13,6 +13,7 @@ export const { connectToRedux: connectUserServiceToRedux, }); -export * from './types'; export { UserActionCreators, UserActionTypes } from './redux'; +export type { IUserActions, UserState } from './redux'; export { UserSelectors } from './selectors'; +export * from './types'; --- packages/allspark-foundation/src/User/selectors.ts @@ -81,17 +81,17 @@ export const getNameFromUser = (user: User | null) => { } if (user.preferredFullName) { - return nameCase(stripUserIdFromName(user.preferredFullName!)); + return nameCase(stripUserIdFromName(user.preferredFullName)!); } if (user.preferredFirstName && user.preferredLastName) { return nameCase( - fullNameFromFields(user.preferredFirstName, user.preferredLastName) + fullNameFromFields(user.preferredFirstName, user.preferredLastName)! ); } if (user.displayName) { - return nameCase(stripUserIdFromName(user.displayName)); + return nameCase(stripUserIdFromName(user.displayName)!); } return '';
chore: continued foundation work
chore: continued foundation work
139c0add2a24c8a87643506262d1141ef4c10464
--- src/cafeOrders/screens/MessagesScreen.tsx @@ -96,6 +96,11 @@ const styles = StyleSheet.create({ messageList: { paddingHorizontal: 16, }, + emptyListPlaceHolder: { + justifyContent: 'center', + alignItems: 'center', + flex: 1, + }, }); type MessageRequest = { @@ -118,7 +123,11 @@ export const renderItem: ListRenderItem<Message> = ({item: message}) => ( <MessageRow {...message} /> ); -const ListEmptyComponent = () => <Body>No messages found</Body>; +const ListEmptyComponent = () => ( + <View style={styles.emptyListPlaceHolder}> + <Body>No messages found</Body> + </View> +); const ChatInput = (props: {onSend: (message: MessageRequest) => void}) => { const {onSend} = props; @@ -234,11 +243,7 @@ export const MessagesScreen = () => { }: { section: SectionListData<Message>; }) => { - return ( - <MessageTimeSectionHeader - time={section.title} - /> - ); + return <MessageTimeSectionHeader time={section.title} />; }; return ( @@ -261,16 +266,19 @@ export const MessagesScreen = () => { </View> </View> </View> - <SectionList - inverted={true} - sections={messages} - keyExtractor={keyExtractor} - renderItem={renderItem} - ListEmptyComponent={ListEmptyComponent} - renderSectionFooter={renderSectionHeader} // SectionList View is inverted so footer is shown as header - showsVerticalScrollIndicator={false} - contentContainerStyle={styles.messageList} - /> + {messages.length === 0 ? ( + <ListEmptyComponent /> + ) : ( + <SectionList + inverted={true} + sections={messages} + keyExtractor={keyExtractor} + renderItem={renderItem} + renderSectionFooter={renderSectionHeader} // SectionList View is inverted so footer is shown as header + showsVerticalScrollIndicator={false} + contentContainerStyle={styles.messageList} + /> + )} <ChatInput onSend={onMessageSend} /> </View> ); --- src/cafeOrders/screens/MessagesScreen.tsx @@ -96,6 +96,11 @@ const styles = StyleSheet.create({ messageList: { paddingHorizontal: 16, }, + emptyListPlaceHolder: { + justifyContent: 'center', + alignItems: 'center', + flex: 1, + }, }); type MessageRequest = { @@ -118,7 +123,11 @@ export const renderItem: ListRenderItem<Message> = ({item: message}) => ( <MessageRow {...message} /> ); -const ListEmptyComponent = () => <Body>No messages found</Body>; +const ListEmptyComponent = () => ( + <View style={styles.emptyListPlaceHolder}> + <Body>No messages found</Body> + </View> +); const ChatInput = (props: {onSend: (message: MessageRequest) => void}) => { const {onSend} = props; @@ -234,11 +243,7 @@ export const MessagesScreen = () => { }: { section: SectionListData<Message>; }) => { - return ( - <MessageTimeSectionHeader - time={section.title} - /> - ); + return <MessageTimeSectionHeader time={section.title} />; }; return ( @@ -261,16 +266,19 @@ export const MessagesScreen = () => { </View> </View> </View> - <SectionList - inverted={true} - sections={messages} - keyExtractor={keyExtractor} - renderItem={renderItem} - ListEmptyComponent={ListEmptyComponent} - renderSectionFooter={renderSectionHeader} // SectionList View is inverted so footer is shown as header - showsVerticalScrollIndicator={false} - contentContainerStyle={styles.messageList} - /> + {messages.length === 0 ? ( + <ListEmptyComponent /> + ) : ( + <SectionList + inverted={true} + sections={messages} + keyExtractor={keyExtractor} + renderItem={renderItem} + renderSectionFooter={renderSectionHeader} // SectionList View is inverted so footer is shown as header + showsVerticalScrollIndicator={false} + contentContainerStyle={styles.messageList} + /> + )} <ChatInput onSend={onMessageSend} /> </View> );
No new messages found fix
No new messages found fix
f00fb5cdc17ce62df1766af95d2217d15feef870
--- src/components/AssociateRosterItem/index.tsx @@ -42,6 +42,7 @@ import {rosterSlice} from '../../redux/reducer'; import {storeAssociateName} from '../../utils/recentSearchHistory'; import {ClockStatusIndicator} from '../ActionButton/ClockStatusIndicator'; import {navigateToMessageScreen} from '@walmart/wmconnect-mini-app'; +import {logger} from '../../logger/Logger'; export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const {associate, first, last, style, isSearchScreen = false} = props; @@ -84,14 +85,20 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { ); const onText = async () => { - if (isSearchScreen) { - dispatch(rosterSlice.actions.SET_SEARCH_TEXT(associateName)); - await storeAssociateName(associateName); - } - if (siteId) { - const encryptedId = encryptUserId(associate?.win?.toString() ?? ''); - const participants: string[] = [viewerId, encryptedId]; - await navigateToMessageScreen(siteId, participants); + try { + if (isSearchScreen) { + dispatch(rosterSlice.actions.SET_SEARCH_TEXT(associateName)); + await storeAssociateName(associateName); + } + if (siteId) { + const encryptedId = encryptUserId(associate?.win?.toString() ?? ''); + const participants: string[] = [viewerId, encryptedId]; + await navigateToMessageScreen(siteId, participants); + } + } catch (error) { + logger.error('onText error', { + message: `error in onText of AssociateRosterItem: ${error}`, + }); } }; const shouldShowMessageAndPttButton = --- src/components/Roster/Roster.tsx @@ -71,8 +71,14 @@ export const Roster: React.FC<RosterProps> = (props) => { //TODO: Roster filter broke after port, troubleshoot further and fix const onFilter = (filteredAssociates: Associate[], filterId: FilterValue) => { - selectedFilter.current = filterId; - setAssociates(sortedAssociateList(filteredAssociates, teamLeads)); + try { + selectedFilter.current = filterId; + setAssociates(sortedAssociateList(filteredAssociates, teamLeads)); + } catch (error: any) { + logger.error('Error in Roster filter: ', { + message: error.toString(), + }); + } }; const handleScrollToTop = () => { @@ -147,7 +153,7 @@ export const Roster: React.FC<RosterProps> = (props) => { associates, associateListSearchQuery, ); - setAssociates(filteredAssociates); + setAssociates(filteredAssociates || []); }, [associateListSearchQuery]); const extraData = useMemo( --- src/components/Roster/search.ts @@ -1,22 +1,29 @@ import {associateDisplayName} from '../../utils'; import {isNil} from 'lodash'; import {Associate} from '../../types'; +import {logger} from '../../logger/Logger'; export const filterAssociatesBySearchInput = ( associates: Associate[], searchInput: string | null, ) => { - if (isNil(searchInput) || searchInput.length === 0) { - return associates; + try { + if (isNil(searchInput) || searchInput.length === 0) { + return associates; + } + return associates.filter((associate) => { + return ( + associateDisplayName(associate) + ?.toLowerCase() + .includes(searchInput.toLowerCase()) || + associate?.jobCategoryCodeDesc + ?.toLowerCase() + .includes(searchInput.toLowerCase()) + ); + }); + } catch (error) { + logger.error('filterAssociatesBySearchInput Error', { + message: `Error in filterAssociatesBySearchInput: ${error}`, + }); } - return associates.filter((associate) => { - return ( - associateDisplayName(associate) - ?.toLowerCase() - .includes(searchInput.toLowerCase()) || - associate?.jobCategoryCodeDesc - ?.toLowerCase() - .includes(searchInput.toLowerCase()) - ); - }); }; --- src/components/TeamList.tsx @@ -50,6 +50,7 @@ import { displayTotalStore, displayViewTeam, } from '../redux/selectors'; +import {logger} from '../logger/Logger'; const styles = StyleSheet.create({ listItem: { @@ -470,7 +471,16 @@ export const TeamChatCard = (props: { { i18nLabel: t('rosterScreen.associateRosterItem.messageBtn'), action(team) { - startTeamText(team.teamId, team?.teamName || team.teamId); + try { + startTeamText( + team.teamId, + team?.teamName || team.teamId, + ); + } catch (error) { + logger.error('startTeamText error', { + message: `error in startTeamText: ${error}`, + }); + } }, }, ]} @@ -483,7 +493,13 @@ export const TeamChatCard = (props: { { i18nLabel: t('rosterScreen.associateRosterItem.messageBtn'), action() { - startStoreText(); + try { + startStoreText(); + } catch (error) { + logger.error('startStoreText error', { + message: `error in startStoreText: ${error}`, + }); + } }, }, ]} --- src/navigation/utils.ts @@ -1,12 +1,19 @@ import {navigate} from '@walmart/react-native-shared-navigation'; import namecase from 'namecase'; +import {logger} from '../logger/Logger'; export const goToWeeklySchedule = (wins: string[], teamName?: string) => { - navigate('scheduleScreen', { - // @ts-ignore - screen: 'scheduleNav.roster', - params: {wins, teamName}, - }); + try { + navigate('scheduleScreen', { + // @ts-ignore + screen: 'scheduleNav.roster', + params: {wins, teamName}, + }); + } catch (error) { + logger.error('goToWeeklySchedule error', { + message: `error in navigation from goToWeeklySchedule: ${error}`, + }); + } }; export const goToIndividualSchedule = ( @@ -17,18 +24,24 @@ export const goToIndividualSchedule = ( win?: number | null, countryCode?: string | null, ) => { - navigate('scheduleScreen', { - // @ts-ignore - screen: 'scheduleNav.associateView', - params: { - userInfo: { - userId: userId, - businessUnitNumber: parseInt(siteId || '', 10), - displayName: namecase(displayName), - payType: payType, - walmartIdentificationNumber: win?.toString(), - country: countryCode, + try { + navigate('scheduleScreen', { + // @ts-ignore + screen: 'scheduleNav.associateView', + params: { + userInfo: { + userId: userId, + businessUnitNumber: parseInt(siteId || '', 10), + displayName: namecase(displayName), + payType: payType, + walmartIdentificationNumber: win?.toString(), + country: countryCode, + }, }, - }, - }); + }); + } catch (error) { + logger.error('goToIndividualSchedule error', { + message: `error in navigation from goToIndividualSchedule: ${error}`, + }); + } };
splunk loggin
splunk loggin