commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
0c05c4fb78050f494eb0fbcd7f84cf7fa50b495d
--- commitlint.config.js @@ -25,33 +25,5 @@ module.exports = { 'build', ], ], - 'scope-enum': [ - 2, - 'always', - [ - 'appConfig', - 'auth', - 'clockStatus', - 'deviceInfo', - 'environment', - 'athena', - 'hooks', - 'httpClient', - 'localStorage', - 'logger', - 'network', - 'notification', - 'permissions', - 'redux', - 'scanner', - 'storeConfig', - 'telemetry', - 'translations', - 'types', - 'user', - 'utils', - 'widgetRegistry', - ], - ], }, };
chore: update commit lint config
chore: update commit lint config
286b08efcd66c7c36bfc12338ef99c9a793229a3
--- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/HomeStackNavTest.tsx.snap @@ -87,6 +87,9 @@ exports[`HomeStackNav matches snapshot 1`] = ` component="MetricsFtprTabNavigation" name="metrics.ftprDrilldown" /> + <Screen + name="metrics.viewAllFreights" + /> </Navigator> `; @@ -208,6 +211,9 @@ exports[`HomeStackNav matches snapshot when user is not present 1`] = ` component="MetricsFtprTabNavigation" name="metrics.ftprDrilldown" /> + <Screen + name="metrics.viewAllFreights" + /> </Navigator> `; --- src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -27,6 +27,7 @@ import { MetricsPreSubInfoModalScreen, MetricsFtprInfoModalScreen, MetricsFtprTabNavigation, + ViewAllFreights, } from '@walmart/metrics-mini-app'; import {UserSelectors} from '@walmart/redux-store'; import {Spinner} from '@walmart/gtp-shared-components'; @@ -162,6 +163,10 @@ export const HomeStackNav = () => { component={MetricsFtprTabNavigation} name='metrics.ftprDrilldown' /> + <HomeStack.Screen + component={ViewAllFreights} + name='metrics.viewAllFreights' + /> </HomeStack.Navigator> ); };
adding navigation page to core
adding navigation page to core
c981d8a421f3ff67dde843532b9756de41538b14
--- targets/US/package.json @@ -93,7 +93,7 @@ "@walmart/calling-mini-app": "0.5.6", "@walmart/checkout-mini-app": "3.22.0", "@walmart/compass-sdk-rn": "5.19.15", - "@walmart/config-components": "4.4.2", + "@walmart/config-components": "4.4.5", "@walmart/core-services": "~6.4.1", "@walmart/core-services-allspark": "workspace:^", "@walmart/core-utils": "6.3.9", --- yarn.lock @@ -6220,23 +6220,26 @@ __metadata: languageName: node linkType: hard -"@walmart/config-components@npm:4.4.2": - version: 4.4.2 - resolution: "@walmart/config-components@npm:4.4.2" - dependencies: - reduxsauce: "npm:^1.2.1" - reselect: "npm:^4.1.5" +"@walmart/config-components@npm:4.4.5": + version: 4.4.5 + resolution: "@walmart/config-components@npm:4.4.5" peerDependencies: "@react-native-firebase/app": ">=15.1.1" "@react-native-firebase/database": ">=15.1.1" + "@react-native-firebase/perf": ">15.1.1" + "@walmart/allspark-foundation": "*" "@walmart/core-services": ">=2.0.15" "@walmart/core-services-allspark": ">=2.10.3" "@walmart/core-utils": ">=1.1.2" + jwt-decode: ">=3.0" react: "*" react-native: "*" react-native-check-app-install: ">=0.0.5" - react-native-device-info: ^10.3.0 - checksum: 10c0/4ef9cd2c581f5e346e5d9fb0381b0ad0d95d2e4b341fafa4f1f44ec198f8fcc79e97fd725ad8e8791eaaf4b1d569520f4945662ebef827e3a28482d93090a66f + react-native-device-info: ">=10.1.0" + redux: ">=4.2.0" + reduxsauce: ">=1" + reselect: ">=4" + checksum: 10c0/c923550eefe9fc8c1366257b08590f1e80dc229f90b2407cd4eb08b11c8a46442e03200c15d7b1a8ee3e3d1b437c85a095cea93bd34ddc887a9f806272918259 languageName: node linkType: hard @@ -6997,7 +7000,7 @@ __metadata: "@walmart/calling-mini-app": "npm:0.5.6" "@walmart/checkout-mini-app": "npm:3.22.0" "@walmart/compass-sdk-rn": "npm:5.19.15" - "@walmart/config-components": "npm:4.4.2" + "@walmart/config-components": "npm:4.4.5" "@walmart/core-services": "npm:~6.4.1" "@walmart/core-services-allspark": "workspace:^" "@walmart/core-utils": "npm:6.3.9"
config component version update
config component version update
4b068d3485fd316114d79be33e3f3b6003ea4526
--- src/components/Roster/AssociateListItem.tsx @@ -9,7 +9,7 @@ import { } from '@walmart/gtp-shared-components'; import {useTranslation} from 'react-i18next'; import {ROSTER_I18N_NAMESPACE} from '../../translations'; -import {useSelector} from 'react-redux'; +import {shallowEqual, useSelector} from 'react-redux'; import {SiteSelectors} from '@walmart/redux-store'; import {useRbacConfigWithJobCode, useUserIsInRoster} from '../../hooks'; import { @@ -34,104 +34,109 @@ interface AssociateListItemProps { } //TODO: i18n is broken on the roster items. Fix translation method -export const AssociateListItem: React.FC<AssociateListItemProps> = (props) => { - const { - associate, - roundBottomCorners = false, - roundTopCorners = false, - actionButtons = null, - } = props; +export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo( + (props) => { + const { + associate, + roundBottomCorners = false, + roundTopCorners = false, + actionButtons = null, + } = props; - const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); - const siteId: string | undefined = useSelector( - SiteSelectors.getUserWorkingSite, - ); - const shouldShowStatusChipAndWeeklySchedule: boolean = - useRbacConfigWithJobCode(); - const userIsInRoster = useUserIsInRoster(); + const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); + const siteId: string | undefined = useSelector( + SiteSelectors.getUserWorkingSite, + ); + const shouldShowStatusChipAndWeeklySchedule: boolean = + useRbacConfigWithJobCode(); + const userIsInRoster = useUserIsInRoster(); - const encryptedId = encryptUserId(associate?.win?.toString() ?? ''); - const associateName = namecase(associateDisplayName(associate).slice(0, 20)); - const isStoreScheduleValid = - associate?.storeSchedule && associate?.storeSchedule?.length > 0; - const isClockedIn = associateIsClockedIn(associate); + const encryptedId = encryptUserId(associate?.win?.toString() ?? ''); + const associateName = namecase( + associateDisplayName(associate).slice(0, 20), + ); + const isStoreScheduleValid = + associate?.storeSchedule && associate?.storeSchedule?.length > 0; + const isClockedIn = associateIsClockedIn(associate); - return ( - <Card - UNSAFE_style={[ - styles.card, - roundTopCorners && styles.firstCard, - roundBottomCorners && styles.lastCard, - ]}> - <CardContent UNSAFE_style={styles.cardContent}> - <ListItem - UNSAFE_style={[styles.item, roundBottomCorners && styles.lastItem]} - title={associateName} - leading={ - <ClockStatusIndicator - isClockedIn={isClockedIn} - style={styles.badge} - /> - } - trailing={ - <> - {shouldShowStatusChipAndWeeklySchedule && ( - <StatusChip - associate={associate} - encryptedId={encryptedId} - style={styles.tag} - /> - )} + return ( + <Card + UNSAFE_style={[ + styles.card, + roundTopCorners && styles.firstCard, + roundBottomCorners && styles.lastCard, + ]}> + <CardContent UNSAFE_style={styles.cardContent}> + <ListItem + UNSAFE_style={[styles.item, roundBottomCorners && styles.lastItem]} + title={associateName} + leading={ + <ClockStatusIndicator + isClockedIn={isClockedIn} + style={styles.badge} + /> + } + trailing={ + <> + {shouldShowStatusChipAndWeeklySchedule && ( + <StatusChip + associate={associate} + encryptedId={encryptedId} + style={styles.tag} + /> + )} - {!isNil(actionButtons) && ( - <View style={styles.buttonsStyle}> - {actionButtons.map((actionButton: RosterActionButton) => { - return ( - <Button - variant={'secondary'} - UNSAFE_style={styles.actionButtonSpacing} - onPress={() => actionButton.action(associate)} - size={'small'} - disabled={!userIsInRoster} - testID={`actionButton-${actionButton.i18nLabel}`}> - <Text>{t(actionButton.i18nLabel)}</Text> - </Button> - ); - })} - </View> - )} - </> - }> - <Body weight='400' size='small' numberOfLines={1}> - {namecase(associate?.jobCategoryCodeDesc)} - </Body> - {isStoreScheduleValid && ( + {!isNil(actionButtons) && ( + <View style={styles.buttonsStyle}> + {actionButtons.map((actionButton: RosterActionButton) => { + return ( + <Button + variant={'secondary'} + UNSAFE_style={styles.actionButtonSpacing} + onPress={() => actionButton.action(associate)} + size={'small'} + disabled={!userIsInRoster} + testID={`actionButton-${actionButton.i18nLabel}`}> + <Text>{t(actionButton.i18nLabel)}</Text> + </Button> + ); + })} + </View> + )} + </> + }> <Body weight='400' size='small' numberOfLines={1}> - {namecase(formatSchedule(associate?.storeSchedule))} + {namecase(associate?.jobCategoryCodeDesc)} </Body> - )} - {shouldShowStatusChipAndWeeklySchedule && ( - <TouchableOpacity - onPress={() => { - goToIndividualSchedule( - associate.userId, - associate.fullName, - siteId, - ); - }} - disabled={!associate.userId}> - <Body - weight='400' - size='small' - numberOfLines={1} - UNSAFE_style={styles.viewSchedule} - testID='viewSchedule'> - {t('rosterScreen.associateRosterItem.viewSchedule')} + {isStoreScheduleValid && ( + <Body weight='400' size='small' numberOfLines={1}> + {namecase(formatSchedule(associate?.storeSchedule))} </Body> - </TouchableOpacity> - )} - </ListItem> - </CardContent> - </Card> - ); -}; + )} + {shouldShowStatusChipAndWeeklySchedule && ( + <TouchableOpacity + onPress={() => { + goToIndividualSchedule( + associate.userId, + associate.fullName, + siteId, + ); + }} + disabled={!associate.userId}> + <Body + weight='400' + size='small' + numberOfLines={1} + UNSAFE_style={styles.viewSchedule} + testID='viewSchedule'> + {t('rosterScreen.associateRosterItem.viewSchedule')} + </Body> + </TouchableOpacity> + )} + </ListItem> + </CardContent> + </Card> + ); + }, + shallowEqual, +);
adding back memo for list items
adding back memo for list items
5375fe455629f293f10d400efb2fc0e75317c3f0
--- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.3.11", + "version": "1.3.12", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
Update foundation version
Update foundation version
6bebc101f1b12ebba6dd1ff3cb7bdd5bc6fb23c2
--- __tests__/home/components/TaskCard/TaskClockStatusTeamCard2Test.tsx @@ -8,6 +8,7 @@ import {useGetTeamByIdHomeQuery} from '@walmart/me-at-walmart-athena-queries'; import {logWMTelemetryTouchComponentEvent} from '../../../../src/home/logger/Logger'; import {TaskClockStatusTeamCard2} from '../../../../src/home/components/TaskCard/TaskClockStatusTeamCard2'; +import {useTranslation} from 'react-i18next'; jest .spyOn(Date, 'now') @@ -27,6 +28,9 @@ const mockUseSelector = useSelector as jest.Mock; const mockQuery = useGetTeamByIdHomeQuery as jest.Mock; const mockLoadQuery = jest.fn(); (useEnvironment as jest.Mock).mockReturnValue({consumerId: '1234'}); +const mockUseTranslation = useTranslation as jest.Mock; + +const t = jest.fn((key) => key); const queryResponse = { getTeamById: { @@ -52,6 +56,7 @@ describe('TaskClockStatusTeamCard2', () => { mockUseSelector.mockReturnValueOnce(['0000041243']); // teamId mockUseSelector.mockReturnValueOnce('US'); // country code mockQuery.mockReturnValueOnce({loading: true, refetch: mockLoadQuery}); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'es-MX'}}); act(() => { component = create(<TaskClockStatusTeamCard2 {...baseProps} />); @@ -73,7 +78,6 @@ describe('TaskClockStatusTeamCard2', () => { }), ); }); - it('shows data on load and navigates on tap', () => { mockUseSelector.mockReturnValueOnce('100'); // siteId mockUseSelector.mockReturnValueOnce(['0000041243']); // teamId @@ -84,6 +88,7 @@ describe('TaskClockStatusTeamCard2', () => { data: queryResponse, refetch: mockLoadQuery, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'es-MX'}}); component.update(<TaskClockStatusTeamCard2 {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -106,6 +111,7 @@ describe('TaskClockStatusTeamCard2', () => { data: queryResponse, refetch: mockLoadQuery, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'en-US'}}); component.update(<TaskClockStatusTeamCard2 {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -121,6 +127,7 @@ describe('TaskClockStatusTeamCard2', () => { data: {getTeamById: undefined}, refetch: mockLoadQuery, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'en-US'}}); component.update(<TaskClockStatusTeamCard2 {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -136,6 +143,7 @@ describe('TaskClockStatusTeamCard2', () => { data: undefined, refetch: mockLoadQuery, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'en-US'}}); component.update(<TaskClockStatusTeamCard2 {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -152,6 +160,7 @@ describe('TaskClockStatusTeamCard2', () => { data: queryResponse, refetch: mockLoadQuery, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'en-US'}}); await act(async () => component.update( --- __tests__/home/components/TaskCard/TaskClockStatusTeamCardTest.tsx @@ -13,6 +13,7 @@ import { import {fetchTeamClockStatusData} from '../../../../src/home/services'; import {TaskClockStatusTeamCard} from '../../../../src/home/components/TaskCard/TaskClockStatusTeamCard'; import {logWMTelemetryTouchComponentEvent} from '../../../../src/home/logger/Logger'; +import {useTranslation} from 'react-i18next'; jest.mock('react', () => ({ ...(jest.requireActual('react') as any), @@ -39,6 +40,9 @@ jest const mockNavigation = useNavigation(); const mockUseAsync = useAsync as jest.Mock; const mockUseSelector = useSelector as jest.Mock; +const mockUseTranslation = useTranslation as jest.Mock; + +const t = jest.fn((key) => key); const baseProps = { refreshKey: 'TaskCard', @@ -54,6 +58,7 @@ describe('TaskClockStatusTeamCard', () => { mockUseSelector.mockReturnValueOnce(['Sup_0000041243']); // teamId mockUseSelector.mockReturnValueOnce('US'); // country code mockUseAsync.mockReturnValueOnce({loading: true}); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'es-MX'}}); const component = create(<TaskClockStatusTeamCard {...baseProps} />); it('matches snapshot while fetching', () => { @@ -75,6 +80,7 @@ describe('TaskClockStatusTeamCard', () => { error: false, data: teamClockStatusResponse, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'es-MX'}}); component.update(<TaskClockStatusTeamCard {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -96,6 +102,7 @@ describe('TaskClockStatusTeamCard', () => { error: false, data: teamClockStatusResponse, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'en-US'}}); component.update(<TaskClockStatusTeamCard {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -110,6 +117,7 @@ describe('TaskClockStatusTeamCard', () => { error: false, data: teamClockStatusNoDataResponse, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'en-US'}}); component.update(<TaskClockStatusTeamCard {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -123,6 +131,7 @@ describe('TaskClockStatusTeamCard', () => { loading: false, error: true, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'en-US'}}); component.update(<TaskClockStatusTeamCard {...baseProps} />); expect(component.toJSON()).toMatchSnapshot(); @@ -136,6 +145,7 @@ describe('TaskClockStatusTeamCard', () => { loading: false, refetch: reload, }); + mockUseTranslation.mockReturnValueOnce({t, i18n: {language: 'en-US'}}); await component.update( <TaskClockStatusTeamCard {...baseProps} refresh={true} />, --- __tests__/home/components/TaskCard/__snapshots__/TaskClockStatusTeamCard2Test.tsx.snap @@ -254,7 +254,7 @@ exports[`TaskClockStatusTeamCard2 shows data on load and navigates on tap 1`] = } } > - teams.teamName.defaultTeamName + teams.teamName.taskFoodConsumables </Text> <Text style={ --- __tests__/home/components/TaskCard/__snapshots__/TaskClockStatusTeamCardTest.tsx.snap @@ -141,7 +141,7 @@ exports[`TaskClockStatusTeamCard matches snapshot when loaded with team view; ca } } > - teams.teamName.defaultTeamName + teams.teamName.taskFoodConsumables </Text> <Text style={
chore: updating tests to bump coverage
chore: updating tests to bump coverage
1e49da3266622b3e274d1e3b6515ab1101e1af6b
--- packages/allspark-foundation-hub/__tests__/Hub/TeamSwitcher.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { TeamSwitcherTypes, TeamSwitcher, -} from '../../src/Store/Modules/Hub/TeamSwitcher'; +} from '../../src/Store/Modules/TeamSwitcher'; import { Dimensions } from 'react-native'; import { useQuery } from '@apollo/client'; import { fireEvent, render } from '../utils'; --- packages/allspark-foundation-hub/__tests__/HubContainer.test.tsx @@ -27,8 +27,8 @@ import { MANAGEMENT_TEAM_ID, MANAGEMENT_TEAM_LABEL, } from '../src/Shared/Common/constant'; -import { Images } from '../src/Shared/Images/images'; -import { TeamSwitcherTypes } from '../src/Store/Modules/Hub/TeamSwitcher'; +import { StoreImages as Images } from '../src/Shared/Images/images'; +import { TeamSwitcherTypes } from '../src/types'; const generateRequestData = (teams: { [teamId: string]: { --- packages/allspark-foundation-hub/__tests__/TeamListItem.test.tsx @@ -3,8 +3,8 @@ import { fireEvent, render, } from '@walmart/allspark-foundation/__tests__/utils'; -import { TeamListItem } from '../src/Store/Components/TeamListItem'; -import { TeamListItemProps } from '../src/Store/Components/TeamListItem/types'; +import { TeamListItem } from '../src/Shared/Components/TeamListItem'; +import { TeamListItemProps } from '../src/Shared/Components/TeamListItem/types'; const teamSelectionProps: TeamListItemProps = { teamName: 'Management', --- packages/allspark-foundation-hub/__tests__/TeamOnboarding/TeamSelection.test.tsx @@ -3,7 +3,10 @@ import { render } from '@testing-library/react-native'; import { useSelector } from 'react-redux'; import { useGetViewersPrimaryTeamName } from '../../src/Store/Hooks/useGetViewersPrimaryTeamName'; import { UserSelectors } from '@walmart/allspark-foundation/User'; -import { useGetTeamsByStoreQuery } from '@walmart/me-at-walmart-athena-queries'; +import { + useGetTeamsByStoreQuery, + useGetAssociatePreferencesQuery, +} from '@walmart/me-at-walmart-athena-queries'; import { TeamSelection } from '../../src/Store/Modules/TeamSelection/Screens/TeamSelection'; import { createSections } from '../../src/Store/Modules/TeamSelection/Utils/sectionListData'; import { MyAreaType, AreaTeamMap, Areas } from '../../src/Shared/Common/types'; @@ -13,7 +16,6 @@ import { groupTeamsByWorkgroupTransform, sortTeamsAscComparator, } from '../../src/Store/Modules/TeamSelection/Utils/teams'; -import { useGetAssociatePreferencesQuery } from '@walmart/me-at-walmart-athena-queries'; jest.mock('react-redux', () => ({ useSelector: jest.fn(), })); @@ -23,16 +25,19 @@ jest.mock('@walmart/me-at-walmart-athena-queries', () => ({ useGetAssociatePreferencesQuery: jest.fn(), })); -jest.mock('../../src/Store/TeamSelection/Component/TeamSelectionList', () => ({ - TeamSelectionList: jest.fn(() => <div data-testid='team-selection-list' />), -})); +jest.mock( + '../../src/Store/Modules/TeamSelection/Component/TeamSelectionList', + () => ({ + TeamSelectionList: jest.fn(() => <div data-testid='team-selection-list' />), + }) +); jest.mock('../../src/Store/Redux/selectors', () => ({ UserSelectors: jest.fn(), })); jest.mock('@walmart/me-at-walmart-athena-queries'); -jest.mock('../../src/Store/TeamSelection/Utils/teams', () => ({ +jest.mock('../../src/Store/Modules/TeamSelection/Utils/teams', () => ({ groupTeamsByWorkgroupTransform: jest.fn(), sortTeamsAscComparator: jest.fn(), })); --- packages/allspark-foundation-hub/__tests__/__snapshots__/TeamListItem.test.tsx.snap @@ -34,10 +34,11 @@ exports[`TeamListItem renders list item for all teams roster view correctly 1`] "alignItems": "center", "backgroundColor": "#fff", "borderBottomColor": "#e3e4e5", - "borderBottomWidth": 1, "display": "flex", "flexDirection": "row", "justifyContent": "space-between", + "marginLeft": 16, + "marginRight": 16, "opacity": 1, "paddingBottom": 16, "paddingTop": 16, @@ -57,7 +58,8 @@ exports[`TeamListItem renders list item for all teams roster view correctly 1`] > <Image onError={[Function]} - resizeMode="cover" + placeholder="KXR:A^%h.AbIj?j??aM|M{" + resizeMode="contain" source={ { "uri": "https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png", @@ -66,9 +68,10 @@ exports[`TeamListItem renders list item for all teams roster view correctly 1`] style={ { "alignSelf": "flex-start", + "backgroundColor": "#cce3f8", + "borderRadius": 16, "height": 32, - "justifyContent": "flex-start", - "width": 36, + "width": 32, } } /> @@ -171,10 +174,11 @@ exports[`TeamListItem renders list item for team selection correctly 1`] = ` "alignItems": "center", "backgroundColor": "#fff", "borderBottomColor": "#e3e4e5", - "borderBottomWidth": 1, "display": "flex", "flexDirection": "row", "justifyContent": "space-between", + "marginLeft": 16, + "marginRight": 16, "opacity": 1, "paddingBottom": 16, "paddingTop": 16, @@ -194,7 +198,8 @@ exports[`TeamListItem renders list item for team selection correctly 1`] = ` > <Image onError={[Function]} - resizeMode="cover" + placeholder="KXR:A^%h.AbIj?j??aM|M{" + resizeMode="contain" source={ { "uri": "https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png", @@ -203,9 +208,10 @@ exports[`TeamListItem renders list item for team selection correctly 1`] = ` style={ { "alignSelf": "flex-start", + "backgroundColor": "#cce3f8", + "borderRadius": 16, "height": 32, - "justifyContent": "flex-start", - "width": 36, + "width": 32, } } /> --- packages/allspark-foundation-hub/__tests__/utils/index.js @@ -28,7 +28,7 @@ function setupStore(preloadedState) { }); } -export function render( +function render( ui, { preloadedState = initialStateMock, store = {}, ...options } = {} ) {
Update tests
Update tests
d5d597b45c7b546b7c2cc164f5e5f3298c4c94ee
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "3.2.1-alpha.2", + "version": "3.2.1", "main": "dist/index.js", "files": [ "dist",
feat(ui): adding changes for wmconnect version
feat(ui): adding changes for wmconnect version
79a406167abf434354b3f3e2b82dcd0f40b90aa9
--- package.json @@ -106,7 +106,7 @@ "@walmart/payrollsolution_miniapp": "0.127.5", "@walmart/price-changes-mini-app": "1.5.4", "@walmart/profile-feature-app": "0.0.71", - "@walmart/push-to-talk-mini-app": "1.8.14", + "@walmart/push-to-talk-mini-app": "1.8.15", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.29.0",
version bump
version bump
6c673f63bb1a0064a41201a0b45ccf98b8ab0f56
--- targets/US/package.json @@ -87,7 +87,7 @@ "@walmart/ask-sam-mini-app": "1.28.12", "@walmart/associate-listening-mini-app": "1.2.10", "@walmart/attendance-mini-app": "3.96.2", - "@walmart/avp-feature-app": "0.16.2", + "@walmart/avp-feature-app": "0.16.4", "@walmart/avp-shared-library": "0.10.7", "@walmart/backroom-mini-app": "1.8.7", "@walmart/calling-mini-app": "0.7.0", @@ -103,7 +103,7 @@ "@walmart/exception-mini-app": "1.8.11", "@walmart/facilities-management-miniapp": "0.17.0", "@walmart/feedback-all-spark-miniapp": "0.9.72", - "@walmart/financial-wellbeing-feature-app": "1.29.2", + "@walmart/financial-wellbeing-feature-app": "1.29.9", "@walmart/functional-components": "~6.3.28", "@walmart/global-vpi-mini-app": "1.1.1", "@walmart/gta-react-native-calendars": "0.7.0", --- yarn.lock @@ -6434,9 +6434,9 @@ __metadata: languageName: node linkType: hard -"@walmart/avp-feature-app@npm:0.16.2": - version: 0.16.2 - resolution: "@walmart/avp-feature-app@npm:0.16.2" +"@walmart/avp-feature-app@npm:0.16.4": + version: 0.16.4 + resolution: "@walmart/avp-feature-app@npm:0.16.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Favp-feature-app%2F-%2F%40walmart%2Favp-feature-app-0.16.4.tgz" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -6445,7 +6445,7 @@ __metadata: react-native: ">=0.72.10" react-redux: ">=8.0.4" redux: ">=4.2.1" - checksum: 10c0/b4fe25363dfdc3112a680246965271b610ad5c3331dd6eef4a2e847ea3d97fb838ef44367b8d4a048cebd94b31bd2b20b10cbc6a3c843eb42a50cad101fd5a37 + checksum: 10c0/baa4f44b2a30bbec2e159671315634394010b740a8ef99ae6ee42fbbc49c57535b51a3b62a9921adfba9ac12cc2c9543b636465aa561c87a7fee8772b0f53a09 languageName: node linkType: hard @@ -6786,9 +6786,9 @@ __metadata: languageName: node linkType: hard -"@walmart/financial-wellbeing-feature-app@npm:1.29.2": - version: 1.29.2 - resolution: "@walmart/financial-wellbeing-feature-app@npm:1.29.2" +"@walmart/financial-wellbeing-feature-app@npm:1.29.9": + version: 1.29.9 + resolution: "@walmart/financial-wellbeing-feature-app@npm:1.29.9" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -6797,7 +6797,7 @@ __metadata: react-native: ">=0.72.10" react-redux: ">=8.0.4" redux: ">=4.2.1" - checksum: 10c0/8ad3af6e17f78c91c078ee2ec404b4312699821fb2f93a16928e2d440be7d47685227b76b9a93fa4cbfc5dea356bec79a4e252f9977caa31a5fdb03c91d20f47 + checksum: 10c0/27311500c2891feb1c4a406e2fcc3b258a58900aa8431fd96748a9f511bc27c5e7c5ab137c114a30819932d3d5067ea971658879df0e810ff1670f6787830f2a languageName: node linkType: hard @@ -7384,7 +7384,7 @@ __metadata: "@walmart/ask-sam-mini-app": "npm:1.28.12" "@walmart/associate-listening-mini-app": "npm:1.2.10" "@walmart/attendance-mini-app": "npm:3.96.2" - "@walmart/avp-feature-app": "npm:0.16.2" + "@walmart/avp-feature-app": "npm:0.16.4" "@walmart/avp-shared-library": "npm:0.10.7" "@walmart/backroom-mini-app": "npm:1.8.7" "@walmart/calling-mini-app": "npm:0.7.0" @@ -7400,7 +7400,7 @@ __metadata: "@walmart/exception-mini-app": "npm:1.8.11" "@walmart/facilities-management-miniapp": "npm:0.17.0" "@walmart/feedback-all-spark-miniapp": "npm:0.9.72" - "@walmart/financial-wellbeing-feature-app": "npm:1.29.2" + "@walmart/financial-wellbeing-feature-app": "npm:1.29.9" "@walmart/functional-components": "npm:~6.3.28" "@walmart/global-vpi-mini-app": "npm:1.1.1" "@walmart/gta-react-native-calendars": "npm:0.7.0"
bump avp and fwb version
bump avp and fwb version
1e087d028cd85dbe3da7423380ba54c5123bf48b
--- package-lock.json @@ -82,7 +82,7 @@ "@walmart/taskit-mini-app": "2.24.5", "@walmart/time-clock-mini-app": "2.49.0", "@walmart/ui-components": "1.10.1", - "@walmart/welcomeme-mini-app": "0.76.0", + "@walmart/welcomeme-mini-app": "0.77.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", "axios-cache-adapter": "2.7.3", @@ -6191,39 +6191,17 @@ } }, "node_modules/@walmart/welcomeme-mini-app": { - "version": "0.76.0", + "version": "0.77.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.77.0.tgz", + "integrity": "sha512-n3861D30+DMw/NbswXxKE2kNnknUjceveIDPzkOFEJDTH1ppq94OazP51blU/4kEOUfMcWS3q/8jj7QpCeP6Cw==", "hasInstallScript": true, "peerDependencies": { - "@react-native-community/async-storage": "^1.11.0", - "@react-native-firebase/app": "12.3.0", - "@react-native-firebase/firestore": "12.3.0", - "@react-native-firebase/remote-config": "12.3.0", "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", - "@walmart/ask-sam-mini-app": "1.3.3", - "@walmart/config-components": "1.0.35", - "@walmart/feedback-all-spark-miniapp": "0.9.9", - "@walmart/functional-components": "1.0.34", - "@walmart/gtp-shared-components": "^2.0.2", - "@walmart/payrollsolution_miniapp": "^0.130.4", - "@walmart/react-native-collapsible": "^1.5.3", - "@walmart/react-native-env": "0.2.0", - "@walmart/react-native-logger": "1.28.0", - "@walmart/redux-store": "2.0.4", - "@walmart/settings-mini-app": "1.3.9", - "@walmart/ui-components": "v1.3.0-rc.0", - "react": "18.1.0", - "react-native": "0.70.4", - "react-native-connect-sso-redux": "^1.1.1", - "react-native-device-info": "^6.2.1", - "react-native-permissions": "3.0.0", - "react-native-video": "^5.1.0-alpha8", - "react-native-wm-config": "0.1.1", - "react-native-wm-network": "0.2.0", - "react-native-wm-notification": "2.0.0", - "react-native-wm-telemetry": "0.3.0", - "react-native-wm-voice-text": "0.5.0", - "react-redux": "^7.2.1" + "@walmart/core-services": "~2.0.11", + "@walmart/gtp-shared-components": "^2.0.0", + "react": "^18.2.0", + "react-native": "~0.70.5" } }, "node_modules/@walmart/wfm-ui": { @@ -25520,7 +25498,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.76.0" + "version": "0.77.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.77.0.tgz", + "integrity": "sha512-n3861D30+DMw/NbswXxKE2kNnknUjceveIDPzkOFEJDTH1ppq94OazP51blU/4kEOUfMcWS3q/8jj7QpCeP6Cw==" }, "@walmart/wfm-ui": { "version": "0.2.26", --- package.json @@ -124,7 +124,7 @@ "@walmart/taskit-mini-app": "2.24.5", "@walmart/time-clock-mini-app": "2.49.0", "@walmart/ui-components": "1.10.1", - "@walmart/welcomeme-mini-app": "0.76.0", + "@walmart/welcomeme-mini-app": "0.77.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", "axios-cache-adapter": "2.7.3",
chore: welcomeMe mini app version bump
chore: welcomeMe mini app version bump
f2a46baaa0fdecfd984c5af505b046ffcf984cd4
--- package-lock.json @@ -67,6 +67,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/ui-components": "1.15.1", + "@walmart/wmconnect-mini-app": "1.0.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11851,6 +11852,13 @@ "react-native-webview": ">=10.10.2" } }, + "node_modules/@walmart/wmconnect-mini-app": { + "version": "1.0.1", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.1.tgz", + "integrity": "sha512-dqFEnqUSqE/wwT84QJQ0wA1iHHAmZy2kFQRfZFzQanREGg2/qHBHgSibufTaY0PG4l+8nyqceHGrJxyR1ZHLBg==", + "dev": true, + "hasInstallScript": true + }, "node_modules/@whatwg-node/events": { "version": "0.0.2", "resolved": "https://npme.walmart.com/@whatwg-node/events/-/events-0.0.2.tgz", @@ -41063,6 +41071,12 @@ "react-native-elements": "^3.4.2" } }, + "@walmart/wmconnect-mini-app": { + "version": "1.0.1", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.1.tgz", + "integrity": "sha512-dqFEnqUSqE/wwT84QJQ0wA1iHHAmZy2kFQRfZFzQanREGg2/qHBHgSibufTaY0PG4l+8nyqceHGrJxyR1ZHLBg==", + "dev": true + }, "@whatwg-node/events": { "version": "0.0.2", "resolved": "https://npme.walmart.com/@whatwg-node/events/-/events-0.0.2.tgz", --- package.json @@ -90,6 +90,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/ui-components": "1.15.1", + "@walmart/wmconnect-mini-app": "1.0.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- src/components/Roster/AssociateListItem.tsx @@ -25,6 +25,7 @@ import {goToIndividualSchedule} from '../../navigation/utils'; import {StatusChip} from '../StatusChip'; import {isNil} from 'lodash'; import {ClockStatusIndicator} from '../ActionButton/ClockStatusIndicator'; +import {getEncryptedUserId} from '../../redux/selectors'; interface AssociateListItemProps { associate: AssociateRosterItem; @@ -52,6 +53,9 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo( const userIsInRoster = useUserIsInRoster(); const encryptedId = encryptUserId(associate?.win?.toString() ?? ''); + const viewerId = useSelector(getEncryptedUserId); + const participants: string[] = [viewerId, encryptedId]; + const associateName = namecase( associateDisplayName(associate).slice(0, 20), ); @@ -95,7 +99,7 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo( <Button variant={'secondary'} UNSAFE_style={styles.actionButtonSpacing} - onPress={() => actionButton.action(associate)} + onPress={() => actionButton.action(participants)} size={'small'} disabled={!userIsInRoster} testID={`actionButton-${actionButton.i18nLabel}`}> --- src/screens/RosterScreen.tsx @@ -1,15 +1,31 @@ import React from 'react'; import {Roster} from '../components/Roster/Roster'; import {StyleSheet, View} from 'react-native'; +import {ROSTER_I18N_NAMESPACE} from '../translations'; +import {useTranslation} from 'react-i18next'; +import {navigateToMessageScreen} from '@walmart/wmconnect-mini-app'; +import {useSelector} from 'react-redux'; +import {SiteSelectors} from '@walmart/redux-store'; export const styles = StyleSheet.create({ container: {paddingVertical: 24, flex: 1}, }); export const RosterScreen: React.FC<any> = () => { + const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); + const storeId: string = useSelector(SiteSelectors.getUserWorkingSite); return ( <View style={styles.container}> - <Roster /> + <Roster + associateActionButtons={[ + { + i18nLabel: t('rosterScreen.associateRosterItem.messageBtn'), + action(data) { + navigateToMessageScreen(storeId, data); + }, + }, + ]} + /> </View> ); };
Integrate message button
Integrate message button
1c9ea519a16751ff42254a2095f514dff032a16a
--- __tests__/auth/ErrorScreenTest.tsx @@ -4,7 +4,7 @@ import {TextInput} from 'react-native'; import {useDispatch} from 'react-redux'; import {create} from 'react-test-renderer'; import {PrimaryButton, LinkButton} from '@walmart/gtp-shared-components'; - +import {Picker} from '@react-native-community/picker'; import {ErrorScreen} from '../../src/auth/ErrorScreen'; import {logger} from '../../src/services/Logger'; @@ -175,7 +175,7 @@ describe('ErrorScreen', () => { expect(mockNavigation.goBack).not.toHaveBeenCalled(); }); - it('handles value change for userId , site Id and details', () => { + it('handles value change for userId , site Id, select error category and details', () => { Platform.OS = 'ios'; mockUseState.mockReturnValueOnce(['swalton3', setUserId]); mockUseState.mockReturnValueOnce(['1234', setSiteId]); @@ -187,6 +187,9 @@ describe('ErrorScreen', () => { component.update(<ErrorScreen navigation={mockNavigation} />); const input = component.root.findAllByType(TextInput); + const picker = component.root.findByType(Picker); + picker.props.onValueChange('Other', 6); + expect(setErrorCategory).toHaveBeenCalledWith('Other'); input[0].props.onChangeText('999'); expect(setUserId).toHaveBeenCalledWith('999'); input[1].props.onChangeText('999');
update test case
update test case
1b56fc2194693b69d330809c5015d0b782510264
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.39.0", + "version": "2.40.0", "main": "dist/index.js", "files": [ "dist" @@ -85,7 +85,7 @@ "@typescript-eslint/parser": "^5.37.0", "@walmart/allspark-authentication": "6.1.4", "@walmart/allspark-foundation": "6.27.4", - "@walmart/allspark-foundation-hub": "1.3.7", + "@walmart/allspark-foundation-hub": "1.3.9", "@walmart/allspark-graphql-client": "^1.4.6", "@walmart/allspark-http-client": "6.1.4", "@walmart/config-components": "4.4.0", --- src/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -4,15 +4,33 @@ import {useSelector} from 'react-redux'; import {SupplyChainRosterDetailScreen} from './SupplyChainRosterDetailScreen'; import {StoreRosterDetailScreen} from './StoreRosterDetailScreen'; import {RosterDetailScreenProps} from './types'; -import {useNavigation} from '@react-navigation/native'; +import {RouteProp, useNavigation} from '@react-navigation/native'; import {translationClient} from '../../common'; import {renderDrawerButton} from '@walmart/allspark-foundation'; -import {useGetViewersPrimaryTeam} from '@walmart/allspark-foundation-hub'; +import { + useGetViewersPrimaryTeam, + useUserCanSeeHub, + UseGetViewersPrimaryTeamReturnType, +} from '@walmart/allspark-foundation-hub'; +import {RosterNavParamsMap} from '../../navigation'; + +export const renderLeftHeader = ( + route: RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, + primaryTeam: UseGetViewersPrimaryTeamReturnType, + showTeamHub: boolean, +) => { + return (!showTeamHub && !route?.params?.teamId) || + (route?.params?.teamId && + primaryTeam?.[0]?.teamId === route?.params?.teamId) + ? renderDrawerButton + : undefined; +}; export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { const isSiteDC = useSelector(SiteSelectors.getWorkingSiteIsDC); const navigation = useNavigation(); const primaryTeam = useGetViewersPrimaryTeam(); + const showTeamHub = useUserCanSeeHub(); useEffect(() => { navigation.setOptions({ @@ -20,8 +38,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { default: 'Roster', fallbackLng: 'en-US', }), - headerLeft: - route.params.teamId === primaryTeam?.[0].teamId && renderDrawerButton, + headerLeft: renderLeftHeader(route, primaryTeam, showTeamHub), }); }, [navigation]); --- yarn.lock @@ -6078,9 +6078,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.3.7": - version: 1.3.7 - resolution: "@walmart/allspark-foundation-hub@npm:1.3.7" +"@walmart/allspark-foundation-hub@npm:1.3.9": + version: 1.3.9 + resolution: "@walmart/allspark-foundation-hub@npm:1.3.9" dependencies: "@reduxjs/toolkit": "npm:^1.9.7" "@shopify/flash-list": "npm:~1.6.4" @@ -6096,7 +6096,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/a006c55c4781eb22808f86a7675cf2b5723fc773b27e25d1c2e3580a12ff5d3d3be42169a275657ef521024b101dfb0304efe9655393763b00342dd13589c33d + checksum: 10c0/bd0fc540d931ba4e74abd375575681e50fa9ebcbb96762ddfa9e144c0c8b66cd211a336820cc7f535d3ed4a2fb5fc1336703a4bc056fe80b2d5095ea562ec539 languageName: node linkType: hard @@ -6547,7 +6547,7 @@ __metadata: "@typescript-eslint/parser": "npm:^5.37.0" "@walmart/allspark-authentication": "npm:6.1.4" "@walmart/allspark-foundation": "npm:6.27.4" - "@walmart/allspark-foundation-hub": "npm:1.3.7" + "@walmart/allspark-foundation-hub": "npm:1.3.9" "@walmart/allspark-graphql-client": "npm:^1.4.6" "@walmart/allspark-http-client": "npm:6.1.4" "@walmart/config-components": "npm:4.4.0"
Update the roster primary team check
Update the roster primary team check
7e2043289567a6b25377cd0a142fb2629c05b3f6
--- package-lock.json @@ -55,7 +55,7 @@ "@walmart/impersonation-mini-app": "1.18.3", "@walmart/ims-print-services-ui": "2.4.1", "@walmart/inbox-mini-app": "0.83.3", - "@walmart/iteminfo-mini-app": "7.3.3", + "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.2", "@walmart/me-field-mini-app": "1.3.0", "@walmart/metrics-mini-app": "0.11.5", @@ -5360,9 +5360,9 @@ } }, "node_modules/@walmart/iteminfo-mini-app": { - "version": "7.3.3", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.3.3.tgz", - "integrity": "sha512-sxgQ5+NyR1/hQxpgOXdyhUTn4X/5UYZRpNXptNsChFU7Jp/VoNaBiV08uUyw3OTgo5esRfb5FcFqHg8Kxm1j7Q==", + "version": "7.3.4", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.3.4.tgz", + "integrity": "sha512-BJUS62cfEayYR2TVps7oiMSIN9GNiPbBp73WcJeu9QmspZmomvLFGQ+mMj9ayuIMvfPhiq7VTzs1wJtl3F+TQg==", "peerDependencies": { "@react-native-community/netinfo": ">=9.3.6", "@react-native-firebase/analytics": ">=15.1.1", @@ -25338,9 +25338,9 @@ } }, "@walmart/iteminfo-mini-app": { - "version": "7.3.3", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.3.3.tgz", - "integrity": "sha512-sxgQ5+NyR1/hQxpgOXdyhUTn4X/5UYZRpNXptNsChFU7Jp/VoNaBiV08uUyw3OTgo5esRfb5FcFqHg8Kxm1j7Q==" + "version": "7.3.4", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.3.4.tgz", + "integrity": "sha512-BJUS62cfEayYR2TVps7oiMSIN9GNiPbBp73WcJeu9QmspZmomvLFGQ+mMj9ayuIMvfPhiq7VTzs1wJtl3F+TQg==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.2" --- package.json @@ -97,7 +97,7 @@ "@walmart/impersonation-mini-app": "1.18.3", "@walmart/ims-print-services-ui": "2.4.1", "@walmart/inbox-mini-app": "0.83.3", - "@walmart/iteminfo-mini-app": "7.3.3", + "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.2", "@walmart/me-field-mini-app": "1.3.0", "@walmart/metrics-mini-app": "0.11.5",
updated iteminfo version with mip bugfix
updated iteminfo version with mip bugfix
75fdc7200e2cfc8e9a46f06d7b06ec1c60ff0e70
--- targets/US/package.json @@ -110,9 +110,9 @@ "@walmart/gtp-shared-components": "2.2.4", "@walmart/ims-print-services-ui": "2.12.0", "@walmart/inbox-mini-app": "0.95.3", - "@walmart/manager-approvals-miniapp": "0.2.8", "@walmart/iteminfo-mini-app": "7.16.2", "@walmart/learning-mini-app": "20.0.35", + "@walmart/manager-approvals-miniapp": "0.2.8", "@walmart/me-at-walmart-athena-queries": "6.24.0-alpha.0", "@walmart/me-at-walmart-common": "workspace:^", "@walmart/me-at-walmart-container": "workspace:^", @@ -125,8 +125,8 @@ "@walmart/native-rfid-scanner": "3.9.15", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.3", - "@walmart/price-changes-mini-app": "1.10.18", "@walmart/payrollsolution_miniapp": "0.141.17", + "@walmart/price-changes-mini-app": "1.10.18", "@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch", "@walmart/react-native-encrypted-storage": "~1.1.3", "@walmart/react-native-env": "~6.3.20", @@ -356,4 +356,4 @@ ] } } -} \ No newline at end of file +} --- yarn.lock @@ -7036,9 +7036,9 @@ __metadata: "@walmart/gtp-shared-components": "npm:2.2.4" "@walmart/ims-print-services-ui": "npm:2.12.0" "@walmart/inbox-mini-app": "npm:0.95.3" - "@walmart/manager-approvals-miniapp": "npm:0.2.8" "@walmart/iteminfo-mini-app": "npm:7.16.2" "@walmart/learning-mini-app": "npm:20.0.35" + "@walmart/manager-approvals-miniapp": "npm:0.2.8" "@walmart/me-at-walmart-athena-queries": "npm:6.24.0-alpha.0" "@walmart/me-at-walmart-common": "workspace:^" "@walmart/me-at-walmart-container": "workspace:^" @@ -7051,8 +7051,8 @@ __metadata: "@walmart/native-rfid-scanner": "npm:3.9.15" "@walmart/onewalmart-miniapp": "npm:1.0.24" "@walmart/pay-stub-miniapp": "npm:0.15.3" - "@walmart/price-changes-mini-app": "npm:1.10.18" "@walmart/payrollsolution_miniapp": "npm:0.141.17" + "@walmart/price-changes-mini-app": "npm:1.10.18" "@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" "@walmart/react-native-env": "npm:~6.3.20"
chore: resolving conflicts
chore: resolving conflicts
22e21f838c9b142e190f2fe1df1ca3ceee5db33b
--- packages/allspark-graphql-client/src/apollo/provider.tsx @@ -7,12 +7,9 @@ import { from, } from '@apollo/client'; import { buildAxiosFetch } from '@lifeomic/axios-fetch'; -// Eventually we can remove the reliance on these types and instead -// have a dependency on allspark-http-client and use its types and instance -import { - AxiosInstance, - AxiosRequestConfig, -} from '@lifeomic/axios-fetch/src/axios-types'; +// Eventually we can remove the reliance on this type and instead +// have a dependency on allspark-http-client +import { AxiosInstance } from '@lifeomic/axios-fetch/src/axios-types'; import { typePolicies } from '../athena'; import { operationNameLink, persistedQueriesLink } from './links'; @@ -23,24 +20,9 @@ export const AllsparkApolloProvider = ( const { url, httpClient, children } = props; const client = useMemo(() => { - const customFetch = buildAxiosFetch(httpClient, (config, uri, options) => { - const body = JSON.parse(options?.body as string); - - // Operation name in body must be removed to work with Athena - delete body.operationName; - - return { - ...config, - url: uri.toString(), - method: options?.method, - data: body, - headers: options?.headers, - } as AxiosRequestConfig; - }); - const httpLink = new HttpLink({ uri: url, - fetch: customFetch, + fetch: buildAxiosFetch(httpClient), }); const newClient = new ApolloClient({
chore: remove uneeded code from apollo provider
chore: remove uneeded code from apollo provider
19d56779f851602db79aff81db6020a24d8514bc
--- packages/allspark-foundation-hub/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. +## [1.6.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.6.2...@walmart/allspark-foundation-hub@1.6.3) (2025-04-07) + +### Bug Fixes + +- **ui:** manager experience bug fix ([#204](https://gecgithub01.walmart.com/allspark/allspark/issues/204)) ([adb3352](https://gecgithub01.walmart.com/allspark/allspark/commit/adb33522441aaddd83fc77e479efac774e014640)) + ## [1.6.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.6.1...@walmart/allspark-foundation-hub@1.6.2) (2025-04-04) ### Bug Fixes --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.6.2", + "version": "1.6.3", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation-hub@1.6.3
88e19ed597427fe78b0c6f5996ae8d3f92a4ce92
--- core/__tests__/__mocks__/@walmart/global-vpi-mini-app.js @@ -0,0 +1,3 @@ +jest.mock('@walmart/global-vpi-mini-app', () => ({ + GlobalVPIMiniApp: 'GlobalVPIMiniApp', +})); --- core/__tests__/navigation/USHallway/AssociateHallwayNav/MainStackNavTest.tsx @@ -16,10 +16,6 @@ jest.mock( }), ); -jest.mock('@walmart/global-vpi-mini-app', () => ({ - GlobalVPIMiniApp: 'GlobalVPIMiniApp', -})); - describe('AssociateHallwayNav', () => { it('matches snapshot; handles mount and unmount effects', () => { let component: ReactTestRenderer; --- package.json @@ -62,7 +62,6 @@ "@walmart/financial-wellbeing-feature-app": { "built": false }, - "@walmart/global-vpi-mini-app": {}, "@walmart/iteminfo-mini-app": { "built": false },
fix: attended pr comments
fix: attended pr comments
d2511433c7f2a8fbcce865389b2bbcd649e82e06
--- graphql.yml @@ -68,11 +68,11 @@ applications: queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociateById.graphql" tags: - "v1" - - name: "getAssociatePreferences" - hash: "38e0530d669fff42cb1dc8e5814369c40c33f6d6a77ed734e039948a0c06e8f4" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociatePreference.graphql" - tags: - - "v1" + # - name: "getAssociatePreferences" + # hash: "38e0530d669fff42cb1dc8e5814369c40c33f6d6a77ed734e039948a0c06e8f4" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociatePreference.graphql" + # tags: + # - "v1" - name: "getDailyRosterHome" hash: "3c492831585580bae535c3386ec48e90c2d1895450016f050653bd51ddf86c21" queryTemplate: "packages/me-at-walmart-athena-queries/src/getDailyRosterHome.graphql" @@ -88,18 +88,18 @@ applications: queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamByIdHome.graphql" tags: - "v1" - - name: "GetTeamsByStore" - hash: "e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql" - tags: - - "v1" + # - name: "GetTeamsByStore" + # hash: "e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql" + # tags: + # - "v1" - name: "upsertAssociatePreference" hash: "972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036" queryTemplate: "packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql" tags: - "v1" - - name: "upsertManagerExperiencePreference" - hash: "bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca" - queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql" - tags: - - "v1" + # - name: "upsertManagerExperiencePreference" + # hash: "bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql" + # tags: + # - "v1"
fix: remove unwanted queries in graphql
fix: remove unwanted queries in graphql
c996ea6c266bf4bb07b130c181689fed59135430
--- package-lock.json @@ -51,7 +51,7 @@ "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "^2.0.0-rc.1", - "@walmart/impersonation-mini-app": "1.8.0", + "@walmart/impersonation-mini-app": "1.9.0", "@walmart/ims-print-services-ui": "1.2.0", "@walmart/inbox-mini-app": "0.73.0", "@walmart/iteminfo-mini-app": "5.3.1", @@ -5172,9 +5172,9 @@ "license": "UNLICENSED" }, "node_modules/@walmart/impersonation-mini-app": { - "version": "1.8.0", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.8.0.tgz", - "integrity": "sha512-1EVD7cyriNJ58KtH25NOZSE2fxghnOTqzSv58u4tq7YL2shajGQ9bRH4cxw2wvDEPkyCU64PlUZK5NmTeug7wg==", + "version": "1.9.0", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.9.0.tgz", + "integrity": "sha512-8oT/YvNFRIEE1k/lrldMcPPCkD2cRiEOd+kxEWS8NFyebagXwCT0sSUVw8Ij7dWgeq2xdjs5Yqzbn4lFrNebWQ==", "peerDependencies": { "@react-native-community/masked-view": ">=0.1.10", "@react-native-community/picker": ">=1.8.1", @@ -24968,9 +24968,9 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.8.0", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.8.0.tgz", - "integrity": "sha512-1EVD7cyriNJ58KtH25NOZSE2fxghnOTqzSv58u4tq7YL2shajGQ9bRH4cxw2wvDEPkyCU64PlUZK5NmTeug7wg==" + "version": "1.9.0", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.9.0.tgz", + "integrity": "sha512-8oT/YvNFRIEE1k/lrldMcPPCkD2cRiEOd+kxEWS8NFyebagXwCT0sSUVw8Ij7dWgeq2xdjs5Yqzbn4lFrNebWQ==" }, "@walmart/ims-print-services-ui": { "version": "1.2.0", --- package.json @@ -94,7 +94,7 @@ "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "^2.0.0-rc.1", - "@walmart/impersonation-mini-app": "1.8.0", + "@walmart/impersonation-mini-app": "1.9.0", "@walmart/ims-print-services-ui": "1.2.0", "@walmart/inbox-mini-app": "0.73.0", "@walmart/iteminfo-mini-app": "5.3.1",
update all gtp comp
update all gtp comp
aabcf54ab12db10c1c378880ae61d70a5f436da8
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/Screens/HubDashboard.tsx @@ -215,6 +215,7 @@ export const HubDashboard = ({ name, widgets }: HubDashboardProps) => { <TeamSwitcher onTeamChange={(id) => setTeamId(id)} refetch={refetchUserPrefs} + refreshing={state.refreshing} /> {userPrefError && ( <View style={styles.warningContainer}> --- packages/allspark-foundation-hub/src/HubFeature/Hub/TeamSwitcher/index.tsx @@ -24,7 +24,11 @@ import { Images } from '../../Images/images'; export * from './types'; -export const TeamSwitcher = ({ onTeamChange, refetch }: TeamSwitcherProps) => { +export const TeamSwitcher = ({ + onTeamChange, + refetch, + refreshing, +}: TeamSwitcherProps) => { const { teamData, loading: isLoading } = useUserPreferences(); const empType: string | undefined = useSelector( UserSelectors.getEmployeeType @@ -114,7 +118,7 @@ export const TeamSwitcher = ({ onTeamChange, refetch }: TeamSwitcherProps) => { const renderTeamItem = ({ item }: { item: TeamSwitcherTypes }) => { const isSelected = item?.teamLabel === selectedTeam; - return isLoading ? ( + return isLoading || refreshing ? ( renderLoadingSkeleton() ) : ( <> --- packages/allspark-foundation-hub/src/HubFeature/Hub/TeamSwitcher/types.ts @@ -7,4 +7,5 @@ export type TeamSwitcherTypes = { export type TeamSwitcherProps = { onTeamChange: (teamId: string) => void; refetch: () => void; + refreshing: boolean; };
fix(ui): show team switcher loader view while refreshing
fix(ui): show team switcher loader view while refreshing
2bfbf4745c20ebd93ae2bdeca37a8183d6d458e0
--- package-lock.json @@ -3543,9 +3543,9 @@ "integrity": "sha512-HqzsayD8WUTeiG7VTuHWPgSqKM/RxN90OYmLxBvtyMgGAeAYz8nKnsR5USnPHGb0L2wHUg/KwAhpqRLr0Y2s7w==" }, "@walmart/shelfavailability-mini-app": { - "version": "0.3.76", - "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-0.3.76.tgz", - "integrity": "sha512-hrB1dCbT8DVeffMIuwB4PiwauBi5J19H7Ic9jH8Yq2ssUjLlNBk+NUdyQfe9P3Iij5dQwTIET/U9bu5+8NzgpA==", + "version": "0.3.78", + "resolved": "https://npme.walmart.com/@walmart/shelfavailability-mini-app/-/shelfavailability-mini-app-0.3.78.tgz", + "integrity": "sha512-w63k0TLpXy3PLRrJlMryLB2Zb2EWuDpEUEFwXVOqyDbdL4m040bnsMOAfsP8q/FKovmkKfJAEmhFiNCR8rYVCA==", "requires": { "@types/uuid": "^8.3.0", "@types/xdate": "^0.8.31", --- package.json @@ -87,7 +87,7 @@ "@walmart/redux-store": "^1.0.15", "@walmart/schedule-mini-app": "0.2.82", "@walmart/settings-mini-app": "1.3.5", - "@walmart/shelfavailability-mini-app": "0.3.76", + "@walmart/shelfavailability-mini-app": "0.3.78", "@walmart/time-clock-mini-app": "0.4.0", "@walmart/ui-components": "1.1.54", "@walmart/welcomeme-mini-app": "0.26.2",
0.3.78 build
0.3.78 build
6492f4dedb1ae779428c445cba1dc32ba2c0a998
--- package.json @@ -107,7 +107,7 @@ "@walmart/functional-components": "~6.3.28", "@walmart/global-vpi-mini-app": "1.1.20", "@walmart/gta-react-native-calendars": "0.7.0", - "@walmart/gtp-shared-components": "2.2.7-rc.0", + "@walmart/gtp-shared-components": "2.2.7-rc.1", "@walmart/ims-print-services-ui": "2.19.2", "@walmart/inbox-mini-app": "0.100.4", "@walmart/invue-react-native-sdk": "0.1.26-alpha.12", --- yarn.lock @@ -8094,9 +8094,9 @@ __metadata: languageName: node linkType: hard -"@walmart/gtp-shared-components@npm:2.2.7-rc.0": - version: 2.2.7-rc.0 - resolution: "@walmart/gtp-shared-components@npm:2.2.7-rc.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fgtp-shared-components%2F-%2Fgtp-shared-components-2.2.7-rc.0.tgz" +"@walmart/gtp-shared-components@npm:2.2.7-rc.1": + version: 2.2.7-rc.1 + resolution: "@walmart/gtp-shared-components@npm:2.2.7-rc.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fgtp-shared-components%2F-%2F%40walmart%2Fgtp-shared-components-2.2.7-rc.1.tgz" dependencies: "@livingdesign/tokens": "npm:0.74.0" "@walmart/gtp-shared-icons": "npm:1.0.10" @@ -8112,9 +8112,9 @@ __metadata: react-native-device-info: "*" react-native-drop-shadow: "*" bin: - installFonts: scripts/installFonts - runCodemods: scripts/runCodemods - checksum: 10c0/b1ac8949b3e171174dc5206c91c79e64ff01692a2d673f22c5d17d4f6454034a27c693b0b4847620171468e27bb32bde5c5cf23c553ef21ded59b042cac90a2b + installFonts: ./scripts/installFonts + runCodemods: ./scripts/runCodemods + checksum: 10c0/5a86987dc963733f0ed83b95b274335b138b5e00f9239ec7f79851173afd8c9b1e949c613db00a5441651e5a8d5192db40a9df3160474fc6fabad5fdac4865e9 languageName: node linkType: hard @@ -8581,7 +8581,7 @@ __metadata: "@walmart/functional-components": "npm:~6.3.28" "@walmart/global-vpi-mini-app": "npm:1.1.20" "@walmart/gta-react-native-calendars": "npm:0.7.0" - "@walmart/gtp-shared-components": "npm:2.2.7-rc.0" + "@walmart/gtp-shared-components": "npm:2.2.7-rc.1" "@walmart/ims-print-services-ui": "npm:2.19.2" "@walmart/inbox-mini-app": "npm:0.100.4" "@walmart/invue-react-native-sdk": "npm:0.1.26-alpha.12"
fix: update gtp lib for bottom sheet fix for RN 76 (#4265)
fix: update gtp lib for bottom sheet fix for RN 76 (#4265)
6861e67ee659c88a31581e6806be565bb4d2a9dc
--- package.json @@ -148,7 +148,7 @@ "@walmart/schedule-mini-app": "1.13.0", "@walmart/shelfavailability-mini-app": "1.5.41", "@walmart/shop-gnfr-mini-app": "1.0.302", - "@walmart/sidekick-mini-app": "4.168.24", + "@walmart/sidekick-mini-app": "4.175.31", "@walmart/store-feature-orders": "1.28.3", "@walmart/taskit-mini-app": "5.31.6", "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A2.462.0#~/.yarn/patches/@walmart-time-clock-mini-app-npm-2.462.0-2066b95de1.patch", --- yarn.lock @@ -7366,7 +7366,7 @@ __metadata: "@walmart/schedule-mini-app": "npm:1.13.0" "@walmart/shelfavailability-mini-app": "npm:1.5.41" "@walmart/shop-gnfr-mini-app": "npm:1.0.302" - "@walmart/sidekick-mini-app": "npm:4.168.24" + "@walmart/sidekick-mini-app": "npm:4.175.31" "@walmart/store-feature-orders": "npm:1.28.3" "@walmart/taskit-mini-app": "npm:5.31.6" "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A2.462.0#~/.yarn/patches/@walmart-time-clock-mini-app-npm-2.462.0-2066b95de1.patch" @@ -8210,9 +8210,9 @@ __metadata: languageName: node linkType: hard -"@walmart/sidekick-mini-app@npm:4.168.24": - version: 4.168.24 - resolution: "@walmart/sidekick-mini-app@npm:4.168.24::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fsidekick-mini-app%2F-%2Fsidekick-mini-app-4.168.24.tgz" +"@walmart/sidekick-mini-app@npm:4.175.31": + version: 4.175.31 + resolution: "@walmart/sidekick-mini-app@npm:4.175.31::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fsidekick-mini-app%2F-%2F%40walmart%2Fsidekick-mini-app-4.175.31.tgz" peerDependencies: "@apollo/client": "*" "@expo/config-plugins": 7.2.2 @@ -8231,7 +8231,7 @@ __metadata: react: "*" react-native: "*" redux: "*" - checksum: 10c0/ccb7046de78762289c9b44e0dcc3e4f54b4ae2e928edb6c3da03f7bf6d0eb41e5c0300479c9c7623deb4acf3792e8bc5d76ed04386f4a62a3ace44500672e1f4 + checksum: 10c0/58853564b7e2490d86c7a5059ebb107077e66ec557ac8715fbf6344668009f05b04affbc670cbae0992e4732e0f34ce5cef157475473752c815e2cbf5ba180a9 languageName: node linkType: hard
feat(sidekick): DWORK-6905 academy trainer and pre 7pm changes (#3887)
feat(sidekick): DWORK-6905 academy trainer and pre 7pm changes (#3887) * sidekick drop 29 changes with updated version * manifest update * updated foundation hub version * sidekick version updated to release version * version update for bug fixes * side kick version updated for bug fixes * feat: DWORK-8353 View only scenarios ccm controlled * chore: update sidekick version 4.175.30 --------- Co-authored-by: Mahabubee Shaik <m0s0nc1@walmart.com> Co-authored-by: Jim Porter <jim.porter@walmart.com> Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com>
247a482cb48b98a6aab17da45883aa71b500fdcb
--- src/components/TeamList.tsx @@ -131,6 +131,7 @@ const TeamItem = (props: { const userIsInRoster = useUserIsInRoster(); const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev(); + const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled); const startTeamText = useStartTeamText(); @@ -174,26 +175,46 @@ const TeamItem = (props: { /> } trailing={ - canMessage && isMessageButtonEnabled ? ( - <Button - variant='secondary' - onPress={onMessage} - size='small' - disabled={!userIsInRoster || !userIsImpersonatedOnDev}> - <Text>{t('rosterScreen.teamListItem.messageBtn')}</Text> - </Button> - ) : ( - <TouchableOpacity onPress={onViewTeam}> - <Body - weight='400' + <> + {isPushToTalkEnabled && ( + <Button + testID='totalStoreTalkButton' + variant='secondary' + UNSAFE_style={styles.pushToTalkBtn} + onPress={() => { + navigation.navigate('myTeam.pushToTalk', { + // @ts-ignore + details: { + channelName: 'TEAM_'+team.teamId, + }, + }); + }} size='small' - numberOfLines={1} - UNSAFE_style={styles.viewTeam} - testID='viewTeamButton'> - {t('rosterScreen.teamListItem.viewTeam')} - </Body> - </TouchableOpacity> - ) + disabled={!userIsInRoster || !userIsImpersonatedOnDev}> + <Text>{t('rosterScreen.associateRosterItem.pushToTalkBtn')}</Text> + </Button> + )} + {canMessage && isMessageButtonEnabled ? ( + <Button + variant='secondary' + onPress={onMessage} + size='small' + disabled={!userIsInRoster || !userIsImpersonatedOnDev}> + <Text>{t('rosterScreen.teamListItem.messageBtn')}</Text> + </Button> + ) : ( + <TouchableOpacity onPress={onViewTeam}> + <Body + weight='400' + size='small' + numberOfLines={1} + UNSAFE_style={styles.viewTeam} + testID='viewTeamButton'> + {t('rosterScreen.teamListItem.viewTeam')} + </Body> + </TouchableOpacity> + )} + </> }> <Body weight='400' size='small'> {t('rosterScreen.teamListItem.clockedIn', { --- src/components/TeamList.tsx @@ -131,6 +131,7 @@ const TeamItem = (props: { const userIsInRoster = useUserIsInRoster(); const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev(); + const isPushToTalkEnabled: boolean = useSelector(pushToTalkEnabled); const startTeamText = useStartTeamText(); @@ -174,26 +175,46 @@ const TeamItem = (props: { /> } trailing={ - canMessage && isMessageButtonEnabled ? ( - <Button - variant='secondary' - onPress={onMessage} - size='small' - disabled={!userIsInRoster || !userIsImpersonatedOnDev}> - <Text>{t('rosterScreen.teamListItem.messageBtn')}</Text> - </Button> - ) : ( - <TouchableOpacity onPress={onViewTeam}> - <Body - weight='400' + <> + {isPushToTalkEnabled && ( + <Button + testID='totalStoreTalkButton' + variant='secondary' + UNSAFE_style={styles.pushToTalkBtn} + onPress={() => { + navigation.navigate('myTeam.pushToTalk', { + // @ts-ignore + details: { + channelName: 'TEAM_'+team.teamId, + }, + }); + }} size='small' - numberOfLines={1} - UNSAFE_style={styles.viewTeam} - testID='viewTeamButton'> - {t('rosterScreen.teamListItem.viewTeam')} - </Body> - </TouchableOpacity> - ) + disabled={!userIsInRoster || !userIsImpersonatedOnDev}> + <Text>{t('rosterScreen.associateRosterItem.pushToTalkBtn')}</Text> + </Button> + )} + {canMessage && isMessageButtonEnabled ? ( + <Button + variant='secondary' + onPress={onMessage} + size='small' + disabled={!userIsInRoster || !userIsImpersonatedOnDev}> + <Text>{t('rosterScreen.teamListItem.messageBtn')}</Text> + </Button> + ) : ( + <TouchableOpacity onPress={onViewTeam}> + <Body + weight='400' + size='small' + numberOfLines={1} + UNSAFE_style={styles.viewTeam} + testID='viewTeamButton'> + {t('rosterScreen.teamListItem.viewTeam')} + </Body> + </TouchableOpacity> + )} + </> }> <Body weight='400' size='small'> {t('rosterScreen.teamListItem.clockedIn', {
adding call button
adding call button
3534abb57cbac26de74bc59e7c58164a28b17ae5
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -112,7 +112,7 @@ export const SupplyChainRosterDetailScreen = ({ }>({ shiftIds: [loggedInUserShift], teamLabel: [defaultTeamLabel as string], - teamIds: selectedTeamIds || defaultTeamIds, + teamIds: selectedTeamIds?.length ? selectedTeamIds : defaultTeamIds, }); const [teamState, setTeamState] = useState<{ teamLabel: string | null;
fix(ui): truthy check bug fix
fix(ui): truthy check bug fix
dfcd9a3fd9500d22431fb4a39391310a5ff36a46
--- src/utils/user.ts @@ -27,10 +27,7 @@ export const associateIsTardy = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 2; export const associateIsClockedIn = (associate?: Associate) => { - return ( - ClockStatusEnum.clockedIn === Number(associate?.punch?.clockStatus) || - ClockStatusEnum.unknown === Number(associate?.punch?.clockStatus) - ); + return ClockStatusEnum.clockedOut !== Number(associate?.punch?.clockStatus); }; export const associateIsOnMeal = (associate?: Associate) => --- src/utils/user.ts @@ -27,10 +27,7 @@ export const associateIsTardy = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 2; export const associateIsClockedIn = (associate?: Associate) => { - return ( - ClockStatusEnum.clockedIn === Number(associate?.punch?.clockStatus) || - ClockStatusEnum.unknown === Number(associate?.punch?.clockStatus) - ); + return ClockStatusEnum.clockedOut !== Number(associate?.punch?.clockStatus); }; export const associateIsOnMeal = (associate?: Associate) =>
updating logic on couting clocked in status
updating logic on couting clocked in status
e44f42a4dae46971f4ad98e527a8455b62e66aa5
--- .looper.multibranch.yml @@ -348,12 +348,14 @@ flows: - group("$os prod"): - call: build-snapshot(prod) else: - - group("$os beta"): - - call: build-release(beta) - - group("$os prod"): - - call: build-release(prod) + - node(label=$LOOPER_NODES, ws="exclusive"): + - parallel(failsafe): + - group("$os beta"): + - call: build-release(beta) + - group("$os prod"): + - call: build-release(prod) - # this is for producing builds that will get uploaded to proximity as snapshot + # this is for producing builds that will get uploaded to proximity as snapshot build-snapshot: - (name Install Dependencies) npm install - declare(buildOutput)
added looper parallel step
added looper parallel step
88be1093b6117f0d013039f0f414fdb2b1da0f2a
--- __tests__/settings/versions/__snapshots__/VersionsListTest.tsx.snap @@ -128,7 +128,7 @@ exports[`VersionsList VersionsList 1`] = ` accessibilityLabel="section-list" contentContainerStyle={ { - "paddingBottom": 30, + "paddingBottom": 46, } } data={ --- src/settings/versions/VersionsList.tsx @@ -61,7 +61,7 @@ export const SessionIdRow = () => { ); }; -const EXTRA_BOTTOM_PADDING = 30; +const EXTRA_BOTTOM_PADDING = 46; const styles = StyleSheet.create({ container: {
feat(drop35): add padding on settings
feat(drop35): add padding on settings
5e0e79b323aa67ea0600730b03c4d63a9ede779b
--- ios/AllSpark.xcodeproj/project.pbxproj @@ -560,7 +560,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D994751F557438D6B85DBCC2 /* Pods-AllSpark.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Teflon"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; @@ -607,7 +607,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 99D7C873A014A98046591001 /* Pods-AllSpark.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Teflon"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; --- ios/AllSpark/Info.plist @@ -115,7 +115,7 @@ <string>remote-notification</string> </array> <key>UILaunchStoryboardName</key> - <string>LaunchScreen-Teflon</string> + <string>LaunchScreen-Dev</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string>
revert env change
revert env change
a31d3e92d61d1bd230334e403c29ee956fb07aff
--- src/components/Roster/types.ts @@ -1,3 +1,5 @@ +import {Associate, Team} from '../../types'; + interface RosterActionButton { label: string; action: (event: any) => void; @@ -20,10 +22,23 @@ export interface RosterProps { } //TODO: Refine type to only include fields needed to render an AssociateItem -export type AssociateRosterItem = any; -// NonNullable< -// ArrayValue<NonNullable<GetDailyRosterQuery['getDailyRoster']>> -// >; -//TODO: Refine type to only include fields needed to render an AssociateItem -export type TeamRosterItem = any; +export type AssociateRosterItem = Pick< + Associate, + | 'userId' + | 'win' + | 'fullName' + | 'preferredFirstName' + | 'preferredLastName' + | 'firstName' + | 'lastName' + | 'storeSchedule' + | 'absentData' + | 'punch' + | 'jobCategoryCodeDesc' +>; + +export type TeamRosterItem = Pick< + Team, + 'teamId' | 'teamName' | 'mewClockedInCount' | 'mewAbsentCount' | 'workgroup' +>; --- src/types.ts @@ -1,10 +1,6 @@ -import {FirebaseFirestoreTypes} from '@react-native-firebase/firestore'; import {GetDailyRosterQuery} from './queries/getDailyRoster'; import {GetTeamByIdQuery} from './queries/getTeamById'; -export type AtLeastOne<T, U = {[K in keyof T]: Pick<T, K>}> = Partial<T> & - U[keyof U]; - // Athena Associate from Query Types export type ArrayValue<T extends Array<any>> = T extends Array<infer P> ? P @@ -15,63 +11,3 @@ export type Associate = NonNullable< >; export type Team = NonNullable<NonNullable<GetTeamByIdQuery['getTeamById']>>; - -export type FirestoreSubscription = {remove: () => void}; - -// Channel Types -export type ImageMedia = { - uri: string; - type: 'image'; -}; - -export type AudioMedia = { - uri: string; - lengthMS: number; - type: 'audio'; - metering?: number[]; -}; - -export type DeleteConfirmationContentType = { - messagePath: string; - modalOnCloseCallback: () => void; - channelPath?: string; -}; -export type TranslationFuntion = (key: string) => string; -export type MessageMedia = ImageMedia | AudioMedia; - -export type LastMessageTimeStamp = Date | undefined; - -export type FirebaseMessage = { - message?: string; - createdAt: FirebaseFirestoreTypes.Timestamp; - sentFrom: string; - image?: ImageMedia; - audio?: AudioMedia; - deleted?: boolean; - deletedTimestamp?: FirebaseFirestoreTypes.Timestamp; -}; - -export type MessageRequest = AtLeastOne<{ - message: string; - image: ImageMedia; - audio: AudioMedia; -}>; - -export type LocalMessage = FirebaseMessage & { - id: string; - isMyMessage: boolean; - messagePath: string; - readReceipt?: string; - messageTime?: string; - showReadReceipt?: boolean; - deleted?: boolean; - deletedByPreferredName?: string; - isGroupMessage?: boolean; - channelPath?: string; - testID?: string; -}; - -export type SubscriptionContext<T> = T & { - subscriptionOn: (...params: any) => void; - subscriptionOff: (...params: any) => void; -};
updating types, removing unused code
updating types, removing unused code
974ffe98943eb3ce2f1e5d88aa0dbd44cb9f0075
--- src/cafeOrders/components/messages/ChannelRow.tsx @@ -77,7 +77,7 @@ export const ChannelRow = (props: ChannelRowProps) => { } = snapshot.data() as Channel; const lastMessageData = (await lastMessage.get()).data(); - const lastMessageMoment = moment(lastMessageTime.toDate()); + const lastMessageMoment = moment(lastMessageTime?.toDate()); const unread = recentRead?.[viewer] ? moment(recentRead[viewer].toDate()).isBefore(lastMessageMoment) : false; @@ -93,7 +93,10 @@ export const ChannelRow = (props: ChannelRowProps) => { lastMessageData?.sentFrom === viewer ? `You: ${lastMessageData?.message}` : lastMessageData?.message, - name: participants.length > 2 ? 'Group' : participants[0], + name: + participants.length > 2 + ? 'Group' + : participants.find((id) => id !== viewer), presense: participants.length === 2, unread, participants, --- src/cafeOrders/screens/ChannelsScreen.tsx @@ -60,8 +60,8 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = () => { }) .sort( (channelA, channelB) => - channelB.lastMessageTime.toMillis() - - channelA.lastMessageTime.toMillis(), + channelB.lastMessageTime?.toMillis() - + channelA.lastMessageTime?.toMillis(), ); setChannels(snapshotChannels); --- src/cafeOrders/screens/MessagesScreen.tsx @@ -22,7 +22,6 @@ import {TouchableOpacity} from 'react-native-gesture-handler'; import {Images} from '../themes'; import {MessageRow} from '../components/messages/MessageRow'; import {PresenceIndicator} from '../components/messages/PresenceIndicator'; -import {Channel} from '../types'; const styles = StyleSheet.create({ container: { @@ -187,13 +186,15 @@ export const MessagesScreen = () => { useEffect(() => { // Create channel doc if not present channelDoc.get().then((doc) => { - const channel = doc.data() as Channel | undefined; - - if (!channel) { + if (!doc.exists) { channelDoc.set({ participants: [user.userId, ...participants], createdAt: firestore.FieldValue.serverTimestamp(), }); + } else { + channelDoc.update({ + [`recentRead.${user.userId}`]: firestore.FieldValue.serverTimestamp(), + }); } }); @@ -202,6 +203,7 @@ export const MessagesScreen = () => { .collection('messages') .orderBy('createdAt', 'asc') .onSnapshot((snapshot) => { + console.log('on messages snapshot', channelDoc.id); const snapshotMessages = snapshot.docs.map((doc) => { const data = doc.data(); return { --- src/cafeOrders/components/messages/ChannelRow.tsx @@ -77,7 +77,7 @@ export const ChannelRow = (props: ChannelRowProps) => { } = snapshot.data() as Channel; const lastMessageData = (await lastMessage.get()).data(); - const lastMessageMoment = moment(lastMessageTime.toDate()); + const lastMessageMoment = moment(lastMessageTime?.toDate()); const unread = recentRead?.[viewer] ? moment(recentRead[viewer].toDate()).isBefore(lastMessageMoment) : false; @@ -93,7 +93,10 @@ export const ChannelRow = (props: ChannelRowProps) => { lastMessageData?.sentFrom === viewer ? `You: ${lastMessageData?.message}` : lastMessageData?.message, - name: participants.length > 2 ? 'Group' : participants[0], + name: + participants.length > 2 + ? 'Group' + : participants.find((id) => id !== viewer), presense: participants.length === 2, unread, participants, --- src/cafeOrders/screens/ChannelsScreen.tsx @@ -60,8 +60,8 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = () => { }) .sort( (channelA, channelB) => - channelB.lastMessageTime.toMillis() - - channelA.lastMessageTime.toMillis(), + channelB.lastMessageTime?.toMillis() - + channelA.lastMessageTime?.toMillis(), ); setChannels(snapshotChannels); --- src/cafeOrders/screens/MessagesScreen.tsx @@ -22,7 +22,6 @@ import {TouchableOpacity} from 'react-native-gesture-handler'; import {Images} from '../themes'; import {MessageRow} from '../components/messages/MessageRow'; import {PresenceIndicator} from '../components/messages/PresenceIndicator'; -import {Channel} from '../types'; const styles = StyleSheet.create({ container: { @@ -187,13 +186,15 @@ export const MessagesScreen = () => { useEffect(() => { // Create channel doc if not present channelDoc.get().then((doc) => { - const channel = doc.data() as Channel | undefined; - - if (!channel) { + if (!doc.exists) { channelDoc.set({ participants: [user.userId, ...participants], createdAt: firestore.FieldValue.serverTimestamp(), }); + } else { + channelDoc.update({ + [`recentRead.${user.userId}`]: firestore.FieldValue.serverTimestamp(), + }); } }); @@ -202,6 +203,7 @@ export const MessagesScreen = () => { .collection('messages') .orderBy('createdAt', 'asc') .onSnapshot((snapshot) => { + console.log('on messages snapshot', channelDoc.id); const snapshotMessages = snapshot.docs.map((doc) => { const data = doc.data(); return {
feat: add update of recent read field
feat: add update of recent read field
3ccf906344ee94893bc51018a26d5adf10a76975
--- .looper.multibranch.yml @@ -124,7 +124,7 @@ envs: slackIcon: ":firecracker:" slackChannel: "allspark-builds-feature" buildType: "SNAPSHOT" - buildGABuilds: true + buildGABuilds: false buildTeflon: false teamsReleaseTypeIcon: "https://ih1.redbubble.net/image.1355946808.4705/flat,128x128,075,t.u1.jpg" teamsWebhookUrl: "https://walmart.webhook.office.com/webhookb2/f0470775-130f-4a42-9531-d0511cf632aa@3cbcc3d3-094d-4006-9849-0d11d61f484d/IncomingWebhook/36aedf59babe497b8b4edd5920d0dd9f/f02e8323-deff-42c4-85df-613f84ca35ff" @@ -295,7 +295,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 @@ -361,10 +361,10 @@ flows: then: - node(label=$LOOPER_NODES, ws="exclusive"): - parallel(failsafe): -# - group("$os dev"): -# - call: build-snapshot(dev) -# - group("$os beta"): -# - call: build-snapshot(beta) + - group("$os dev"): + - call: build-snapshot(dev) + - group("$os beta"): + - call: build-snapshot(beta) - if: $buildGABuilds then: - group("$os prod"): @@ -400,7 +400,7 @@ flows: - call: android-process - try: - echo "uploading aab build for android" - - call: upload-build(version = ${version}, artifactId = "allspark-core-${os}-${env}", buildOutput = ${buildAabOutput}, sourceMap = ${sourceMap}, packaging = "aab") + - call: upload-build(version = "${version}-${env}-SNAPSHOT", artifactId = "allspark-core-${os}-${env}", buildOutput = ${buildAabOutput}, sourceMap = ${sourceMap}, packaging = "aab") catch: - echo "failure in uploading aab" - echo "uploading build"
revert test changes
revert test changes
a94259260c79a3387c26e65134786d3a0fecf6b1
--- src/screens/MessagesScreen.tsx @@ -222,30 +222,15 @@ export const MessagesScreen = () => { return message.message || ''; }; - const channelType = getChannelTypeFromPath(channelPath); - - const getRecipientsForPush = () => { - if (channelType === ChannelTypes.ONETOONE) { - const recipients = channelData?.participants - .filter((recipient) => recipient !== viewerId) - .map((encyptedUser) => decryptUserId(encyptedUser)); - return recipients || []; - } else if (channelType === ChannelTypes.STOREALL) { - //TODO: Get list of username for whole store roster, wait for athena changes to be merged - return []; - } else if (channelType === ChannelTypes.TEAM) { - //TODO: Get TeamId for members in team, wait for athena changes to be merged - return []; - } else { - return []; - } - }; + const recipients = channelData?.participants + .filter((recipient) => recipient !== viewerId) + .map((encyptedUser) => decryptUserId(encyptedUser)); const channelId = getChannelIdFromChannelPath(channelData?.id); await PushNotificationApi.notifyRecipients( capitalize(viewerFirstName), getMessageTextForPush(), - getRecipientsForPush(), + recipients || [], parseInt(siteId, 10), channelId, message?.image?.uri, @@ -270,7 +255,10 @@ export const MessagesScreen = () => { [`recentRead.${viewerId}`]: createdAt, }); - await sendPushNotification(message); + const channelType = getChannelTypeFromPath(channelPath); + if (channelType === ChannelTypes.ONETOONE) { + await sendPushNotification(message); + } }; return ( --- src/screens/MessagesScreen.tsx @@ -222,30 +222,15 @@ export const MessagesScreen = () => { return message.message || ''; }; - const channelType = getChannelTypeFromPath(channelPath); - - const getRecipientsForPush = () => { - if (channelType === ChannelTypes.ONETOONE) { - const recipients = channelData?.participants - .filter((recipient) => recipient !== viewerId) - .map((encyptedUser) => decryptUserId(encyptedUser)); - return recipients || []; - } else if (channelType === ChannelTypes.STOREALL) { - //TODO: Get list of username for whole store roster, wait for athena changes to be merged - return []; - } else if (channelType === ChannelTypes.TEAM) { - //TODO: Get TeamId for members in team, wait for athena changes to be merged - return []; - } else { - return []; - } - }; + const recipients = channelData?.participants + .filter((recipient) => recipient !== viewerId) + .map((encyptedUser) => decryptUserId(encyptedUser)); const channelId = getChannelIdFromChannelPath(channelData?.id); await PushNotificationApi.notifyRecipients( capitalize(viewerFirstName), getMessageTextForPush(), - getRecipientsForPush(), + recipients || [], parseInt(siteId, 10), channelId, message?.image?.uri, @@ -270,7 +255,10 @@ export const MessagesScreen = () => { [`recentRead.${viewerId}`]: createdAt, }); - await sendPushNotification(message); + const channelType = getChannelTypeFromPath(channelPath); + if (channelType === ChannelTypes.ONETOONE) { + await sendPushNotification(message); + } }; return (
only send push notifications for onetoone chat
only send push notifications for onetoone chat
4bc90fb66528fa889b796a5b12b32166236eaf21
--- packages/me-at-walmart-athena-queries/README.md @@ -1,5 +1,5 @@ # DEPRECATED -This is no longer supported, please use [@walmart/me-at-walmart-container](../me-at-walmart-container/README.md) instead. +This is no longer supported, please use [@walmart/me-at-walmart-common](../me-at-walmart-common/README.md) instead. Versions >=5.0.0 will mark all exports as deprecated and either map to `@walmart/me-at-walmart-container` functionality or return stubbed values.
Update README.md
Update README.md
38aca5888f2cc1bb0005e43bbe870b58e540806e
--- src/utils/assoicateList.ts @@ -23,8 +23,16 @@ const checkUserIsTeamLead = (associate: Associate, teamLeads: string[]) => const checkUserClockedIn = (associate: Associate) => associateIsClockedIn(associate) ? ASC_ORDER : DESC_ORDER; +const associateIsOnlyClockedOut = (associate: Associate) => + associateIsClockedOut(associate) && + !associateIsTardy(associate) && + !associateIsAbsent(associate) && + !associateIsNotScheduled(associate) && + !associateIsOnPTO(associate) && + !associateIsOnPPTO(associate); + const checkUserClockedOut = (associate: Associate) => - associateIsClockedOut(associate) ? ASC_ORDER : DESC_ORDER; + associateIsOnlyClockedOut(associate) ? ASC_ORDER : DESC_ORDER; const checkUserTardy = (associate: Associate) => associateIsTardy(associate) ? ASC_ORDER : DESC_ORDER; --- src/utils/assoicateList.ts @@ -23,8 +23,16 @@ const checkUserIsTeamLead = (associate: Associate, teamLeads: string[]) => const checkUserClockedIn = (associate: Associate) => associateIsClockedIn(associate) ? ASC_ORDER : DESC_ORDER; +const associateIsOnlyClockedOut = (associate: Associate) => + associateIsClockedOut(associate) && + !associateIsTardy(associate) && + !associateIsAbsent(associate) && + !associateIsNotScheduled(associate) && + !associateIsOnPTO(associate) && + !associateIsOnPPTO(associate); + const checkUserClockedOut = (associate: Associate) => - associateIsClockedOut(associate) ? ASC_ORDER : DESC_ORDER; + associateIsOnlyClockedOut(associate) ? ASC_ORDER : DESC_ORDER; const checkUserTardy = (associate: Associate) => associateIsTardy(associate) ? ASC_ORDER : DESC_ORDER;
update the sorting order for Absent, Tardy, PTO, PPTO and Not scheduled
update the sorting order for Absent, Tardy, PTO, PPTO and Not scheduled
4cf3229e979a077c4bea1fbe09d311f9246fbb26
--- __tests__/managerExperience/components/FilterChip.test.tsx @@ -3,12 +3,13 @@ import {FilterChip} from '../../../src/managerExperience/components/FilterChip'; import {fireEvent} from '@testing-library/react-native'; import {renderWithProviders} from '../../harness'; import {FilterChipProps} from '../../../src/managerExperience/components/FilterChip/types'; +import {FilterValue} from '../../../src/containers/RosterFilters'; const defaultProps: FilterChipProps = { count: 25, label: '9 Clocked in', isApplied: false, - id: 'test', + id: FilterValue.all, }; describe('FilterChip', () => { --- __tests__/managerExperience/components/FilterChipGroup.test.tsx @@ -81,7 +81,7 @@ describe('FilterChipGroup', () => { const clockedInChip = getByText('193 Clocked in'); fireEvent.press(clockedInChip); fireEvent.press(clockedInChip); - expect(defaultProps.handleFilter).toHaveBeenCalledWith(null); + expect(defaultProps.handleFilter).toHaveBeenCalledWith(FilterValue.all); }); it('calls handleFilter any time a filter is pressed', () => { --- __tests__/managerExperience/components/RosterFiltersAndInfo.test.tsx @@ -36,7 +36,6 @@ describe('RosterFiltersAndInfo Component', () => { headerText: `Today's roster`, filterChips: mockFilterChips, loading: false, - numberOfAssociates: 226, teamName: 'Team A', associates: [mockAssociate], handleFilter: jest.fn(), @@ -89,7 +88,6 @@ describe('RosterFiltersAndInfo Component', () => { headerText: `Today's roster`, filterChips: mockFilterChips, loading: false, - numberOfAssociates: 226, teamName: 'Team A', handleFilter: jest.fn(), }; @@ -122,11 +120,9 @@ describe('RosterFiltersAndInfo Component', () => { const RosterFiltersHeaderContainer = getByTestId('rosterFiltersHeader'); //Accessing the props of the FilterChip directly through its parent - const {headerText, numberOfAssociates} = - RosterFiltersHeaderContainer.props.children.props; + const {headerText} = RosterFiltersHeaderContainer.props.children.props; expect(headerText).toBe(defaultProps.headerText); - expect(numberOfAssociates).toBe(defaultProps.numberOfAssociates); }); it('renders loading team details if data is loading', () => { --- __tests__/managerExperience/components/__snapshots__/RosterFiltersAndInfo.test.tsx.snap @@ -4,7 +4,8 @@ exports[`RosterFiltersAndInfo Component renders correctly with given props 1`] = <View style={ { - "padding": 12, + "paddingHorizontal": 16, + "paddingVertical": 10, "width": "100%", } } @@ -15,8 +16,6 @@ exports[`RosterFiltersAndInfo Component renders correctly with given props 1`] = "alignItems": "center", "flexDirection": "row", "marginBottom": 16, - "marginLeft": 4, - "marginTop": 4, } } testID="headerContainer" @@ -55,7 +54,7 @@ exports[`RosterFiltersAndInfo Component renders correctly with given props 1`] = Today's roster </Text> <Text - accessibilityLabel="226" + accessibilityLabel="1" accessibilityRole="text" style={ [ @@ -76,7 +75,7 @@ exports[`RosterFiltersAndInfo Component renders correctly with given props 1`] = testID="numberOfAssociates" > ( - 226 + 1 ) </Text> </View> @@ -441,7 +440,8 @@ exports[`RosterFiltersAndInfo Component renders loading team details if data is <View style={ { - "padding": 12, + "paddingHorizontal": 16, + "paddingVertical": 10, "width": "100%", } } @@ -453,8 +453,6 @@ exports[`RosterFiltersAndInfo Component renders loading team details if data is "alignItems": "center", "flexDirection": "row", "marginBottom": 16, - "marginLeft": 4, - "marginTop": 4, } } > @@ -510,6 +508,7 @@ exports[`RosterFiltersAndInfo Component renders loading team details if data is "display": "flex", "flexDirection": "row", "gap": 8, + "marginTop": 16, } } >
test: updated roster info tests
test: updated roster info tests
4c097d8ed2efe703b7e53b46f52e9860ad04dcca
--- package-lock.json @@ -3187,25 +3187,16 @@ "integrity": "sha512-4VL2h7BKEZNP+QtIaYbQXJ6kpxZdeeCqTA3PvP1L933vlNsilF3y5RO9lCyMsTjWQ+AJ3Ww6gqC/oNDxjTvtGw==" }, "@walmart/time-clock-mini-app": { - "version": "0.3.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.3.0.tgz", - "integrity": "sha512-SCq8K+isIKq6w3got6oaAmmhStcbt5PNMpiSqEfEwb3BhvAJz5yH7LjdnhGoPnCCv0QbEB18eri4SO7m3oFENQ==", + "version": "0.3.1", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.3.1.tgz", + "integrity": "sha512-OSGbrKHLn6cw1wlcKdGmtXj9qH4kPnkw9FGMQZ3PCSc3OvM9ML3nNmVpch3f/tAOtsafnrJcZlecjjHN4kFTAg==", "requires": { "@react-native-community/datetimepicker": "3.0.9", - "javascript-time-ago": "^2.3.4", "moment-timezone": "^0.5.31", "react-native-geolocation-service": "^5.0.0", "wfm-allspark-data-library": "^0.0.19" }, "dependencies": { - "javascript-time-ago": { - "version": "2.3.6", - "resolved": "https://npme.walmart.com/javascript-time-ago/-/javascript-time-ago-2.3.6.tgz", - "integrity": "sha512-OZLtmx+o+LyfLLi7oKsz7taNCx2uguf1qsdN3KCYDe89L7D1OT1BcR/E0HgK5EYqvXxpPEl0oiuypFC7ugyeJA==", - "requires": { - "relative-time-format": "^1.0.5" - } - }, "wfm-allspark-data-library": { "version": "0.0.19", "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.19.tgz", --- package.json @@ -81,7 +81,7 @@ "@walmart/redux-store": "^1.0.12", "@walmart/schedule-mini-app": "0.2.74", "@walmart/settings-mini-app": "1.2.3", - "@walmart/time-clock-mini-app": "0.3.0", + "@walmart/time-clock-mini-app": "0.3.1", "@walmart/ui-components": "1.1.14", "@walmart/welcomeme-mini-app": "0.5.27", "@walmart/wfm-ui": "^0.1.50",
Falling back to GTA API to load business unit
Falling back to GTA API to load business unit If the K-Graph call fails
e6271615914e4a35cd4b5951515c5dff9ee76977
--- .looper.yml @@ -30,8 +30,7 @@ flows: # - (name Test) npm run test preparePublish: - - (name Install Lerna project dependencies) npm ci - - (name Bootstrap the packages) npx lerna bootstrap + - (name Install Dependencies) npm install publishFromChanges: - call: preparePublish --- package.json @@ -5,7 +5,6 @@ "description": "", "private": true, "scripts": { - "bootstrap": "npm i", "test": "lerna run test --since", "lint": "lerna run lint --since", "publish": "lerna publish --yes",
chore: looper publish fix
chore: looper publish fix
b57fb425b58f135a28efaeaf991c9d64ae631cec
--- package-lock.json @@ -79,7 +79,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.6.1", - "@walmart/receipt-check-miniapp": "1.18.4", + "@walmart/receipt-check-miniapp": "1.18.5", "@walmart/redux-store": "3.7.0", "@walmart/returns-mini-app": "3.13.0", "@walmart/schedule-mini-app": "0.63.0", @@ -9564,9 +9564,9 @@ } }, "node_modules/@walmart/receipt-check-miniapp": { - "version": "1.18.4", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.18.4.tgz", - "integrity": "sha512-oWCJrF3hj3BPOat8d+xjnvQLoGdBlnrO92VjKOnxd2Wp2rR6yp73n2QHxzK3t3A+WeEiN/gT1P9ElVFgktLS0Q==", + "version": "1.18.5", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.18.5.tgz", + "integrity": "sha512-6Ucoppilcl51HWa4YFpiHiQ3TxAZNu7g1c9UtPYoviRcmENpEQsB12mRsOa1ZVS7SBX0rF4LlNFlfHlkNKHghg==", "hasInstallScript": true, "dependencies": { "@walmart/tcnumber": "^2.3.3", @@ -33499,9 +33499,9 @@ "integrity": "sha512-jGJ2GDvDka1L8scmqvU2puNj93TFRgpr61ef4XyFO+FPUIPhs4CUtxDAChg4XIHMjLcNkQOwpc2mtz4A01wJfg==" }, "@walmart/receipt-check-miniapp": { - "version": "1.18.4", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.18.4.tgz", - "integrity": "sha512-oWCJrF3hj3BPOat8d+xjnvQLoGdBlnrO92VjKOnxd2Wp2rR6yp73n2QHxzK3t3A+WeEiN/gT1P9ElVFgktLS0Q==", + "version": "1.18.5", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.18.5.tgz", + "integrity": "sha512-6Ucoppilcl51HWa4YFpiHiQ3TxAZNu7g1c9UtPYoviRcmENpEQsB12mRsOa1ZVS7SBX0rF4LlNFlfHlkNKHghg==", "requires": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", --- package.json @@ -120,7 +120,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.6.1", - "@walmart/receipt-check-miniapp": "1.18.4", + "@walmart/receipt-check-miniapp": "1.18.5", "@walmart/redux-store": "3.7.0", "@walmart/returns-mini-app": "3.13.0", "@walmart/schedule-mini-app": "0.63.0",
update version
update version
31c39bc65dd1d7cdeb502cac5b672bc5dc900ec0
--- commitlint.config.ts @@ -0,0 +1,10 @@ +import type {UserConfig} from '@commitlint/types' + +const config: UserConfig = { + extends: ['@commitlint/config-conventional'], + rules: { + 'subject-case': [0, 'always', 'upper-case'] + } +} + +export default config
fix: SMDV-9999 update looper
fix: SMDV-9999 update looper
bdbfbabcca1bd22b430e260054accdd868a7709e
--- __tests__/screens/RosterDetails/RosterDetailScreen.test.tsx @@ -5,15 +5,12 @@ import { RosterDetailScreen, } from '../../../src/screens/RosterDetailScreen/RosterDetailScreen'; import {RosterNavParamsMap} from '../../../src/navigation'; -import {SupplyChainRosterDetailScreen} from '../../../src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen/SupplyChainRosterDetailScreen'; -import {StoreRosterDetailScreen} from '../../../src/screens/RosterDetailScreen/StoreRosterDetailScreen/StoreRosterDetailScreen'; import React from 'react'; -import {renderWithProviders} from '../../harness'; +//import {renderWithProviders} from '../../harness'; import {useSelector} from 'react-redux'; -import { - useGetViewersPrimaryTeam, - useUserCanSeeHub, -} from '@walmart/allspark-foundation-hub'; +import {UseGetViewersPrimaryTeamReturnType} from '@walmart/allspark-foundation-hub'; +import {translationClient} from '../../../src/common'; +import {render} from '@testing-library/react-native'; jest.mock('../../../src/common', () => ({ translationClient: { @@ -27,109 +24,98 @@ jest.mock('react-redux', () => ({ jest.mock( '../../../src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen/SupplyChainRosterDetailScreen', - () => jest.fn(() => null), + () => jest.fn(() => <>Supply Chain Screen</>), ); jest.mock( '../../../src/screens/RosterDetailScreen/StoreRosterDetailScreen/StoreRosterDetailScreen', - () => jest.fn(() => null), + () => jest.fn(() => <>Store Screen</>), ); -describe('renderLeftHeader', () => { - const mockRoute = (teamId?: string): RouteProp<any, any> => ({ - key: 'test-key', - name: 'myTeam.rosterDetail', - params: teamId ? {teamId} : {}, +const mockRoute = ( + teamId?: string, +): RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'> => ({ + key: 'test-key', + name: 'myTeam.rosterDetail', + params: teamId ? {teamId} : {}, +}); + +const primaryTeamMock = [{teamId: 'abc'}] as UseGetViewersPrimaryTeamReturnType; + +describe('renderTitle', () => { + it('returns team title when conditions match', () => { + (translationClient.translate as unknown as jest.Mock).mockReturnValue( + 'Team Title', + ); + const result = renderTitle(mockRoute('abc'), primaryTeamMock, false); + expect(result).toBe('Team Title'); }); - it('returns undefined when showTeamHub is true', () => { - const result = renderLeftHeader( - mockRoute() as RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, - [], - true, + it('returns roster title when team ID does not match', () => { + (translationClient.translate as unknown as jest.Mock).mockReturnValue( + 'Roster Title', ); - expect(result).toBeUndefined(); + const result = renderTitle(mockRoute('xyz'), primaryTeamMock, false); + expect(result).toBe('Roster Title'); }); - it('returns undefined when teamId exists in route params and does not match primaryTeam teamId', () => { - const result = renderLeftHeader( - mockRoute('123') as RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, - [{teamId: '456', teamName: ''}], - false, + it('returns roster title when showTeamHub is true', () => { + (translationClient.translate as unknown as jest.Mock).mockReturnValue( + 'Roster Title', ); - expect(result).toBeUndefined(); + const result = renderTitle(mockRoute('abc'), primaryTeamMock, true); + expect(result).toBe('Roster Title'); }); }); -describe('renderTitle', () => { - const mockRoute = (teamId?: string): RouteProp<any, any> => ({ - key: 'test-key', - name: 'myTeam.rosterDetail', - params: teamId ? {teamId} : {}, +describe('renderLeftHeader', () => { + it('returns renderDrawerButton when conditions match', () => { + const result = renderLeftHeader(mockRoute('abc'), primaryTeamMock, false); + expect(result).toBeUndefined(); }); - it('returns "Team" when showTeamHub is false and no teamId in route params', () => { - const result = renderTitle( - mockRoute() as RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, - [], - false, - ); - expect(result).toBe('Team'); + it('returns undefined when team ID does not match', () => { + const result = renderLeftHeader(mockRoute('xyz'), primaryTeamMock, false); + expect(result).toBeUndefined(); }); - it('returns "Team" when showTeamHub is false and primaryTeam teamId matches route params', () => { - const result = renderTitle( - mockRoute('123') as RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, - [{teamId: '123', teamName: ''}], - false, - ); - expect(result).toBe('Team'); + it('returns undefined when showTeamHub is true', () => { + const result = renderLeftHeader(mockRoute('abc'), primaryTeamMock, true); + expect(result).toBeUndefined(); }); - it('returns "Roster" when showTeamHub is true', () => { - const result = renderTitle( - mockRoute() as RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, - [], - true, + + it('returns renderDrawerButton when teamId is missing', () => { + const result = renderLeftHeader( + mockRoute(undefined), + primaryTeamMock, + false, ); - expect(result).toBe('Roster'); + expect(result).toBeUndefined(); }); }); describe('RosterDetailScreen', () => { - const mockNavigation = {setOptions: jest.fn()}; - const mockRoute = { - key: 'test-key', - name: 'myTeam.rosterDetail', - params: {teamId: '123'}, - } as RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>; + const setOptionsMock = jest.fn(); beforeEach(() => { jest.clearAllMocks(); - (useNavigation as jest.Mock).mockReturnValue(mockNavigation); + (useNavigation as jest.Mock).mockReturnValue({setOptions: setOptionsMock}); }); - it('renders SupplyChainRosterDetailScreen when site is DC', () => { + it('renders SupplyChainRosterDetailScreen when isSiteDC is true', () => { (useSelector as jest.Mock).mockReturnValue(true); - (useGetViewersPrimaryTeam as jest.Mock).mockReturnValue('Primary Team'); - (useUserCanSeeHub as jest.Mock).mockReturnValue(true); - - renderWithProviders(<RosterDetailScreen route={mockRoute} />); - - expect(SupplyChainRosterDetailScreen).toHaveBeenCalledWith( - {route: mockRoute}, - {}, + const {getByText} = render(<RosterDetailScreen route={mockRoute('abc')} />); + expect(getByText(/Supply Chain Screen/i)).toBeTruthy(); + expect(setOptionsMock).toHaveBeenCalledWith( + expect.objectContaining({ + title: expect.any(String), + headerLeft: expect.anything(), + }), ); }); - it('renders StoreRosterDetailScreen when site is not DC', () => { + it('renders StoreRosterDetailScreen when isSiteDC is false', () => { (useSelector as jest.Mock).mockReturnValue(false); - (useGetViewersPrimaryTeam as jest.Mock).mockReturnValue('Primary Team'); - (useUserCanSeeHub as jest.Mock).mockReturnValue(true); - - renderWithProviders(<RosterDetailScreen route={mockRoute} />); - - expect(StoreRosterDetailScreen).toHaveBeenCalledWith( - {route: mockRoute}, - {}, - ); + const {getByText} = render(<RosterDetailScreen route={mockRoute('abc')} />); + expect(getByText(/Store Screen/i)).toBeTruthy(); }); }); --- __tests__/screens/RosterDetails/useStoreRosterDetails.test.ts @@ -186,7 +186,7 @@ describe('useStoreRosterDetails', () => { }); const {header, subText} = result.current.getHeaderAndSubtext({ - teamName: null, + teamName: null as any, }); expect(header).toBe(''); expect(subText).toBe('');
test: increase coverage for RosterDetailScreen
test: increase coverage for RosterDetailScreen
7ca58e0994747f9f8cace99e78efe3e0ac7fbd65
--- core/src/auth/SitePrompt.tsx @@ -88,7 +88,9 @@ export const SitePrompt: AllsparkModalComponent< style={styles.container}> <View style={styles.card}> <Text style={styles.headerText}>{t('storePrompt.title')}</Text> - <Text style={styles.siteText}>{t('storePrompt.siteNumber')}</Text> + <Text style={styles.siteText} nativeID='store_prompt'> + {t('storePrompt.siteNumber')} + </Text> <TextInput testID='site_input' @@ -98,6 +100,8 @@ export const SitePrompt: AllsparkModalComponent< maxLength={5} autoFocus={true} importantForAutofill='no' + accessibilityLabel={t('storePrompt.siteNumber')} + accessibilityLabelledBy='store_prompt' /> <Button
fix: ADA fix for SitePrompt for RECRUIT-88829
fix: ADA fix for SitePrompt for RECRUIT-88829
18f4ef6dda7817d3185782db356b40eade1b72d5
--- src/auth/AuthenticatorView.tsx @@ -55,8 +55,7 @@ export const AuthenticatorView = () => { const logger = useLogger<IAllsparkLogger>(); const telemetry = useTelemetry<IAllsparkTelemetry>(); - const signingIn = useSelector(AuthSelectors.getSigningIn); - const signingOut = useSelector((state) => state.auth.signingOut); + const {signingIn, signingOut} = useSelector(AuthSelectors.getAuthState); const fetchingUser = useSelector(getFetchingUser); const fetchingSite = useSelector(SiteSelectors.getSiteConfigFetching); const fetchingAppConfig = useSelector(AppConfigSelectors.getAppConfigLoading);
auth view fix
auth view fix
9bdc127af1c0463afab88d451a3a915519a2e2d9
--- packages/allspark-foundation/__tests__/Components/SharedComponents.test.tsx @@ -3,15 +3,6 @@ import { render } from '@testing-library/react-native'; import { Text } from 'react-native'; import { AllsparkSharedComponents } from '../../src/Components/SharedComponents'; - -// jest.mock('@walmart/allspark-utils', () => ({ -// EventManager: jest.fn().mockImplementation(() => ({ -// addListener: jest.fn(), -// runEventListener: jest.fn(), -// })), -// useRenderOnChange: jest.fn(), -// })); - describe('AllsparkSharedComponents', () => { const manager = AllsparkSharedComponents as any; let runEventListenerSpy: jest.SpyInstance; @@ -23,7 +14,7 @@ describe('AllsparkSharedComponents', () => { afterEach(() => { runEventListenerSpy.mockRestore(); }); - + it('should register a component', () => { const TestComponent = ({ value }: { value: string }) => <Text>{value}</Text>; const result = manager.register('TestComponent', TestComponent);
code cleanup
code cleanup
3d3f9fa77df22b3664b31b0da1b0b6cabfad58b5
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.34", + "version": "2.0.35", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/texting-mini-app", - "version": "2.0.34", + "version": "2.0.35", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.8.4", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.34", + "version": "2.0.35", "private": false, "main": "dist/index.js", "files": [ --- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.34", + "version": "2.0.35", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/texting-mini-app", - "version": "2.0.34", + "version": "2.0.35", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.8.4", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.34", + "version": "2.0.35", "private": false, "main": "dist/index.js", "files": [
update package version
update package version
c7178a6e83f7541e4dc9f2f561c18635933771fc
--- package-lock.json @@ -62,7 +62,7 @@ "@walmart/inbox-mini-app": "0.86.1", "@walmart/iteminfo-mini-app": "7.4.0", "@walmart/manager-approvals-miniapp": "0.2.4", - "@walmart/me-field-mini-app": "13.0.3", + "@walmart/me-field-mini-app": "14.0.2", "@walmart/metrics-mini-app": "0.13.11", "@walmart/mod-flex-mini-app": "1.10.4", "@walmart/moment-walmart": "1.0.4", @@ -8600,9 +8600,9 @@ } }, "node_modules/@walmart/me-field-mini-app": { - "version": "13.0.3", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-13.0.3.tgz", - "integrity": "sha512-JvV5AUWQ51uTUyD3LNk0UD8W5nQjUTRnMdJMvh2x3OHmKAhqTGctHoKjcpBzrtZlBie6e6Az3CUWtPrcA2TZwA==", + "version": "14.0.2", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-14.0.2.tgz", + "integrity": "sha512-JGf97zQqXPczaYyCjbkSHZ/inO1AkewmMqaj9GgdIGQumgRL17lLsviNp2drH2yFLMee2JIMx2zMJ0g62LCuPw==", "hasInstallScript": true, "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", @@ -33681,9 +33681,9 @@ } }, "@walmart/me-field-mini-app": { - "version": "13.0.3", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-13.0.3.tgz", - "integrity": "sha512-JvV5AUWQ51uTUyD3LNk0UD8W5nQjUTRnMdJMvh2x3OHmKAhqTGctHoKjcpBzrtZlBie6e6Az3CUWtPrcA2TZwA==" + "version": "14.0.2", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-14.0.2.tgz", + "integrity": "sha512-JGf97zQqXPczaYyCjbkSHZ/inO1AkewmMqaj9GgdIGQumgRL17lLsviNp2drH2yFLMee2JIMx2zMJ0g62LCuPw==" }, "@walmart/metrics-mini-app": { "version": "0.13.11", --- package.json @@ -103,7 +103,7 @@ "@walmart/inbox-mini-app": "0.86.1", "@walmart/iteminfo-mini-app": "7.4.0", "@walmart/manager-approvals-miniapp": "0.2.4", - "@walmart/me-field-mini-app": "13.0.3", + "@walmart/me-field-mini-app": "14.0.2", "@walmart/metrics-mini-app": "0.13.11", "@walmart/mod-flex-mini-app": "1.10.4", "@walmart/moment-walmart": "1.0.4",
⬆️ Bump Learning mini app
⬆️ Bump Learning mini app
2987ac725ef08a64f28171bf5cced96a57f2d76e
--- src/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -45,6 +45,7 @@ import {Alert, Body} from '@walmart/gtp-shared-components'; import { associateIsAbsent, associateIsClockedIn, + associateIsScheduled, associateIsTardy, } from '../../utils/user'; import { @@ -205,7 +206,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { const filterCount = useMemo(() => { if (teamState.teamIds?.[0] === TOTAL_STORE_TEAM_ID) { return { - scheduledCount: teamRoster?.length, + scheduledCount: teamRoster?.filter(associateIsScheduled).length, clockedInCount: teamRoster?.filter(associateIsClockedIn)?.length, absentCount: teamRoster?.filter(associateIsAbsent)?.length, tardyCount: teamRoster?.filter(associateIsTardy)?.length, --- src/utils/user.ts @@ -106,6 +106,10 @@ export const associateIsNotScheduled = (associate?: Associate) => { return false; }; +export const associateIsScheduled = (associate?: Associate) => { + return associate?.wfmSchedule !== null; +}; + export const associateDisplayName = (associate?: Associate) => { const preferredFullName = (!isNil(associate?.preferredFirstName) ||
Update schedule count for roster
Update schedule count for roster
0502717c3556abe40e0d0fc176fe536bb14b3bf2
--- targets/US/package.json @@ -89,7 +89,7 @@ "@walmart/attendance-mini-app": "3.44.0", "@walmart/avp-feature-app": "0.10.7", "@walmart/avp-shared-library": "0.10.1", - "@walmart/backroom-mini-app": "1.5.18", + "@walmart/backroom-mini-app": "1.5.20", "@walmart/calling-mini-app": "0.5.17", "@walmart/checkout-mini-app": "3.24.0", "@walmart/compass-sdk-rn": "5.19.15", --- yarn.lock @@ -6068,9 +6068,9 @@ __metadata: languageName: node linkType: hard -"@walmart/backroom-mini-app@npm:1.5.18": - version: 1.5.18 - resolution: "@walmart/backroom-mini-app@npm:1.5.18" +"@walmart/backroom-mini-app@npm:1.5.20": + version: 1.5.20 + resolution: "@walmart/backroom-mini-app@npm:1.5.20" dependencies: pubsub-js: "npm:^1.9.4" react-native-mask-input: "npm:^1.2.3" @@ -6093,7 +6093,7 @@ __metadata: react-native-svg-transformer: ">=1.0.0" react-redux: ^8.0.0 redux: ^4.0.0 - checksum: 10c0/797ed0429e6b5a839cf4ca082c81a4d0095339360a35c031b50461814d6c839ed764e0fc98a6b1ed446374283232eec068093ec0a8a00dbae1d487ac2238e22b + checksum: 10c0/6dd25b1d39a39312409c839102a82974a316b7f9c6f2db2941a2e41059626e94a4bcb77c5297c3aca7478b8e527ccb83320a00e5a4dc97a4619d9f10fb41c98a languageName: node linkType: hard @@ -6996,7 +6996,7 @@ __metadata: "@walmart/attendance-mini-app": "npm:3.44.0" "@walmart/avp-feature-app": "npm:0.10.7" "@walmart/avp-shared-library": "npm:0.10.1" - "@walmart/backroom-mini-app": "npm:1.5.18" + "@walmart/backroom-mini-app": "npm:1.5.20" "@walmart/calling-mini-app": "npm:0.5.17" "@walmart/checkout-mini-app": "npm:3.24.0" "@walmart/compass-sdk-rn": "npm:5.19.15"
Update @walmart/backroom-mini-app to 1.5.20
Update @walmart/backroom-mini-app to 1.5.20
57f02f251dc791ce431cf6a080aaaacc464a81fb
--- src/containers/ChatInput/AudioPlayback.tsx @@ -61,7 +61,7 @@ export const AudioPlayback = (props: { try { const Sound = await Audio.Sound.createAsync( audio, - {shouldPlay: false}, + {shouldPlay: true}, (status) => { if (status.isLoaded) { const {positionMillis, durationMillis = 0, didJustFinish} = status; @@ -91,12 +91,6 @@ export const AudioPlayback = (props: { // Unload audio once component is unmounted useEffect(() => { - createSound(); - Audio.setAudioModeAsync({ - playsInSilentModeIOS: true, - interruptionModeAndroid: InterruptionModeAndroid.DuckOthers, - interruptionModeIOS: InterruptionModeIOS.MixWithOthers, - }); return () => { SoundRef.current?.unloadAsync(); }; @@ -111,12 +105,25 @@ export const AudioPlayback = (props: { }, [currentPlaying]); // Playback Control - const onPlay = () => - SoundRef.current?.playAsync().catch((e) => { + const onPlay = async () => { + if (SoundRef.current) { + await SoundRef.current?.unloadAsync(); + } + + await Audio.setAudioModeAsync({ + playsInSilentModeIOS: true, + interruptionModeAndroid: InterruptionModeAndroid.DuckOthers, + interruptionModeIOS: InterruptionModeIOS.MixWithOthers, + }); + + try { + await createSound(); + } catch (e: any) { logger.error('audio error', { message: `'error while playing audio ${e.toString()}'`, }); - }); + } + }; const onReplay = () => SoundRef.current?.replayAsync().catch((e) => { --- src/containers/ChatInput/AudioPlayback.tsx @@ -61,7 +61,7 @@ export const AudioPlayback = (props: { try { const Sound = await Audio.Sound.createAsync( audio, - {shouldPlay: false}, + {shouldPlay: true}, (status) => { if (status.isLoaded) { const {positionMillis, durationMillis = 0, didJustFinish} = status; @@ -91,12 +91,6 @@ export const AudioPlayback = (props: { // Unload audio once component is unmounted useEffect(() => { - createSound(); - Audio.setAudioModeAsync({ - playsInSilentModeIOS: true, - interruptionModeAndroid: InterruptionModeAndroid.DuckOthers, - interruptionModeIOS: InterruptionModeIOS.MixWithOthers, - }); return () => { SoundRef.current?.unloadAsync(); }; @@ -111,12 +105,25 @@ export const AudioPlayback = (props: { }, [currentPlaying]); // Playback Control - const onPlay = () => - SoundRef.current?.playAsync().catch((e) => { + const onPlay = async () => { + if (SoundRef.current) { + await SoundRef.current?.unloadAsync(); + } + + await Audio.setAudioModeAsync({ + playsInSilentModeIOS: true, + interruptionModeAndroid: InterruptionModeAndroid.DuckOthers, + interruptionModeIOS: InterruptionModeIOS.MixWithOthers, + }); + + try { + await createSound(); + } catch (e: any) { logger.error('audio error', { message: `'error while playing audio ${e.toString()}'`, }); - }); + } + }; const onReplay = () => SoundRef.current?.replayAsync().catch((e) => {
reverting some changes on AudioPlayback
reverting some changes on AudioPlayback
ad305a31ef95dbc4a40032aaf2e335fe7a7385bf
--- .looper.yml @@ -21,4 +21,4 @@ flows: - npm install - npm run lint - npm run build - # - npm run coverage + - npm run coverage
Update tests
Update tests
fc18f039ac076ff3edd546eec877cefd4f8463fb
--- __tests__/navigation/ChangeStorePromptTest.tsx @@ -57,7 +57,10 @@ describe('ChangeStorePrompt', () => { const UpdateButton = component.root.findByProps({testID: 'updateStoreBtn'}); UpdateButton.props.onPress(); - expect(userActions.updateUser).toHaveBeenCalledWith({siteId: '1234'}); + expect(userActions.updateUser).toHaveBeenCalledWith({ + siteId: '1234', + workingSite: '1234', + }); expect(navigation.goBack).toHaveBeenCalled(); expect(interactionSpy).toHaveBeenCalled(); --- __tests__/startup/SsoSagaTest.ts @@ -8,6 +8,7 @@ import { CONFIG_FETCH_SUCCESS, User, userActions, + UserSelectors, UserTypes, } from '@walmart/redux-store'; @@ -192,37 +193,18 @@ describe('getCachedUser', () => { }); describe('updateCacheUser', () => { - it('handles if no auth user', () => { + it('handles if no user', () => { const iterator = updateCacheUser({fields: {siteId: '5260'}}); - expect(iterator.next().value).toEqual(select(getAuthUser)); + expect(iterator.next().value).toEqual(select(UserSelectors.getUser)); expect(iterator.next(null).done).toEqual(true); }); - it('handles if no cache user', () => { - const iterator = updateCacheUser({fields: {siteId: '5260'}}); - expect(iterator.next().value).toEqual(select(getAuthUser)); - expect(iterator.next({userId: 'swalton3'} as User).value).toEqual( - call(getCachedUser, 'swalton3'), - ); - expect(iterator.next(undefined).done).toEqual(true); - }); - it('updates cached user', () => { const iterator = updateCacheUser({fields: {siteId: '5260'}}); - expect(iterator.next().value).toEqual(select(getAuthUser)); - expect(iterator.next({userId: 'swalton3'} as User).value).toEqual( - call(getCachedUser, 'swalton3'), - ); + expect(iterator.next().value).toEqual(select(UserSelectors.getUser)); expect( iterator.next({userId: 'swalton3', siteId: '100'} as User).value, - ).toEqual( - call( - EncryptedStorage.setItem, - USER_CACHE_KEY, - JSON.stringify({userId: 'swalton3', siteId: '5260'}), - noop, - ), - ); + ).toEqual(call(cacheUserInfo, {userId: 'swalton3', siteId: '5260'})); }); }); --- src/navigation/ChangeStorePrompt.tsx @@ -91,7 +91,7 @@ export const ChangeStorePrompt = (props: StackScreenProps<any>) => { setSiteId(value.replace(/[^0-9]/g, '')); const updateSite = () => { - userActions.updateUser({siteId}); + userActions.updateUser({siteId, workingSite: siteId}); navigation.goBack(); InteractionManager.runAfterInteractions(() => navigation.navigate('Core.Toast', { --- src/startup/SsoSagas.ts @@ -6,10 +6,10 @@ import {noop} from 'lodash'; import { userActions, User, - AuthUser, UserTypes, CONFIG_FETCH_SUCCESS, CONFIG_BACKGROUND_REFRESH, + UserSelectors, } from '@walmart/redux-store'; import WmTelemetry from 'react-native-wm-telemetry'; import {SSOEnv} from 'react-native-ssmp-sso-allspark'; @@ -65,14 +65,12 @@ export function* cacheUserInfo(user: User) { export const getCachedUser = async (userId: string) => { try { - EncryptedStorage.removeItem(USER_CACHE_KEY); const cachedUser = await EncryptedStorage.getItem(USER_CACHE_KEY); if (!cachedUser) return undefined; const {user, expires} = JSON.parse(cachedUser); const valid = !!expires && Date.now() < Number(expires); - if (user.userId === userId && valid) return user; - + if (user?.userId === userId && valid) return user; EncryptedStorage.removeItem(USER_CACHE_KEY); return undefined; } catch (error) { @@ -81,18 +79,10 @@ export const getCachedUser = async (userId: string) => { }; export function* updateCacheUser({fields: userInfo}: {fields: Partial<User>}) { - const user: AuthUser | null = yield select(getAuthUser); + const user: User | null = yield select(UserSelectors.getUser); if (user) { - const cachedUser: User | undefined = yield call(getCachedUser, user.userId); - if (cachedUser) { - const finalUser = {...cachedUser, ...userInfo}; - yield call( - EncryptedStorage.setItem, - USER_CACHE_KEY, - JSON.stringify(finalUser), - noop, - ); - } + const finalUser = {...user, ...userInfo}; + yield call(cacheUserInfo, finalUser); } } @@ -107,8 +97,10 @@ export function* handleUserInfo(): any { yield call(userActions.getUserSuccess, cachedUser); } else { const response: {data: KGraphResult} = yield call(getLoggedInUser); - const loggedInUser = response?.data?.data?.getLoggedInUser; - const userInfo: User = yield call(kGraphUserToRedux, loggedInUser); + const userInfo: User = yield call( + kGraphUserToRedux, + response?.data?.data?.getLoggedInUser, + ); const user = {...authUser, ...userInfo}; yield call(userActions.getUserSuccess, user);
Fixing change store action. Fixing updating of cached user
Fixing change store action. Fixing updating of cached user
e7e6912fc4d1f3afc18e89a052129efc8c833fe4
--- packages/allspark-foundation/src/HubFeature/Onboarding/TeamOnboarding/Component/TeamOnboardingCards.tsx @@ -32,7 +32,12 @@ export const TeamOnboardingCards = ({ cards }: TeamOnboardingCardProps) => { onScroll={onScroll} showsVerticalScrollIndicator={false} > - <View accessibilityRole='list' accessible style={styles.container}> + <View + accessibilityRole='list' + accessible + accessibilityLabel='Team-onboarding-cards-list' + style={styles.container} + > {cards.map((item) => ( <TeamOnboardingCard key={item.title} --- packages/allspark-foundation/src/HubFeature/Onboarding/TeamSelection/Component/ListHeader.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { View, Text } from 'react-native'; import { Checkbox } from '@walmart/gtp-shared-components/dist'; -import { Teams } from '../Constants/TeamSelectionConstants'; import { ListHeaderProps } from '../types'; import { useAllsparkTranslation } from '../../../../Translation'; @@ -18,10 +17,11 @@ export const ListHeader = ({ } const isCheckboxChecked = selectedTeams.length === allAvailableTeams.length; return ( - //TODO: Add translations to constants - //TODO: replace hardcoded accessibilityLabel with translation for Title <> - <View accessibilityRole='header' accessibilityLabel={Teams}> + <View + accessibilityRole='header' + accessibilityLabel={t('teamSelection.teams')} + > <Text style={styles.header}>{t('teamSelection.teams')}</Text> </View> <View @@ -29,6 +29,10 @@ export const ListHeader = ({ accessibilityState={{ checked: isCheckboxChecked, }} + accessibilityLabel={t('teamSelection.selectAll')} + accessibilityActions={[ + { name: t('teamSelection.selectAll'), label: 'checkbox' }, + ]} style={styles.selectAllContainer} > <Text style={styles.selectTeamsText}> --- packages/allspark-foundation/src/HubFeature/Onboarding/TeamSelection/Component/SelectionBanner.tsx @@ -2,10 +2,7 @@ import React from 'react'; import { Text, View, StyleSheet } from 'react-native'; import { selectionBannerType } from '../types'; import { colors } from '@walmart/gtp-shared-components'; -import { - TeamSelected, - TeamsSelected, -} from '../Constants/TeamSelectionConstants'; +import { useAllsparkTranslation } from '../../../../Translation'; const selectionBannerStyles = StyleSheet.create({ container: { @@ -25,10 +22,14 @@ const selectionBannerStyles = StyleSheet.create({ }); export const SelectionBanner = ({ selectedTeams }: selectionBannerType) => { + const { t } = useAllsparkTranslation('managerExperience'); if (selectedTeams === 0) { return null; } - const teamLabel = selectedTeams === 1 ? TeamSelected : TeamsSelected; + const teamLabel = + selectedTeams === 1 + ? t('teamSelection.teamSelected') + : t('teamSelection.teamsSelected'); return ( <View accessibilityRole='alert' --- packages/allspark-foundation/src/HubFeature/Onboarding/TeamSelection/Component/SelectionBannerFooterButtons.tsx @@ -41,7 +41,9 @@ export const SelectionBannerFooterButtons = ({ isFullWidth={true} accessibilityLabel={SaveTeamsButton} accessibilityRole='button' - accessibilityActions={[{ name: CancelButton, label: 'save button' }]} + accessibilityActions={[ + { name: SaveTeamsButton, label: 'save teams button' }, + ]} > {t('teamSelection.saveTeams')} </Button> --- packages/allspark-foundation/src/HubFeature/Onboarding/TeamSelection/Component/TeamSelectionList.tsx @@ -126,6 +126,8 @@ export const TeamSelectionList = ({ //TODO: Add translations to all constants <View testID='selectionList'> <SectionList + accessible + accessibilityLabel='team-selection-list' style={styles.container} sections={sections} keyExtractor={(item, index) => item + index} --- packages/allspark-foundation/src/HubFeature/translation.ts @@ -40,6 +40,8 @@ export const enUS = { primaryTeam: 'Primary Team', cancel: 'Cancel', saveTeams: 'Save teams', + teamSelected: 'team selected', + teamsSelected: 'teams selected', }, bottomSheet: { title: 'Teams updated', @@ -96,6 +98,8 @@ export const esMX = { primaryTeam: 'Equipo Principal', cancel: 'Cancelar', saveTeams: 'Guardar equipos', + teamSelected: 'Equipo seleccionado', + teamsSelected: 'Equipos seleccionados', }, bottomSheet: { title: 'Equipos actualizados',
Adding accessibility lables and translations to it
Adding accessibility lables and translations to it
e36bb9f0c487f9799d58dd0634f68fda84352332
--- __tests__/harness/index.tsx @@ -24,7 +24,8 @@ import { MockedProvider as MockAthenaProvider, MockedResponse, } from '@apollo/client/testing'; -import {mockGetDailyRosterQuery} from "./athenaQueries/getDailyRoster"; +import {mockGetDailyRosterQuery} from './athenaQueries/getDailyRoster'; +import {mockGetTeamsByStoreQuery} from './athenaQueries/getTeamsByStore'; const rootReducer = reducerManager.getRootReducer(); @@ -61,7 +62,10 @@ const envConfig: EnvConfig = { const channelsContext = createMockChannelsContext(100); const presenceContext = createMockPresenceContext(100); -const mockAthenaQueries: MockedResponse[] = [mockGetDailyRosterQuery]; +const mockAthenaQueries: MockedResponse[] = [ + mockGetDailyRosterQuery, + mockGetTeamsByStoreQuery, +]; //TODO: Wrap harness with AllsparkCoreServices to make it more robust export const renderWithProviders: typeof render = ( --- __tests__/harness/index.tsx @@ -24,7 +24,8 @@ import { MockedProvider as MockAthenaProvider, MockedResponse, } from '@apollo/client/testing'; -import {mockGetDailyRosterQuery} from "./athenaQueries/getDailyRoster"; +import {mockGetDailyRosterQuery} from './athenaQueries/getDailyRoster'; +import {mockGetTeamsByStoreQuery} from './athenaQueries/getTeamsByStore'; const rootReducer = reducerManager.getRootReducer(); @@ -61,7 +62,10 @@ const envConfig: EnvConfig = { const channelsContext = createMockChannelsContext(100); const presenceContext = createMockPresenceContext(100); -const mockAthenaQueries: MockedResponse[] = [mockGetDailyRosterQuery]; +const mockAthenaQueries: MockedResponse[] = [ + mockGetDailyRosterQuery, + mockGetTeamsByStoreQuery, +]; //TODO: Wrap harness with AllsparkCoreServices to make it more robust export const renderWithProviders: typeof render = (
adding new team to harness
adding new team to harness
fa7de907919a44d5b150c43bdb9c349329dc4116
--- package.json @@ -75,7 +75,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.44", "@walmart/allspark-home-mini-app": "0.5.47", "@walmart/allspark-neon-core": "0.1.29", - "@walmart/amp-mini-app": "0.2.10", + "@walmart/amp-mini-app": "0.2.11", "@walmart/ask-sam-mini-app": "1.1.3", "@walmart/config-components": "3.0.2", "@walmart/core-services": "~1.2.4",
AMP Version updated to 0.2.11 with fix to CTP-7943
AMP Version updated to 0.2.11 with fix to CTP-7943
596ca5b8a7025efb924dfa9918a259eed24a9364
--- src/components/ClockedOutScreenGuard.tsx @@ -15,7 +15,7 @@ import {DrawerButton, Header} from '@walmart/ui-components'; import {TEXTING_I18N_NAMESPACE} from '../translations'; import {navigate} from '@walmart/react-native-shared-navigation'; import {showViewTimeClock} from '../redux/selectors'; -import {useIsHourly, useUserIsInRoster} from '../hooks'; +import {useIsHourly, useUserIsInRoster} from '../hooks/user'; const styles = StyleSheet.create({ warning: { --- src/hooks/user.ts @@ -0,0 +1,22 @@ +import {User, UserSelectors} from "@walmart/redux-store"; +import {useSelector} from "react-redux"; +import {isNil} from "lodash"; + +const HOURLY_PAYTYPE = 'H'; + +export const useIsHourly = () => { + const user: User = useSelector(UserSelectors.getUser); + const payType = user.employeeType as 'H' | 'S'; + return payType?.toString()?.toUpperCase() === HOURLY_PAYTYPE ; +}; + +export const useUserIsInRoster = () => { + const workingSite: string = useSelector(UserSelectors.getUserWorkingSite); + const homeSite: string = useSelector(UserSelectors.getUserHomeSite); + + if (isNil(workingSite) || isNil(homeSite)) { + return false; + } + + return workingSite.toString() === homeSite.toString(); +}; --- src/redux/selectors.ts @@ -25,3 +25,10 @@ export const shouldDisplayWarningBanner = createSelector( state?.shouldDisplayWarningBanner?.toString()?.toLowerCase() === 'true' ?? CCMFallbacks.shouldDisplayWarningBanner, ); + +export const showViewTimeClock = createSelector( + [getTextingAppConfigData], + (state) => + state?.showViewTimeClock?.toString()?.toLowerCase() === 'true' ?? + CCMFallbacks.showViewTimeClock, +);
fixing clocked out screen guard component
fixing clocked out screen guard component
3b0894ae6d6b42c93de617f0d87d5207a84f79e0
--- packages/expo-config-plugins/src/withEmmAppRestrictions.ts @@ -64,7 +64,6 @@ const withAppRestrictionsXml: ConfigPlugin = (config) => { <restriction android:key="emmDeviceType" android:title="EMM Device Type" - android:description="Specifies the device classification for enterprise management" android:restrictionType="string" android:defaultValue="" /> </restrictions>
fix(ci): remove android description from emm plugin (#555)
fix(ci): remove android description from emm plugin (#555)
b7d2185603ba1a0f93ffbb3cdc30925b1a953884
--- core/src/startup/AuthFlow.ts @@ -7,14 +7,18 @@ import {IAuthActions, AuthActionTypes} from '@walmart/allspark-foundation/Auth'; import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; /** - * get user failed, authorization canceled - iOS - * no user signed in, user cancelled flow - Android + * Auth errors that shouldn't redirect to the Login Error screen where errors can be manually reported. + * 'get user failed' - legacy, shouldn't happen anymore + * 'the operation couldn’t be completed' - iOS manually cancelled flow + * 'no user signed in, user cancelled flow' - Android manually cancelled flow + * 'unknown, invalid, or expired refresh token' - Invalid Grant (Either Platform) */ const SILENT_SSO_ERRORS = [ 'get user failed', 'no user signed in', 'user cancelled flow', 'the operation couldn’t be completed', + 'unknown, invalid, or expired refresh token', ]; export const isSilentSignInError = (error?: Error) =>
fix: add invalid grant error to silent errors list
fix: add invalid grant error to silent errors list
079383eec8eadeac4cc487e23939f3d6b5af3ecb
--- src/navigation/index.tsx @@ -6,6 +6,7 @@ import {RosterScreen} from '../screens/RosterScreen'; import {SearchHeader} from '../components/SearchHeader'; import {ViewTeamScreen} from '../screens/ViewTeamScreen'; import {RosterDetailScreen} from '../managerExperience/screens/RosterDetailScreen'; +import {AllTeamsScreen} from '../managerExperience/screens/AllTeamsScreen'; const RosterStack = createStackNavigator<TextingNavParamsMap>(); @@ -43,6 +44,15 @@ export const RosterNavigation = () => { }} component={SearchScreen} /> + <RosterStack.Screen + name='myTeam.allTeams' + options={{ + cardStyle: { + backgroundColor: 'rgba(0, 0, 0, 0)', + }, + }} + component={AllTeamsScreen} + /> <RosterStack.Screen name='myTeam.rosterDetail' options={{ --- src/navigation/types.ts @@ -12,5 +12,6 @@ export type TextingNavParamsMap = { }; 'myTeam.searchScreen': {searchInput: string}; 'myTeam.clockedOutScreen': any; + 'myTeam.allTeams': any; 'myTeam.rosterDetail': {teamId: string}; };
added all teams screen to nav
added all teams screen to nav
a6d73d1d5d6e1e03da3ba447448a4df93fcebc07
--- package.json @@ -93,7 +93,7 @@ "@walmart/ask-sam-mini-app": "1.35.21", "@walmart/associate-exp-hub-hub": "2.21.2", "@walmart/associate-exp-hub-team-switcher": "2.23.2", - "@walmart/associate-listening-mini-app": "2.0.32", + "@walmart/associate-listening-mini-app": "2.0.37", "@walmart/attendance-mini-app": "patch:@walmart/attendance-mini-app@npm:3.176.0#~/.yarn/patches/@walmart-attendance-mini-app-npm-3.176.0-b8336306f0.patch", "@walmart/avp-feature-app": "0.28.47", "@walmart/avp-shared-library": "0.27.24", --- yarn.lock @@ -7823,9 +7823,9 @@ __metadata: languageName: node linkType: hard -"@walmart/associate-listening-mini-app@npm:2.0.32": - version: 2.0.32 - resolution: "@walmart/associate-listening-mini-app@npm:2.0.32::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fassociate-listening-mini-app%2F-%2F%40walmart%2Fassociate-listening-mini-app-2.0.32.tgz" +"@walmart/associate-listening-mini-app@npm:2.0.37": + version: 2.0.37 + resolution: "@walmart/associate-listening-mini-app@npm:2.0.37::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fassociate-listening-mini-app%2F-%2F%40walmart%2Fassociate-listening-mini-app-2.0.37.tgz" dependencies: "@walmart/associate-listening-utils": "npm:6.4.3" peerDependencies: @@ -7836,7 +7836,7 @@ __metadata: "@walmart/gtp-shared-components-3": "*" react: ^18.3.1 react-native: 0.79.5 - checksum: 10c0/5c7322398287d9a9d3ba25c5686c5a9dfe1ad4809044c796510c0766bfae533bac8821afe79e370820c170a64d253cd38a225dd285338c8a971ceaae9ad36035 + checksum: 10c0/5c366f5a82c322f094bb535ce2b44870cb383e298d49c2715c5c29cf835b5ab3c6551acafd989ba87caf14f353f70db5b13e17bc29f1149e0f2aa0857d18b454 languageName: node linkType: hard @@ -8855,7 +8855,7 @@ __metadata: "@walmart/ask-sam-mini-app": "npm:1.35.21" "@walmart/associate-exp-hub-hub": "npm:2.21.2" "@walmart/associate-exp-hub-team-switcher": "npm:2.23.2" - "@walmart/associate-listening-mini-app": "npm:2.0.32" + "@walmart/associate-listening-mini-app": "npm:2.0.37" "@walmart/attendance-mini-app": "patch:@walmart/attendance-mini-app@npm:3.176.0#~/.yarn/patches/@walmart-attendance-mini-app-npm-3.176.0-b8336306f0.patch" "@walmart/avp-feature-app": "npm:0.28.47" "@walmart/avp-shared-library": "npm:0.27.24"
fix(engage-1623): associate-listening-mini-app - drop35 homecard - 2 (#5272)
fix(engage-1623): associate-listening-mini-app - drop35 homecard - 2 (#5272) Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com> Co-authored-by: Daniel Mustafa - damusta <Daniel.Mustafa@walmart.com> Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com> Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com> Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com>
c420af4e9606ed1d8feb292ca537e224ba22d253
--- src/notification.ts @@ -22,15 +22,12 @@ const goToMessageScreenForChannel = ( channelId: string, ) => { const channelPath = createChannelPath(storeNumber, channelId); - navigate(ROOT_CONTAINER_SCREEN_NAME, { - // @ts-ignore - screen: 'myTeam.tabs', - }); navigate(ROOT_CONTAINER_SCREEN_NAME, { // @ts-ignore screen: APP_CONTAINER_SCREEN_NAME, params: { screen: MESSAGES_SCREEN_NAME, + initial: false, params: { channelPath, details: { --- src/notification.ts @@ -22,15 +22,12 @@ const goToMessageScreenForChannel = ( channelId: string, ) => { const channelPath = createChannelPath(storeNumber, channelId); - navigate(ROOT_CONTAINER_SCREEN_NAME, { - // @ts-ignore - screen: 'myTeam.tabs', - }); navigate(ROOT_CONTAINER_SCREEN_NAME, { // @ts-ignore screen: APP_CONTAINER_SCREEN_NAME, params: { screen: MESSAGES_SCREEN_NAME, + initial: false, params: { channelPath, details: {
finally getting navigation to work
finally getting navigation to work
f63fbcdecb9f8edea6ad17dda620289a0ad8d8f5
--- package-lock.json @@ -36,7 +36,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.3.52", + "@walmart/ask-sam-mini-app": "1.3.53", "@walmart/attendance-mini-app": "0.33.0", "@walmart/config-components": "4.0.1", "@walmart/core-services": "~1.4.11", @@ -4731,9 +4731,9 @@ } }, "node_modules/@walmart/ask-sam-mini-app": { - "version": "1.3.52", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.52.tgz", - "integrity": "sha512-ZPSOiv1FnocwuQJA4ilMNcIXwSNyveV7uGKLllwlZIaiv6GGPTH58ZwMJjHl+yK8/QvIq/ETYO9vxc52TUyWsA==", + "version": "1.3.53", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.53.tgz", + "integrity": "sha512-aND2jjqh3CHEx4iejR1ccOe4W3uBnuOwWLRdBRry/hjnMoAAtfbOG2KKa5W8T8lrXniccELxeq5WTq2ujxWwFA==", "license": "NONE", "dependencies": { "apisauce": "^1.1.2", @@ -25025,9 +25025,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "1.3.52", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.52.tgz", - "integrity": "sha512-ZPSOiv1FnocwuQJA4ilMNcIXwSNyveV7uGKLllwlZIaiv6GGPTH58ZwMJjHl+yK8/QvIq/ETYO9vxc52TUyWsA==", + "version": "1.3.53", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.53.tgz", + "integrity": "sha512-aND2jjqh3CHEx4iejR1ccOe4W3uBnuOwWLRdBRry/hjnMoAAtfbOG2KKa5W8T8lrXniccELxeq5WTq2ujxWwFA==", "requires": { "apisauce": "^1.1.2", "axios-cache-adapter": "^2.7.3", --- package.json @@ -78,7 +78,7 @@ "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.3.52", + "@walmart/ask-sam-mini-app": "1.3.53", "@walmart/attendance-mini-app": "0.33.0", "@walmart/config-components": "4.0.1", "@walmart/core-services": "~1.4.11",
SMBLV-3091: Log firebase events for scan and dotcom links
SMBLV-3091: Log firebase events for scan and dotcom links
345d323ef074038516306ab2c87dfe966305b2fd
--- src/screens/ViewTeamScreen.tsx @@ -14,7 +14,7 @@ import {teamLeadJobDescriptions} from '../redux/selectors'; import {TEXTING_I18N_NAMESPACE} from '../translations'; import {useTranslation} from 'react-i18next'; import {sortedAssociateList} from '../utils'; -import { AssociateRosterItem } from "../components/Roster/types"; +import {AssociateRosterItem} from '../components/Roster/types'; const styles = StyleSheet.create({ associateRosterItemStyle: {marginHorizontal: 16, height: 100},
fix lint error
fix lint error
5ba0aa1708484646b6248d4776d821c1a568c73a
--- targets/US/package.json @@ -87,7 +87,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.27.5", "@walmart/associate-listening-mini-app": "1.2.10", - "@walmart/attendance-mini-app": "3.96.0", + "@walmart/attendance-mini-app": "3.96.2", "@walmart/avp-feature-app": "0.10.19", "@walmart/avp-shared-library": "0.10.5", "@walmart/backroom-mini-app": "1.8.7", --- yarn.lock @@ -6304,9 +6304,9 @@ __metadata: languageName: node linkType: hard -"@walmart/attendance-mini-app@npm:3.96.0": - version: 3.96.0 - resolution: "@walmart/attendance-mini-app@npm:3.96.0" +"@walmart/attendance-mini-app@npm:3.96.2": + version: 3.96.2 + resolution: "@walmart/attendance-mini-app@npm:3.96.2" dependencies: "@walmart/wfm-ui": "npm:^0.2.26" moment-timezone: "npm:0.5.40" @@ -6336,7 +6336,7 @@ __metadata: redux-saga: ^1.2.0 reselect: ^4.1.0 wfm-allspark-data-library: ^3.3.0 - checksum: 10c0/1d302c4ba094d5dcad3480b68901630505d4377c18810fb23cfd2a7071fce00381914a38cc9f77e53f477d45a6c9cc7210a5d49ac9caa259db29b04e02b33cea + checksum: 10c0/4181b03dfdf629d612d305f1a5731673e20af12c3bf2aba14889c32f2e2e3ea509c161472255d30e5056f6444fe2a9e22e4811c941b5de2658697d971726a03b languageName: node linkType: hard @@ -7324,7 +7324,7 @@ __metadata: "@walmart/ask-sam-chat-components": "npm:^0.2.7" "@walmart/ask-sam-mini-app": "npm:1.27.5" "@walmart/associate-listening-mini-app": "npm:1.2.10" - "@walmart/attendance-mini-app": "npm:3.96.0" + "@walmart/attendance-mini-app": "npm:3.96.2" "@walmart/avp-feature-app": "npm:0.10.19" "@walmart/avp-shared-library": "npm:0.10.5" "@walmart/backroom-mini-app": "npm:1.8.7"
feature/GTA-157944: fixed drop27 ama crashing issue
feature/GTA-157944: fixed drop27 ama crashing issue
68a7042246dbf888cb59a5bb426cb945b0fe88c4
--- package-lock.json @@ -3611,9 +3611,9 @@ } }, "@walmart/time-clock-mini-app": { - "version": "0.4.14", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.4.14.tgz", - "integrity": "sha512-ONZTYt2E38yYEm2t1TnNOaCUJlvvU1SmN3EnOal4d54uOUMBfCPhWBlKYfznvWOAh18Sr6/o0B63eOrkXh95Ug==", + "version": "0.4.16", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.4.16.tgz", + "integrity": "sha512-g010saS6yFUxaIzN4fI4dbSOtoUS+Uxfg/zFMwQsVFyrAVf12sATwS6fEJ2pNI+1Pr2mH4lKuw6ysucIYZQFvQ==", "requires": { "@react-native-community/datetimepicker": "3.0.9", "@react-native-picker/picker": "^1.16.1", --- package.json @@ -97,7 +97,7 @@ "@walmart/schedule-mini-app": "0.3.1", "@walmart/settings-mini-app": "1.3.7", "@walmart/shelfavailability-mini-app": "0.3.89", - "@walmart/time-clock-mini-app": "0.4.14", + "@walmart/time-clock-mini-app": "0.4.16", "@walmart/ui-components": "1.1.57", "@walmart/welcomeme-mini-app": "0.30.4", "@walmart/wfm-ui": "^0.1.50",
Teflon env and fixes
Teflon env and fixes
74225dc8973f5d58798869ad10d92c8f296f7742
--- .looper.multibranch.yml @@ -565,8 +565,6 @@ flows: fields: - type: mrkdwn text: "*Download:* <${fastlane-session.download_link}|Link :calling:>" - - type: mrkdwn - text: "*Build Information:* ${fastlane-session.build_information}" - type: section fields: - type: mrkdwn @@ -666,7 +664,6 @@ flows: --jobNbr "${BUILD_NUMBER}" \ --jobUrl "${JOB_URL}" \ --downloadUrl "${fastlane-session.download_link}" \ - --downloadPassword "${fastlane-session.build_information}" msteams-failure: - |
removed build information
removed build information
52ce5058dde58a0e7fece6ebc5c9e70c89ef7c21
--- packages/allspark-authentication/src/index.ts @@ -1,19 +1,19 @@ import { - AuthEvents, - AuthEvent, - AuthEventListener, - AuthEventPayload, + AuthInfoEvent, + AuthErrorEvent, + AuthInfoCategories, + AuthErrorCategories, } from './events'; import { AuthError, AuthResult } from './types'; import { Authentication, IAuthentication } from './auth'; -export { AuthEvents }; export * from './react'; export type { - AuthEvent, - AuthEventListener, - AuthEventPayload, + AuthInfoEvent, + AuthErrorEvent, + AuthInfoCategories, + AuthErrorCategories, AuthError, AuthResult, IAuthentication, --- packages/allspark-authentication/src/refreshToken.ts @@ -9,7 +9,6 @@ import { CachedAuthResult, CachedAuthConfig, NO_CACHE_ERROR } from './cache'; import { AuthEventManager } from './events'; import { AuthError } from './types'; import { isAuthResultExpired, SessionUtils } from './utils'; -import { cacheAuthResult } from '../lib/cache'; export const shouldRetry = (e: any) => { const error = e as AppAuthError; @@ -58,7 +57,7 @@ export const refreshToken = async () => { accessTokenExpirationDate: refreshResult.accessTokenExpirationDate, }; - cacheAuthResult(newAuthResult); + CachedAuthResult.set(newAuthResult); AuthEventManager.runEvent('info', { category: 'TOKEN_REFRESH_SUCCESS',
fix: fix type references
fix: fix type references
bb5853507ec786a825d4afd335f2e0c742aa41a6
--- docs/CHANGELOG.md @@ -1,3 +1,11 @@ +# [2.19.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.18.0...v2.19.0) (2025-03-28) + + +### Features + +* **ui:** update the readme file ([911336b](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/911336bd4e6ded6d844b72aeeb102950f417f3ff)) +* **ui:** update version for the roster ([b259209](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/b25920978d8848abdcf082f0b94e1c2e63fae09b)) + # [2.18.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.17.0...v2.18.0) (2025-03-28) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.18.0", + "version": "2.19.0", "main": "dist/index.js", "files": [ "dist" @@ -233,7 +233,7 @@ "pre-commit": "run-p lint verifyBranchName" } }, - "packageManager": "yarn@4.6.0", + "packageManager": "yarn@4.4.0", "engines": { "node": ">=18" }
chore(release): 2.19.0 [skip ci]
chore(release): 2.19.0 [skip ci] # [2.19.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.18.0...v2.19.0) (2025-03-28) ### Features * **ui:** update the readme file ([911336b](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/911336bd4e6ded6d844b72aeeb102950f417f3ff)) * **ui:** update version for the roster ([b259209](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/b25920978d8848abdcf082f0b94e1c2e63fae09b))
c98f9269778b3086c32cce144131f145e6630afa
--- package.json @@ -95,7 +95,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.8.0", "@walmart/redux-store": "6.3.29", - "@walmart/roster-mini-app": "3.1.1", + "@walmart/roster-mini-app": "3.2.0", "@walmart/ui-components": "1.15.1", "@walmart/wmconnect-mini-app": "3.1.1", "babel-jest": "^29.6.3", --- yarn.lock @@ -6350,7 +6350,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.8.0" "@walmart/redux-store": "npm:6.3.29" - "@walmart/roster-mini-app": "npm:3.1.1" + "@walmart/roster-mini-app": "npm:3.2.0" "@walmart/ui-components": "npm:1.15.1" "@walmart/wmconnect-mini-app": "npm:3.1.1" babel-jest: "npm:^29.6.3" @@ -6476,9 +6476,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:3.1.1": - version: 3.1.1 - resolution: "@walmart/roster-mini-app@npm:3.1.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.1.1.tgz" +"@walmart/roster-mini-app@npm:3.2.0": + version: 3.2.0 + resolution: "@walmart/roster-mini-app@npm:3.2.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.2.0.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ~52.0.46 @@ -6489,7 +6489,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/c992f01a4f72a2eef06795b8a47252dca25e8016c2612a3272d1177063afdbe2f883d270548c18241214b0ee5a17664fd980b06e49a002e4a2d99135f39b0ee0 + checksum: 10c0/ca91051c769a863628ad7d3bbbee7fcf893c88ef5e7480a503737cdf9009c8cd3ca400a9122bf6b9e8da21b945ab8ffe07dda56db2954468e299af71e1a929b1 languageName: node linkType: hard
fix(ui): update roster mini app version
fix(ui): update roster mini app version
32b356ebc190c6a06f55371667a3e770faa9d2e5
--- src/components/ActionButton/ClockStatusIndicator.tsx @@ -2,7 +2,7 @@ import React from 'react'; import {StyleProp, StyleSheet, TextStyle, View, ViewStyle} from 'react-native'; import {Body, colors} from '@walmart/gtp-shared-components'; import {useTranslation} from 'react-i18next'; -import { ROSTER_I18N_NAMESPACE } from "../../translations"; +import {ROSTER_I18N_NAMESPACE} from '../../translations'; const styles = StyleSheet.create({ indicatorRow: { --- src/components/StatusChip.tsx @@ -1,7 +1,6 @@ import React from 'react'; import {StyleProp, ViewStyle} from 'react-native'; import {Tag, TagColor} from '@walmart/gtp-shared-components'; -import {Associate} from '../types'; import { associateIsAbsent, associateIsOnMeal, --- src/utils/user.ts @@ -48,8 +48,7 @@ export const associateIsOnPPTO = (associate?: AssociateRosterItem) => export const associateIsNotScheduled = (associate?: AssociateRosterItem) => false; -export const associateDisplayName = (associate?: AssociateRosterItem, -) => { +export const associateDisplayName = (associate?: AssociateRosterItem) => { return ( (associate?.preferredFirstName || associate?.firstName || '') + ' ' +
fixing lint issues
fixing lint issues
ea311a12e22baa6235f6776326e95eac97f9b448
--- package-lock.json @@ -56,7 +56,7 @@ "@walmart/ims-print-services-ui": "1.2.2", "@walmart/inbox-mini-app": "0.81.7", "@walmart/iteminfo-mini-app": "5.3.4", - "@walmart/manager-approvals-miniapp": "0.1.2", + "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.1.45", "@walmart/metrics-mini-app": "0.9.38", "@walmart/mod-flex-mini-app": "1.3.15", @@ -5432,31 +5432,31 @@ } }, "node_modules/@walmart/manager-approvals-miniapp": { - "version": "0.1.2", - "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.1.2.tgz", - "integrity": "sha512-zOmvEEul9aMoJhNbE2Hz1FxxeXGovIwPojGjvjyhHBDcHTQGWHJVX5d2WpxgRk7M81jBnEzluDU5dJHK9bf3oQ==", + "version": "0.2.1", + "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.2.1.tgz", + "integrity": "sha512-zmboOlWLlIW/CgLTWKgMOZvkE+b+Z3ltDxB0rAB8RqW95I4q7O6BkK/OFWFAAateYddhtE9wVvSS9A3vFxBAyw==", + "hasInstallScript": true, "peerDependencies": { - "@react-native-community/async-storage": "^1.11.0", - "@react-native-community/netinfo": "^5.9.9", - "@react-navigation/native": "^5.7.3", - "@react-navigation/stack": "^5.9.0", - "@walmart/core-services": "^1.0.14", - "@walmart/core-utils": "^1.0.8", - "@walmart/gtp-shared-components": "^1.8.5", - "@walmart/react-native-logger": "^1.17.0", - "@walmart/react-native-shared-navigation": "^0.2.0", - "@walmart/redux-store": "^1.0.15", - "i18next": "^19.8.3", + "@react-native-community/async-storage": "^1.12.1", + "@react-native-community/netinfo": "9.3.6", + "@react-navigation/native": "^6.0.0", + "@react-navigation/stack": "^6.1.0", + "@walmart/core-services-allspark": "~1.10.11", + "@walmart/core-utils": "~1.3.0", + "@walmart/gtp-shared-components": "^2.0.0", + "@walmart/react-native-logger": "1.31.0-rc.1", + "@walmart/react-native-shared-navigation": "1.0.2", + "i18next": "^22.0.1", "jwt-decode": "^3.1.2", - "react": "^17.0.2", - "react-i18next": "^11.7.3", - "react-native": "^0.67.4", - "react-native-check-app-install": "0.0.5", - "react-native-device-info": "^5.6.5", + "react": "^18.2.0", + "react-i18next": "^12.0.0", + "react-native": "0.70.5", + "react-native-app-auth": "^6.4.3", + "react-native-device-info": "^10.3.0", "react-native-wm-network": "^0.1.0", - "react-native-wm-telemetry": "^0.2.0", - "react-redux": "^7.2.1", - "reselect": "^4.0.0" + "react-native-wm-telemetry": "0.3.0", + "react-redux": "^8.0.4", + "reselect": "^4.1.0" } }, "node_modules/@walmart/me-field-mini-app": { @@ -25333,9 +25333,9 @@ "integrity": "sha512-jL8iD/55+BQk+1uupy1j4hvh8AeopcKdsi5efF6P7w6r9jzR9H99kkOyFyb/QgEg46BzyUSn07vzZuyobMLjXA==" }, "@walmart/manager-approvals-miniapp": { - "version": "0.1.2", - "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.1.2.tgz", - "integrity": "sha512-zOmvEEul9aMoJhNbE2Hz1FxxeXGovIwPojGjvjyhHBDcHTQGWHJVX5d2WpxgRk7M81jBnEzluDU5dJHK9bf3oQ==" + "version": "0.2.1", + "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.2.1.tgz", + "integrity": "sha512-zmboOlWLlIW/CgLTWKgMOZvkE+b+Z3ltDxB0rAB8RqW95I4q7O6BkK/OFWFAAateYddhtE9wVvSS9A3vFxBAyw==" }, "@walmart/me-field-mini-app": { "version": "1.1.45", --- package.json @@ -98,7 +98,7 @@ "@walmart/ims-print-services-ui": "1.2.2", "@walmart/inbox-mini-app": "0.81.7", "@walmart/iteminfo-mini-app": "5.3.4", - "@walmart/manager-approvals-miniapp": "0.1.2", + "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.1.45", "@walmart/metrics-mini-app": "0.9.38", "@walmart/mod-flex-mini-app": "1.3.15",
Bump manager approvals v0.2.1
Bump manager approvals v0.2.1
e1cb48f98d6370d2d0abf9cbb914902314dda5a5
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.21", + "version": "2.0.25", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/texting-mini-app", - "version": "2.0.21", + "version": "2.0.25", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.8.4", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.24", + "version": "2.0.25", "private": false, "main": "bundle/dist/index.js", "files": [ --- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.21", + "version": "2.0.25", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/texting-mini-app", - "version": "2.0.21", + "version": "2.0.25", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.8.4", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/texting-mini-app", - "version": "2.0.24", + "version": "2.0.25", "private": false, "main": "bundle/dist/index.js", "files": [
Update pacakge version
Update pacakge version
d1708096261336d82b7f84476296928b27d81251
--- ios/Podfile.lock @@ -427,7 +427,7 @@ PODS: - React - react-native-safe-area-context (3.3.2): - React-Core - - react-native-scanner-3.0 (0.1.18): + - react-native-scanner-3.0 (0.1.19): - Firebase/Analytics - React - ScanditBarcodeCapture (= 6.14.0) @@ -1005,7 +1005,7 @@ SPEC CHECKSUMS: react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa react-native-ptt-module: 03c55e2666382002ce515ab08941d81987a4b2e1 react-native-safe-area-context: 5cf05f49df9d17261e40e518481f2e334c6cd4b5 - react-native-scanner-3.0: 2e7f9fac35486c1babdccf0067e50764f7f49382 + react-native-scanner-3.0: 6c4bff0888617d1884095baedf52df981ed5555c react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444 react-native-view-shot: 08c46c9e8e92f6681e8f2ffa55ac3d06e7e99070 --- package-lock.json @@ -5480,9 +5480,9 @@ "integrity": "sha512-qxVserzdiG4xsZCLRIwYfRq/KuHsYSPkrl02tKHNhF5bhtWWo6oEUatBoSsY5BL8EVGOHk2ezsPWb2o5pg9Ryw==" }, "@walmart/react-native-scanner-3.0": { - "version": "0.1.18", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.18.tgz", - "integrity": "sha512-yMXcpt7ZcIxQ2xGlRu9zuE5N9uwifs40cc5qsqYrR3ayt1wYuxYbcGmwLgMKQFV+5MPF8vCYrpDONaa/mM5eXA==" + "version": "0.1.19", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.19.tgz", + "integrity": "sha512-GStJx72Zi54yWL09cPeGhzDy20eHimVXDhIj9a6twVhh/S/OyUYy0fh6VNfO3GRCZtBVgO7LZGq1woFPnmuiDQ==" }, "@walmart/react-native-shared-navigation": { "version": "1.0.2", --- package.json @@ -110,7 +110,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.29.0", - "@walmart/react-native-scanner-3.0": "0.1.18", + "@walmart/react-native-scanner-3.0": "0.1.19", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "^0.3.7", "@walmart/react-native-sumo-sdk": "2.2.2-beta.2",
Scanner3: Android not to standby on pause state
Scanner3: Android not to standby on pause state
0354e526bfa1afd7e408ef78c10510737c175281
--- android/app/build.gradle @@ -158,8 +158,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 902 - versionName "1.8.16" + versionCode 903 + versionName "1.8.17" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { // We configure the CMake build only if you decide to opt-in for the New Architecture. --- ios/AllSpark/Info.plist @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.8.16</string> + <string>1.8.17</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -36,7 +36,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>902</string> + <string>903</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key> --- package-lock.json @@ -1,12 +1,12 @@ { "name": "allspark-main", - "version": "1.8.16", + "version": "1.8.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "allspark-main", - "version": "1.8.16", + "version": "1.8.17", "hasInstallScript": true, "dependencies": { "@react-native-community/art": "^1.2.0", @@ -37,7 +37,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.41", "@walmart/attendance-mini-app": "0.33.0", - "@walmart/config-components": "4.0.1", + "@walmart/config-components": "4.0.2", "@walmart/core-services": "~1.4.9", "@walmart/core-services-allspark": "~1.10.13", "@walmart/core-utils": "~1.3.0", @@ -4778,9 +4778,9 @@ } }, "node_modules/@walmart/config-components": { - "version": "4.0.1", - "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.0.1.tgz", - "integrity": "sha512-+lGTMnKtiUvNwI1+ZWBhqpQatJukM/4HDt+YXfON5znTvrioywgV3nOcPD6WuTjLqZCLd2g2tk/4OmYuu1JJyA==", + "version": "4.0.2", + "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.0.2.tgz", + "integrity": "sha512-jzz13R6c2B2pjUBr7c0/3ElqH67e/gIOSq6MoxLPa01pqRmQ76mxZQKJPA+9EJgvmMhU78YOFu6RIeSzJF9lqA==", "dependencies": { "reduxsauce": "^1.2.1", "reselect": "^4.1.5" @@ -24759,9 +24759,9 @@ } }, "@walmart/config-components": { - "version": "4.0.1", - "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.0.1.tgz", - "integrity": "sha512-+lGTMnKtiUvNwI1+ZWBhqpQatJukM/4HDt+YXfON5znTvrioywgV3nOcPD6WuTjLqZCLd2g2tk/4OmYuu1JJyA==", + "version": "4.0.2", + "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.0.2.tgz", + "integrity": "sha512-jzz13R6c2B2pjUBr7c0/3ElqH67e/gIOSq6MoxLPa01pqRmQ76mxZQKJPA+9EJgvmMhU78YOFu6RIeSzJF9lqA==", "requires": { "reduxsauce": "^1.2.1", "reselect": "^4.1.5" --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.8.16", + "version": "1.8.17", "private": true, "scripts": { "android": "react-native run-android", @@ -80,7 +80,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.41", "@walmart/attendance-mini-app": "0.33.0", - "@walmart/config-components": "4.0.1", + "@walmart/config-components": "4.0.2", "@walmart/core-services": "~1.4.9", "@walmart/core-services-allspark": "~1.10.13", "@walmart/core-utils": "~1.3.0",
ver bump to 1.8.17 and config component bump
ver bump to 1.8.17 and config component bump
2c9bd5a88b306428aa982e191195aa8fee6d0aea
--- package.json @@ -109,7 +109,7 @@ "@walmart/global-vpi-mini-app": "1.1.20", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.7-rc.0", - "@walmart/ims-print-services-ui": "2.19.1", + "@walmart/ims-print-services-ui": "2.19.2", "@walmart/inbox-mini-app": "0.100.4", "@walmart/invue-react-native-sdk": "0.1.26-alpha.10-wt1", "@walmart/iteminfo-mini-app": "8.3.2", --- yarn.lock @@ -7882,9 +7882,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ims-print-services-ui@npm:2.19.1": - version: 2.19.1 - resolution: "@walmart/ims-print-services-ui@npm:2.19.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fims-print-services-ui%2F-%2F%40walmart%2Fims-print-services-ui-2.19.1.tgz" +"@walmart/ims-print-services-ui@npm:2.19.2": + version: 2.19.2 + resolution: "@walmart/ims-print-services-ui@npm:2.19.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fims-print-services-ui%2F-%2F%40walmart%2Fims-print-services-ui-2.19.2.tgz" peerDependencies: "@react-native-firebase/analytics": ">=10.5.1" "@react-native-firebase/app": ">=10.5.0" @@ -7904,7 +7904,7 @@ __metadata: react-native: "*" react-native-wm-telemetry: ">=0.2.0" uuid: ">=3.3.2" - checksum: 10c0/35fd84e7365518305df804c547b06f8356ef08ee58a4790c2f4774f3f8ea27e5df49df81a508d257c76e61acb863f48e89c93419bb74b5908437cf31dcbcb2d6 + checksum: 10c0/058f7494314f41fe80cdf42f4189ddafb3065c8df77244d058e3669bb88e4da346978ee37eed70a1b4e32ab0fc7ff8dad2bd74e1dc3487c5f10b608d77c07e97 languageName: node linkType: hard @@ -8282,7 +8282,7 @@ __metadata: "@walmart/global-vpi-mini-app": "npm:1.1.20" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.7-rc.0" - "@walmart/ims-print-services-ui": "npm:2.19.1" + "@walmart/ims-print-services-ui": "npm:2.19.2" "@walmart/inbox-mini-app": "npm:0.100.4" "@walmart/invue-react-native-sdk": "npm:0.1.26-alpha.10-wt1" "@walmart/iteminfo-mini-app": "npm:8.3.2"
fix(print): SSLS-11156 Revert apparel name change to fashion (#4218)
fix(print): SSLS-11156 Revert apparel name change to fashion (#4218)
eb1cf8f5cf569fa917941011f593775b81f5101e
--- .looper.multibranch.yml @@ -40,7 +40,7 @@ envs: variables: TMPDIR: /tmp - TARGET_XCODE: "12.0" + TARGET_XCODE: "12.3" RCT_NO_LAUNCH_PACKAGER: true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true EXTRA_PACKAGER_ARGS: "--sourcemap-output /tmp/index.ios.js.map" @@ -91,42 +91,48 @@ envs: test: variables: releaseType: "test" - releaseTypeDesc: "Build from a feature branch; test feature in isolation" + releaseTypeDesc: "build from a feature branch; test feature in isolation" slackIcon: ":firecracker:" slackChannel: "allspark-builds-developer" buildType: "SNAPSHOT" + buildGABuilds: false develop: variables: releaseType: "develop" - releaseTypeDesc: "Builds from develop branch; internal integration testing" + releaseTypeDesc: "build from develop branch; internal integration testing" slackIcon: ":construction:" slackChannel: "allspark-builds-developer" buildType: "SNAPSHOT" + buildGABuilds: false rc: variables: releaseType: "rc" - releaseTypeDesc: "Build from release branch; release candidate meant for wider testing" + releaseTypeDesc: "build from release branch; release candidate meant for wider testing" slackIcon: ":8bitmaro:" slackChannel: "allspark-builds-rc" buildType: "SNAPSHOT" + buildGABuilds: true + master: variables: releaseType: "master" - releaseTypeDesc: "Build from master branch; will be deployed to production" + releaseTypeDesc: "build from master branch; will be deployed to production" slackIcon: ":cool-doge:" slackChannel: "allspark-builds-prod" buildType: "RELEASE" + buildGABuilds: true hotfix: variables: releaseType: "hotfix" - releaseTypeDesc: "Build from hotfix branch; meant for wider testing" + releaseTypeDesc: "build from hotfix branch; meant for wider testing" slackIcon: ":hotsprings" slackChannel: "allspark-builds-developer" buildType: "SNAPSHOT" + buildGABuilds: true ## deployments prod: @@ -214,6 +220,7 @@ flows: - npm run lint - npm run coverage - call: build-js-bundle + - call: notify-pr-via-slack ## build entry point ## @@ -265,7 +272,6 @@ flows: - echo "os is ${os}" - echo "packaging is ${packaging}" - try: - - (name Install Dependencies) npm install - call: build-deployments catch: - fail('Failed to generate builds - $flowErrorMessage') @@ -276,12 +282,16 @@ flows: - if: | %{ buildType == "SNAPSHOT" } then: - - group("$os dev"): - - call: build-snapshot(dev) - - group("$os beta"): - - call: build-snapshot(beta) - - group("$os prod"): - - call: build-snapshot(prod) + - node(label="stable_osx", ws="exclusive"): + - parallel(failsafe): + - group("$os dev"): + - call: build-snapshot(dev) + - group("$os beta"): + - call: build-snapshot(beta) + - if: $buildGABuilds + then: + - group("$os prod"): + - call: build-snapshot(prod) else: - group("$os beta"): - call: build-release(beta) @@ -290,6 +300,7 @@ flows: # this is for producing builds that will get uploaded to proximity as snapshot build-snapshot: + - (name Install Dependencies) npm install - declare(buildOutput) - declare(sourceMap) - var(version): sh scripts/getIOSAppVersionFromInfoPlist.sh ios/AllSpark/Info.plist @@ -312,6 +323,7 @@ flows: # Checks if the build artifact is already published in the expected place. # if it is not, build it and publish it build-release: + - (name Install Dependencies) npm install - declare(buildOutput) - declare(sourceMap) - var(version): sh scripts/getIOSAppVersionFromInfoPlist.sh ios/AllSpark/Info.plist @@ -342,6 +354,16 @@ flows: - call: slack-failure(version = ${version}, flowErrorMessage = ${flowErrorMessage}) - fail('Failed to generate build with flowErrorMessage - $flowErrorMessage') + ruby-configuration: + - echo ${WORKSPACE} + - (name Ruby/Gem version) ruby -v; gem -v + - (name gem environment) gem environment + - (name Gem dependencies) gem dependency + - (name Remove RubyGems HTTP) gem sources --remove "http://rubygems.org" + - (name Remove RubyGems HTTPS) gem sources --remove "https://rubygems.org" + - (name Add repository source) gem sources --add "https://repository.walmart.com/content/repositories/rubygems/" + - (name Clear cache) gem sources -c + # sets variables and performs steps for making an ios build ios-process: - call: set-buildOutput @@ -365,6 +387,7 @@ flows: cocoapods-install: - dir(ios): + - call: ruby-configuration - echo "Proceeding with pod install" - | (name delete index file) @@ -451,7 +474,7 @@ flows: - type: section text: type: mrkdwn - text: ${releaseTypeDesc} + text: ":green_alert: *${env}* ${releaseTypeDesc}" - type: divider - type: section fields: @@ -516,7 +539,7 @@ flows: - type: mrkdwn text: "*OS Type:* ${os}" - type: mrkdwn - text: "*Branch:* TODO" + text: "*Branch:* ${GITHUB_BRANCH_NAME}" - type: mrkdwn text: "*Author:* ${GIT_COMMIT_AUTHOR}" - type: mrkdwn
Feature/git flow (#538)
Feature/git flow (#538) * updated Xcode to 12.3 and adding a check for skipping GA builds from test, and develop builds * testing ruby installation * adding branch name to the slack failure * calling PR slack notification flow. * added logic to distinguish build envrionment; dev or beta * Added build distinction on environment. * Added build distinction based on environment. * test to run parallel builds for different environments * test to run parallel builds for different environments * test to run parallel builds for different environments * release description title fix * Update .looper.multibranch.yml Co-authored-by: Hitesh Arora <>
1f786d8f034fbe4257db3a00edc1cc9162c56971
--- scripts/mini-app-scan/.eslintrc-custom.json @@ -1,30 +1,47 @@ { + "plugins": [ + "@typescript-eslint", + "react-hooks" + ], "rules": { "no-raw-text-custom": [ "error", { "textProxyComponents": [ - "Text", + "Alert", "Body", + "Button", "Caption", + "Display", + "ErrorMessage", + "FilterTag", + "FilterToggle", + "FilterTriggerSingle", "Heading", - "Title", + "Headline", "Label", "NotificationDueDateBadge", - "Button", - "Subheader", - "Nudge", - "Alert", - "FilterTriggerSingle", - "FilterToggle", - "FilterTag", - "Tag", - "Headline", "Nudge", "PrimaryButton", - "ErrorMessage" + "Subheader", + "Tag", + "Text", + "Title" ] } + ], + "react-hooks/exhaustive-deps": [ + "warn", + { + "additionalHooks": "(use.*Query|use.*LazyQuery|use.*Mutation)" + } + ], + "@typescript-eslint/no-unused-vars": [ + "warn", + { + "argsIgnorePattern": "^_", + "varsIgnorePattern": "^_" + } ] }, "parserOptions": { --- scripts/mini-app-scan/scan-changed-walmart-libs.sh @@ -4,6 +4,18 @@ cd "$(dirname "$0")/../.." set -e +# Parse verbose flag and remove it from arguments +verbose_flag="" +new_args=() +for arg in "$@"; do + if [[ "$arg" == "--verbose" || "$arg" == "-v" ]]; then + verbose_flag="$arg" + else + new_args+=("$arg") + fi +done +set -- "${new_args[@]}" + # Use first argument as comparison branch, default to origin/main COMPARE_BRANCH="${1:-origin/main}" echo "Comparing package.json to $COMPARE_BRANCH..." @@ -29,5 +41,9 @@ fi echo "Changed @walmart libraries: ${changed_libs[*]}" -# Call the scan script with the changed libraries as arguments -./scripts/mini-app-scan/scan-walmart-packages.sh "${changed_libs[@]}" +# Call the scan script with the changed libraries as arguments, forwarding verbose flag if set +if [ -n "$verbose_flag" ]; then + ./scripts/mini-app-scan/scan-walmart-packages.sh "${changed_libs[@]}" "$verbose_flag" +else + ./scripts/mini-app-scan/scan-walmart-packages.sh "${changed_libs[@]}" +fi --- scripts/mini-app-scan/scan-walmart-packages.sh @@ -5,12 +5,30 @@ cd "$(dirname "$0")/../.." echo "Scanning @walmart packages for raw text violations..." echo "==================================================" +# Check for verbose flag +verbose=0 +new_args=() +for arg in "$@"; do + if [[ "$arg" == "--verbose" || "$arg" == "-v" ]]; then + verbose=1 + else + new_args+=("$arg") + fi +done +set -- "${new_args[@]}" + +echo "Verbose mode: $([ "$verbose" -eq 1 ] && echo "enabled" || echo "disabled")" +echo "===================================================" + # List of packages to ignore (add package names to this array) ignore_packages=("@walmart/gtp-shared-components") # List of filename patterns to ignore (add patterns to this array) ignore_patterns=("*.test.js" "*.test.ts" "*.test.tsx") +# List of grep patterns to filter out from ESLint output (non-violation errors) +filter_patterns=("Definition for rule.*was not found" "Error: Failed to load" "TypeError:" "SyntaxError:") + # Build the find ignore arguments from the ignore_patterns array find_ignore_args=() for pattern in "${ignore_patterns[@]}"; do @@ -62,18 +80,46 @@ for package_name in "${packages_to_scan[@]}"; do eslint_output=$(find "$scan_dir" -type f \( -name "*.js" -o -name "*.ts" -o -name "*.tsx" \) "${find_ignore_args[@]}" -print0 | xargs -0 npx eslint --no-ignore --no-eslintrc --parser=@typescript-eslint/parser --config ./scripts/mini-app-scan/.eslintrc-custom.json --rulesdir ./scripts/mini-app-scan/eslint-rules 2>&1) eslint_exit_code=$? # Filter out rule definition errors and other non-violation errors - clean_output=$(echo "$eslint_output" | grep -v "Definition for rule.*was not found" | grep -v "Error: Failed to load" | grep -v "TypeError:" | grep -v "SyntaxError:") - # Check for any lint errors or warnings + clean_output="$eslint_output" + for pattern in "${filter_patterns[@]}"; do + clean_output=$(echo "$clean_output" | grep -v "$pattern") + done + # Check for any lint errors or warnings (actual violations) lint_violations=$(echo "$clean_output" | grep -E "^\s*[0-9]+:[0-9]+\s+(error|warning)" || true) - if [ -n "$lint_violations" ]; then - echo " ❌ VIOLATIONS FOUND:" - echo "$clean_output" | head -20 # Show first 20 lines + # Separate errors and warnings, including file path context + lint_errors=$(echo "$clean_output" | grep -B 1 -E "^\s*[0-9]+:[0-9]+\s+error" | grep -v "^--$" || true) + lint_warnings=$(echo "$clean_output" | grep -B 1 -E "^\s*[0-9]+:[0-9]+\s+warning" | grep -v "^--$" || true) + error_count=$(echo "$lint_errors" | grep -E "^\s*[0-9]+:[0-9]+\s+error" | grep -c ".") + warning_count=$(echo "$lint_warnings" | grep -E "^\s*[0-9]+:[0-9]+\s+warning" | grep -c ".") + if [ "$error_count" -gt 0 ]; then + echo " ❌ VIOLATIONS FOUND: $error_count error(s) detected" + if [ "$verbose" -eq 1 ]; then + echo "$lint_errors" + else + echo "$lint_errors" | head -40 # Show first 20 errors (with file path context) + fi echo "" violation_found=1 + elif [ "$warning_count" -gt 0 ]; then + echo " ⚠️ $warning_count warning(s) detected" + if [ "$verbose" -eq 1 ]; then + echo "$lint_warnings" + fi + echo "" elif echo "$eslint_output" | grep -q "Definition for rule.*was not found"; then echo " ⚠️ Rule definition errors only (ignored)" + if [ "$verbose" -eq 1 ]; then + echo " --- ESLint output (rule definition errors and all): ---" + echo "$eslint_output" + echo " --- End ESLint output ---" + fi else echo " ✅ No violations found" + if [ "$verbose" -eq 1 ]; then + echo " --- Full ESLint output (cleaned): ---" + echo "$clean_output" + echo " --- End ESLint output ---" + fi fi else echo " No JS/TS/TSX files found"
feat: update scan scripts to differentiate between warnings and errors. add verbose modes
feat: update scan scripts to differentiate between warnings and errors. add verbose modes
9d3d8ab89e82eb12e1fe72f80423dc14450c086a
--- package.json @@ -89,7 +89,7 @@ "@walmart/counts-component-miniapp": "0.0.42", "@walmart/emergency-mini-app": "1.17.0", "@walmart/exception-mini-app": "1.0.14", - "@walmart/facilities-management-miniapp": "0.5.17", + "@walmart/facilities-management-miniapp": "0.5.17-rc1", "@walmart/feedback-all-spark-miniapp": "0.9.9", "@walmart/financial-wellbeing-feature-app": "1.0.64", "@walmart/functional-components": "2.0.6", @@ -123,7 +123,7 @@ "@walmart/schedule-mini-app": "0.29.0", "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.2", - "@walmart/taskit-mini-app": "0.49.6", + "@walmart/taskit-mini-app": "0.49.9", "@walmart/time-clock-mini-app": "0.30.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.73.0",
Update package.json
Update package.json
b85308920c4e4db82697fe55c2e7c8e9a16b5072
--- .looper.yml @@ -22,4 +22,4 @@ flows: - (name Yarn Version) yarn --version - yarn install - yarn run lint - # - yarn run coverage + - yarn run coverage --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.12.1", + "version": "2.12.0", "main": "dist/index.js", "files": [ "dist" @@ -103,7 +103,7 @@ "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "6.1.4", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "2.11.1", + "@walmart/wmconnect-mini-app": "2.7.0", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- yarn.lock @@ -6318,7 +6318,7 @@ __metadata: "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:6.1.4" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.11.1" + "@walmart/wmconnect-mini-app": "npm:2.7.0" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" eslint: "npm:8.22.0" @@ -6451,9 +6451,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.11.1": - version: 2.11.1 - resolution: "@walmart/wmconnect-mini-app@npm:2.11.1" +"@walmart/wmconnect-mini-app@npm:2.7.0": + version: 2.7.0 + resolution: "@walmart/wmconnect-mini-app@npm:2.7.0" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6493,7 +6493,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/63172950f38704a6214542ee5ded0aecbb4bbe70439e2b2f11c25bbbe1e4fd3f449da0e2cb15bb78f01dbed2e9f7b4d8e007787090e85d7f44a612aae08e850b + checksum: 10c0/ce28cf7664920e6c76161a7537363d4018fff03ba73095dc215984bb74121d6db890ec95a25dc466be9036d91982e149ce94342953e7707c17aa04c38bd86248 languageName: node linkType: hard
Revert "feat(ui): Update textng mini app version"
Revert "feat(ui): Update textng mini app version"
7b6c178b0c1f768211af234a48e08b6681f0ac53
--- package-lock.json @@ -88,7 +88,7 @@ "@walmart/time-clock-mini-app": "2.175.2", "@walmart/topstock-mini-app": "1.3.1", "@walmart/ui-components": "1.15.1", - "@walmart/welcomeme-mini-app": "0.84.4", + "@walmart/welcomeme-mini-app": "0.85.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", "axios-cache-adapter": "2.7.3", @@ -9390,9 +9390,9 @@ } }, "node_modules/@walmart/welcomeme-mini-app": { - "version": "0.84.4", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.84.4.tgz", - "integrity": "sha512-lfK1Y7QJkGK1q9HsqbNDuBFrlb6jGAFRmhQsYZcFaYKztQijCcw3NKbEgEo0e1DvGhS0T3ZLiOJPIxndaGUHuw==", + "version": "0.85.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.85.0.tgz", + "integrity": "sha512-JSUltBgjn4DcKeytI6OlGgpt9e4dWv0q7Y9h2j+z5bptRvVC2HonUVPWo4SOHxGB9hqXt6q/Px2gNgfbAMDTZQ==", "hasInstallScript": true, "dependencies": { "apisauce": "^1.1.2" @@ -34637,9 +34637,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.84.4", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.84.4.tgz", - "integrity": "sha512-lfK1Y7QJkGK1q9HsqbNDuBFrlb6jGAFRmhQsYZcFaYKztQijCcw3NKbEgEo0e1DvGhS0T3ZLiOJPIxndaGUHuw==", + "version": "0.85.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.85.0.tgz", + "integrity": "sha512-JSUltBgjn4DcKeytI6OlGgpt9e4dWv0q7Y9h2j+z5bptRvVC2HonUVPWo4SOHxGB9hqXt6q/Px2gNgfbAMDTZQ==", "requires": { "apisauce": "^1.1.2" } --- package.json @@ -129,7 +129,7 @@ "@walmart/time-clock-mini-app": "2.175.2", "@walmart/topstock-mini-app": "1.3.1", "@walmart/ui-components": "1.15.1", - "@walmart/welcomeme-mini-app": "0.84.4", + "@walmart/welcomeme-mini-app": "0.85.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", "axios-cache-adapter": "2.7.3",
chore: welcome me version bump
chore: welcome me version bump
c0fe5ab55738e01a4edd80c40c7a7f48c0175db2
--- packages/allspark-app-auth/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.4](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/allspark-app-auth@2.0.3...@walmart/allspark-app-auth@2.0.4) (2022-12-16) + +**Note:** Version bump only for package @walmart/allspark-app-auth + + + + + ## [2.0.3](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/allspark-app-auth@1.8.2...@walmart/allspark-app-auth@2.0.3) (2022-10-19) **Note:** Version bump only for package @walmart/allspark-app-auth --- packages/allspark-app-auth/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-app-auth", - "version": "2.0.3", + "version": "2.0.4", "lockfileVersion": 2, "requires": true, "packages": { --- packages/allspark-app-auth/package.json @@ -1,10 +1,12 @@ { "name": "@walmart/allspark-app-auth", - "version": "2.0.3", + "version": "2.0.4", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", - "files": ["lib"], + "files": [ + "lib" + ], "scripts": { "coverage": "jest --coverage", "test": "jest", @@ -33,10 +35,10 @@ }, "devDependencies": { "@react-native-community/async-storage": "^1.12.1", - "@walmart/react-native-encrypted-storage": "^1.1.13", "@types/lodash": "~4.14.178", "@types/react": "^17.0.37", "@types/react-native": "^0.67.4", + "@walmart/react-native-encrypted-storage": "^1.1.13", "react": "^18.2.0", "react-native": "~0.70.5", "react-native-app-auth": ">=6.4.3" --- packages/allspark-http-client/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-http-client@2.0.3...@walmart/allspark-http-client@2.0.4) (2022-12-16) + +**Note:** Version bump only for package @walmart/allspark-http-client + + + + + ## 2.0.3 (2022-10-19) **Note:** Version bump only for package @walmart/allspark-http-client --- packages/allspark-http-client/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-http-client", - "version": "2.0.3", + "version": "2.0.4", "lockfileVersion": 2, "requires": true, "packages": { --- packages/allspark-http-client/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-http-client", - "version": "2.0.3", + "version": "2.0.4", "description": "", "author": "rlane1 <russell.lane@walmart.com>", "license": "ISC",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-app-auth@2.0.4 - @walmart/allspark-http-client@2.0.4
6c9112577b6405876cc7b9754a2a5302371d51d3
--- package-lock.json @@ -43,7 +43,7 @@ "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.9", "@walmart/config-components": "4.2.13", - "@walmart/copilot-mini-app": "^3.41.4", + "@walmart/copilot-mini-app": "^3.41.6", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5", @@ -8592,9 +8592,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "3.41.4", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.41.4.tgz", - "integrity": "sha512-0sHBgidtgXifmqvRrtycAGPidtdXcMPnX/5IOwlYzdpiQNEve81b3dVE2T2nY+2r308iGy+WQcwo2Z1f3eWqxw==", + "version": "3.41.6", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.41.6.tgz", + "integrity": "sha512-/5+I9iV+bkgTdlOHoEvY9RKcRB769iFklDTS2g9V8AN6gWJvl7lhTiyM6/sQCcgr3J3CZy2iflTPGD+8L+tpTQ==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33223,9 +33223,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "3.41.4", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.41.4.tgz", - "integrity": "sha512-0sHBgidtgXifmqvRrtycAGPidtdXcMPnX/5IOwlYzdpiQNEve81b3dVE2T2nY+2r308iGy+WQcwo2Z1f3eWqxw==" + "version": "3.41.6", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.41.6.tgz", + "integrity": "sha512-/5+I9iV+bkgTdlOHoEvY9RKcRB769iFklDTS2g9V8AN6gWJvl7lhTiyM6/sQCcgr3J3CZy2iflTPGD+8L+tpTQ==" }, "@walmart/core-services": { "version": "2.3.2", --- package.json @@ -84,7 +84,7 @@ "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.9", "@walmart/config-components": "4.2.13", - "@walmart/copilot-mini-app": "3.41.4", + "@walmart/copilot-mini-app": "^3.41.6", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5",
chore: bump copilot@3.41.6
chore: bump copilot@3.41.6
80fa6f8e56869d5e58623bce0442e69fe4ad88f1
--- src/presence/provider.tsx @@ -78,7 +78,4 @@ export const PresenceProvider = (props: PropsWithChildren<{}>) => { ); }; -export const DoNotDisturbController = ({children}: PropsWithChildren<{}>) => { - useEffect(() => ) - return <DoNotDisturbController>{children}</DoNotDisturbController>; -}; + --- src/presence/service.ts @@ -50,10 +50,11 @@ export const setLastOfflineTimeForAsyncStorage = async () => { /** * Algo: * 1. App starts up - check last offline timestamp - * 2. If last offline timestamp is not expired then check if timeLeft <= threshold. + * 2. If last offline timestamp is not expired then check if timeLeft <= threshold (ccm value). * 3. If timeLeft <= threshold then start setInterval for goOnlineForUserIfOfflineTimeExpired method * 4. After first fire of goOnlineForUserIfOfflineTimeExpired, cancel the timer * Note: threshold value is average session time for user on app (2 minutes default) <-- make configurable in CCM + * Note: Auto reset DND feature should be feature flagged */ export const goOnlineForUserIfOfflineTimeExpired = async ( --- src/presence/provider.tsx @@ -78,7 +78,4 @@ export const PresenceProvider = (props: PropsWithChildren<{}>) => { ); }; -export const DoNotDisturbController = ({children}: PropsWithChildren<{}>) => { - useEffect(() => ) - return <DoNotDisturbController>{children}</DoNotDisturbController>; -}; + --- src/presence/service.ts @@ -50,10 +50,11 @@ export const setLastOfflineTimeForAsyncStorage = async () => { /** * Algo: * 1. App starts up - check last offline timestamp - * 2. If last offline timestamp is not expired then check if timeLeft <= threshold. + * 2. If last offline timestamp is not expired then check if timeLeft <= threshold (ccm value). * 3. If timeLeft <= threshold then start setInterval for goOnlineForUserIfOfflineTimeExpired method * 4. After first fire of goOnlineForUserIfOfflineTimeExpired, cancel the timer * Note: threshold value is average session time for user on app (2 minutes default) <-- make configurable in CCM + * Note: Auto reset DND feature should be feature flagged */ export const goOnlineForUserIfOfflineTimeExpired = async (
update latest for autoset
update latest for autoset
6e7c104f342569df2cd8ab8f78f3e150affb2931
--- src/components/Avatar.tsx @@ -74,6 +74,11 @@ export const Avatar = (props: AvatarProps) => { const [initials, setInitials] = useState<string>(); const viewerName: string = useSelector(UserSelectors.getName); + + // The following API call has been removed to optimize performance + // We now receive associate data directly through props from the parent component's roster data + // This eliminates redundant API calls and improves loading time + // // const envConfig = useEnvironment(); // const associateUserId = decryptUserId(userId) || ''; // const {loading: isLoading, data} = useGetAssociateNameQuery({
chore: remove redundant API call
chore: remove redundant API call
f1a963a042313b1ceff45a95b4fb34ef72a86110
--- ios/BuildSupport/install-cocoapods.sh @@ -5,7 +5,7 @@ set -x echo "Current Directory: $WORKSPACE" echo "Installing CocoaPods" -CCP_VER=1.9.1 +CCP_VER=1.9.3 export GEM_HOME=$HOME/.gem export PATH=$GEM_HOME/bin:$PATH
updating cocoapods version to 1.9.3
updating cocoapods version to 1.9.3
c5b64aaedcfb9e1acbe96125d12276f3eb1b2640
--- tsconfig.json @@ -65,6 +65,7 @@ "graphql.config.js", "allspark.config.js", "react-native.config.js", + "ReactotronConfig.js", "index.js", "container", "__tests__",
fix(ui): update the tsconfig to exclude reactotron
fix(ui): update the tsconfig to exclude reactotron
a2b74158ad5951223190caf3c1e4fe77808d2c01
--- package.json @@ -144,7 +144,7 @@ "@walmart/roster-mini-app": "2.8.2", "@walmart/schedule-mini-app": "0.118.0", "@walmart/shelfavailability-mini-app": "1.5.33", - "@walmart/sidekick-mini-app": "4.67.14", + "@walmart/sidekick-mini-app": "4.67.15", "@walmart/store-feature-orders": "1.26.12", "@walmart/taskit-mini-app": "3.3.0", "@walmart/time-clock-mini-app": "2.395.0", --- yarn.lock @@ -7144,9 +7144,9 @@ __metadata: languageName: node linkType: hard -"@walmart/sidekick-mini-app@npm:4.67.14": - version: 4.67.14 - resolution: "@walmart/sidekick-mini-app@npm:4.67.14" +"@walmart/sidekick-mini-app@npm:4.67.15": + version: 4.67.15 + resolution: "@walmart/sidekick-mini-app@npm:4.67.15" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 @@ -7158,7 +7158,7 @@ __metadata: expo-linear-gradient: ~12.3.0 react: ^18.2.0 react-native: ~0.70.5 - checksum: 10c0/6a231ed796e1ee90a558da60944081f54bfcda7af133f2824694a0803dec81b52d63cba9193f0e04d9fe3d8f54b26ab4d00d76ca5c148c9c846a0cdff7ddee56 + checksum: 10c0/8add47620e5513ee7f50b9d9e344e35e9639fa3937229dcaf9d3e42c8630192f498cb0dbafa593e0c3a9be4e5be0420841e4dad16315c4b56a3643087ced4933 languageName: node linkType: hard @@ -7869,7 +7869,7 @@ __metadata: "@walmart/roster-mini-app": "npm:2.8.2" "@walmart/schedule-mini-app": "npm:0.118.0" "@walmart/shelfavailability-mini-app": "npm:1.5.33" - "@walmart/sidekick-mini-app": "npm:4.67.14" + "@walmart/sidekick-mini-app": "npm:4.67.15" "@walmart/store-feature-orders": "npm:1.26.12" "@walmart/taskit-mini-app": "npm:3.3.0" "@walmart/time-clock-mini-app": "npm:2.395.0"
chore: bump sidekick@4.67.15
chore: bump sidekick@4.67.15
a43dc6c5528df7b9467b1c7133c449ae6410444c
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/translation.ts @@ -12,11 +12,6 @@ export const enUS = { subText: 'Shift A1 is selected by default, but you can change it at any time.', }, - editSavedTeams: { - title: 'My Saved Teams', - subText: - "Shortcut to quickly view teams you're interested in. Edit anytime.", - }, }; export const esMX = { @@ -33,9 +28,4 @@ export const esMX = { subText: 'El cambio A1 está seleccionado de forma predeterminada, pero puede cambiarlo en cualquier momento.', }, - editSavedTeams: { - title: 'Mis equipos guardados', - subText: - 'Acceso directo para ver rápidamente los equipos que te interesan. Edita en cualquier momento.', - }, };
updated translations
updated translations
086511de4476473293a2140d7b268ba295fdda0e
--- package.json @@ -137,7 +137,7 @@ "@walmart/react-native-shared-navigation": "~6.3.28", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.7.4", - "@walmart/react-native-webex-sdk": "0.8.27", + "@walmart/react-native-webex-sdk": "0.8.37", "@walmart/receipt-check-miniapp": "1.29.4", "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.16.7", --- yarn.lock @@ -7357,7 +7357,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:~6.3.28" "@walmart/react-native-store-map": "npm:0.3.7" "@walmart/react-native-sumo-sdk": "npm:2.7.4" - "@walmart/react-native-webex-sdk": "npm:0.8.27" + "@walmart/react-native-webex-sdk": "npm:0.8.37" "@walmart/receipt-check-miniapp": "npm:1.29.4" "@walmart/redux-store": "npm:~6.3.28" "@walmart/returns-mini-app": "npm:4.16.7" @@ -7926,14 +7926,14 @@ __metadata: languageName: node linkType: hard -"@walmart/react-native-webex-sdk@npm:0.8.27": - version: 0.8.27 - resolution: "@walmart/react-native-webex-sdk@npm:0.8.27::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.8.27.tgz" +"@walmart/react-native-webex-sdk@npm:0.8.37": + version: 0.8.37 + resolution: "@walmart/react-native-webex-sdk@npm:0.8.37::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.8.37.tgz" peerDependencies: react: "*" react-native: "*" react-native-logger: "*" - checksum: 10c0/ade4482508842931451cca5c4fc7688cc5ef1428cec0d3fff9dfca3cfb42f3d8783a16b440e47c74a66864416d48da20445e2f79058fb9c0eb2edfdc1b099eb2 + checksum: 10c0/5bfb68eb1a1e21ca19c60229867ccf30e45aa2c9b2057ba083861f71436293cfa4a452fd4cc9d89073cb241ffa63d0b2f99e0222382f1b95358aee556431fa8a languageName: node linkType: hard
fix: CONAS-1878 Calling crash fix for NullPointerException
fix: CONAS-1878 Calling crash fix for NullPointerException
22133503d920541dfc76830ea7ef3153c67663de
--- example/src/teamHub/screens/teamSelection.tsx @@ -72,8 +72,6 @@ export const TeamSelectionScreen = TeamHub.createScreen( return ( <TeamSelection - headerTitle="Personalize your hubs" - headerSubText="Your primary team is automatically selected. Choose additional teams to view on your Team and Work hubs." areas={areas} selectedTeams={selectedTeams} myArea={myArea}
Removing header component props
Removing header component props
0caa9847b85b2e40ce92287e2e8f279431670f07
--- lerna.json @@ -6,6 +6,7 @@ "command": { "publish": { "conventionalCommits": true, + "conventionalPrerelease": true, "message": "chore(publish): publish package", "verifyAccess": false },
chore: lerna config change
chore: lerna config change
b34fb23a2088967afe9c5eda73ab38fbc032c2bc
--- docs/CHANGELOG.md @@ -1,3 +1,18 @@ +# [2.9.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.8.3...v2.9.0) (2024-08-09) + + +### Bug Fixes + +* **ui:** ignoring prop for now ([be0faa3](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/be0faa3061f2dc3b647c53f74726c754af4ecae1)) +* **ui:** updated wmconnect version for roster ([1b8f107](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/1b8f107da5a0eecf347e03d7c2ddb49fe2971d94)) + + +### Features + +* **ui:** moved error handler to onComplete to avoid unnecessary logging ([2fcf078](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/2fcf078aab71efcf533146858391cd6f837ef921)) +* **ui:** skipping tests till we have that package published ([6dcbc6e](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/6dcbc6ecf36ae1a9bafa48f64d0ad8113829ea45)) +* **ui:** updated search header to use header from foundation ([ffc351d](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/ffc351dcdab176bcc92ae43edd78e6aec7927017)) + ## [2.8.3](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.8.2...v2.8.3) (2024-08-06) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.8.3", + "version": "2.9.0", "main": "dist/index.js", "files": [ "dist"
chore(release): 2.9.0 [skip ci]
chore(release): 2.9.0 [skip ci] # [2.9.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.8.3...v2.9.0) (2024-08-09) ### Bug Fixes * **ui:** ignoring prop for now ([be0faa3](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/be0faa3061f2dc3b647c53f74726c754af4ecae1)) * **ui:** updated wmconnect version for roster ([1b8f107](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/1b8f107da5a0eecf347e03d7c2ddb49fe2971d94)) ### Features * **ui:** moved error handler to onComplete to avoid unnecessary logging ([2fcf078](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/2fcf078aab71efcf533146858391cd6f837ef921)) * **ui:** skipping tests till we have that package published ([6dcbc6e](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/6dcbc6ecf36ae1a9bafa48f64d0ad8113829ea45)) * **ui:** updated search header to use header from foundation ([ffc351d](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/ffc351dcdab176bcc92ae43edd78e6aec7927017))
ab73ebb988232a33dee5939f42b01592a7a398b9
--- src/navigation/AssociateHallwayNav/SideMenuContent.tsx @@ -94,7 +94,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps< StatusBar.setBarStyle('light-content', true); if (remoteNavConfig?.length && !navConfig) { // TODO: revert back to setNavConfig(remoteNavConfig); - setNavConfig([defaultConfig[0], ...remoteNavConfig ]); + setNavConfig([defaultConfig[0], ...remoteNavConfig]); } } // eslint-disable-next-line react-hooks/exhaustive-deps
linter is working different in build
linter is working different in build
929514b75bd8809fd0c0604cf058d2b8e684bead
--- react-native.config.js @@ -1,7 +1,9 @@ module.exports = { project: { ios: {}, - android: {}, + android: { + manifestPath: '/app/src/main/AndroidManifest.xml' + }, }, dependencies: { ...(process.env.CI
Update react-native.config.js
Update react-native.config.js
1b370fc2c50a0f318672be36720e0796176f75b0
--- docs/docs/components/allspark foundation/clients/foundation-permissions.md @@ -9,16 +9,25 @@ The Allspark Permission Client is a wrapper around [react-native-permissions](ht ## API -View the [react-native-permissions documentation](https://github.com/zoontek/react-native-permissions#-react-native-permissions) for more information on the below available methods. +View the [react-native-permissions documentation](https://github.com/zoontek/react-native-permissions#Methods) for more information on the below available methods. ### `check()` +Checks the status of a permission. ### `checkMultiple()` +Checks the status of multiple permissions. ### `request()` +Requests a permission. ### `checkNotifications()` +Checks the status of the notification permission. ### `requestNotifications()` +Requests the notification permission. ### `openSettings()` +Opens the settings page for the app. + +## Available Permissions and Permission Statuses +View the [react-native-permissions documentation](https://github.com/zoontek/react-native-permissions#Supported-permissions) for a list of permissions and permission statuses available for Android, iOS, and Windows.
Permissions client updates.
Permissions client updates.
b2fc6df3e28f3e23d855c4adcc0c692ae783d0af
--- core/src/core/FeatureToggleGuard.tsx @@ -1,10 +1,10 @@ import React, {ComponentProps, ComponentType, PropsWithChildren} from 'react'; import {useOneClick} from '../oneClick/useOneClick'; -import {MINI_APPS} from '../oneClick/MiniApps'; import {useNavigation} from '@react-navigation/native'; import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; import {ClockOutOverlay} from '@walmart/ui-components'; +import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; export const FeatureToggleGuard = (props: PropsWithChildren<{}>) => { const {children} = props; @@ -13,16 +13,18 @@ export const FeatureToggleGuard = (props: PropsWithChildren<{}>) => { const [translate] = useAllsparkTranslation(); const oneClick = useOneClick(); + // Find enum from MINI_APPS that matches featureName (eg. ask_sam) + const featureName = AllsparkNavigationClient.getCurrentRouteName(); + const onGoHome = () => navigation.navigate('tabs', { screen: 'home', params: {screen: 'home.root'}, }); - - return oneClick.isMiniAppEnabled(MINI_APPS.ASK_SAM) ? ( + return oneClick.isMiniAppEnabled(featureName) ? ( <ClockOutOverlay title={translate('featureToggleGuard.title')} - content={translate('featureToggleGuard.content')} + content={translate('featureToggleGuard.content', featureName)} buttonTitle={translate('featureToggleGuard.action')} onButtonPress={onGoHome} /> --- core/src/core/translations.ts @@ -92,6 +92,11 @@ export const enUS = { content: 'You must be clocked in to access this feature.', title: 'Clock in required', }, + featureToggleGuard: { + action: 'Got it', + content: 'You’ll be able to use {{featureName}} when everything is fixed.', + title: 'something isn’t available right now', + }, gotIt: 'Got it', language: {changeTitle: 'Choose your preferred language'}, menu: { --- core/src/oneClick/useOneClick.ts @@ -6,7 +6,7 @@ export const useOneClick = () => { const appConfig = useSelector(AppConfigSelector); const oneClick = appConfig?.oneClick; - const isMiniAppEnabled = (miniAppName: MINI_APPS): boolean => + const isMiniAppEnabled = (miniAppName: any): boolean => oneClick?.[miniAppName]?.enable ?? false; return {isMiniAppEnabled, MINI_APPS};
ALLSPARK-3962: added oneclick and featureToggleGuard
ALLSPARK-3962: added oneclick and featureToggleGuard
453b1f8401285ddbead0adc1dd5c986b57302d33
--- src/components/RosterHeader.tsx @@ -1,12 +1,11 @@ import React, {useMemo} from 'react'; import {StyleSheet, View} from 'react-native'; import {Body, Button} from '@walmart/gtp-shared-components'; -import {Associate} from '../types'; import {goToWeeklySchedule} from '../navigation/utils'; import {ROSTER_I18N_NAMESPACE} from '../translations'; import {useTranslation} from 'react-i18next'; import {useRbacConfigWithJobCode, useSiteTranslationContext} from '../hooks'; -import { AssociateRosterItem } from "./Roster/types"; +import {AssociateRosterItem} from './Roster/types'; const styles = StyleSheet.create({ rosterHeader: { --- src/components/TeamList.tsx @@ -1,5 +1,4 @@ import React, {useMemo, useState} from 'react'; -import {useSelector} from 'react-redux'; import { StyleProp, StyleSheet, @@ -25,7 +24,6 @@ import { useDailyRoster, useGetRosterByTeam, useGetTeamsByStore, - useIsImpersonatedOnDev, useUserIsInRoster, useSiteTranslationContext, useGetViewersPrimaryTeamId, --- src/navigation/index.tsx @@ -7,7 +7,7 @@ import {RosterScreen} from '../screens/RosterScreen'; import {ROSTER_I18N_NAMESPACE} from '../translations'; import {useTranslation} from 'react-i18next'; import {SearchHeader, SearchHeaderRight} from '../components/SearchHeader'; -import { ViewTeamScreen } from "../screens/ViewTeamScreen"; +import {ViewTeamScreen} from '../screens/ViewTeamScreen'; const RosterStack = createStackNavigator<TextingNavParamsMap>();
fix lint errors
fix lint errors
7b854abe77a3e581f8237edfd371d0adef507437
--- core/src/manifest.ts @@ -54,6 +54,7 @@ export const getAssociateFeatures = (): AllsparkFeatureModule[] => { require('./storeInfo').StoreInfoFeature, require('./features/timeclock').default, require('./whatsNew').WhatsNewFeature, + require('@walmart/checkout-mini-app').CheckoutMiniApp, ]; // Me@Walmart US Only Associate Features --- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -13,7 +13,6 @@ import {AskSamMiniApp} from '@walmart/ask-sam-mini-app'; import {AvailableSurveysNav} from '@walmart/associate-listening-mini-app'; import {AVPNav, AVP_NAV_SCREEN_NAME} from '@walmart/avp-feature-app'; import BackroomMiniApp from '@walmart/backroom-mini-app'; -import {CheckoutMiniApp} from '@walmart/checkout-mini-app'; import {EmergencyBannerScreen} from '@walmart/emergency-mini-app'; import {ExceptionMiniApp as PinpointMiniApp} from '@walmart/exception-mini-app'; import {FacilitiesMaintainanceStack} from '@walmart/facilities-management-miniapp'; @@ -79,7 +78,7 @@ import SideKeyFeature from '../../../sideKey'; import {StoreInfoFeature} from '../../../storeInfo'; import {TermsOfUseFeature} from '../../../termsOfUse'; import {WhatsNewFeature} from '../../../whatsNew'; - +import {CheckoutMiniApp} from '@walmart/checkout-mini-app'; import {MainTabsNav} from './Tabs'; import {MyTeamStackNav} from './Tabs/MyTeamStackNav'; import {MainStackMap} from './types'; @@ -180,15 +179,6 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [ }, clockCheckEnabled: true, }, - { - featureId: MINI_APPS.CHECKOUT, - name: 'Checkout', - component: CheckoutMiniApp, - options: { - headerShown: false, - }, - clockCheckEnabled: true, - }, { featureId: 'backroom', name: 'Backroom', @@ -548,7 +538,7 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [ export const MainStackNav = () => { const dispatch = useDispatch(); - + console.log('######### Inside MainStackNav!! ##########'); useEffect(() => { // Signals the completion of startup. This is used to resume the startup flow saga that runs startup side effects dispatch(ContainerActionCreators.STARTUP_COMPLETE()); @@ -628,6 +618,10 @@ export const MainStackNav = () => { {ManagerApprovalsFeature.buildAllScreens({ Navigator: MainStack as any, })} + + {CheckoutMiniApp.buildAllScreens({ + Navigator: MainStack as any, + })} </MainStack.Navigator> </> ); --- core/src/navigation/USHallway/AssociateHallwayNav/SideMenuContent.tsx @@ -56,6 +56,7 @@ export const SCREEN_RENAME_MAP = { FeatureRestrictions: 'Core.FeatureRestrictions', WhatsNewModal: 'Core.WhatsNewModal', ManagerApprovals: 'ma.startManagerApprovals', + Checkout: 'Checkout.Root', }; export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( @@ -119,7 +120,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( return; } } - + console.log('$$$$$$ Route Name ', route, params); setImmediate(() => // Look to rename mapping for new route name, if none found, use route name navigation.navigate(SCREEN_RENAME_MAP[route] || route, { --- core/src/navigation/USHallway/AssociateHallwayNav/types.ts @@ -85,7 +85,7 @@ export type MainStackMap = CoreAssociateStackMap & { taskItQuickActions: undefined; timeClock: undefined; Topstock: undefined; - Checkout: undefined; + 'Checkout.Root': undefined; Receiving: undefined; };
Checkout phase 5 changes
Checkout phase 5 changes
86849329fc0d83c4b8ef30158c796eea6788370b
--- package-lock.json @@ -4166,9 +4166,9 @@ "integrity": "sha512-t1d3ohYMyfrKWEogykstetXWuIeHcGrnClVJu+m1CrTlL0o4ZrcyNpHwZLo1olJbwX3ujgmpRRcygMmWpowDCA==" }, "@walmart/ask-sam-mini-app": { - "version": "0.40.6", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.40.6.tgz", - "integrity": "sha512-vouZNprLXMh96t7E5+NwHbhI54k4gOE5zy9n3oWjLMD6U7DZBm1dCqvhHVRAnqXVOU05IltT0tY/V0VCCwMUVw==", + "version": "0.40.7", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.40.7.tgz", + "integrity": "sha512-LU0A7hzy4a8tU+451r2YBf5IDFcRSvzhCwOv4pDcLqjX9Bd6lQ2nXxzfdrcZeziF1YOKo6QJEwB0MSAOQv2QBQ==", "requires": { "apisauce": "^1.1.2", "axios-cache-adapter": "^2.7.3", @@ -19929,7 +19929,7 @@ "wm-react-native-vector-icons": { "version": "1.0.33", "resolved": "https://npme.walmart.com/wm-react-native-vector-icons/-/wm-react-native-vector-icons-1.0.33.tgz", - "integrity": "sha1-vIAL0WOWBBaAsIuacYHnzsxTQxk=", + "integrity": "sha512-pAcEq6iOVxzKM55qucKOkh2ML3kii4yGJ5YdmMEOcRAGH4fQ1lHa7BETIl+jzX5n1ZVKgWkzmAiH3vw0nkuklQ==", "requires": { "lodash": "^4.0.0", "prop-types": "^15.6.2", --- package.json @@ -74,7 +74,7 @@ "@walmart/allspark-home-mini-app": "0.5.25", "@walmart/allspark-me-mini-app": "0.31.4", "@walmart/allspark-neon-core": "0.1.25", - "@walmart/ask-sam-mini-app": "0.40.6", + "@walmart/ask-sam-mini-app": "0.40.7", "@walmart/config-components": "1.0.35", "@walmart/counts-component-miniapp": "0.0.32", "@walmart/exception-mini-app": "0.39.2",
Ask Sam version bump.
Ask Sam version bump.