commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
00ca0f2e9c3cfd0b12899b5215ced6533e2806e3
--- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.0.0-beta.8", + "version": "1.0.0-beta.9", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts",
Update hub version
Update hub version
5da268b55e4b6fb25d8b6210a3c40490227702eb
--- package-lock.json @@ -3372,9 +3372,9 @@ "integrity": "sha512-L9Ig27eukaRF9mCTo7bJjv0SL84iDLlmM8FNb0882XTBFeeQT7PuBVWDnQSNjhmxmrWHXOH/cC05G/wBHjgCHA==" }, "@walmart/inbox-mini-app": { - "version": "0.0.105", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.105.tgz", - "integrity": "sha512-cKvZIhfn+NPDhdwFONeRyOmj81FOh7Qmne00KJ4gah40L3T2cWvNR1lXRmC0ORLQ/cK0orrDvXfVpVTIa06CKQ==" + "version": "0.5.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.5.0.tgz", + "integrity": "sha512-OOYBMD+O5stpF2joINj6vgJiWMe926EQEw4IwlrlFfR6VX4UDKV8cu0ctD5CEzXDIz9cR/dUZZ1YapYr/qUc+g==" }, "@walmart/iteminfo-mini-app": { "version": "2.0.6", --- package.json @@ -82,7 +82,7 @@ "@walmart/gtp-shared-components": "^1.2.0", "@walmart/impersonation-mini-app": "1.0.18", "@walmart/ims-print-services-ui": "0.0.35", - "@walmart/inbox-mini-app": "0.0.105", + "@walmart/inbox-mini-app": "0.5.0", "@walmart/iteminfo-mini-app": "2.0.6", "@walmart/manager-approvals-miniapp": "0.0.49", "@walmart/metrics-mini-app": "0.4.11",
inbox version bump
inbox version bump
0ef920eed65d1477b14b2f1bf0b2ce80854582d0
--- .looper.multibranch.yml @@ -23,46 +23,6 @@ envs: IOS_BASE_PATH: targets/US/ios ANDROID_BASE_PATH: targets/US/android -branches: - - spec: feature/drop24 - triggers: - - manual: - name: Publish Packages (Pre-Release) - call: publishPrerelease - - manual: - name: Publish Packages (Graduate) - call: publishGraduate - - manual: - name: Build Both Dev - call: dev(test) - - manual: - name: Build Android Dev - call: android-dev(test) - - manual: - name: Build iOS Dev - call: ios-dev(test) - - manual: - name: Build Both Beta - call: beta(test) - - manual: - name: Build Android Beta - call: android-beta(test) - - manual: - name: Build iOS Beta - call: ios-beta(test) - - manual: - name: Build Both Teflon - call: teflon(test) - - manual: - name: Build Android Teflon - call: android-teflon(test) - - manual: - name: Build iOS Teflon - call: ios-teflon(test) - - manual: - name: Build Simulator - call: push(simulator) - flows: yarnInstall: - (name Yarn Install) corepack enable
chore: removing looper trigger overrides
chore: removing looper trigger overrides
282fc72f910a89f007bba434109728ac4f4fe3e7
--- packages/allspark-utils/src/RenderGuard.tsx @@ -48,3 +48,45 @@ export const RenderGuard = ( return ready ? <>{children}</> : null; }; + +export const createRenderGuard = ( + config: AtLeastOne<{ + preRender: () => Promise<void>; + preRenderHook: () => boolean; + }> +) => { + const { preRender = Promise.resolve, preRenderHook: usePreRender } = config; + + if (usePreRender) { + return (props: PropsWithChildren<{}>) => { + const { children } = props; + const { value: ready, toggleOn } = useToggleState(false); + + // Setup pre render hook + const complete = usePreRender?.(); + + // Toggle on when hook first returns true + useEffect(() => { + if (complete && !ready) { + toggleOn(); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [complete]); + + return ready ? <>{children}</> : null; + }; + } + + return (props: PropsWithChildren<{}>) => { + const { children } = props; + const { value: ready, toggleOn } = useToggleState(false); + + // Handle pre render promise, toggle on when complete + useEffect(() => { + preRender?.().then(() => toggleOn()); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + + return ready ? <>{children}</> : null; + }; +};
feat: add create render guard method
feat: add create render guard method
22da5e92a87c6893a6a48a0923d49928937f03d1
--- src/navigation/index.tsx @@ -31,6 +31,11 @@ import {useSelector} from 'react-redux'; import {displaySearchIcon} from '../redux/selectors'; import {AllsparkHubContainer} from '@walmart/allspark-foundation-hub/HubFeature'; import {initializeWidgets} from './utils'; +import { + TEAM_HUB_CCM_NAMESPACE, + TEAM_HUB_KEY, + TEAM_HUB_SCREEN_NAME, +} from '@walmart/me-at-walmart-common'; const TextingStack = createStackNavigator<TextingNavParamsMap>(); @@ -109,9 +114,9 @@ export const TeamHub = () => { initializeWidgets(); const MyTeamHubContainer = new AllsparkHubContainer() .create( - 'Me@Walmart.ManagerExperience.MyTeam', - 'myteam', - 'myTeam.root', + TEAM_HUB_KEY, + TEAM_HUB_CCM_NAMESPACE, + TEAM_HUB_SCREEN_NAME, ['roster'], { ['Header']: {id: 'teamHub.header'}, --- src/navigation/utils.ts @@ -13,10 +13,10 @@ import { NEW_MESSAGES_SCREEN_NAME, } from '../constants'; import {analytics} from '../logger/Analytics'; -import {AllsparkComponentContainers} from '@walmart/allspark-foundation/Components'; import {RosterWidget} from '@walmart/roster-mini-app'; import {TeamHubHeader} from '../components/TeamHubHeader'; import {TeamHubButton} from '../components/TeamHubButton'; +import {TeamHubContainer} from '@walmart/me-at-walmart-common'; let comingFrom: keyof TextingNavParamsMap | null = null; const REPLACE_SCREEN = 'myTeam.newMessage'; @@ -132,21 +132,7 @@ export const onNewMessage = () => { }; export const initializeWidgets = () => { - AllsparkComponentContainers.add( - 'Me@Walmart.ManagerExperience.MyTeam', - 'roster', - RosterWidget, - ); - - AllsparkComponentContainers.add( - 'Me@Walmart.ManagerExperience.MyTeam', - 'teamHub.header', - TeamHubHeader, - ); - - AllsparkComponentContainers.add( - 'Me@Walmart.ManagerExperience.MyTeam', - 'floating.button', - TeamHubButton, - ); + TeamHubContainer.add('roster', RosterWidget); + TeamHubContainer.add('teamHub.header', TeamHubHeader); + TeamHubContainer.add('floating.button', TeamHubButton); };
Import team hub and work hub from me at walmart common
Import team hub and work hub from me at walmart common
6cd1d59d2c157ee1b89b353c96a8dff1ba178d94
--- example/index.js @@ -7,3 +7,6 @@ AppRegistry.registerComponent(appName, () => App); // import {Feature1Standalone} from './src'; // AppRegistry.registerComponent(appName, Feature1Standalone.App); + +// import {TeamHubStandalone} from './src'; +// AppRegistry.registerComponent(appName, TeamHubStandalone.App); --- example/src/core/index.tsx @@ -208,12 +208,13 @@ const Navigation = () => { export function App() { return ( - <TestContainer.Provider env={'dev'}> + <TestContainer.Provider> <Navigation /> </TestContainer.Provider> ); } +TestContainer.initialize('dev'); TestContainer.addSetup('root', CoreSetup); type CoreRootParamList = { --- example/src/teamHub/screens/index.ts @@ -1,3 +1,4 @@ +import {NavigatorScreenParams} from '@react-navigation/native'; import {ContainerScreen} from './container'; import {TestModal} from './modal'; import {OnboardingScreen} from './onboarding'; @@ -10,7 +11,27 @@ export const TeamHubScreens = { 'teamHub.container': ContainerScreen, 'teamHub.stack': FeatureStack, }; - export const TeamHubModals = { 'teamHub.modal': TestModal, }; + +export type TeamHubScreenParams = { + 'teamHub.home': undefined; + 'teamHub.onboarding': undefined; + 'teamHub.container': undefined; + 'teamHub.stack': NavigatorScreenParams<{ + nestedScreen1: undefined; + nestedScreen2: undefined; + }>; +}; + +export type TeamHubModalParams = { + 'teamHub.modal': undefined; +}; + +declare global { + namespace Allspark { + interface ScreenParams extends TeamHubScreenParams {} + interface ModalParams extends TeamHubScreenParams {} + } +}
Update container
Update container
97c2573a5bf916bfba3990d50703f08e259ab40d
--- package-lock.json @@ -3292,9 +3292,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.30.29", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.30.29.tgz", - "integrity": "sha512-OjfbNT8QGcmeo6aUTrSFiTPwwuM+FKspyidbRO34+dkkaN1BtVzCxqTeCNPUR2L9JQLHNiUBEY0pRHab+NZYQQ==", + "version": "0.30.31", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.30.31.tgz", + "integrity": "sha512-0AQ3uf+zYLJGXH/NwqwjoWOf73oiFdA6OicSBiu6sgyoSGa/Cna0Uyprv+uGR21PAy+/2gBFe8xKDJXZ69fjkA==", "requires": { "apisauce": "^1.1.2", "axios-cache-adapter": "^2.7.3", --- package.json @@ -73,7 +73,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.43", "@walmart/allspark-home-mini-app": "0.5.2", "@walmart/allspark-me-mini-app": "0.2.4", - "@walmart/ask-sam-mini-app": "0.30.29", + "@walmart/ask-sam-mini-app": "^0.30.31", "@walmart/config-components": "^1.0.33", "@walmart/counts-component-miniapp": "0.0.22", "@walmart/exception-mini-app": "0.37.1",
Bumping ask sam version for store map fix
Bumping ask sam version for store map fix
52866681448408348c4bbd8b73cbd96801a0435a
--- package.json @@ -89,7 +89,7 @@ "@walmart/allspark-utils": "7.1.0", "@walmart/amp-mini-app": "1.2.10", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.34.14", + "@walmart/ask-sam-mini-app": "1.33.101", "@walmart/associate-listening-mini-app": "1.2.39", "@walmart/attendance-mini-app": "3.174.5", "@walmart/avp-feature-app": "0.26.15", --- yarn.lock @@ -7030,9 +7030,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ask-sam-mini-app@npm:1.34.14": - version: 1.34.14 - resolution: "@walmart/ask-sam-mini-app@npm:1.34.14::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.34.14.tgz" +"@walmart/ask-sam-mini-app@npm:1.33.101": + version: 1.33.101 + resolution: "@walmart/ask-sam-mini-app@npm:1.33.101::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.33.101.tgz" dependencies: apisauce: "npm:^1.1.2" numeral: "npm:^2.0.6" @@ -7075,7 +7075,7 @@ __metadata: react-native-wm-voice-text: ">=0.3" reselect: ">=4" victory-native: ">=36.5" - checksum: 10c0/60436ff2a09e3221cde05166ce7f3f01063a1beb2118066b151ca0ca562c5ebc5fe48c5837d6ee83526d193216655543c03d02caa5acb80082baae3b141b002f + checksum: 10c0/26f0cc083aca70b41bf50b4dcb2711c817d232701faa9f6e6cc1e406ac0163a430a7f5dfa386f517c96b88924d29307b94f41969a2f5bbba74496fd7a5e82bff languageName: node linkType: hard @@ -8123,7 +8123,7 @@ __metadata: "@walmart/allspark-utils": "npm:7.1.0" "@walmart/amp-mini-app": "npm:1.2.10" "@walmart/ask-sam-chat-components": "npm:^0.2.7" - "@walmart/ask-sam-mini-app": "npm:1.34.14" + "@walmart/ask-sam-mini-app": "npm:1.33.101" "@walmart/associate-listening-mini-app": "npm:1.2.39" "@walmart/attendance-mini-app": "npm:3.174.5" "@walmart/avp-feature-app": "npm:0.26.15"
fix(ask-sam-mini-app): SMBLV-9287 hot fix for black screen
fix(ask-sam-mini-app): SMBLV-9287 hot fix for black screen
dc43c629e4559eab8fe7042a8fef14bcbeca1f05
--- package-lock.json @@ -4408,12 +4408,12 @@ "@walmart/moment-walmart": { "version": "1.0.4", "resolved": "https://npme.walmart.com/@walmart/moment-walmart/-/moment-walmart-1.0.4.tgz", - "integrity": "sha512-iTkDEL7GeYYS8laso4ECQ7DyHgBxnJh/uP5PJNQMHZyKb8niIwIwb19HFLuGBVRa9vZIjTz7mChSydbIn4KV0w==" + "integrity": "sha1-696avfrTbdFORoktjdt8w3uZ9hw=" }, "@walmart/patient-portal-mobile": { "version": "2.1.14", "resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.1.14.tgz", - "integrity": "sha512-LhqS1Ogr1vi5Nj2/gIRPQnn/ogReKbIhXvXsLdDzltCibI5YGoKxHpReIQKp3YJ01xBUJyUBzrc3G/JCe7KYSg==", + "integrity": "sha1-6a8PZ45o8XUCL3Jj8H7rlEfmefQ=", "requires": { "@react-native-community/datetimepicker": "^3.0.3", "@walmart/react-native-collapsible": "1.5.3", @@ -4447,9 +4447,9 @@ "integrity": "sha512-5VXiKOX6nl2OPte+FFWxAZbWi+aCW0o7rbzJldiMN7XewyTIxsyBMwWlUW5Y29WYa4ZaaVstjincL76EW5v2dA==" }, "@walmart/profile-feature-app": { - "version": "0.0.32", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.0.32.tgz", - "integrity": "sha512-vSrCRBPE2HeqsVJWbMuO9FLX9WSnrz6ijlLcZ889p7w0pCfDQVbL1JyjrCHI1/OPcQ7TvKuFYLjFDy6Ld/ClNg==" + "version": "0.0.34", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.0.34.tgz", + "integrity": "sha512-uIUj9pncr+UHyTCegApYq91eQCcTGeLu1ejINUZAij0N8IHtnZwPgudV2gLTpdi8a7uxuW1SGQARGV96XC8/+w==" }, "@walmart/push-to-talk-mini-app": { "version": "1.7.10", @@ -4467,7 +4467,7 @@ "@walmart/react-native-env": { "version": "0.2.0", "resolved": "https://npme.walmart.com/@walmart/react-native-env/-/react-native-env-0.2.0.tgz", - "integrity": "sha512-YkJeKZP5HuqzZF6y4H/mnktOuWzMhDUFYOkjItGfuesYSZaigcZYOklu6Ut5FFwWgy7xiS+FzvMW7IUZkxKlOw==" + "integrity": "sha1-Wj8o61r2LUN+3ZXhDrzrmHwelGU=" }, "@walmart/react-native-logger": { "version": "1.29.0", @@ -4477,7 +4477,7 @@ "@walmart/react-native-shared-navigation": { "version": "0.4.0", "resolved": "https://npme.walmart.com/@walmart/react-native-shared-navigation/-/react-native-shared-navigation-0.4.0.tgz", - "integrity": "sha512-xXCe5sJeytOO9HAKLaTiQQMzomfUS2wUP6ICLYv9BGtdJUDmoKNT7aFYeRDGPgvPvkc1A8oFrqJIrOshjLnxSg==" + "integrity": "sha1-dBX44FzZJKjZPuXiMoFiFQzybYE=" }, "@walmart/react-native-sumo-sdk": { "version": "2.2.2-beta.2", @@ -18420,7 +18420,7 @@ "react-native-wm-config": { "version": "0.1.1", "resolved": "https://npme.walmart.com/react-native-wm-config/-/react-native-wm-config-0.1.1.tgz", - "integrity": "sha512-s3S3bciDoyVqUyfzVKsXJp+aQxPriU62yL+cvbBJB6d7sGnCFHDQHF7/2y8YfK4Qc756VQ2o3SgCzlcQEYoTEw==" + "integrity": "sha1-Nn+tRZascRxL031AMLmpsn4nbB4=" }, "react-native-wm-network": { "version": "0.2.0", @@ -18435,7 +18435,7 @@ "react-native-wm-telemetry": { "version": "0.3.0", "resolved": "https://npme.walmart.com/react-native-wm-telemetry/-/react-native-wm-telemetry-0.3.0.tgz", - "integrity": "sha512-zTOSJ7BMbGHaqAF8+LDQI/s5winKcxsHSe4hv49gUbfDz19v71apgNchz31W1D2UQP+kNgrglrmCdmr5RdI8mw==" + "integrity": "sha1-8QwZvpngLi+J6pHSOcu+5HqQcLs=" }, "react-native-wm-voice-text": { "version": "0.6.0", @@ -20975,7 +20975,7 @@ "wfm-allspark-data-library": { "version": "0.0.11", "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.11.tgz", - "integrity": "sha512-o34ej3nNhCcy3uwWkOJcU/3zjXmX+VvbqiZrEgQwrxbO6cbJGxiK1Tz/JQX8j1lwi6cZFJKvDOucJtlduzVQrg==", + "integrity": "sha1-E27LsiPO+Sbj5h3p0FQpcH9VU8g=", "requires": { "@walmart/functional-components": "^1.0.22", "@walmart/react-native-env": "^0.1.0", @@ -20989,7 +20989,7 @@ "@walmart/react-native-env": { "version": "0.1.0", "resolved": "https://npme.walmart.com/@walmart/react-native-env/-/react-native-env-0.1.0.tgz", - "integrity": "sha512-ooH0AqLGhS5PNcLaOWRHAEIIvrYIyTUXqshlHkgEKDLhLtGW8WvFu0mlcCXb1FEUc/PVmKEzHNHYV1gzGNBqxQ==" + "integrity": "sha1-ojNwDE5pPTzF1RuQXDc//Fnlpz0=" }, "moment": { "version": "2.24.0", @@ -20999,7 +20999,7 @@ "react-native-ssmp-sso-allspark": { "version": "0.0.1-rc8", "resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-0.0.1-rc8.tgz", - "integrity": "sha512-4ZWTteIvddzP7Lg3EM0KP1fDfcN8nx7v5yvHASCLUpoZvhxHQUkjj8uTt4TkJxvTuEK16w7mTwHDauTrIC/BJg==" + "integrity": "sha1-/SHw48C+3muBMp2bynExhYPZl0s=" } } }, @@ -21100,7 +21100,7 @@ "wifi-store-locator": { "version": "1.0.0-alpha2", "resolved": "https://npme.walmart.com/wifi-store-locator/-/wifi-store-locator-1.0.0-alpha2.tgz", - "integrity": "sha512-Gj0fP/NwQAguJrxEuRuHQjlUHDDH2qnFZAGgh1R0l1CUAPKFROL8L8gHZ1GDKnfoYMev7AOXKcEbZVcXpNomOg==" + "integrity": "sha1-W1OXsVMHI8dYMcI0QKg6pJO/R3Q=" }, "wm-react-native-vector-icons": { "version": "1.0.33", --- package.json @@ -90,7 +90,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/payrollsolution_miniapp": "0.121.0", "@walmart/price-changes-mini-app": "1.2.3", - "@walmart/profile-feature-app": "0.0.32", + "@walmart/profile-feature-app": "0.0.34", "@walmart/push-to-talk-mini-app": "1.7.10", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.29.0",
updated profile feature app to v0.0.34 with translation support
updated profile feature app to v0.0.34 with translation support
1b9be21d312afd5c343298bd9d9b99910142fd9d
--- __tests__/home/components/TaskCard/TaskStatusDetailsTest.tsx @@ -0,0 +1,53 @@ +import React from 'react'; +import {create} from 'react-test-renderer'; +import {fireEvent} from '@testing-library/react-native'; +import {TaskStatusDetails} from '../../../../src/home/components/TaskCard/TaskStatusDetails'; + +jest.mock('../../../../src/home/logger/Logger', () => ({ + logGeneralError: jest.fn(), +})); + +const setup = (extraProps = {} as any) => { + const props = { + clockStatusDisplaytext: '107 clocked in', + teamDisplayText: 'Store #100', + viewRoster: jest.fn(), + viewRosterText: 'View roster', + teamImage: 'Fresh', + ...extraProps, + }; + + const component = create(<TaskStatusDetails {...props} />); + return { + props, + component, + }; +}; + +describe('test TaskStatusDetails', () => { + it('verify snapshot', () => { + const {component} = setup(); + expect(component.toJSON()).toMatchSnapshot(); + }); + + it('verify image url', () => { + const {props, component} = setup(); + const imgComp = component.root.findByType('Image'); + expect(imgComp.props.source).toEqual({ + uri: 'https://i5-me.walmartimages.com/images/teams/task-image-meatproduce-a5965a9074.png', + }); + + const newProps = {...props, teamImage: 'taskImageStore'}; + component.update(<TaskStatusDetails {...newProps} />); + expect(imgComp.props.source).toEqual({ + uri: 'https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png', + }); + }); + + it('verify event handler', async () => { + const {props, component} = setup(); + const linkBtn = component.root.findByType('LinkButton'); + fireEvent.press(linkBtn); + expect(props.viewRoster).toHaveBeenCalled(); + }); +}); --- __tests__/home/components/TaskCard/__snapshots__/TaskStatusDetailsTest.tsx.snap @@ -0,0 +1,103 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`test TaskStatusDetails verify snapshot 1`] = ` +<View + style={ + { + "flexDirection": "row", + "justifyContent": "space-between", + } + } +> + <View + style={ + { + "flexDirection": "row", + "justifyContent": "space-between", + "marginRight": -16, + } + } + > + <View + style={ + { + "justifyContent": "space-evenly", + } + } + > + <Text + style={ + { + "color": "#2e2f32", + "fontFamily": "Bogle-Bold", + "fontSize": 18, + "lineHeight": 20, + "paddingBottom": 4, + } + } + > + Store #100 + </Text> + <Text + style={ + { + "color": "#2e2f32", + "fontFamily": "Bogle-Regular", + "fontSize": 14, + "lineHeight": 20, + "paddingBottom": 4, + } + } + > + 107 clocked in + + </Text> + <LinkButton + onPress={[MockFunction]} + style={ + { + "alignSelf": "flex-start", + } + } + > + <Text + style={ + { + "color": "#000", + "fontFamily": "Bogle-Regular", + "fontSize": 14, + "fontWeight": "400", + "lineHeight": 20, + } + } + > + View roster + </Text> + </LinkButton> + </View> + </View> + <View> + <Image + contentFit="contain" + onError={[Function]} + placeholder={ + { + "testUri": "../../../src/images/assets/tasks/task-image-store.png", + } + } + source={ + { + "uri": "https://i5-me.walmartimages.com/images/teams/task-image-meatproduce-a5965a9074.png", + } + } + style={ + { + "height": 85, + "marginLeft": 12, + "width": 135, + } + } + /> + </View> +</View> +`; --- package.json @@ -44,7 +44,7 @@ "projConfig:teflon": "yarn run iosConfig:teflon && yarn run androidConfig:teflon", "solidarity": "solidarity", "start": "react-native start", - "test": "cp env.dev.js env.js && jest --testPathPattern=__tests__/", + "test": "cp env.dev.js env.js && jest --collectCoverage", "update:major": "npm version major --no-git-tag-version", "update:minor": "npm version minor --no-git-tag-version", "update:patch": "npm version patch --no-git-tag-version", --- src/images/assets/index.ts @@ -265,6 +265,10 @@ export const i5Images: {[key: string]: i5ImageType} = { uri: 'https://i5-me.walmartimages.com/images/teams/task-image-meatproduce-a5965a9074.png', placeholderImageHash: 'KlRM6ytR?^Sin$t7.9jFMw', }, + taskFresh: { + uri: 'https://i5-me.walmartimages.com/images/teams/task-image-meatproduce-a5965a9074.png', + placeholderImageHash: 'KlRM6ytR?^Sin$t7.9jFMw', + }, taskPharmacy: { uri: 'https://i5-me.walmartimages.com/images/teams/task-image-pharmacy-95002883d0.png', placeholderImageHash: 'KKSF@V~UOux^Rji^-.Ipr=',
fix: ALLSPARK-366 fix image link for a Fresh team in home page
fix: ALLSPARK-366 fix image link for a Fresh team in home page
888deafd8d199ee535c5689eb9cc3cf677ae3b93
--- package.json @@ -81,7 +81,7 @@ "@walmart/allspark-authentication": "6.4.10", "@walmart/allspark-cope-key-listener": "0.0.18", "@walmart/allspark-foundation": "6.50.0", - "@walmart/allspark-foundation-hub": "1.16.0", + "@walmart/allspark-foundation-hub": "1.17.0", "@walmart/allspark-graphql-client": "~6.3.28", "@walmart/allspark-http-client": "~6.3.28", "@walmart/allspark-neon-core": "0.1.31", --- yarn.lock @@ -7010,9 +7010,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.16.0": - version: 1.16.0 - resolution: "@walmart/allspark-foundation-hub@npm:1.16.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.16.0.tgz" +"@walmart/allspark-foundation-hub@npm:1.17.0": + version: 1.17.0 + resolution: "@walmart/allspark-foundation-hub@npm:1.17.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.17.0.tgz" peerDependencies: "@react-navigation/native": 7.x "@walmart/allspark-foundation": ">=6.27" @@ -7022,7 +7022,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/11094bed935afc51c1c574307411ac290e65dc5e663c1d50093d362a04299a82978cc843628c5604dda137e9a7e271a5b524a06c1d6da8bfb7258d17f29227ac + checksum: 10c0/3b66d1f1effc6a1698fa8154c9b5457360f7463c8abb94c29d9e2d74ceceda6c35ed6f89ccda046eddd146f203a1461359bfd34e9173bf31594d53a36e32335b languageName: node linkType: hard @@ -8332,7 +8332,7 @@ __metadata: "@walmart/allspark-authentication": "npm:6.4.10" "@walmart/allspark-cope-key-listener": "npm:0.0.18" "@walmart/allspark-foundation": "npm:6.50.0" - "@walmart/allspark-foundation-hub": "npm:1.16.0" + "@walmart/allspark-foundation-hub": "npm:1.17.0" "@walmart/allspark-graphql-client": "npm:~6.3.28" "@walmart/allspark-http-client": "npm:~6.3.28" "@walmart/allspark-neon-core": "npm:0.1.31"
feat(ui): bumped allspark-foundation-hub version (#4834)
feat(ui): bumped allspark-foundation-hub version (#4834) Co-authored-by: Aroushi Sharma - a0s11tw <Aroushi.Sharma@walmart.com>
3d40b249449b9b5869924879dcff61127b6e8c96
--- android/app/proguard-rules.pro @@ -8,3 +8,11 @@ # http://developer.android.com/guide/developing/tools/proguard.html # Add any project specific keep options here: +-keep public class com.dylanvann.fastimage.* {*;} +-keep public class com.dylanvann.fastimage.** {*;} +-keep public class * implements com.bumptech.glide.module.GlideModule +-keep public class * extends com.bumptech.glide.module.AppGlideModule +-keep public enum com.bumptech.glide.load.ImageHeaderParser$** { + **[] $VALUES; + public *; +} \ No newline at end of file --- ios/Podfile.lock @@ -390,6 +390,15 @@ PODS: - gRPC-Core/Interface (1.28.2) - GTMSessionFetcher/Core (1.5.0) - leveldb-library (1.22) + - libwebp (1.2.0): + - libwebp/demux (= 1.2.0) + - libwebp/mux (= 1.2.0) + - libwebp/webp (= 1.2.0) + - libwebp/demux (1.2.0): + - libwebp/webp + - libwebp/mux (1.2.0): + - libwebp/demux + - libwebp/webp (1.2.0) - nanopb (1.30906.0): - nanopb/decode (= 1.30906.0) - nanopb/encode (= 1.30906.0) @@ -679,6 +688,10 @@ PODS: - React-Core - RNDeviceInfo (5.6.5): - React + - RNFastImage (8.3.4): + - React-Core + - SDWebImage (~> 5.8) + - SDWebImageWebPCoder (~> 0.6.1) - RNFBAnalytics (7.6.10): - Firebase/Analytics (~> 6.34.0) - React-Core @@ -728,6 +741,12 @@ PODS: - AppAuth - React - SSO (= 1.2.1) + - SDWebImage (5.10.4): + - SDWebImage/Core (= 5.10.4) + - SDWebImage/Core (5.10.4) + - SDWebImageWebPCoder (0.6.1): + - libwebp (~> 1.0) + - SDWebImage/Core (~> 5.7) - SSO (1.2.1): - AppAuth - Starscream (3.0.6) @@ -785,6 +804,7 @@ DEPENDENCIES: - "RNCPicker (from `../node_modules/@react-native-community/picker`)" - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)" - RNDeviceInfo (from `../node_modules/react-native-device-info`) + - RNFastImage (from `../node_modules/react-native-fast-image`) - "RNFBAnalytics (from `../node_modules/@react-native-firebase/analytics`)" - "RNFBApp (from `../node_modules/@react-native-firebase/app`)" - "RNFBCrashlytics (from `../node_modules/@react-native-firebase/crashlytics`)" @@ -835,9 +855,12 @@ SPEC REPOS: - gRPC-Core - GTMSessionFetcher - leveldb-library + - libwebp - nanopb - PromisesObjC - Protobuf + - SDWebImage + - SDWebImageWebPCoder - Starscream EXTERNAL SOURCES: @@ -939,6 +962,8 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-community/datetimepicker" RNDeviceInfo: :path: "../node_modules/react-native-device-info" + RNFastImage: + :path: "../node_modules/react-native-fast-image" RNFBAnalytics: :path: "../node_modules/@react-native-firebase/analytics" RNFBApp: @@ -1007,6 +1032,7 @@ SPEC CHECKSUMS: gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5 GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52 leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 + libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0 nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc Permission-LocationWhenInUse: e09ae67e8db2b1eeefb35f18ca59848d0785de5b Permission-Notifications: 4325073de6e418cfbbdd8d296822c419d8ddc7ef @@ -1055,6 +1081,7 @@ SPEC CHECKSUMS: RNCPicker: 914b557e20b3b8317b084aca9ff4b4edb95f61e4 RNDateTimePicker: aab869a517ecf3095910be81093e3d9b27cd82ed RNDeviceInfo: e841619c3dac5495a095c5455473579ff04908d4 + RNFastImage: d4870d58f5936111c56218dbd7fcfc18e65b58ff RNFBAnalytics: 6414e9fe1f36c3074f39cd6265b3def777dbfbdb RNFBApp: 804b98033f45c3a3e35b56de8c894f85ef5e4388 RNFBCrashlytics: 501d01e5dd0cd6affedba60762b9b8d7d579cea8 @@ -1072,6 +1099,8 @@ SPEC CHECKSUMS: RNSVG: ce9d996113475209013317e48b05c21ee988d42e RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59 RNWMSSOLibrary: 1602252933b7a5caae14e8fa071d673a85269074 + SDWebImage: c666b97e1fa9c64b4909816a903322018f0a9c84 + SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21 SSO: 7b015d84bb6a974eb9945c4c10ed6951dc9e7412 Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 Yoga: 7740b94929bbacbddda59bf115b5317e9a161598 --- package-lock.json @@ -3032,9 +3032,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.10.22", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.10.22.tgz", - "integrity": "sha512-22JJSU8iMew0PFrTb+XMahFipexcxqjkJKSS6EcPtZ0+v3HU9A8xWFe2doe27edhaRj3JN3KVv4xD//y4A5n5w==", + "version": "0.10.24", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.10.24.tgz", + "integrity": "sha512-kE5B3ZjJRl44DYYBc4f74H1c7Idrw9mRmGiMlbLtJHUf+BQJykwN0tZ9iFWVdJuZ24mWePasLwLODFVmcI9t4w==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", @@ -12171,6 +12171,11 @@ "resolved": "https://npme.walmart.com/react-native-error-boundary/-/react-native-error-boundary-1.1.6.tgz", "integrity": "sha512-IqNcD0Qigx2Dk4fP+OcTYLH8XjbijPEmLZqCh2flLijUkEo8G/D151tRcUV6DHU0IL0ZHOB+/wF2kEUT+liPdg==" }, + "react-native-fast-image": { + "version": "8.3.4", + "resolved": "https://npme.walmart.com/react-native-fast-image/-/react-native-fast-image-8.3.4.tgz", + "integrity": "sha512-LpzAdjUphihUpVEBn5fEv5AILe55rHav0YiZroPZ1rumKDhAl4u2cG01ku2Pb7l8sayjTsNu7FuURAlXUUDsow==" + }, "react-native-geolocation-service": { "version": "5.1.1", "resolved": "https://npme.walmart.com/react-native-geolocation-service/-/react-native-geolocation-service-5.1.1.tgz", --- package.json @@ -50,7 +50,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.25", "@walmart/allspark-home-mini-app": "0.1.10", "@walmart/allspark-me-mini-app": "0.0.22", - "@walmart/ask-sam-mini-app": "0.10.22", + "@walmart/ask-sam-mini-app": "0.10.24", "@walmart/config-components": "1.0.12", "@walmart/feedback-all-spark-miniapp": "0.0.37", "@walmart/functional-components": "1.0.24", @@ -79,6 +79,7 @@ "react-native-circular-progress": "^1.3.6", "react-native-connect-sso-redux": "^1.0.0-rc1", "react-native-device-info": "^5.6.5", + "react-native-fast-image": "^8.3.4", "react-native-geolocation-service": "^5.0.0", "react-native-gesture-handler": "^1.7.0", "react-native-get-random-values": "^1.5.1",
Incrementing ask sam, addin fast image dependency (#361)
Incrementing ask sam, addin fast image dependency (#361) Co-authored-by: rlane1 <rlane1@walmart.com>
547d3dc64f946271ada3cb322fc11738d841da9e
--- package.json @@ -77,7 +77,7 @@ "@walmart/ask-sam-mini-app": "0.41.5", "@walmart/config-components": "3.0.2", "@walmart/counts-component-miniapp": "0.0.34", - "@walmart/exception-mini-app": "0.40.3", + "@walmart/exception-mini-app": "0.40.4", "@walmart/feedback-all-spark-miniapp": "0.3.4", "@walmart/functional-components": "1.0.34", "@walmart/gta-react-native-calendars": "0.0.15",
pinpoint version bump
pinpoint version bump
c9178f789cd542b09c7fb62967437071e11ef9d0
--- package-lock.json @@ -79,7 +79,7 @@ "@walmart/settings-mini-app": "1.10.0", "@walmart/shelfavailability-mini-app": "1.3.2", "@walmart/taskit-mini-app": "0.34.5-beta.9", - "@walmart/time-clock-mini-app": "0.28.0", + "@walmart/time-clock-mini-app": "0.30.0", "@walmart/ui-components": "1.5.0", "@walmart/welcomeme-mini-app": "0.71.0", "@walmart/wfm-ui": "0.2.24", @@ -6757,9 +6757,9 @@ } }, "node_modules/@walmart/time-clock-mini-app": { - "version": "0.28.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.28.0.tgz", - "integrity": "sha512-d6YGhLMXKf5K6oQEWu1n1EGIxKxPCrviCnoG+Ncl5FbWptFWiy837IjneID0tIhmwzhPD8o8uyqi8LjwIFpxQQ==", + "version": "0.30.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.30.0.tgz", + "integrity": "sha512-AWyf0uhy/8Rkpw9jf6+xgU8FaaC0Lo+5paHJEiStoaPQvMv8d+yT5mAJquoU8/S7qlo0hWzR+X+nrMFOtpdzPg==", "dependencies": { "moment-timezone": "0.5.33", "react-query": "^3.26.0", @@ -29871,9 +29871,9 @@ } }, "@walmart/time-clock-mini-app": { - "version": "0.28.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.28.0.tgz", - "integrity": "sha512-d6YGhLMXKf5K6oQEWu1n1EGIxKxPCrviCnoG+Ncl5FbWptFWiy837IjneID0tIhmwzhPD8o8uyqi8LjwIFpxQQ==", + "version": "0.30.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.30.0.tgz", + "integrity": "sha512-AWyf0uhy/8Rkpw9jf6+xgU8FaaC0Lo+5paHJEiStoaPQvMv8d+yT5mAJquoU8/S7qlo0hWzR+X+nrMFOtpdzPg==", "requires": { "moment-timezone": "0.5.33", "react-query": "^3.26.0", --- package.json @@ -121,7 +121,7 @@ "@walmart/settings-mini-app": "1.10.0", "@walmart/shelfavailability-mini-app": "1.3.2", "@walmart/taskit-mini-app": "0.34.5-beta.9", - "@walmart/time-clock-mini-app": "0.28.0", + "@walmart/time-clock-mini-app": "0.30.0", "@walmart/ui-components": "1.5.0", "@walmart/welcomeme-mini-app": "0.71.0", "@walmart/wfm-ui": "0.2.24",
chore: bump timeclock
chore: bump timeclock
714a7078dc68a54c8aed34ce6cb440229056bc55
--- src/images/assets/ask-sam-illustration.png Binary files a/src/images/assets/ask-sam-illustration.png and b/src/images/assets/ask-sam-illustration.png differ --- src/images/assets/ask-sam-illustration@2x.png Binary files a/src/images/assets/ask-sam-illustration@2x.png and /dev/null differ --- src/images/assets/ask-sam-illustration@3x.png Binary files a/src/images/assets/ask-sam-illustration@3x.png and /dev/null differ --- src/images/assets/index.ts @@ -25,6 +25,7 @@ const Images: {[key: string]: ImageURISource} = { MeTab: require('./me-tab.png'), MeTabActive: require('./me-tab-active.png'), MetricsIllustration: require('./team-metrics-illustration.png'), + MyTeamsIllustration: require('./my-teams-illustration.png'), NewMenuIllustration: require('./new-menu-illustration.png'), NoInternet: require('./no-internet.png'), NotificationsIllustration: require('./notifications-illustration.png'), --- src/images/assets/my-teams-illustration.png Binary files /dev/null and b/src/images/assets/my-teams-illustration.png differ
updated images for drop 8
updated images for drop 8
7d180fba252197326502a9ad1c53094f49fd9b18
--- src/screens/ChannelsScreen.tsx @@ -72,6 +72,24 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( }); }; + const getBannerDescription = () => { + if (!userIsInRoster) { + return t('rosterScreen.notInRoster', {siteId: currentUserSite}); + } + + if (!isMessageButtonEnabled) { + t('channelsScreen.textingDisabled.textingUnavailableDescription'); + } + + if (!userIsImpersonatedOnDev) { + t( + 'channelsScreen.textingDisabled.textingUnavailableForImpersonationOnBeta', + ); + } + + return ''; + }; + // Channel name and last message details are not tracked by default. Turning // the subscription on while on the view and off when leaving. useFocusEffect(() => { @@ -105,13 +123,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( ) : ( <TextingDisabledScreen title={t('channelsScreen.textingDisabled.textingUnavailable')} - description={ - !userIsInRoster || !userIsImpersonatedOnDev - ? t('rosterScreen.notInRoster', {siteId: currentUserSite}) - : t( - 'channelsScreen.textingDisabled.textingUnavailableDescription', - ) - } + description={getBannerDescription()} /> )} --- src/translations/en-US.ts @@ -75,6 +75,8 @@ export const enUS = { textingUnavailable: 'Texting unavailable', textingUnavailableDescription: 'Use your company-issued device to \ntext your team', + textingUnavailableForImpersonationOnBeta: + 'You cannot text other associates since you are in impersonation mode', //Todo:This needs to be updated with the appropriate message }, }, newMessageScreen: { --- src/translations/es-MX.ts @@ -75,6 +75,8 @@ export const esMX = { textingUnavailable: 'Envío de mensajes de texto no disponible', textingUnavailableDescription: 'Utiliza el dispositivo de la compañía para enviar \nmensajes de texto a tu equipo', + textingUnavailableForImpersonationOnBeta: + 'No puedes enviar mensajes de texto a otros asociados porque estás en modo de suplantación', //Todo: This needs to updated with the proper translation }, }, newMessageScreen: { --- src/screens/ChannelsScreen.tsx @@ -72,6 +72,24 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( }); }; + const getBannerDescription = () => { + if (!userIsInRoster) { + return t('rosterScreen.notInRoster', {siteId: currentUserSite}); + } + + if (!isMessageButtonEnabled) { + t('channelsScreen.textingDisabled.textingUnavailableDescription'); + } + + if (!userIsImpersonatedOnDev) { + t( + 'channelsScreen.textingDisabled.textingUnavailableForImpersonationOnBeta', + ); + } + + return ''; + }; + // Channel name and last message details are not tracked by default. Turning // the subscription on while on the view and off when leaving. useFocusEffect(() => { @@ -105,13 +123,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = ( ) : ( <TextingDisabledScreen title={t('channelsScreen.textingDisabled.textingUnavailable')} - description={ - !userIsInRoster || !userIsImpersonatedOnDev - ? t('rosterScreen.notInRoster', {siteId: currentUserSite}) - : t( - 'channelsScreen.textingDisabled.textingUnavailableDescription', - ) - } + description={getBannerDescription()} /> )} --- src/translations/en-US.ts @@ -75,6 +75,8 @@ export const enUS = { textingUnavailable: 'Texting unavailable', textingUnavailableDescription: 'Use your company-issued device to \ntext your team', + textingUnavailableForImpersonationOnBeta: + 'You cannot text other associates since you are in impersonation mode', //Todo:This needs to be updated with the appropriate message }, }, newMessageScreen: { --- src/translations/es-MX.ts @@ -75,6 +75,8 @@ export const esMX = { textingUnavailable: 'Envío de mensajes de texto no disponible', textingUnavailableDescription: 'Utiliza el dispositivo de la compañía para enviar \nmensajes de texto a tu equipo', + textingUnavailableForImpersonationOnBeta: + 'No puedes enviar mensajes de texto a otros asociados porque estás en modo de suplantación', //Todo: This needs to updated with the proper translation }, }, newMessageScreen: {
update user is impersonated on the banner
update user is impersonated on the banner
1c378df4698cd91f9f829a77baf5adb95ecb0565
--- package.json @@ -16,7 +16,7 @@ "scripts": { "android": "expo run:android", "build-packages": "yarn workspaces foreach --all --topological-dev run build", - "build": "yarn run build-packages", + "build": "yarn workspaces foreach --all --topological-dev run build", "check-expo-libs": "expo install --check", "certify-booted-sim": "scripts/certifyBootedSim.sh", "coverage": "jest --coverage",
fix: build packages infinite loop
fix: build packages infinite loop
e122ecd488251df161f6d3f515019389d4d10400
--- packages/me-at-walmart-container/src/graphql/index.ts @@ -1,6 +1,6 @@ import {GraphQLClientConfig} from '@walmart/allspark-foundation/GraphQL'; import {IMeAtWalmartEnvironment} from '@walmart/me-at-walmart-common'; -import {AthenaUriLink, ErrorLoggerLink} from './links'; +import {AthenaUriLink, ErrorLoggerLink, TypeRemappingLink} from './links'; import {TypePolicies} from './policies'; export const MeAtWalmartGraphQLConfig = ( @@ -13,7 +13,7 @@ export const MeAtWalmartGraphQLConfig = ( 'Content-Type': 'application/json', }, }, - links: [ErrorLoggerLink, AthenaUriLink], + links: [TypeRemappingLink, ErrorLoggerLink, AthenaUriLink], cacheConfig: {typePolicies: TypePolicies}, persistedQueryConfig: { enabled: env.graphql.persistedQueries, --- packages/me-at-walmart-container/src/graphql/links.ts @@ -5,6 +5,48 @@ import {AllsparkEnvironment} from '@walmart/allspark-foundation/Environment'; import {IMeAtWalmartEnvironment} from '@walmart/me-at-walmart-common'; import {GraphqlLogger} from './logger'; +import {MewAssociate} from './schema.types'; + +// Remap Mew typenames to their counterparts +const handleDailyRoster = (associates: MewAssociate[]) => { + return associates.map((associate) => { + const newAssociate = { + ...associate, + __typename: 'Associate', // was MewAssociate + }; + + if (newAssociate.teams) { + // @ts-ignore - purposely renaming __typename + newAssociate.teams = newAssociate.teams.map((team) => { + const newTeam = { + ...team, + __typename: 'Team', // was MewTeam + }; + + if (newTeam.membership) { + // @ts-ignore - purposely renaming __typename + newTeam.membership = newTeam.membership.map((membership) => ({ + ...membership, + __typename: 'TeamAssociateMapping', // was MewTeamAssociateMapping + })); + } + + return newTeam; + }); + } + + return newAssociate; + }); +}; + +export const TypeRemappingLink = new ApolloLink((operation, forward) => { + return forward(operation).map((data) => { + if (data?.data?.getDailyRoster) { + data.data.getDailyRoster = handleDailyRoster(data.data.getDailyRoster); + } + return data; + }); +}); export const ErrorLoggerLink = onError(({graphQLErrors}) => { if (graphQLErrors) {
revert(graphql config): ALLSPARK-5741 add type remapping link back
revert(graphql config): ALLSPARK-5741 add type remapping link back
d6314fc23292d1f976c26601e58bc82eee0f04b5
--- package-lock.json @@ -52,7 +52,7 @@ "@walmart/emergency-mini-app": "1.25.1", "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.64", - "@walmart/feedback-all-spark-miniapp": "0.9.33", + "@walmart/feedback-all-spark-miniapp": "0.9.41", "@walmart/financial-wellbeing-feature-app": "1.10.4", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", @@ -7274,13 +7274,9 @@ } }, "node_modules/@walmart/feedback-all-spark-miniapp": { - "version": "0.9.40", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.40.tgz", - "integrity": "sha512-+0NvFBHAKpIVTxZWLrQRk/O8o5s2ICxMrFBArzdJmPaXTCVJ8JrXuyOqITBtq9KCjCKnPfymO/BR92f/9VH+8w==", - "dependencies": { - "react-native-image-crop-picker": "^0.38.1", - "react-native-keyboard-aware-scroll-view": "^0.9.5" - }, + "version": "0.9.41", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.41.tgz", + "integrity": "sha512-yDhVeTDHJYx+S+ae+uwkVdErU76dyM8YkJUAzcVieVx9jtyGjbMG0oNcXBFU/8+uZZNDYpbUBlYmKCgVjG67Eg==", "peerDependencies": { "@react-native-async-storage/async-storage": "^1.19.0", "@react-native-community/datetimepicker": "^6.1.3", @@ -30503,13 +30499,9 @@ "integrity": "sha512-xKv+oBGAgXM9+am/1mLmCA+mZBvt2Sx37ZtLQDE3BUZYKCaSo6o+/t+Um85IDXL3JWZkMafpssR0NNVhbTY8/g==" }, "@walmart/feedback-all-spark-miniapp": { - "version": "0.9.40", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.40.tgz", - "integrity": "sha512-+0NvFBHAKpIVTxZWLrQRk/O8o5s2ICxMrFBArzdJmPaXTCVJ8JrXuyOqITBtq9KCjCKnPfymO/BR92f/9VH+8w==", - "requires": { - "react-native-image-crop-picker": "^0.38.1", - "react-native-keyboard-aware-scroll-view": "^0.9.5" - } + "version": "0.9.41", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.41.tgz", + "integrity": "sha512-yDhVeTDHJYx+S+ae+uwkVdErU76dyM8YkJUAzcVieVx9jtyGjbMG0oNcXBFU/8+uZZNDYpbUBlYmKCgVjG67Eg==" }, "@walmart/financial-wellbeing-feature-app": { "version": "1.10.4", --- package.json @@ -93,7 +93,7 @@ "@walmart/emergency-mini-app": "1.25.1", "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.64", - "@walmart/feedback-all-spark-miniapp": "0.9.33", + "@walmart/feedback-all-spark-miniapp": "0.9.41", "@walmart/financial-wellbeing-feature-app": "1.10.4", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16",
feedback mini app version bump
feedback mini app version bump
fd4e584a277ea9c937f21b302ab4ccd18b71ae61
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 77 + versionCode 78 versionName "1.0.5" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>77</string> + <string>78</string> <key>LSApplicationQueriesSchemes</key> <array> <string>invmgmt</string> @@ -42,7 +42,7 @@ <string>awbs</string> </array> <key>LSRequiresIPhoneOS</key> - <true/> + <true /> <key>NSAppTransportSecurity</key> <dict> <key>NSExceptionDomains</key> @@ -50,14 +50,14 @@ <key>i5.walmartimages.com</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> + <true /> <key>NSIncludesSubdomains</key> - <true/> + <true /> </dict> <key>localhost</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> + <true /> </dict> </dict> </dict> @@ -108,7 +108,7 @@ <string>armv7</string> </array> <key>UIRequiresFullScreen</key> - <true/> + <true /> <key>UISupportedInterfaceOrientations</key> <array> <string>UIInterfaceOrientationPortrait</string> @@ -116,7 +116,7 @@ <key>UIUserInterfaceStyle</key> <string>Light</string> <key>UIViewControllerBasedStatusBarAppearance</key> - <false/> + <false /> <key>WMKits</key> <dict> <key>team-id</key>
Incrementing build number
Incrementing build number
5f5abfd93afb96f095bc1403b9650df91540e167
--- package-lock.json @@ -3032,9 +3032,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.10.29", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.10.29.tgz", - "integrity": "sha512-SI1QpKEzQOkt4vRovF9q7jibNahBImeKkMCNkLAcYLUnAthTAI+Hx5vMcOARzVHp4nWyWDylENttbqcGUk1rcA==", + "version": "0.10.30", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.10.30.tgz", + "integrity": "sha512-ByYCZxifajBYitfJjkLfrv6z+N+tmcNAGxRJNbkMILBN+O8CYy6WHOVIYoqoSXh3yQQBvkeKgyVbOa1T530ziQ==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", @@ -12172,9 +12172,9 @@ "integrity": "sha512-l457wv7gYXSRnm38AH+NpCgKYa1zxxfN0EL8mTBxo+TnasXtk0FZ86zWDLhm4eqpcSH8xpT/+z2MQrATfqCaoA==" }, "react-native-error-boundary": { - "version": "1.1.6", - "resolved": "https://npme.walmart.com/react-native-error-boundary/-/react-native-error-boundary-1.1.6.tgz", - "integrity": "sha512-IqNcD0Qigx2Dk4fP+OcTYLH8XjbijPEmLZqCh2flLijUkEo8G/D151tRcUV6DHU0IL0ZHOB+/wF2kEUT+liPdg==" + "version": "1.1.7", + "resolved": "https://npme.walmart.com/react-native-error-boundary/-/react-native-error-boundary-1.1.7.tgz", + "integrity": "sha512-/JOztxlyhPOojj0WRmckx0AE3DVUee6xP55gh1jTnJieZILG7/jPz+VPCg0zslOy6VABf5rp4KRnoEJPjLnclA==" }, "react-native-fast-image": { "version": "8.3.4", --- package.json @@ -50,7 +50,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.25", "@walmart/allspark-home-mini-app": "0.1.11", "@walmart/allspark-me-mini-app": "0.0.22", - "@walmart/ask-sam-mini-app": "0.10.29", + "@walmart/ask-sam-mini-app": "0.10.30", "@walmart/config-components": "1.0.12", "@walmart/feedback-all-spark-miniapp": "0.0.37", "@walmart/functional-components": "1.0.24",
update to send requestId to feedback endpoint (#397)
update to send requestId to feedback endpoint (#397)
45afe66dca8507dc44c600cb7126a181d9ee0cce
--- package-lock.json @@ -43,7 +43,7 @@ "@walmart/attendance-mini-app": "0.190.4", "@walmart/compass-sdk-rn": "4.2.0", "@walmart/config-components": "4.2.1", - "@walmart/copilot-mini-app": "^1.77.6", + "@walmart/copilot-mini-app": "^1.77.7", "@walmart/core-services": "~2.1.1", "@walmart/core-services-allspark": "~2.11.1", "@walmart/core-utils": "~2.0.5", @@ -7030,9 +7030,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "1.77.6", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.6.tgz", - "integrity": "sha512-/xIMiOFDYzCS/pmLL28O9fJS8WO1wsS4+qLjYeo5bjJVSxxtV1rDZHdqNc8BJmGV9Lh7A79REyKoFKSKNsZMvQ==", + "version": "1.77.7", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.7.tgz", + "integrity": "sha512-QkbEgzGNrG6m9j7URKlbKxJW5CReifTJkzepvspZTPOmGitkI7cda3f/OXQAaiDUcpwHNbrZeNfKwTRP9t7UaQ==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -30415,9 +30415,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "1.77.6", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.6.tgz", - "integrity": "sha512-/xIMiOFDYzCS/pmLL28O9fJS8WO1wsS4+qLjYeo5bjJVSxxtV1rDZHdqNc8BJmGV9Lh7A79REyKoFKSKNsZMvQ==" + "version": "1.77.7", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.77.7.tgz", + "integrity": "sha512-QkbEgzGNrG6m9j7URKlbKxJW5CReifTJkzepvspZTPOmGitkI7cda3f/OXQAaiDUcpwHNbrZeNfKwTRP9t7UaQ==" }, "@walmart/core-services": { "version": "2.1.1", --- package.json @@ -84,7 +84,7 @@ "@walmart/attendance-mini-app": "0.190.4", "@walmart/compass-sdk-rn": "4.2.0", "@walmart/config-components": "4.2.1", - "@walmart/copilot-mini-app": "1.77.6", + "@walmart/copilot-mini-app": "1.77.7", "@walmart/core-services": "~2.1.1", "@walmart/core-services-allspark": "~2.11.1", "@walmart/core-utils": "~2.0.5",
chore: bump copilot@1.77.7
chore: bump copilot@1.77.7
194db609ebeaa90e3b3931c22f2f404e1bfbeb52
--- packages/associate-exp-hub-mini-app/src/types/api/team.types.ts @@ -55,12 +55,11 @@ export type TeamImage = { }; export type EnrichedStoreAssociateTeam = StoreAssociateTeam & { - areaDepartments: AreaDepartments; + areaDepartments?: AreaDepartments; teamImage: TeamImage; }; export type EnrichedSupplyChainTeam = SupplyChainTeam & { - areaDepartments: AreaDepartments; teamImage: TeamImage; };
feat(ui): lint fix
feat(ui): lint fix
a530633819ab3dbd8ae00ee94e20da6225e3c7ef
--- package-lock.json @@ -4277,9 +4277,9 @@ "integrity": "sha512-0M7ySb3F2lKlIfwBosm+Slx3kJvdoEHm5haaZ05WKCJ1hctu0F0CzTGDSbZciXWX92HJBmxvsvr8yi2H435R8g==" }, "@walmart/ims-print-services-ui": { - "version": "0.1.22", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-0.1.22.tgz", - "integrity": "sha512-Vpwrt460LPca7ZGjDrDezorVnr+WebRntHaUGkAhIDVVfna0P3wyJcRnr18/hged+q/3f6NmYfZgB3ZaGxGlgg==" + "version": "0.1.24", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-0.1.24.tgz", + "integrity": "sha512-k7tYJCXRVqw+59pK4eSZ80LKwWxz7Xfp6JbeWXELDTCRfWJ66OuhQqx25GFtyIBjZm1g8eNLvR6wiBHvzUKxvg==" }, "@walmart/inbox-mini-app": { "version": "0.35.0", @@ -4287,9 +4287,9 @@ "integrity": "sha512-f2Y0d8Cmu7N6gvO8c5985AWYZ5kXI83cH6P7tN/ojgrJEcLFPAD/D8+YVVO4kyIQxydDcLGNDbZt3K3xxe1sDQ==" }, "@walmart/iteminfo-mini-app": { - "version": "4.1.3", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-4.1.3.tgz", - "integrity": "sha512-cKasUC/cFqbmLW0fVX5tl7sv74QXz5fKGAemAuqmcVic/0HETb56z0Us1aMBc9PjiOvwHtSf2+1lAtJcIzslLw==" + "version": "4.1.4", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-4.1.4.tgz", + "integrity": "sha512-c1bH1/+/C5xxehOVy4a7C7inXCmweHBDl2HdYaSzErZvo5ESKC4KPgfQqFrUgFdJ+umP0F6PEblv4kWB4lIH1A==" }, "@walmart/manager-approvals-miniapp": { "version": "0.0.59", --- package.json @@ -83,9 +83,9 @@ "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.2.0", "@walmart/impersonation-mini-app": "1.0.27", - "@walmart/ims-print-services-ui": "0.1.22", + "@walmart/ims-print-services-ui": "0.1.24", "@walmart/inbox-mini-app": "0.35.0", - "@walmart/iteminfo-mini-app": "4.1.3", + "@walmart/iteminfo-mini-app": "4.1.4", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.7.65", "@walmart/moment-walmart": "1.0.4",
Item info multiple minor fixes
Item info multiple minor fixes
0ab94b2a3de33175f95b3875d6dfa40720ad3412
--- 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.4.0", + "@walmart/impersonation-mini-app": "1.6.0", "@walmart/ims-print-services-ui": "1.2.0", "@walmart/inbox-mini-app": "0.73.0", "@walmart/iteminfo-mini-app": "5.3.1", @@ -5126,9 +5126,9 @@ } }, "node_modules/@walmart/gtp-shared-components": { - "version": "2.0.0-rc.1", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.0.0-rc.1.tgz", - "integrity": "sha512-oI+0BvpRb4anUV7DF4hRz572U9AGp4wQF3kD1snDNos24G6vX3fCul2FDpCirlYl9lX3a5O8qQsICt03CNov4A==", + "version": "2.0.0-rc.2", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.0.0-rc.2.tgz", + "integrity": "sha512-f/m/bEd6BasW2xTK8AO+/JePzwUa7gGg6GXufXIS6ujHu/pbU77BnXJ4F1OLJ6iDqlXc+3TcTx0BoVNPVfiCqQ==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -5172,9 +5172,12 @@ "license": "UNLICENSED" }, "node_modules/@walmart/impersonation-mini-app": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.4.0.tgz", - "integrity": "sha512-vOHw5n1Add02n7GazeXNpwaoZhnEEMZrEVPwey4kT/jRpuuBnv1w0XJZBIH/BgqtYSrqsH0zMB05YnSUP2ypaA==", + "version": "1.6.0", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.6.0.tgz", + "integrity": "sha512-aeUFmSRYeCkhKL+8w5kC78K23akQlu0q6Nk5nk/Lq+IfhCNYgKUf3MgywUmW8F1KjKOeEEOqwmnb1/T4twehMQ==", + "dependencies": { + "@walmart/gtp-shared-components": "1.8.18" + }, "peerDependencies": { "@react-native-community/masked-view": ">=0.1.10", "@react-native-community/picker": ">=1.8.1", @@ -5192,6 +5195,29 @@ "react-redux": ">=7.2.0" } }, + "node_modules/@walmart/impersonation-mini-app/node_modules/@livingdesign/tokens": { + "version": "0.41.0", + "resolved": "https://npme.walmart.com/@livingdesign/tokens/-/tokens-0.41.0.tgz", + "integrity": "sha512-lUfen6iHPD28xJTew6Hc/N8LsG8Bwww2w7OG6Ug3rhDMncFqrRXcKMD5qws5xWgyhdNqmPQPq3mRyrTfMBH8hA==", + "license": "UNLICENSED" + }, + "node_modules/@walmart/impersonation-mini-app/node_modules/@walmart/gtp-shared-components": { + "version": "1.8.18", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.18.tgz", + "integrity": "sha512-zqS4CO+Q8AtwlOp2sTq70Lq3I0xgDK+P/Myrx1oimnMUh/nn1cvDy0M8dDbKCnWYeYAQjk6gCKv4gpJoQL1pDA==", + "license": "Apache-2.0", + "dependencies": { + "@livingdesign/tokens": "^0.41.0", + "lodash": "^4.17.15", + "moment": "^2.29.4" + }, + "peerDependencies": { + "@react-native-community/datetimepicker": "*", + "@react-native-picker/picker": "*", + "react": "*", + "react-native": "*" + } + }, "node_modules/@walmart/ims-print-services-ui": { "version": "1.2.0", "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-1.2.0.tgz", @@ -24939,9 +24965,9 @@ } }, "@walmart/gtp-shared-components": { - "version": "2.0.0-rc.1", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.0.0-rc.1.tgz", - "integrity": "sha512-oI+0BvpRb4anUV7DF4hRz572U9AGp4wQF3kD1snDNos24G6vX3fCul2FDpCirlYl9lX3a5O8qQsICt03CNov4A==", + "version": "2.0.0-rc.2", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.0.0-rc.2.tgz", + "integrity": "sha512-f/m/bEd6BasW2xTK8AO+/JePzwUa7gGg6GXufXIS6ujHu/pbU77BnXJ4F1OLJ6iDqlXc+3TcTx0BoVNPVfiCqQ==", "requires": { "@livingdesign/tokens": "0.61.0", "@walmart/gtp-shared-icons": "1.0.5", @@ -24969,9 +24995,29 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.4.0.tgz", - "integrity": "sha512-vOHw5n1Add02n7GazeXNpwaoZhnEEMZrEVPwey4kT/jRpuuBnv1w0XJZBIH/BgqtYSrqsH0zMB05YnSUP2ypaA==" + "version": "1.6.0", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.6.0.tgz", + "integrity": "sha512-aeUFmSRYeCkhKL+8w5kC78K23akQlu0q6Nk5nk/Lq+IfhCNYgKUf3MgywUmW8F1KjKOeEEOqwmnb1/T4twehMQ==", + "requires": { + "@walmart/gtp-shared-components": "1.8.18" + }, + "dependencies": { + "@livingdesign/tokens": { + "version": "0.41.0", + "resolved": "https://npme.walmart.com/@livingdesign/tokens/-/tokens-0.41.0.tgz", + "integrity": "sha512-lUfen6iHPD28xJTew6Hc/N8LsG8Bwww2w7OG6Ug3rhDMncFqrRXcKMD5qws5xWgyhdNqmPQPq3mRyrTfMBH8hA==" + }, + "@walmart/gtp-shared-components": { + "version": "1.8.18", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.18.tgz", + "integrity": "sha512-zqS4CO+Q8AtwlOp2sTq70Lq3I0xgDK+P/Myrx1oimnMUh/nn1cvDy0M8dDbKCnWYeYAQjk6gCKv4gpJoQL1pDA==", + "requires": { + "@livingdesign/tokens": "^0.41.0", + "lodash": "^4.17.15", + "moment": "^2.29.4" + } + } + } }, "@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.4.0", + "@walmart/impersonation-mini-app": "1.6.0", "@walmart/ims-print-services-ui": "1.2.0", "@walmart/inbox-mini-app": "0.73.0", "@walmart/iteminfo-mini-app": "5.3.1",
impersonation temp fix with gtp upgrade
impersonation temp fix with gtp upgrade
ccee318ce3d2b6fad933f99a8c97f9786c40f177
--- __tests__/__mocks__/@walmart/push-to-talk-mini-app.js @@ -19,6 +19,7 @@ module.exports = { useVMBadgesCount: jest.fn(() => [0]), useTextMessages: jest.fn(), useTextBadgesCount: jest.fn(() => [0]), + useUnreadMessageCount: jest.fn(() => [0]), }, Providers: { ConversationProvider: 'ConversationProvider', --- __tests__/navigation/AssociateHallwayNav/SideMenuContentTest.tsx @@ -30,9 +30,12 @@ jest.mock('../../../src/hooks', () => ({ useCanImpersonate: jest.fn(), })); -(Hooks.useTextMessages as jest.Mock).mockReturnValue({ - getUnreadCountForAllChannels: jest.fn().mockReturnValue(1), -}); +jest.mock('@walmart/push-to-talk-mini-app', () => ({ + PushToTalkMiniApp: 'PushToTalkMiniApp', + Hooks: { + useUnreadMessageCount: jest.fn((_) => [1]), + }, +})); const mockUseDrawerStatus = (useDrawerStatus as jest.Mock).mockReturnValue( 'open', @@ -67,7 +70,6 @@ const navConfig = [ ]; const setShowDialog = jest.fn(); -const setUnreadMessagesCount = jest.fn(); const baseProps = { navigation: { navigate: jest.fn(), @@ -92,24 +94,12 @@ describe('SideMenuContent', () => { mockUseSelector.mockReturnValueOnce({highPriorityCount: 0}); // taskBadge mockUseSelector.mockReturnValueOnce(true); mockUseState.mockReturnValueOnce([false, setShowDialog]); - mockUseState.mockReturnValueOnce([0, setUnreadMessagesCount]); + (Hooks.useUnreadMessageCount as jest.Mock).mockReturnValueOnce([0]); let component; act(() => { component = create(<SideMenuContent {...baseProps} />); }); - it('matches snapshot with not user/clockstatus data', () => { - expect(component.toJSON()).toMatchSnapshot(); - expect(WmTelemetry.logEvent).toHaveBeenCalledWith( - 'global_navigation', - 'closed', - { - composite_app: appJson.displayName, - }, - ); - expect(setUnreadMessagesCount).toHaveBeenCalledWith(1); - }); - it('matches snapshot with user/clockstatus data', () => { mockUseDrawerStatus.mockReturnValue('open'); mockUseCanImpersonate.mockReturnValue(false); @@ -125,7 +115,7 @@ describe('SideMenuContent', () => { mockUseSelector.mockReturnValueOnce({highPriorityCount: 1}); // taskBadge mockUseSelector.mockReturnValueOnce(true); mockUseState.mockReturnValueOnce([false, setShowDialog]); - mockUseState.mockReturnValueOnce([0, setUnreadMessagesCount]); + (Hooks.useUnreadMessageCount as jest.Mock).mockReturnValueOnce([0]); act(() => { component.update(<SideMenuContent {...baseProps} />); }); @@ -239,7 +229,7 @@ describe('SideMenuContent', () => { mockUseSelector.mockReturnValueOnce({highPriorityCount: 0}); // taskBadge mockUseSelector.mockReturnValueOnce(true); mockUseState.mockReturnValueOnce([false, setShowDialog]); - mockUseState.mockReturnValueOnce([0, setUnreadMessagesCount]); + (Hooks.useUnreadMessageCount as jest.Mock).mockReturnValueOnce([0]); act(() => { component.update(<SideMenuContent {...baseProps} />); }); --- __tests__/navigation/AssociateHallwayNav/__snapshots__/SideMenuContentTest.tsx.snap @@ -87,93 +87,6 @@ exports[`SideMenuContent matches snapshot for undefined user info, and can imper </SafeAreaView> `; -exports[`SideMenuContent matches snapshot with not user/clockstatus data 1`] = ` -<SafeAreaView - edges={ - Array [ - "top", - ] - } - style={ - Object { - "backgroundColor": "#002d58", - "flex": 1, - "overflow": "hidden", - } - } -> - <GlobalNavigation - appId="test" - baseURL="" - clockIn={false} - defaultLocale="en-US" - developersText="impersonation.developers" - deviceType="PERSONAL" - displayName="Sam Walton" - enableDevelopersOption={false} - enablePttAlert={0} - enableTaskItAlert={false} - enableTimeClock={true} - error={false} - errorText="menu.errorText" - globalNavConfig={ - Array [ - Object { - "action": Object { - "type": "NAVIGATE", - "value": "Settings", - }, - "enabled": true, - "icon": "settings", - "menuType": "SUBMENU", - "title": "Settings", - }, - ] - } - loading={true} - loadingText="menu.loadingText" - locale="en-US" - nameInitials="SW" - navigate={[Function]} - onDevelopersOptionClick={[Function]} - onDrawerClose={[Function]} - onPressTimeClock={[Function]} - onRetry={[Function]} - onSignOut={[Function]} - quickActionData={ - Array [ - Object { - "action": Object { - "type": "NAVIGATE", - "value": "Settings", - }, - "enabled": true, - "icon": "settings", - "menuType": "SUBMENU", - "title": "Settings", - }, - ] - } - retryText="menu.retryText" - showDefaultNav={false} - showInboxBadge={false} - signOutText="menu.signOutText" - siteId={0} - testID="globalNav" - /> - <Dialog - headerText="signoutDialog.title" - onClose={[Function]} - primaryButtonPress={[Function]} - primaryButtonText="signoutDialog.signOutButtonText" - secondaryButtonPress={[Function]} - secondaryButtonText="signoutDialog.cancelButtonText" - testID="signoutDialog" - visible={false} - /> -</SafeAreaView> -`; - exports[`SideMenuContent matches snapshot with user/clockstatus data 1`] = ` <SafeAreaView edges={ --- src/navigation/AssociateHallwayNav/SideMenuContent.tsx @@ -49,7 +49,6 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( const [translate, i18n] = useTranslation('common'); const drawerStatus = useDrawerStatus(); const canImpersonate = useCanImpersonate(); - const {getUnreadCountForAllChannels} = PTTHooks.useTextMessages(); const badgesCount = useSelector(getInboxBadgeCount); const user = useSelector(UserSelectors.getUser); const clockedIn = useSelector(ClockStatusSelectors.getIsClockedIn); @@ -64,7 +63,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( ClockAppSelectors.getIsTimeClockFetureEnabled, ); const [showDialog, setShowDialog] = useState(false); - const [unreadMessagesCount, setUnreadMessagesCount] = useState(0); + const [unreadMessageCount] = PTTHooks.useUnreadMessageCount(0); useEffect(() => { if (drawerStatus === 'open') { @@ -78,11 +77,6 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( } }, [drawerStatus]); - useEffect(() => { - setUnreadMessagesCount(getUnreadCountForAllChannels()); - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); - const onDrawerClose = () => { navigation.dispatch(DrawerActions.closeDrawer()); }; @@ -163,7 +157,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( onRetry={onRetry} enableTaskItAlert={!!highPriorityCount} showInboxBadge={!!badgesCount} - enablePttAlert={unreadMessagesCount} + enablePttAlert={unreadMessageCount} enableTimeClock={getIsClockingEnabled} />
Revert "Revert "feat: adding message and channel count (SMDV-2612)""
Revert "Revert "feat: adding message and channel count (SMDV-2612)"" This reverts commit 24e1edc4a3f293632db75849a6348f57255b48c1.
f81aeab8aab68ad1aeebe5904c72cedb0b6e1ad3
--- package-lock.json @@ -12639,9 +12639,9 @@ "integrity": "sha512-zTOSJ7BMbGHaqAF8+LDQI/s5winKcxsHSe4hv49gUbfDz19v71apgNchz31W1D2UQP+kNgrglrmCdmr5RdI8mw==" }, "react-native-wm-voice-text": { - "version": "0.3.1", - "resolved": "https://npme.walmart.com/react-native-wm-voice-text/-/react-native-wm-voice-text-0.3.1.tgz", - "integrity": "sha512-vTFlR8FBzPDWlqFwK3KB3Gj8zCQSF79Uk0OhOaneCrL65v7TmqoydhftaxCb+kDVre20FfRCiFP+uYK9QG+2qA==" + "version": "0.4.1", + "resolved": "https://npme.walmart.com/react-native-wm-voice-text/-/react-native-wm-voice-text-0.4.1.tgz", + "integrity": "sha512-R/wxnch7BptfSG0Lddh2Bjg+9VARzKPDmgL9BJfGU2UNLZwntJUkbLg5cAB0CR0VnJ8j5CktMJJ+foIZvwPFwg==" }, "react-redux": { "version": "7.2.2", --- package.json @@ -134,7 +134,7 @@ "react-native-wm-network": "^0.1.0", "react-native-wm-notification": "^1.0.0", "react-native-wm-telemetry": "^0.3.0", - "react-native-wm-voice-text": "^0.3.0", + "react-native-wm-voice-text": "0.4.1", "react-redux": "^7.2.1", "redux": "^4.0.5", "redux-devtools-extension": "^2.13.8",
adding new version of voice to text library with crash fix
adding new version of voice to text library with crash fix
32205858f27d690d2b58b2d8c7ff982fe9386649
--- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.2.7-alpha.6", + "version": "1.2.7-alpha.7", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation-hub/src/Shared/Components/TeamListItem/TeamListItem.tsx @@ -5,36 +5,44 @@ import { Body, Checkbox, ChevronRightIcon, + Tag, } from '@walmart/gtp-shared-components'; -import { StoreImages as Images } from '../../../Shared'; import { TeamListItemProps } from './types'; import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context'; import { LoggerService } from '@walmart/allspark-foundation/Logger'; import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry'; import { useSelector } from 'react-redux'; import { + primaryTeamChipEnabled, teamImageEnabled, teamSelectionCheckboxEnabled, teamSelectionNavArrowEnabled, } from '../../../Store/Redux'; +import { useUserPersonaType } from '../../Hooks/useUserPersonaType'; +import { StoreImages, SupplyChainImages } from '../../Images'; -//TODO: Remove primary team auto select logic export const TeamListItem = ({ checkboxDisabled, iconType, + isLastListItem, isSelected, + isPrimaryTeam, + primaryTeamText, subText, teamName, teamId, handlePress, + domain = 'store', }: TeamListItemProps) => { const styles = useMemo( - () => teamSelectionListItemStyles(Boolean(subText)), - [subText] + () => teamSelectionListItemStyles(!isLastListItem, Boolean(subText)), + [isLastListItem, subText] ); const TeamImage = useAllsparkImage(); const logger = LoggerService.getContainerInstance(); const telemetryService = useTelemetryService(); + const personaType = useUserPersonaType(); + const showPrimaryTeamChip = useSelector(primaryTeamChipEnabled); const showTeamSelectionCheckbox = useSelector(teamSelectionCheckboxEnabled); const showTeamSelectionNavArrow = useSelector(teamSelectionNavArrowEnabled); const showTeamImage = useSelector(teamImageEnabled); @@ -48,11 +56,20 @@ export const TeamListItem = ({ <View style={styles.teamOuterContainer}> {showTeamImage ? ( <TeamImage - resizeMode='contain' + resizeMode='cover' source={{ - uri: Images['0000000'].uri, + uri: + domain === 'store' + ? StoreImages[teamId ?? teamName]?.uri || + StoreImages['0000000'].uri + : SupplyChainImages[teamId ?? teamName]?.uri || + SupplyChainImages['0000000'].uri, }} - placeholder={Images['0000000']?.blurhash} + placeholder={ + domain === 'store' + ? StoreImages[teamId ?? teamName]?.blurhash + : SupplyChainImages[teamId ?? teamName]?.blurhash + } style={styles.teamImage} onError={(error) => { logger.error('ImageFailure', { @@ -62,6 +79,7 @@ export const TeamListItem = ({ message: 'Image failure', teamId: teamId, teamName: teamName, + personaType: personaType, }); }} /> @@ -79,6 +97,21 @@ export const TeamListItem = ({ </View> </View> <View style={styles.iconContainer}> + {showPrimaryTeamChip && isPrimaryTeam && ( + <Tag + accessibilityLabel={primaryTeamText} + color='blue' + UNSAFE_style={styles.primaryTeamContainer} + variant='tertiary' + > + <Body + UNSAFE_style={styles.primaryTeamText} + testID='teamlist-primaryteam' + > + {primaryTeamText} + </Body> + </Tag> + )} {showTeamSelectionCheckbox && iconType === 'checkbox' && ( <Checkbox accessibilityState={{ @@ -86,6 +119,7 @@ export const TeamListItem = ({ disabled: checkboxDisabled, }} checked={isSelected} + disabled={checkboxDisabled} testID={`team-selection-checkbox-${teamName}`} onPress={handlePress} /> --- packages/allspark-foundation-hub/src/Shared/Components/TeamListItem/styles.ts @@ -1,18 +1,20 @@ import { StyleSheet } from 'react-native'; import { colors } from '@walmart/gtp-shared-components/dist'; -export const teamSelectionListItemStyles = (hasSubText?: boolean) => +export const teamSelectionListItemStyles = ( + hasBorder: boolean, + hasSubText?: boolean +) => StyleSheet.create({ container: { display: 'flex', paddingTop: 16, paddingBottom: 16, - marginLeft: 16, - marginRight: 16, justifyContent: 'space-between', alignItems: 'center', flexDirection: 'row', borderBottomColor: colors.gray['20'], + borderBottomWidth: hasBorder ? 1 : 0, backgroundColor: colors.white, }, teamOuterContainer: { @@ -24,9 +26,8 @@ export const teamSelectionListItemStyles = (hasSubText?: boolean) => teamImage: { alignSelf: 'flex-start', height: 32, - width: 32, - backgroundColor: colors.blue['20'], - borderRadius: 16, + width: 36, + justifyContent: 'flex-start', }, teamInnerContainer: { display: 'flex', --- packages/allspark-foundation-hub/src/Shared/Components/TeamListItem/types.ts @@ -9,4 +9,5 @@ export interface TeamListItemProps { teamName: string; teamId: string; handlePress?: () => void; + domain?: 'store' | 'supplyChain'; } --- packages/allspark-foundation-hub/src/SupplyChain/Hub/index.ts @@ -1 +1,2 @@ export * from './SiteHubDashboard'; +export * from './types';
Update the site hub dashbaord changes
Update the site hub dashbaord changes
8d4736977d5bb4961a22de617f153e72a15fd3ec
--- package.json @@ -111,7 +111,7 @@ "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.11.1", "@walmart/inbox-mini-app": "0.93.28", - "@walmart/iteminfo-mini-app": "7.13.0", + "@walmart/iteminfo-mini-app": "7.13.1", "@walmart/learning-mini-app": "20.0.21", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-at-walmart-athena-queries": "6.1.4", --- yarn.lock @@ -6309,9 +6309,9 @@ __metadata: languageName: node linkType: hard -"@walmart/iteminfo-mini-app@npm:7.13.0": - version: 7.13.0 - resolution: "@walmart/iteminfo-mini-app@npm:7.13.0" +"@walmart/iteminfo-mini-app@npm:7.13.1": + version: 7.13.1 + resolution: "@walmart/iteminfo-mini-app@npm:7.13.1" peerDependencies: "@react-navigation/drawer": ">=6.3.0" "@react-navigation/native": ">=6.0.0" @@ -6352,7 +6352,7 @@ __metadata: reselect: ">=4.1.0" uuid: ">=3.3.2" victory-native: ">=36.5.0" - checksum: 10c0/5ef2fb32c8f2fd3e52b2ad494e233b17992b51dbe62a9daeb8e36159841b80cef12293c9011a55bcb56a6ee2b4917e98bfe90d35fd6003359df7978bfbbad3df + checksum: 10c0/09c97bc03d3b8a8ee498c3633a0b5302f55dc60f3bf18ce1264b8535357e65da991d0e7242b97e7cd61b570765192e8748b55b3a928f9ae64b2ce69997dfe185 languageName: node linkType: hard @@ -7751,7 +7751,7 @@ __metadata: "@walmart/impersonation-mini-app": "npm:1.20.8" "@walmart/ims-print-services-ui": "npm:2.11.1" "@walmart/inbox-mini-app": "npm:0.93.28" - "@walmart/iteminfo-mini-app": "npm:7.13.0" + "@walmart/iteminfo-mini-app": "npm:7.13.1" "@walmart/learning-mini-app": "npm:20.0.21" "@walmart/manager-approvals-miniapp": "npm:0.2.4" "@walmart/me-at-walmart-athena-queries": "npm:6.1.4"
bump up iteminfo for drop 23
bump up iteminfo for drop 23
72821b0dccd44a88b4fc1e1762c244ccb8d0b67e
--- package.json @@ -90,7 +90,7 @@ "@walmart/exception-mini-app": "0.43.1", "@walmart/facilities-management-miniapp": "0.3.26", "@walmart/feedback-all-spark-miniapp": "0.9.0", - "@walmart/financial-wellbeing-feature-app": "1.0.63", + "@walmart/financial-wellbeing-feature-app": "1.0.64", "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.8.17",
bumped financial-wellbeing-feature-app to 1.0.64
bumped financial-wellbeing-feature-app to 1.0.64
89d1bde9305a71cd6ee04fb5e8265d6e0a4ce683
--- package.json @@ -104,7 +104,7 @@ "@walmart/iteminfo-mini-app": "7.4.0", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "13.0.3", - "@walmart/metrics-mini-app": "0.15.4", + "@walmart/metrics-mini-app": "0.15.5", "@walmart/mod-flex-mini-app": "1.10.4", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16",
metrics version bump
metrics version bump
950cd8bb23a8f9cf3272bc7f89be5ad4dfb06e50
--- graphql.yml @@ -103,50 +103,50 @@ applications: queryTemplate: "src/common/queries/upsertSupplyChainAssociatePreference.graphql" tags: - "v1" - - name: "prod" - persistedQueries: - - name: "getStoreAssociateTeamPreference" - hash: "1e18943c5d1c8767cbe580cda967e568ce70a9cb2482003139014a8e88ccede5" - queryTemplate: "src/common/queries/getStoreAssociateTeamPreference.graphql" - tags: - - "v1" - - name: "getSupplyChainAssociateTeamPreference" - hash: "f791b78f4a290a25a523e50d76e0ee3dcb44508a6824b111e15aeecc63ac0052" - queryTemplate: "src/common/queries/getSupplyChainAssociateTeamPreference.graphql" - tags: - - "v1" - - name: "getSupplyChainShifts" - hash: "9e0e9437569e9f80611fa57786bb96d34f753c3cf0fdfa0ba1f6f22a21c2383b" - queryTemplate: "src/common/queries/getSupplyChainShifts.graphql" - tags: - - "v1" - - name: "getSupplyChainTeamById" - hash: "d32776219afbb11ff8a4b74a179a1ce6374e50758ed1d081481ca3db5bc56bb1" - queryTemplate: "src/common/queries/getSupplyChainTeamById.graphql" - tags: - - "v1" - - name: "getSupplyChainTeamsBySite" - hash: "2952687fc08ad7426c329b19272b75b387d7237a5dda898f337b4b48d8958cf5" - queryTemplate: "src/common/queries/getSupplyChainTeamsBySite.graphql" - tags: - - "v1" - - name: "getStoreTeamById" - hash: "3d72aa00de7767143a2d6c50dd586f685ad1ad038556574a99a944ed4290ae28" - queryTemplate: "src/common/queries/getTeamById.graphql" - tags: - - "v1" - - name: "getTeamsByStore" - hash: "49da730c0bc1d293da071814f3d7506a7daf865110898f8d5e92f6c41a9ac8d1" - queryTemplate: "src/common/queries/getTeamsByStore.graphql" - tags: - - "v1" - - name: "upsertStoreAssociatePreference" - hash: "ece5e7fa9951764fa7d520a07b6faeb8d8797b75badb4275344643ecdf29a619" - queryTemplate: "src/common/queries/upsertStoreAssociatePreference.graphql" - tags: - - "v1" - - name: "upsertSupplyChainAssociatePreference" - hash: "39c45936c3b4d0020c6192b629c29860a30a5f2f70c5297c9e34dcffbaa0c7b0" - queryTemplate: "src/common/queries/upsertSupplyChainAssociatePreference.graphql" - tags: - - "v1" + # - name: "prod" + # persistedQueries: + # - name: "getStoreAssociateTeamPreference" + # hash: "1e18943c5d1c8767cbe580cda967e568ce70a9cb2482003139014a8e88ccede5" + # queryTemplate: "src/common/queries/getStoreAssociateTeamPreference.graphql" + # tags: + # - "v1" + # - name: "getSupplyChainAssociateTeamPreference" + # hash: "f791b78f4a290a25a523e50d76e0ee3dcb44508a6824b111e15aeecc63ac0052" + # queryTemplate: "src/common/queries/getSupplyChainAssociateTeamPreference.graphql" + # tags: + # - "v1" + # - name: "getSupplyChainShifts" + # hash: "9e0e9437569e9f80611fa57786bb96d34f753c3cf0fdfa0ba1f6f22a21c2383b" + # queryTemplate: "src/common/queries/getSupplyChainShifts.graphql" + # tags: + # - "v1" + # - name: "getSupplyChainTeamById" + # hash: "d32776219afbb11ff8a4b74a179a1ce6374e50758ed1d081481ca3db5bc56bb1" + # queryTemplate: "src/common/queries/getSupplyChainTeamById.graphql" + # tags: + # - "v1" + # - name: "getSupplyChainTeamsBySite" + # hash: "2952687fc08ad7426c329b19272b75b387d7237a5dda898f337b4b48d8958cf5" + # queryTemplate: "src/common/queries/getSupplyChainTeamsBySite.graphql" + # tags: + # - "v1" + # - name: "getStoreTeamById" + # hash: "3d72aa00de7767143a2d6c50dd586f685ad1ad038556574a99a944ed4290ae28" + # queryTemplate: "src/common/queries/getTeamById.graphql" + # tags: + # - "v1" + # - name: "getTeamsByStore" + # hash: "49da730c0bc1d293da071814f3d7506a7daf865110898f8d5e92f6c41a9ac8d1" + # queryTemplate: "src/common/queries/getTeamsByStore.graphql" + # tags: + # - "v1" + # - name: "upsertStoreAssociatePreference" + # hash: "ece5e7fa9951764fa7d520a07b6faeb8d8797b75badb4275344643ecdf29a619" + # queryTemplate: "src/common/queries/upsertStoreAssociatePreference.graphql" + # tags: + # - "v1" + # - name: "upsertSupplyChainAssociatePreference" + # hash: "39c45936c3b4d0020c6192b629c29860a30a5f2f70c5297c9e34dcffbaa0c7b0" + # queryTemplate: "src/common/queries/upsertSupplyChainAssociatePreference.graphql" + # tags: + # - "v1"
feat(ui): update graphql for non prod only for now
feat(ui): update graphql for non prod only for now
7acf2543884dc4d513ce606cb0fa443bc78b2d3b
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 34 + versionCode 35 versionName "1.0.2" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>34</string> + <string>35</string> <key>LSApplicationQueriesSchemes</key> <array> <string>invmgmt</string> --- ios/AllSparkTests/Info.plist @@ -19,6 +19,6 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>34</string> + <string>35</string> </dict> </plist>
Incrementing build number
Incrementing build number
e821c615bb6d26bbcd3a6ad95a1ad0c34db8204c
--- docs/CHANGELOG.md @@ -1,3 +1,11 @@ +## [2.46.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.46.0...v2.46.1) (2025-06-26) + + +### Bug Fixes + +* sonar violation critical ([1eda47d](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/1eda47d91f72f73d1683fe5a70563c2674d4f0fd)) +* update looper test fix and sonar major ([8fe77f3](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8fe77f3f8f65f7dfab0cf45257d3722ed524a248)) + # [2.46.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.45.0...v2.46.0) (2025-06-26) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.46.0", + "version": "2.46.1", "main": "dist/index.js", "files": [ "dist",
chore(release): 2.46.1 [skip ci]
chore(release): 2.46.1 [skip ci] ## [2.46.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.46.0...v2.46.1) (2025-06-26) ### Bug Fixes * sonar violation critical ([1eda47d](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/1eda47d91f72f73d1683fe5a70563c2674d4f0fd)) * update looper test fix and sonar major ([8fe77f3](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8fe77f3f8f65f7dfab0cf45257d3722ed524a248))
99335d7867cc6cd9b780aa12ecc45047c869c992
--- src/utils/user.ts @@ -4,6 +4,7 @@ import {Associate} from '../types'; import {GetAssociateNameQuery} from '../queries/getAssociateName'; import {ClockStatusEnum} from './ClockStatusEnum'; import moment from 'moment'; +import {payTypes} from '../constants'; const OBFUSCATION_KEY = 'texting-mini-app'; const OBFUSCATION_PARSE_KEY = OBFUSCATION_KEY.padStart(64, '0'); @@ -20,6 +21,17 @@ export const decryptUserId = (userId: string) => { return decrypted.toString(CryptoJS.enc.Utf8); }; +export const returnClockedStatusBasedOnSchedule = (scheduleInfo: any) => { + const {schedStartTime, schedEndTime} = + getScheduleStartAndEndTime(scheduleInfo); + const currentTime = moment().format('h:mma'); + if (currentTime < schedStartTime || currentTime > schedEndTime) { + return false; // Clocked status would be Clocked Out + } else { + return true; // Clocked status would be Clocked In + } +}; + export const associateIsAbsent = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 1; @@ -27,7 +39,42 @@ export const associateIsTardy = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 2; export const associateIsClockedIn = (associate?: Associate) => { - return ClockStatusEnum.clockedOut !== Number(associate?.punch?.clockStatus); + /* + If associate is Salaried and punch data is null, clocked status would be Clocked In + */ + if ( + associate?.payType?.toUpperCase() === payTypes.SALARIED && + !associate.punch + ) { + return true; + } + + /* + If punch data is null, then we would check if the associate has schedule data + If there is schedule info, we would return the Clocked status based on schedule info else clocked status would be Clocked out + */ + if (!associate?.punch) { + if (!associate?.storeSchedule) { + return true; + } else if (associate.storeSchedule && associate.storeSchedule.length > 0) { + return returnClockedStatusBasedOnSchedule(associate.storeSchedule); + } else { + return false; + } + } + + /* + If punch data has clockStatus and its value is unknown, then we would check if the associate has schedule data + If there is schedule info, we would return the Clocked status based on schedule info else clocked status would be Clocked out + */ + if (ClockStatusEnum.unknown === Number(associate?.punch?.clockStatus)) { + if (associate.storeSchedule && associate.storeSchedule.length > 0) { + return returnClockedStatusBasedOnSchedule(associate.storeSchedule); + } else { + return false; + } + } + return ClockStatusEnum.clockedIn === Number(associate?.punch?.clockStatus); }; export const associateIsClockedOut = (associate?: Associate) => { --- src/utils/user.ts @@ -4,6 +4,7 @@ import {Associate} from '../types'; import {GetAssociateNameQuery} from '../queries/getAssociateName'; import {ClockStatusEnum} from './ClockStatusEnum'; import moment from 'moment'; +import {payTypes} from '../constants'; const OBFUSCATION_KEY = 'texting-mini-app'; const OBFUSCATION_PARSE_KEY = OBFUSCATION_KEY.padStart(64, '0'); @@ -20,6 +21,17 @@ export const decryptUserId = (userId: string) => { return decrypted.toString(CryptoJS.enc.Utf8); }; +export const returnClockedStatusBasedOnSchedule = (scheduleInfo: any) => { + const {schedStartTime, schedEndTime} = + getScheduleStartAndEndTime(scheduleInfo); + const currentTime = moment().format('h:mma'); + if (currentTime < schedStartTime || currentTime > schedEndTime) { + return false; // Clocked status would be Clocked Out + } else { + return true; // Clocked status would be Clocked In + } +}; + export const associateIsAbsent = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 1; @@ -27,7 +39,42 @@ export const associateIsTardy = (associate?: Associate) => associate?.absentData?.absenceTypeCode === 2; export const associateIsClockedIn = (associate?: Associate) => { - return ClockStatusEnum.clockedOut !== Number(associate?.punch?.clockStatus); + /* + If associate is Salaried and punch data is null, clocked status would be Clocked In + */ + if ( + associate?.payType?.toUpperCase() === payTypes.SALARIED && + !associate.punch + ) { + return true; + } + + /* + If punch data is null, then we would check if the associate has schedule data + If there is schedule info, we would return the Clocked status based on schedule info else clocked status would be Clocked out + */ + if (!associate?.punch) { + if (!associate?.storeSchedule) { + return true; + } else if (associate.storeSchedule && associate.storeSchedule.length > 0) { + return returnClockedStatusBasedOnSchedule(associate.storeSchedule); + } else { + return false; + } + } + + /* + If punch data has clockStatus and its value is unknown, then we would check if the associate has schedule data + If there is schedule info, we would return the Clocked status based on schedule info else clocked status would be Clocked out + */ + if (ClockStatusEnum.unknown === Number(associate?.punch?.clockStatus)) { + if (associate.storeSchedule && associate.storeSchedule.length > 0) { + return returnClockedStatusBasedOnSchedule(associate.storeSchedule); + } else { + return false; + } + } + return ClockStatusEnum.clockedIn === Number(associate?.punch?.clockStatus); }; export const associateIsClockedOut = (associate?: Associate) => {
revert clockedin count logic
revert clockedin count logic
c1412f9a4bd5daf386b71adb8f5076753f725114
--- packages/allspark-foundation/src/Navigation/client.tsx @@ -84,14 +84,18 @@ export class NavigationClient< DefaultModalOptions ); private _modalSubscription: ModalStateSubscription<M>; - private _modalInitialized = false; + private _modalState = { + initialized: false, + enabled: true, + disableReason: '', + }; constructor() { // Subscribe to modalfy state changes to capture initialization of modal state // from modalfy provider. Only then we can update the modal state or else it could be overwritten. this._modalSubscription = ModalState.subscribe(() => { this._modalSubscription.unsubscribe(); - this._modalInitialized = true; + this._modalState.initialized = true; this._queueManager.flush('updateModalState', this._updateModalState); }); } @@ -139,7 +143,7 @@ export class NavigationClient< * addModal or configure */ private _updateModalState = () => { - if (!this._modalInitialized) { + if (!this._modalState.initialized) { this._queueManager.enqueue('updateModalState', undefined); } else { ModalState.setState<M>(() => ({ @@ -304,6 +308,25 @@ export class NavigationClient< return this.getCurrentRoute()?.name || ''; }; + /** + * Get feature id for currently focused screen. + */ + public getCurrentRouteFeatureId = () => { + const name = this.getCurrentRouteName(); + return this._screenToFeatureMapping.get.call( + this._screenToFeatureMapping, + name + ); + }; + + /** + * Check if the currently focused screen is assigned to a given feature id. + * @param featureId - The ID of the feature to check. + */ + public isFeatureScreen = (featureId: string) => { + return this.getCurrentRouteFeatureId() === featureId; + }; + // --- Screen Navigation --- // /** @@ -533,7 +556,13 @@ export class NavigationClient< params?: M[K], callback?: () => void ) => { - this._modalfy.openModal(modalName, params, callback); + if (this._modalState.enabled) { + this._modalfy.openModal(modalName, params, callback); + } else { + console.warn( + `Allspark Modals are currently disabled. Reason: ${this._modalState.disableReason}` + ); + } }; /** @@ -568,6 +597,15 @@ export class NavigationClient< this._modalfy.closeAllModals(callback); }; + public enableModals = () => { + this._modalState.enabled = true; + }; + + public disableModals = (reason: string = '') => { + this._modalState.enabled = false; + this._modalState.disableReason = reason; + }; + /** * Creates StackNavigator connected to AllsparkNavigationClient. */
feat: add disable modal and get feature id for screen capabilities to navigation client
feat: add disable modal and get feature id for screen capabilities to navigation client
60b54edbc20fc596348d67d8e6efe666bbdf40ee
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Hub/SiteHubDashboard.tsx @@ -291,7 +291,7 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => { <Popover content={"Tap here to change the team you're viewing."} handleClose={handlePopoverClose} - showPopover={false} //change this to show + showPopover={show} //TODO: Need to update logic UNSAFE_style={{ width: '60%' }} /> )}
Updating PR
Updating PR
2d53f3d50d61c063ac2006993b341b7b85588e64
--- package-lock.json @@ -97,7 +97,7 @@ "@walmart/receipt-check-miniapp": "1.21.2", "@walmart/redux-store": "6.0.16", "@walmart/returns-mini-app": "4.6.0", - "@walmart/rfid-scan-mini-app": "2.3.10", + "@walmart/rfid-scan-mini-app": "2.3.11", "@walmart/roster-mini-app": "1.1.7", "@walmart/schedule-mini-app": "0.108.0", "@walmart/shelfavailability-mini-app": "1.5.23", @@ -12390,16 +12390,16 @@ } }, "node_modules/@walmart/rfid-scan-mini-app": { - "version": "2.3.10", - "resolved": "https://npme.walmart.com/@walmart/rfid-scan-mini-app/-/rfid-scan-mini-app-2.3.10.tgz", - "integrity": "sha512-GvJtFvKN1v/ouIh221qMO0ISpH4xdDK2hAGWG16g7c19XnhmRIQ/y0l7mcfUj6ciwM7EvJhTHpyzBqlwwqdTmQ==", + "version": "2.3.11", + "resolved": "https://npme.walmart.com/@walmart/rfid-scan-mini-app/-/rfid-scan-mini-app-2.3.11.tgz", + "integrity": "sha512-oy+M2ZE/Br19kwLPmX1wXLvMPc7q+3T4/mghgFOwZqo0KKRP5OWrsQrYXZl7F/Ga0SnEcEJiQZP+/Lky7mKIOw==", "peerDependencies": { "@react-navigation/native": ">=6.0.0", "@react-navigation/stack": ">=6.1.0", "@walmart/functional-components": ">=4.0.3", "@walmart/gtp-shared-components": ">=2.1.3", "@walmart/ims-print-services-ui": "^2.10.3", - "@walmart/native-rfid-scanner": ">=3.9.9", + "@walmart/native-rfid-scanner": ">=3.9.10", "@walmart/react-native-scanner-3.0": ">=0.3.0", "@walmart/redux-store": ">=3.1.7", "@walmart/ui-components": ">=1.15.1", --- package.json @@ -139,7 +139,7 @@ "@walmart/receipt-check-miniapp": "1.21.2", "@walmart/redux-store": "6.0.16", "@walmart/returns-mini-app": "4.6.0", - "@walmart/rfid-scan-mini-app": "2.3.10", + "@walmart/rfid-scan-mini-app": "2.3.11", "@walmart/roster-mini-app": "1.1.7", "@walmart/schedule-mini-app": "0.108.0", "@walmart/shelfavailability-mini-app": "1.5.23", @@ -401,7 +401,7 @@ "@walmart/receipt-check-miniapp": "1.21.2", "@walmart/redux-store": "6.0.16", "@walmart/returns-mini-app": "4.6.0", - "@walmart/rfid-scan-mini-app": "2.3.10", + "@walmart/rfid-scan-mini-app": "2.3.11", "@walmart/schedule-mini-app": "0.108.0", "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.7",
Update rfid-scan-mini-app@2.3.11
Update rfid-scan-mini-app@2.3.11
4ce35af2745dac91b00c11033e22e907e78fa70b
--- packages/me-at-walmart-container/src/services/logger.ts @@ -7,6 +7,7 @@ import { TFields, ILogger, TParams, + TLogLevelOverride, } from '@walmart/react-native-logger/dist/types'; import { @@ -15,6 +16,8 @@ import { LoggerServiceCreator, } from '@walmart/allspark-foundation/Logger'; +export type { TLogLevelOverride }; + const OVERRIDES = [ { key: 'appConfigLogLevel', @@ -63,8 +66,11 @@ class LoggerClient { }); } - public setLogLevel = (level: LogLevel) => { - this._logger.setLogLevel(level as unknown as TLogLevel); + public setLogLevel = (level: LogLevel, overrides?: TLogLevelOverride[]) => { + this._logger.setLogLevel({ + defaultLevel: level as any, + overrides, + }); }; public debug = (message: string, params?: Record<string, any>) => { @@ -92,7 +98,9 @@ class LoggerClient { this._logger.error(message, params as TParams); }; - public configure = (config: FoundationLoggerConfig) => { + public configure = ( + config: FoundationLoggerConfig & { overrides?: TLogLevelOverride[] } + ) => { const { logLevel, ...restConfig } = config || {}; if (logLevel) {
fix: set log level using incorrect type for logger module
fix: set log level using incorrect type for logger module
e5615e0d6547b39935749426d9e744c4cb7b02a1
--- core/__tests__/navigation/USHallway/PreHireHallwayNav/__snapshots__/PreHireHallwayNavTest.tsx.snap @@ -21,5 +21,13 @@ exports[`PreHireHallwayNav matches snapshot 1`] = ` } /> AskSamMiniApp + <Screen + name="paymentselection" + options={ + { + "headerShown": false, + } + } + /> </Navigator> `;
updated the snapshot
updated the snapshot
8cc7903689e29858b30563498ac854f21ae1eba0
--- package-lock.json @@ -3310,9 +3310,9 @@ "integrity": "sha512-+25H67LTPtrwp3AAmNm4E3hzqIJy5G8zhJ804cEj/DsyHH/Kb1HbyehtJ3KWqE2lj/2PlXc0LmGdYGWt+NcWWA==" }, "@walmart/exception-mini-app": { - "version": "0.27.0", - "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.27.0.tgz", - "integrity": "sha512-ememnOBGo3jXu/76LypK3tUgPnRWy0LfMIb4he8yxpN97Q/0hs60bfoJlH0dBIFpY9P5u7SAPg2CyOwMSbk/RA==" + "version": "0.28.0", + "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.28.0.tgz", + "integrity": "sha512-B31BaP6kN0RtiKzp7xK9qvo7XwPiqC0z/8J1se0K3pIqHeNx2mvbSRDGLoCzh+szhWGkPlyTDRAbJrZI+B8IRA==" }, "@walmart/feedback-all-spark-miniapp": { "version": "0.0.55", --- package.json @@ -69,7 +69,7 @@ "@walmart/ask-sam-mini-app": "0.30.2", "@walmart/config-components": "^1.0.26", "@walmart/counts-component-miniapp": "0.0.13", - "@walmart/exception-mini-app": "0.27.0", + "@walmart/exception-mini-app": "0.28.0", "@walmart/feedback-all-spark-miniapp": "0.0.55", "@walmart/functional-components": "1.0.28", "@walmart/gtp-shared-components": "^1.1.8",
version bump
version bump
1e1f1a0feb3c71bf4332572f5972e846fbd1d05e
--- package-lock.json @@ -57,7 +57,7 @@ "@walmart/iteminfo-mini-app": "7.1.4", "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.3.0", - "@walmart/metrics-mini-app": "0.9.63", + "@walmart/metrics-mini-app": "0.9.64", "@walmart/mod-flex-mini-app": "1.6.3", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14", @@ -5521,9 +5521,9 @@ } }, "node_modules/@walmart/metrics-mini-app": { - "version": "0.9.63", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.63.tgz", - "integrity": "sha512-2qkrWRphmivOOigoRm4UjWFfkDaTa2r4+X691ex5bIa/NR0LFyr2c+W2Jevk4L+Csn4ntvSlSkxWyAmwiSiu4A==", + "version": "0.9.64", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.64.tgz", + "integrity": "sha512-FPWu5RcSgjHZHSoJ3msxjHFI85lOuFIabSXwW2zpi4dp6uMHxYGMk2Toq3rqtZQLXqtkMVcWt6twM59aSP3wsA==", "dependencies": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", @@ -25307,9 +25307,9 @@ "integrity": "sha512-75CISnPJImPcR33NhMkwonct2dJbHWVVZsL7DaADW28V2K2WEKLd+k0CvSHubjhxD2DAHKQf/gH0YZ3jDjiEtA==" }, "@walmart/metrics-mini-app": { - "version": "0.9.63", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.63.tgz", - "integrity": "sha512-2qkrWRphmivOOigoRm4UjWFfkDaTa2r4+X691ex5bIa/NR0LFyr2c+W2Jevk4L+Csn4ntvSlSkxWyAmwiSiu4A==", + "version": "0.9.64", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.64.tgz", + "integrity": "sha512-FPWu5RcSgjHZHSoJ3msxjHFI85lOuFIabSXwW2zpi4dp6uMHxYGMk2Toq3rqtZQLXqtkMVcWt6twM59aSP3wsA==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", --- package.json @@ -99,7 +99,7 @@ "@walmart/iteminfo-mini-app": "7.1.4", "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.3.0", - "@walmart/metrics-mini-app": "0.9.63", + "@walmart/metrics-mini-app": "0.9.64", "@walmart/mod-flex-mini-app": "1.6.3", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14",
metrics version bump
metrics version bump
6700278a1ef445c77aa6c42160bc64f2f7b96442
--- packages/allspark-foundation-hub/__tests__/HubFeature/TeamOnboarding/TeamOnboardingScreen.test.tsx @@ -6,6 +6,7 @@ import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry'; import { LoggerService } from '@walmart/allspark-foundation/Logger'; import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigation'; +import { useNavigation } from '@react-navigation/native'; jest.mock('@walmart/allspark-foundation/Translation', () => ({ useAllsparkTranslation: jest.fn(), @@ -24,6 +25,9 @@ jest.mock('@walmart/allspark-foundation/Navigation', () => ({ }, })); +// eslint-disable-next-line react-hooks/rules-of-hooks +const navigation = useNavigation(); + describe('TeamOnboarding Screen Component Tests', () => { beforeEach(() => { (useAllsparkTranslation as jest.Mock).mockReturnValue({ @@ -66,6 +70,9 @@ describe('TeamOnboarding Screen Component Tests', () => { it('calls handleNavigation on button click', () => { render(<TeamOnboardingScreen />); + expect(navigation.setOptions).toHaveBeenCalledWith({ + title: 'teamOnboarding.navigationHeaderFirstEntry', + }); const button = screen.getByTestId('onboarding-entry-btn'); fireEvent.press(button); --- packages/allspark-foundation-hub/src/HubFeature/Onboarding/TeamOnboarding/Screens/TeamOnboardingScreen.tsx @@ -8,7 +8,7 @@ import { LoggerService } from '@walmart/allspark-foundation/Logger'; import { OnboardingImages } from '../../../Images/images'; import { useSelector } from 'react-redux'; import { hubOnboardingEnabled } from '../../../Redux'; -import { useNavigation } from '@react-navigation/core'; +import { useNavigation } from '@react-navigation/native'; export const TeamOnboardingScreen = () => { const { t } = useAllsparkTranslation(FEATURE_ID);
Update widget style
Update widget style
3278c000628c6efe53150869f9201a431466c408
--- package-lock.json @@ -5497,9 +5497,9 @@ "integrity": "sha512-vGHNXjipnOEdJaASi+EQjTr0YeBNJ2/8Az1pRWzi72gPKh3LfBWidMwrN7CzOCNNuXirVuRVP9zyfTscyQN6pw==" }, "@walmart/emergency-mini-app": { - "version": "1.1.0", - "resolved": "https://npme.walmart.com/@walmart/emergency-mini-app/-/emergency-mini-app-1.1.0.tgz", - "integrity": "sha512-yGeSvDiGxQVYuAekosQ8N3ijMdcsxsZ8ZKuCrXmdCRt1OxU5OxfR/lWamaE07LzKyyICOGCYGqe4gBbUXq0A4g==", + "version": "1.2.0", + "resolved": "https://npme.walmart.com/@walmart/emergency-mini-app/-/emergency-mini-app-1.2.0.tgz", + "integrity": "sha512-m0KcbEaVD81NC8ZIDQ8eNfCrx6zSa4XlvX1V8VaooI1ve2ztrU5VG4EyU1QPN69yw6XzaHAi/GyC2NyWrqWI/g==", "requires": { "@walmart/core-widget-registry": "^0.6.6" }, @@ -5577,9 +5577,9 @@ "integrity": "sha512-kgl3PpMJiM1hqhpEfLMIEHBdq+e6mKLPZNT3fmJIgO3RZYV3xcCrO2gIacJL3j+nr8DuDdw/FzeCGzKdKurniw==" }, "@walmart/inbox-mini-app": { - "version": "0.66.0", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.66.0.tgz", - "integrity": "sha512-YwDxTDYf86pOUWtnjJfs1nFEDRqRQyiImORPjkTbIrVwX9SejLsDC7V1n6ZbSKxyY+9hLjDkDMIaAIXcSe6Gvg==", + "version": "0.67.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.67.0.tgz", + "integrity": "sha512-/kojMX9VncZuJprShdYhU17umdeBUCJZ56aWUY+QPdBuq79Nzl/ELuWuM4tMsCubNibwlwFli/FShJxg365qaQ==", "requires": { "@walmart/walmart-fiscal-week": "^0.3.6" } --- package.json @@ -86,7 +86,7 @@ "@walmart/core-utils": "~1.0.10", "@walmart/core-widget-registry": "0.5.7", "@walmart/counts-component-miniapp": "0.0.39", - "@walmart/emergency-mini-app": "1.1.0", + "@walmart/emergency-mini-app": "1.2.0", "@walmart/exception-mini-app": "0.43.1", "@walmart/facilities-management-miniapp": "0.3.26", "@walmart/feedback-all-spark-miniapp": "0.8.0", @@ -96,7 +96,7 @@ "@walmart/gtp-shared-components": "1.8.9", "@walmart/impersonation-mini-app": "1.2.0", "@walmart/ims-print-services-ui": "1.1.4", - "@walmart/inbox-mini-app": "0.66.0", + "@walmart/inbox-mini-app": "0.67.0", "@walmart/iteminfo-mini-app": "5.1.7", "@walmart/manager-approvals-miniapp": "0.1.1", "@walmart/me-field-mini-app": "1.1.30",
update inbox and emergency for feature flagging mms screen
update inbox and emergency for feature flagging mms screen
6364e5f91f13beb03dd3638e0bc75d9761286c64
--- targets/US/package.json @@ -101,7 +101,7 @@ "@walmart/counts-component-miniapp": "0.1.13", "@walmart/emergency-mini-app": "1.29.8", "@walmart/exception-mini-app": "1.8.11", - "@walmart/facilities-management-miniapp": "0.14.6", + "@walmart/facilities-management-miniapp": "0.15.0", "@walmart/feedback-all-spark-miniapp": "0.9.66", "@walmart/financial-wellbeing-feature-app": "1.26.0", "@walmart/functional-components": "~6.3.20", --- yarn.lock @@ -6363,12 +6363,12 @@ __metadata: languageName: node linkType: hard -"@walmart/facilities-management-miniapp@npm:0.14.6": - version: 0.14.6 - resolution: "@walmart/facilities-management-miniapp@npm:0.14.6" +"@walmart/facilities-management-miniapp@npm:0.15.0": + version: 0.15.0 + resolution: "@walmart/facilities-management-miniapp@npm:0.15.0" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/c7d728a946a8593d3db3aad00eef1138358a3cb2a73b979059b48995e86537e2689c43460d3be6b69694a942baec985152dd870be4c74b8ef8caa7203cd72ffa + checksum: 10c0/e736263a6921861c397862b90f36036bf0774694321743508c099401605d912afe454804d9f21275c857d0168a27b430d12623a6442d15dc9db1c3b39de55d99 languageName: node linkType: hard @@ -7008,7 +7008,7 @@ __metadata: "@walmart/counts-component-miniapp": "npm:0.1.13" "@walmart/emergency-mini-app": "npm:1.29.8" "@walmart/exception-mini-app": "npm:1.8.11" - "@walmart/facilities-management-miniapp": "npm:0.14.6" + "@walmart/facilities-management-miniapp": "npm:0.15.0" "@walmart/feedback-all-spark-miniapp": "npm:0.9.66" "@walmart/financial-wellbeing-feature-app": "npm:1.26.0" "@walmart/functional-components": "npm:~6.3.20"
drop 26 version bump
drop 26 version bump
8e262da9f87540e94789ea44071757f584a8563d
--- package-lock.json @@ -82,7 +82,7 @@ "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.11", "@walmart/taskit-mini-app": "0.49.6", - "@walmart/time-clock-mini-app": "2.13.0", + "@walmart/time-clock-mini-app": "2.15.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.73.0", "@walmart/wfm-ui": "0.2.26", @@ -6102,9 +6102,9 @@ } }, "node_modules/@walmart/time-clock-mini-app": { - "version": "2.13.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.13.0.tgz", - "integrity": "sha512-LwAhBUJmxQUCK7Tidbc8WovwoveYC9ECrUyCnZwy85zsMDh19yx9vyFjKtovSbJE8x2a1LjRLiNalBSI3NN6PA==", + "version": "2.15.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.15.0.tgz", + "integrity": "sha512-wRtPgZ6UIU3qI8Xyqq2FljgHnzlZVFkTcqJHZnIC3OVRWkZfaloZdkrPwHqoQX5YTntuh5YWvg3YU6RGr8KqRg==", "hasInstallScript": true, "license": "UNLICENSED", "dependencies": { @@ -25629,9 +25629,9 @@ } }, "@walmart/time-clock-mini-app": { - "version": "2.13.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.13.0.tgz", - "integrity": "sha512-LwAhBUJmxQUCK7Tidbc8WovwoveYC9ECrUyCnZwy85zsMDh19yx9vyFjKtovSbJE8x2a1LjRLiNalBSI3NN6PA==", + "version": "2.15.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.15.0.tgz", + "integrity": "sha512-wRtPgZ6UIU3qI8Xyqq2FljgHnzlZVFkTcqJHZnIC3OVRWkZfaloZdkrPwHqoQX5YTntuh5YWvg3YU6RGr8KqRg==", "requires": { "@react-navigation/elements": "^1.3.1", "moment-timezone": "0.5.33", --- package.json @@ -124,7 +124,7 @@ "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.2", "@walmart/taskit-mini-app": "0.49.6", - "@walmart/time-clock-mini-app": "2.13.0", + "@walmart/time-clock-mini-app": "2.15.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.73.0", "@walmart/wfm-ui": "0.2.26",
Update Time Clock to 2.15.0
Update Time Clock to 2.15.0
0666cf7feb2a21be17d852fda772f297696a4c3c
--- .yarn/patches/@walmart-schedule-mini-app-npm-5.4.4-e63d1ba9c6.patch @@ -1,16 +1,15 @@ -diff --git a/src/common/translations/updateDateLocale.ts b/src/common/translations/updateDateLocale.ts -index 57340eeef0bb2bfe7f87a3ed791e2fe5e0ccc0a5..8b8ce0afff29f922a0e5603391beceaa750a0806 100644 ---- a/src/common/translations/updateDateLocale.ts -+++ b/src/common/translations/updateDateLocale.ts -@@ -17,7 +17,10 @@ export const UpdateDateLocale = (lang: string, ns: string) => { - amDesignator: null, - pmDesignator: null, - }; -- -+ // Check if localizedStrings and calendarLocale exist -+ if (!localizedStrings || !localizedStrings.calendarLocale) { -+ return strings; -+ } - const keys = Object.keys(strings); - keys.forEach((key) => { - switch (key) { +diff --git a/dist/common/translations/updateDateLocale.js b/dist/common/translations/updateDateLocale.js +index 5d3b96abcf39a5b30be1210ceb1a09ecfbcb148e..b60fe93cc035aed36de4660ce496cbbef164079e 100644 +--- a/dist/common/translations/updateDateLocale.js ++++ b/dist/common/translations/updateDateLocale.js +@@ -16,6 +16,10 @@ export const UpdateDateLocale = (lang, ns) => { + amDesignator: null, + pmDesignator: null, + }; ++ // Check if localizedStrings and calendarLocale exist ++ if (!localizedStrings || !localizedStrings.calendarLocale) { ++ return strings; ++ } + const keys = Object.keys(strings); + keys.forEach((key) => { + switch (key) { --- yarn.lock @@ -9805,7 +9805,7 @@ __metadata: "@walmart/schedule-mini-app@patch:@walmart/schedule-mini-app@npm%3A5.4.4#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.4-e63d1ba9c6.patch": version: 5.4.4 - resolution: "@walmart/schedule-mini-app@patch:@walmart/schedule-mini-app@npm%3A5.4.4%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540walmart%252Fschedule-mini-app%252F-%252F%2540walmart%252Fschedule-mini-app-5.4.4.tgz#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.4-e63d1ba9c6.patch::version=5.4.4&hash=e33eb4" + resolution: "@walmart/schedule-mini-app@patch:@walmart/schedule-mini-app@npm%3A5.4.4%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540walmart%252Fschedule-mini-app%252F-%252F%2540walmart%252Fschedule-mini-app-5.4.4.tgz#~/.yarn/patches/@walmart-schedule-mini-app-npm-5.4.4-e63d1ba9c6.patch::version=5.4.4&hash=77ee3d" peerDependencies: "@react-native-community/datetimepicker": ">=7.6.2" "@react-native-firebase/remote-config": ">=10.1.1" @@ -9839,7 +9839,7 @@ __metadata: redux: ">=4.0.5" reselect: ">=4.0.0" wfm-allspark-data-library: ">=7.0.0" - checksum: 10c0/e3d44997f0a81477d320ffa5fc86fa6b4a20740f09f49fc7e02d2db3bbbe4a4ebb1f7a329d7fd6f780bec93ec6221dd770f8c6af7dea1b07580612c60f89af35 + checksum: 10c0/269e0c406ed39c502b89b2d1714711fd58e0258ba7b5d294cf745492e20b40fcc44dfbd58776245823881c14d551836a4b5bc1892a797baad245740d6be47f64 languageName: node linkType: hard
feat(translation): stabilize
feat(translation): stabilize
6ca1a79193ef4bbc9542b85e876c7829c69c0352
--- android/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"> + <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.USE_BIOMETRIC" /> <uses-permission android:name="android.permission.USE_FINGERPRINT" />
android manifest file updated
android manifest file updated
e549b0d008336bf4eb696d861bba601c71656283
--- packages/core-services-allspark/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.9.2...@walmart/core-services-allspark@2.10.0) (2023-03-16) + + +### Features + +* add config for user info source. switch user info query on config flag. update teams extraction from query result. ([d115ce2](https://gecgithub01.walmart.com/allspark/allspark-core-services/commit/d115ce252c269b3ed443251c5387a52dff95e0ab)) + + + + + ## [2.9.2](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.9.1...@walmart/core-services-allspark@2.9.2) (2023-03-15) **Note:** Version bump only for package @walmart/core-services-allspark --- packages/core-services-allspark/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.9.2", + "version": "2.10.0", "lockfileVersion": 1, "requires": true, "dependencies": { --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.9.2", + "version": "2.10.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -27,7 +27,7 @@ "@walmart/allspark-http-client": "^2.4.8", "@walmart/allspark-utils": "^1.5.1", "@walmart/core-services": "^2.0.13", - "@walmart/me-at-walmart-athena-queries": "^1.2.0", + "@walmart/me-at-walmart-athena-queries": "^1.3.0", "crypto-js": "~4.1.1", "jwt-decode": "^3.1.2", "luxon": "^2.4.0", --- packages/me-at-walmart-athena-queries/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.3.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@1.2.0...@walmart/me-at-walmart-athena-queries@1.3.0) (2023-03-16) + + +### Features + +* add fallback query for logged in user using tms 1 ([8648851](https://gecgithub01.walmart.com/allspark/allspark/commit/86488514586f128580dad7f4755767690f22cbe2)) + + + + + # [1.2.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@1.1.2...@walmart/me-at-walmart-athena-queries@1.2.0) (2023-03-15) --- packages/me-at-walmart-athena-queries/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-athena-queries", - "version": "1.2.0", + "version": "1.3.0", "description": "> TODO: description", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "",
chore(version): updating package version
chore(version): updating package version - @walmart/core-services-allspark@2.10.0 - @walmart/me-at-walmart-athena-queries@1.3.0
d2d6e09efa7ff6bb9caf945f82c6b033a1ab507c
--- packages/allspark-foundation-hub/__tests__/HubFeature/shared/AlertBanner.test.tsx @@ -0,0 +1,52 @@ +import React from 'react'; +import { + fireEvent, + render, +} from '@walmart/allspark-foundation/__tests__/utils'; +import { AlertBanner } from '@walmart/allspark-foundation-hub/src/HubFeature/Shared/Components/AlertBanner'; + +describe('AlertBanner', () => { + const alertBannerProps = { + label: 'Unable to load shifts.', + }; + + it('renders alert banner component with required props', () => { + const { getByTestId, toJSON } = render( + <AlertBanner {...alertBannerProps} /> + ); + const alertBannerLabel = getByTestId('alert-banner-label'); + expect(alertBannerLabel).toBeDefined(); + expect(alertBannerLabel.props.children).toStrictEqual( + alertBannerProps.label + ); + expect(toJSON()).toMatchSnapshot(); + }); + + it('renders alert banner component with optional props required props', () => { + const { getByTestId, toJSON } = render( + <AlertBanner + {...alertBannerProps} + buttonLabel='Try again.' + onPressButton={jest.fn()} + /> + ); + const alertBannerButton = getByTestId('banner-button-text'); + expect(alertBannerButton).toBeDefined(); + expect(alertBannerButton.props.children).toStrictEqual('Try again.'); + expect(toJSON()).toMatchSnapshot(); + }); + + it('it calls onPressButton when alert banner button is press', () => { + const onPressButton = jest.fn(); + const { getByTestId } = render( + <AlertBanner + {...alertBannerProps} + buttonLabel='Try again.' + onPressButton={onPressButton} + /> + ); + const alertBannerButton = getByTestId('alert-banner-button'); + fireEvent.press(alertBannerButton); + expect(onPressButton).toHaveBeenCalled(); + }); +}); --- packages/allspark-foundation-hub/__tests__/HubFeature/shared/__snapshots__/AlertBanner.test.tsx.snap @@ -0,0 +1,122 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`AlertBanner renders alert banner component with optional props required props 1`] = ` +<View + style={ + { + "backgroundColor": "#fce8e9", + "borderBottomColor": "#ef8e92", + "borderBottomWidth": 1, + "borderLeftColor": "#de1c24", + "borderLeftWidth": 4, + "borderRadius": 4, + "borderRightColor": "#ef8e92", + "borderRightWidth": 1, + "borderTopColor": "#ef8e92", + "borderTopWidth": 1, + "display": "flex", + "flexDirection": "row", + "gap": 10, + "marginBottom": 20, + "padding": 8, + "width": "100%", + } + } +> + <Image + accessibilityRole="image" + source={ + { + "testUri": "../../@walmart/gtp-shared-icons/assets/images/icons/ExclamationCircle-16.png", + } + } + style={ + [ + { + "height": 16, + "tintColor": "#9b1419", + "width": 16, + }, + {}, + ] + } + testID="ExclamationCircleIcon" + /> + <Body + accessibilityLabel="Unable to load shifts." + color="red130" + size="small" + testID="alert-banner-label" + > + Unable to load shifts. + </Body> + <Button + accessibilityRole="button" + onPress={[MockFunction]} + testID="alert-banner-button" + variant="tertiary" + > + <Body + accessibilityLabel="Try again." + color="red130" + size="small" + testID="banner-button-text" + > + Try again. + </Body> + </Button> +</View> +`; + +exports[`AlertBanner renders alert banner component with required props 1`] = ` +<View + style={ + { + "backgroundColor": "#fce8e9", + "borderBottomColor": "#ef8e92", + "borderBottomWidth": 1, + "borderLeftColor": "#de1c24", + "borderLeftWidth": 4, + "borderRadius": 4, + "borderRightColor": "#ef8e92", + "borderRightWidth": 1, + "borderTopColor": "#ef8e92", + "borderTopWidth": 1, + "display": "flex", + "flexDirection": "row", + "gap": 10, + "marginBottom": 20, + "padding": 8, + "width": "100%", + } + } +> + <Image + accessibilityRole="image" + source={ + { + "testUri": "../../@walmart/gtp-shared-icons/assets/images/icons/ExclamationCircle-16.png", + } + } + style={ + [ + { + "height": 16, + "tintColor": "#9b1419", + "width": 16, + }, + {}, + ] + } + testID="ExclamationCircleIcon" + /> + <Body + accessibilityLabel="Unable to load shifts." + color="red130" + size="small" + testID="alert-banner-label" + > + Unable to load shifts. + </Body> +</View> +`;
test: tests for alert banner
test: tests for alert banner
80b659e128a6a086fe81f0ae7e9deb4d41c7a7f1
--- src/components/TeamList.tsx @@ -451,7 +451,7 @@ export const TeamChatCard = (props: { { i18nLabel: t('rosterScreen.associateRosterItem.messageBtn'), action(team) { - analytics('associate_messagebtn', { + analytics('team_messagebtn', { teamName: team?.teamName, teamID: team.teamId, }); @@ -468,7 +468,7 @@ export const TeamChatCard = (props: { { i18nLabel: t('rosterScreen.associateRosterItem.messageBtn'), action() { - analytics('associate_messagebtn', { + analytics('team_messagebtn', { teamName: 'TOTAL STORE', teamID: 'TOTAL_STORE', });
message button for team
message button for team
35768afcb4a56bcaab9816ca23f74d8afaf5c6b6
--- src/managerExperience/components/AssociateList/AssociateList.tsx @@ -5,6 +5,7 @@ import {AssociateListProps, AssociateListRenderItem} from './types'; import {associateListStyles as styles} from './styles'; import {ListEmptyComponent} from '../../../components/Roster/ListEmptyComponent'; import {FlashList} from '@shopify/flash-list'; +import {View} from 'react-native'; export const AssociateList = ({ associates, @@ -51,6 +52,7 @@ export const AssociateList = ({ }} /> )} + ListFooterComponent={<View style={styles.footerSpacing} />} /> ); }; --- src/managerExperience/components/AssociateList/styles.ts @@ -1,4 +1,4 @@ -import {StyleSheet} from 'react-native'; +import {Dimensions, StyleSheet} from 'react-native'; import {colors} from '@walmart/gtp-shared-components'; export const associateListStyles = StyleSheet.create({ @@ -6,6 +6,11 @@ export const associateListStyles = StyleSheet.create({ backgroundColor: colors.white, paddingHorizontal: 16, width: '100%', - marginBottom: 104, + }, + footerSpacing: { + height: 104, + backgroundColor: '#F5F6FA', + width: Dimensions.get('window').width, + marginLeft: -16, }, });
feat: added correct bottom padding
feat: added correct bottom padding
440d0687ccefb11d45dbbffd61eea15ed75f5641
--- package-lock.json @@ -4282,9 +4282,9 @@ "integrity": "sha512-Vpwrt460LPca7ZGjDrDezorVnr+WebRntHaUGkAhIDVVfna0P3wyJcRnr18/hged+q/3f6NmYfZgB3ZaGxGlgg==" }, "@walmart/inbox-mini-app": { - "version": "0.36.0", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.36.0.tgz", - "integrity": "sha512-X4bzTxXztncSASGEvlVia1/RM/qNR9xqK802ewMOZ7bx586XMTijjCaOIt5F3bVLc41Mp8D4TVm4aA44SYl64g==" + "version": "0.37.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.37.0.tgz", + "integrity": "sha512-7IEyBIuL87sBJj2YD1suMfIM0g/ifdZZ1B6IVWxOAkWRhTZXyrskZf9kySQ4/nAI8mspHkXXVmEsboRAJSZ8OA==" }, "@walmart/iteminfo-mini-app": { "version": "4.1.3", --- package.json @@ -84,7 +84,7 @@ "@walmart/gtp-shared-components": "1.2.0", "@walmart/impersonation-mini-app": "1.0.27", "@walmart/ims-print-services-ui": "0.1.22", - "@walmart/inbox-mini-app": "0.36.0", + "@walmart/inbox-mini-app": "0.37.0", "@walmart/iteminfo-mini-app": "4.1.3", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.7.65",
version bump inbox
version bump inbox
a7dc283350a6aca9262488fda99c13cc158c9574
--- package-lock.json @@ -29702,17 +29702,17 @@ } }, "@walmart/pay-stub-miniapp": { - "version": "0.8.74", - "resolved": "https://npme.walmart.com/@walmart/pay-stub-miniapp/-/pay-stub-miniapp-0.8.74.tgz", - "integrity": "sha512-/mjKJmj1faO5VhxUbx3WZpskBXcpxEDOJ9gsV1uQlED0OWbp+VryoPzCOw4zpfhsnWK0rf/R+FM0MR32bVNimQ==", + "version": "0.9.5", + "resolved": "https://npme.walmart.com/@walmart/pay-stub-miniapp/-/pay-stub-miniapp-0.9.5.tgz", + "integrity": "sha512-1rWobfVHjmiS4FE1H6sM2hr/0LNxQN33zcbh64+DJQ89j+U7dMvKjXCJQuhJ/phtzJq2oe8fJ2UpLYY2B0+5AQ==", "requires": { "crypto-js": "^3.3.0" } }, "@walmart/payrollsolution_miniapp": { - "version": "0.129.0", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.129.0.tgz", - "integrity": "sha512-fhnYFQl+J5BQBbl8ElwK9cARJKi5pHWWft5Ugx3JCDfl9D59YlP9bJEjPRSY9xuiulgMsCkJ6vdVuxsULdCNmg==", + "version": "0.130.1", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.130.1.tgz", + "integrity": "sha512-f7JM2iqvi4v1OeDnbubu5C5dI4CIl5GCp78wFP8gPTCs6vSTMT7Ru6kfZ7JeraCu6X8ZENLC8xZcNOHD90jVMA==", "requires": { "crypto-js": "^3.3.0" } --- package.json @@ -73,7 +73,6 @@ "@react-navigation/stack": "^6.1.0", "@sharcoux/slider": "^6.1.1", "@terrylinla/react-native-sketch-canvas": "0.8.0", - "@walmart/OneWalmart-MiniApp": "1.0.12", "@walmart/allspark-health-survey-mini-app": "0.0.44", "@walmart/allspark-home-mini-app": "0.6.10", "@walmart/allspark-neon-core": "0.1.31", @@ -102,8 +101,9 @@ "@walmart/metrics-mini-app": "0.9.28", "@walmart/mod-flex-mini-app": "1.2.7", "@walmart/moment-walmart": "1.0.4", - "@walmart/pay-stub-miniapp": "0.8.74", - "@walmart/payrollsolution_miniapp": "0.129.0", + "@walmart/OneWalmart-MiniApp": "1.0.12", + "@walmart/pay-stub-miniapp": "^0.9.5", + "@walmart/payrollsolution_miniapp": "^0.130.1", "@walmart/price-changes-mini-app": "1.5.6", "@walmart/profile-feature-app": "0.0.71", "@walmart/push-to-talk-mini-app": "1.8.15",
bump version
bump version
1477e25488a6295d0df8d854f465c6ec6bd9db53
--- src/index.tsx @@ -17,24 +17,10 @@ export default MyTeamFeature.createModule({ ['myTeam.root']: MyTeamFeature.createScreen(MyTeamMiniApp, { tags: [ScreenTags.MyTeamTab], clockCheckRequired: true, - options: { - title: translationClient.translate('myTeam.title', { - defaultValue: 'Team', - fallbackLng: 'en-US', - }), - headerLeft: renderDrawerButton, - }, }), ['myTeam.hub']: MyTeamFeature.createScreen(MyTeamHubWithBanner, { tags: [ScreenTags.MyTeamTab], clockCheckRequired: true, - options: { - title: translationClient.translate('myTeam.title', { - defaultValue: 'Team', - fallbackLng: 'en-US', - }), - headerLeft: renderDrawerButton, - }, }), ['myTeam.rosterDetailScreen']: MyTeamFeature.createScreen( RosterDetailScreen, --- src/myteam-hub/screens/MyTeamHubWithBanner.tsx @@ -3,10 +3,13 @@ * @description MyTeam Hub Screen with Warning Banner on top */ -import React from 'react'; +import React, {useLayoutEffect} from 'react'; import {View, StyleSheet} from 'react-native'; +import {useNavigation} from '@react-navigation/native'; +import {renderDrawerButton} from '@walmart/allspark-foundation/Navigation'; import {WarningBanner} from '../../components/WarningBanner'; import {MyTeamHubScreen} from './MyTeamHubScreen'; +import {translationClient} from '../../common/translation'; /** * MyTeam Hub Screen with Warning Banner @@ -15,6 +18,19 @@ import {MyTeamHubScreen} from './MyTeamHubScreen'; * to provide a complete hub experience with contextual warnings when needed. */ export const MyTeamHubWithBanner: React.FC = () => { + const navigation = useNavigation(); + const {t} = translationClient.useTranslation(); + + useLayoutEffect(() => { + navigation.setOptions({ + title: t('myTeam.title', { + defaultValue: 'Team', + fallbackLng: 'en-US', + }), + headerLeft: renderDrawerButton, + }); + }, [navigation, t]); + return ( <View style={styles.container}> <WarningBanner /> --- src/navigation/index.tsx @@ -1,6 +1,6 @@ -import React, {useCallback} from 'react'; +import React, {useLayoutEffect} from 'react'; import {SafeAreaProvider} from 'react-native-safe-area-context'; -import {useFocusEffect, useNavigation} from '@react-navigation/native'; +import {useNavigation} from '@react-navigation/native'; import {initializeWidgets} from './utils'; import { AllsparkHubContainer, @@ -17,18 +17,17 @@ export * from './types'; export const MyTeamMiniApp = () => { const navigation = useNavigation(); + const {t} = translationClient.useTranslation(); - useFocusEffect( - useCallback(() => { - navigation.setOptions({ - title: translationClient.translate('myTeam.title', { - defaultValue: 'Team', - fallbackLng: 'en-US', - }), - headerLeft: renderDrawerButton, - }); - }, [navigation]), - ); + useLayoutEffect(() => { + navigation.setOptions({ + title: t('myTeam.title', { + defaultValue: 'Team', + fallbackLng: 'en-US', + }), + headerLeft: renderDrawerButton, + }); + }, [navigation, t]); return ( <>
fix: refactor dynamic header to useLayoutEffect for blink-free updates
fix: refactor dynamic header to useLayoutEffect for blink-free updates
1c7d1f300d2eddff0c6392e1527d3ba08c394ecd
--- core/__tests__/features/timeclock/timeclock-oldClockTest.tsx @@ -53,9 +53,6 @@ jest.mock('@walmart/allspark-foundation', () => ({ jest.mock('@walmart/time-clock-mini-app', () => ({ ...jest.requireActual('@walmart/time-clock-mini-app'), - // ClockAppActions: { - // setDisableGeoValidation: () => jest.fn(), - // }, })); const Component: React.FC = () => {
chore: remove commented code
chore: remove commented code
e39e5bc551ba1b2e913ce769da463046d2073010
--- package.json @@ -145,7 +145,7 @@ "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.7", "@walmart/taskit-mini-app": "2.81.15", - "@walmart/time-clock-mini-app": "2.353.0", + "@walmart/time-clock-mini-app": "2.355.0", "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.11#~/.yarn/patches/@walmart-ui-components-npm-1.15.11-19ccf914c5.patch", "@walmart/welcomeme-mini-app": "0.90.3", --- yarn.lock @@ -7149,9 +7149,9 @@ __metadata: languageName: node linkType: hard -"@walmart/time-clock-mini-app@npm:2.353.0": - version: 2.353.0 - resolution: "@walmart/time-clock-mini-app@npm:2.353.0" +"@walmart/time-clock-mini-app@npm:2.355.0": + version: 2.355.0 + resolution: "@walmart/time-clock-mini-app@npm:2.355.0" dependencies: "@react-navigation/elements": "npm:^1.3.1" moment-timezone: "npm:0.5.33" @@ -7194,7 +7194,7 @@ __metadata: uuid: ^3.3.2 wifi-store-locator: ^1.4.0 xdate: ^0.8.2 - checksum: 10c0/3d96ee8d13bdc00e61f39688bd80cc50eccaf9c63e8312f442833409e1fa95a8679c08b9532811172c07c62821651d44cecc0fa021f871980264ef8643ee3539 + checksum: 10c0/5e4c1c8021a9478d37f493a14da9d7224128b658758ae8a1f4055621cf14b3ef4dbdb26bdfed6d915b0030705d828ece92424d5e90f5c00c1a83d20e873e4235 languageName: node linkType: hard @@ -7788,7 +7788,7 @@ __metadata: "@walmart/shelfavailability-mini-app": "npm:1.5.23" "@walmart/store-feature-orders": "npm:1.26.7" "@walmart/taskit-mini-app": "npm:2.81.15" - "@walmart/time-clock-mini-app": "npm:2.353.0" + "@walmart/time-clock-mini-app": "npm:2.355.0" "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.11#~/.yarn/patches/@walmart-ui-components-npm-1.15.11-19ccf914c5.patch" "@walmart/welcomeme-mini-app": "npm:0.90.3"
Update time clock to 2.355.0
Update time clock to 2.355.0
3137a8fd4d3fdd71429192eb4637e5cb4a3abcd4
--- package.json @@ -108,7 +108,7 @@ "@walmart/iteminfo-mini-app": "7.9.0", "@walmart/learning-mini-app": "18.0.5", "@walmart/manager-approvals-miniapp": "0.2.4", - "@walmart/metrics-mini-app": "0.20.7", + "@walmart/metrics-mini-app": "0.20.8", "@walmart/mod-flex-mini-app": "1.15.5", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.1.4",
metrics version bump
metrics version bump
4c340d81ef4be2555be289efc5bc63d032ac82b8
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.15.35", + "version": "1.15.36", "main": "dist/index.js", "files": [ "dist" @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.12.37", + "@walmart/roster-mini-app": "2.12.38", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- yarn.lock @@ -6416,7 +6416,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.12.37" + "@walmart/roster-mini-app": "npm:2.12.38" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6597,9 +6597,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.12.37": - version: 2.12.37 - resolution: "@walmart/roster-mini-app@npm:2.12.37" +"@walmart/roster-mini-app@npm:2.12.38": + version: 2.12.38 + resolution: "@walmart/roster-mini-app@npm:2.12.38" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6641,7 +6641,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/c88b1f32d6547bce02f8fcb60f7e66e8135e7ac9589eaacdb82685e97942a5b4614494a9ae16f93102a60b08a2f243dcc80fa3326d90a6889e7d5713ffe3f5ce + checksum: 10c0/333b8c53189a321bb575a21328b4986ffde422840352f5659a4c8e55ef3186db883e9344c0ab81bc41113a7ee5203401f742b5d2a7dc7138ca6f2b1bf07fdab8 languageName: node linkType: hard
Update the roster mini app version
Update the roster mini app version
601f43df497fe715d770c028a91adda14156e925
--- src/channels/components/ChannelRow.tsx @@ -104,7 +104,6 @@ export const ChannelRow = (props: ChannelRowProps) => { ); const firstRecipientClockedIn = associateIsClockedIn(firstRecipientAssociate); - //@ts-ignore const lastMessageTime = lastMessage?.deleted ? channelRowTimeStamp(lastMessage?.deletedTimestamp?.toDate(), t) : channelRowTimeStamp(lastMessage?.createdAt?.toDate(), t); --- src/containers/Message/index.tsx @@ -13,7 +13,6 @@ import {TEXTING_I18N_NAMESPACE} from '../../translations'; import {useRbacConfigForDeleteMessage} from '../../hooks'; import {deleteMessageEnabled} from '../../redux/selectors'; import {MessageOptionsModal} from './MessageOptionsModal'; -import {channelRowTimeStamp} from '../../utils/timestamps'; const {width} = Dimensions.get('window'); // screen width - (avatar width (40) + avatar margin (16/10)) * 0.8 (80%) @@ -56,15 +55,10 @@ export const Message = ({ showReadReceipt, deleted, deletedByPreferredName, - deletedTimestamp, messagePath, channelPath, }: LocalMessage) => { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); - const deletedMessageTimeStamp = channelRowTimeStamp( - deletedTimestamp?.toDate(), - t, - ); const [isLongPressed, setIsLongPressed] = useState(false); const [isConfirmationModalVisible, setIsConfirmationModalVisible] = useState(false); @@ -154,9 +148,7 @@ export const Message = ({ </Caption> )} {!!messageTime && ( - <Caption UNSAFE_style={styles.readReceipt}> - {deleted ? deletedMessageTimeStamp : messageTime} - </Caption> + <Caption UNSAFE_style={styles.readReceipt}>{messageTime}</Caption> )} </View> </Pressable> --- src/types.ts @@ -47,6 +47,8 @@ export type FirebaseMessage = { sentFrom: string; image?: ImageMedia; audio?: AudioMedia; + deleted?: boolean; + deletedTimestamp?: FirebaseFirestoreTypes.Timestamp; }; export type MessageRequest = AtLeastOne<{ @@ -64,7 +66,6 @@ export type LocalMessage = FirebaseMessage & { showReadReceipt?: boolean; deleted?: boolean; deletedByPreferredName?: string; - deletedTimestamp?: any; isGroupMessage?: boolean; channelPath?: string; }; --- src/utils/messages.ts @@ -95,6 +95,8 @@ export const createMessageList = (config: { const data = document.data(); const hasPendingWrites = document.metadata.hasPendingWrites; const createdAt = moment(data.createdAt?.toDate()); + const deletedMessageTime = moment(data.deletedTimestamp?.toDate()); + const isMessageDeleted = data.deleted; // Add last messages date if its a change if (lastMoment && !lastMoment.isSame(createdAt, 'day')) { @@ -105,7 +107,9 @@ export const createMessageList = (config: { messages.push(date); } if (index === 0) { - const messageTime = getLastMessageTime(createdAt); + const messageTime = isMessageDeleted + ? getLastMessageTime(deletedMessageTime) + : getLastMessageTime(createdAt); messages.push( createLocalMesssage({ document, --- src/channels/components/ChannelRow.tsx @@ -104,7 +104,6 @@ export const ChannelRow = (props: ChannelRowProps) => { ); const firstRecipientClockedIn = associateIsClockedIn(firstRecipientAssociate); - //@ts-ignore const lastMessageTime = lastMessage?.deleted ? channelRowTimeStamp(lastMessage?.deletedTimestamp?.toDate(), t) : channelRowTimeStamp(lastMessage?.createdAt?.toDate(), t); --- src/containers/Message/index.tsx @@ -13,7 +13,6 @@ import {TEXTING_I18N_NAMESPACE} from '../../translations'; import {useRbacConfigForDeleteMessage} from '../../hooks'; import {deleteMessageEnabled} from '../../redux/selectors'; import {MessageOptionsModal} from './MessageOptionsModal'; -import {channelRowTimeStamp} from '../../utils/timestamps'; const {width} = Dimensions.get('window'); // screen width - (avatar width (40) + avatar margin (16/10)) * 0.8 (80%) @@ -56,15 +55,10 @@ export const Message = ({ showReadReceipt, deleted, deletedByPreferredName, - deletedTimestamp, messagePath, channelPath, }: LocalMessage) => { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); - const deletedMessageTimeStamp = channelRowTimeStamp( - deletedTimestamp?.toDate(), - t, - ); const [isLongPressed, setIsLongPressed] = useState(false); const [isConfirmationModalVisible, setIsConfirmationModalVisible] = useState(false); @@ -154,9 +148,7 @@ export const Message = ({ </Caption> )} {!!messageTime && ( - <Caption UNSAFE_style={styles.readReceipt}> - {deleted ? deletedMessageTimeStamp : messageTime} - </Caption> + <Caption UNSAFE_style={styles.readReceipt}>{messageTime}</Caption> )} </View> </Pressable> --- src/types.ts @@ -47,6 +47,8 @@ export type FirebaseMessage = { sentFrom: string; image?: ImageMedia; audio?: AudioMedia; + deleted?: boolean; + deletedTimestamp?: FirebaseFirestoreTypes.Timestamp; }; export type MessageRequest = AtLeastOne<{ @@ -64,7 +66,6 @@ export type LocalMessage = FirebaseMessage & { showReadReceipt?: boolean; deleted?: boolean; deletedByPreferredName?: string; - deletedTimestamp?: any; isGroupMessage?: boolean; channelPath?: string; }; --- src/utils/messages.ts @@ -95,6 +95,8 @@ export const createMessageList = (config: { const data = document.data(); const hasPendingWrites = document.metadata.hasPendingWrites; const createdAt = moment(data.createdAt?.toDate()); + const deletedMessageTime = moment(data.deletedTimestamp?.toDate()); + const isMessageDeleted = data.deleted; // Add last messages date if its a change if (lastMoment && !lastMoment.isSame(createdAt, 'day')) { @@ -105,7 +107,9 @@ export const createMessageList = (config: { messages.push(date); } if (index === 0) { - const messageTime = getLastMessageTime(createdAt); + const messageTime = isMessageDeleted + ? getLastMessageTime(deletedMessageTime) + : getLastMessageTime(createdAt); messages.push( createLocalMesssage({ document,
Addressing PR comments
Addressing PR comments
2c434d7c03fe04836b8987debd304952123ed333
--- packages/allspark-foundation-hub/src/Store/Hooks/useGetViewersPrimaryTeamName.ts @@ -10,7 +10,6 @@ export const useGetViewersPrimaryTeamName = () => { ); const isUserSalariedEmployee: boolean = employeeType?.toUpperCase() === EMP_TYPE_SALARIED; - //TODO: Check if there is a way to check if the user is a manager if (!viewerTeam?.length) { if (isSalaried || isUserSalariedEmployee) { return [{ teamName: 'Management' }];
Remove todo
Remove todo
81dfbd2fed48e3c3fad90e8a5906855c30efc98f
--- .looper-pr.yml @@ -32,4 +32,3 @@ envs: -
feat(ui): update concord yml #SMDV-9999
feat(ui): update concord yml #SMDV-9999
9cdfd37ed2e6291368765158accef10275f58691
--- package.json @@ -87,8 +87,8 @@ "@walmart/ask-sam-mini-app": "1.32.4", "@walmart/associate-listening-mini-app": "1.2.37", "@walmart/attendance-mini-app": "3.174.0", - "@walmart/avp-feature-app": "0.16.19", - "@walmart/avp-shared-library": "0.10.12", + "@walmart/avp-feature-app": "0.16.25", + "@walmart/avp-shared-library": "0.10.14", "@walmart/backroom-mini-app": "1.13.3", "@walmart/calling-mini-app": "0.7.63", "@walmart/checkout-mini-app": "4.14.0", --- yarn.lock @@ -6782,9 +6782,9 @@ __metadata: languageName: node linkType: hard -"@walmart/avp-feature-app@npm:0.16.19": - version: 0.16.19 - resolution: "@walmart/avp-feature-app@npm:0.16.19::__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.19.tgz" +"@walmart/avp-feature-app@npm:0.16.25": + version: 0.16.25 + resolution: "@walmart/avp-feature-app@npm:0.16.25::__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.25.tgz" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -6793,13 +6793,13 @@ __metadata: react-native: ">=0.72.10" react-redux: ">=8.0.4" redux: ">=4.2.1" - checksum: 10c0/0913e9392af8ec1311ec4daefd42fcc870e27c097116f784692ca125a82fa72aefdb0b01c2b79e460c84a092a9ad42a56421b95ff7a04a761948bcccd0256b3e + checksum: 10c0/c18d75500d32e4b4ebe37637f376dd7584bb8da7f04cef081599f8607f7b387e783e5fe73e2dcdae819116883e5ec55ba3db75248339226d47a7fe3e0adb9112 languageName: node linkType: hard -"@walmart/avp-shared-library@npm:0.10.12": - version: 0.10.12 - resolution: "@walmart/avp-shared-library@npm:0.10.12::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Favp-shared-library%2F-%2F%40walmart%2Favp-shared-library-0.10.12.tgz" +"@walmart/avp-shared-library@npm:0.10.14": + version: 0.10.14 + resolution: "@walmart/avp-shared-library@npm:0.10.14" peerDependencies: axios: ^1.3.4 immer: ^9.0.16 @@ -6809,7 +6809,7 @@ __metadata: redux-saga: ^1.1.3 reduxsauce: ^1.2.0 reselect: ^4.1.7 - checksum: 10c0/401326bf2692ce5c80b74b003604a02d9bb490811eb05a6b6c0af55b44ea2e4c5095e963c877d63ae9d1b0cbdea548335e5c4c22f4404562a64e9b57050f59ff + checksum: 10c0/04e06b7c31b1e91428e65e8df8f4bf28e76c2d25423913a6ccf12cc904394291a97712e722733216d9ce7613797b1e6c97f773c32a3ed60d642388d09debf994 languageName: node linkType: hard @@ -7599,8 +7599,8 @@ __metadata: "@walmart/ask-sam-mini-app": "npm:1.32.4" "@walmart/associate-listening-mini-app": "npm:1.2.37" "@walmart/attendance-mini-app": "npm:3.174.0" - "@walmart/avp-feature-app": "npm:0.16.19" - "@walmart/avp-shared-library": "npm:0.10.12" + "@walmart/avp-feature-app": "npm:0.16.25" + "@walmart/avp-shared-library": "npm:0.10.14" "@walmart/backroom-mini-app": "npm:1.13.3" "@walmart/calling-mini-app": "npm:0.7.63" "@walmart/checkout-mini-app": "npm:4.14.0"
fix(avp-feature-app): bug fix for paycheck date display (#4485)
fix(avp-feature-app): bug fix for paycheck date display (#4485) * feat: TPB Drop 32 * chore: bump avp version * chore: fix indentation * fix(htttpclient.js): fixed x-apollo-operation-name header issue --------- Co-authored-by: Sai Devineni - s0d0fds <Sai.Devineni0@walmart.com> Co-authored-by: Mounish kumar Venkateskumar - m0v067c <Mounish.Kumar.Venkateskumar@walmart.com>
72be5b91fafec2be7869e82e31bcff4ca86f7da2
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/TeamListItem/TeamListItem.tsx @@ -5,7 +5,6 @@ import { Body, Checkbox, ChevronRightIcon, - // Tag, } from '@walmart/gtp-shared-components'; import { Images } from '../Images/images'; import { TeamListItemProps } from './types'; @@ -19,6 +18,7 @@ import { teamSelectionNavArrowEnabled, } from '../Redux'; +//TODO: Remove primary team auto select logic export const TeamListItem = ({ checkboxDisabled, iconType, @@ -86,7 +86,6 @@ export const TeamListItem = ({ disabled: checkboxDisabled, }} checked={isSelected} - disabled={checkboxDisabled} testID={`team-selection-checkbox-${teamName}`} onPress={handlePress} />
Removing disabled checkbox state
Removing disabled checkbox state
abe57abc24959e2446a811db18586c1baf172ddb
--- graphql.yml @@ -88,11 +88,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" @@ -103,43 +103,43 @@ applications: queryTemplate: "packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql" tags: - "v1" - - name: "GetSupplyChainShifts" - hash: "b0f8dbb33dfb79cf68890fa719d4a9a6a2ab8e851ea3a81708a31ac9078c988c" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getSupplyChainShifts.graphql" - tags: - - "v1" - - name: "getSupplyChainTeamPreference" - hash: "61253c3d4d8ab6db774a903969c2f63de9113f44c1947d52c3630dd38ce30839" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getSupplyChainTeamPreferenceQuery.graphql" - tags: - - "v1" - - name: "GetSupplyChainTeamsByStore" - hash: "74bb80b3180028948952cb07a41ad7a621c0721110520631ee9d871f7a555b67" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getSupplyChainTeamsByStore.graphql" - tags: - - "v1" + # - name: "GetSupplyChainShifts" + # hash: "b0f8dbb33dfb79cf68890fa719d4a9a6a2ab8e851ea3a81708a31ac9078c988c" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/getSupplyChainShifts.graphql" + # tags: + # - "v1" + # - name: "getSupplyChainTeamPreference" + # hash: "61253c3d4d8ab6db774a903969c2f63de9113f44c1947d52c3630dd38ce30839" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/getSupplyChainTeamPreferenceQuery.graphql" + # tags: + # - "v1" + # - name: "GetSupplyChainTeamsByStore" + # hash: "74bb80b3180028948952cb07a41ad7a621c0721110520631ee9d871f7a555b67" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/getSupplyChainTeamsByStore.graphql" + # tags: + # - "v1" - name: "getTeamByIdHome" hash: "6b4b876250309d85dd51831ace4595bd1764b3d41ef7fd65c08df03b4c4982e0" queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamByIdHome.graphql" tags: - "v1" - - name: "GetTeamsByStore" - hash: "e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql" - tags: - - "v1" + # - name: "GetTeamsByStore" + # hash: "e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql" + # tags: + # - "v1" - name: "upsertAssociatePreference" hash: "972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036" queryTemplate: "packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql" tags: - "v1" - - name: "upsertManagerExperiencePreference" - hash: "bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca" - queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql" - tags: - - "v1" - - name: "upsertSupplyChainAssociatePreference" - hash: "39c45936c3b4d0020c6192b629c29860a30a5f2f70c5297c9e34dcffbaa0c7b0" - queryTemplate: "packages/me-at-walmart-athena-queries/src/upsertSupplyChainAssociatePreference.graphql" - tags: - - "v1" + # - name: "upsertManagerExperiencePreference" + # hash: "bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql" + # tags: + # - "v1" + # - name: "upsertSupplyChainAssociatePreference" + # hash: "39c45936c3b4d0020c6192b629c29860a30a5f2f70c5297c9e34dcffbaa0c7b0" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/upsertSupplyChainAssociatePreference.graphql" + # tags: + # - "v1"
Commenting queries in Prod
Commenting queries in Prod
753ab934680e50f20d2ce26f809a20524fd0ccad
--- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/ActionButtonGroup/ActionButtonGroup.tsx @@ -9,6 +9,7 @@ export const ActionButtonGroup = ({ primaryButtonLabel, onSecondaryButtonPress, onPrimaryButtonPress, + isPrimaryButtonDisabled = false, }: ButtonGroupProps) => { return ( <View style={styles.buttonContainer}> @@ -33,6 +34,7 @@ export const ActionButtonGroup = ({ accessibilityRole='button' accessibilityLabel={primaryButtonLabel} testID='primary-button' + disabled={isPrimaryButtonDisabled} > {primaryButtonLabel} </Button> --- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/ActionButtonGroup/types.ts @@ -3,4 +3,5 @@ export interface ButtonGroupProps { primaryButtonLabel: string; onSecondaryButtonPress?: () => void; onPrimaryButtonPress: () => void; + isPrimaryButtonDisabled?: boolean; } --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/TeamShiftSwitcher/TeamShiftSwitcher.tsx @@ -107,7 +107,7 @@ export const TeamShiftSwitcher = ({ accessibilityLabel={accessibilityLabel} testID='team-and-shift-text' > - {teamAndShiftText} + {teamAndShiftText || fullTeamAndShiftText} </Body> {allSavedTeams && ( <Body --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/EditSavedTeamModal/EditSavedTeamsModal.tsx @@ -12,6 +12,11 @@ import { modalStyles } from './styles'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { FEATURE_ID } from '../../constant'; import { ActionButtonGroup } from '../../../Shared/Components/ActionButtonGroup'; +import { useDispatch, useSelector } from 'react-redux'; +import { + ManagerExperienceCreators, + ManagerExperienceSelectors, +} from '../../../Store/Redux'; export interface ModalProps { modal: { @@ -22,12 +27,16 @@ export interface ModalProps { export const EditSavedTeamsModal = ({ modal }: ModalProps) => { const { t } = useAllsparkTranslation(FEATURE_ID); - const { closeModal, getParam } = modal; - const currentSelectedTeams = getParam('selectedTeams') || []; + const { closeModal } = modal; + const dispatch = useDispatch(); const [input, setInput] = useState(''); + const prevSelectedTeamIds = + (useSelector(ManagerExperienceSelectors.getSelectedTeamIDs) as string[]) || + []; + const [selectedTeams, setSelectedTeams] = - useState<string[]>(currentSelectedTeams); + useState<string[]>(prevSelectedTeamIds); const [sections, setSearchedsections] = useState<typeof sortedSections>(sortedSections); @@ -60,8 +69,9 @@ export const EditSavedTeamsModal = ({ modal }: ModalProps) => { [selectedTeams, setSelectedTeams] ); - // save action on selections - const handleSaveButton = useCallback(() => {}, []); + const handleSaveButton = useCallback(() => { + dispatch(ManagerExperienceCreators.updateSelectedTeamIDs(selectedTeams)); + }, [selectedTeams]); return ( <> --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/UpdateTeamsModal/UpdateTeamsModal.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useState } from 'react'; +import React, { useCallback, useMemo, useState } from 'react'; import { ScrollView, View } from 'react-native'; import { Body, @@ -17,17 +17,33 @@ import { AllSupplyTeamList } from '../../Components/AllSupplyTeamsList/AllSupply import { ActionButtonGroup } from '../../../Shared/Components/ActionButtonGroup'; import { styles } from './styles'; import { AllsparkNavigationClient } from '@walmart/allspark-foundation'; +import { useDispatch, useSelector } from 'react-redux'; +import { + ManagerExperienceCreators, + ManagerExperienceSelectors, +} from '../../../Store/Redux'; export interface ModalProps { modal: { closeModal: () => void; - getParam: any; }; } export const UpdateTeamsModal = ({ modal: { closeModal } }: ModalProps) => { const { t } = useAllsparkTranslation(FEATURE_ID); - const [selectedTeams, setSelectedTeams] = useState<string[]>([]); + const dispatch = useDispatch(); + + const prevSelectedTeamIds = + (useSelector(ManagerExperienceSelectors.getSelectedTeamIDs) as string[]) || + []; + const prevSelectedShifts = + (useSelector(ManagerExperienceSelectors.getSelectedShifts) as string[]) || + []; + + const [selectedTeams, setSelectedTeams] = + useState<string[]>(prevSelectedTeamIds); + const [selectedShifts, setSelectedShifts] = + useState<string[]>(prevSelectedShifts); // useOnboarding context to pull saved shifts and teams const handleSelection = useCallback( @@ -44,6 +60,33 @@ export const UpdateTeamsModal = ({ modal: { closeModal } }: ModalProps) => { [selectedTeams, setSelectedTeams] ); + const handleShiftSelection = useCallback( + (item: string) => { + const shiftIsSelected = Boolean( + selectedShifts.find((team) => team === item) + ); + if (shiftIsSelected) { + setSelectedShifts(selectedShifts.filter((shift) => shift !== item)); + } else { + setSelectedShifts([...selectedShifts, item]); + } + }, + [selectedShifts, setSelectedShifts] + ); + + const handleApplyButton = useCallback(() => { + dispatch(ManagerExperienceCreators.updateSelectedTeamIDs(selectedTeams)); + dispatch(ManagerExperienceCreators.updateSelectedShifts(selectedShifts)); + closeModal(); + }, [dispatch, selectedTeams, selectedShifts]); + + const isDisabled = useMemo(() => { + return ( + prevSelectedTeamIds.length !== selectedTeams.length || + prevSelectedShifts.length !== selectedShifts.length + ); + }, [selectedTeams, selectedShifts]); + return ( <> <ScrollView style={styles.rootContainer}> @@ -58,7 +101,7 @@ export const UpdateTeamsModal = ({ modal: { closeModal } }: ModalProps) => { <View style={styles.filterContainer}> <ShiftFilterList filterListData={mockFilterListData} - handleSelectShift={() => {}} + handleSelectShift={handleShiftSelection} isModal={true} isLoading={false} /> @@ -83,8 +126,9 @@ export const UpdateTeamsModal = ({ modal: { closeModal } }: ModalProps) => { <ActionButtonGroup primaryButtonLabel={t('updateTeamsModal.button.apply')} secondaryButtonLabel={t('updateTeamsModal.button.cancel')} - onPrimaryButtonPress={closeModal} + onPrimaryButtonPress={handleApplyButton} onSecondaryButtonPress={closeModal} + isPrimaryButtonDisabled={isDisabled} /> </> );
feat(ui): cherry picking changes due to bad merge
feat(ui): cherry picking changes due to bad merge
5f50c2f9545305d2b1f4750fa975e88b6a09b160
--- CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) + + +### Bug Fixes + +* **calling-mini-app:** CONAS-2311 Android crash fix on prod dynamic builds ([#4675](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4675)) ([20a3fde](https://gecgithub01.walmart.com/allspark/allspark-core/commit/20a3fded13460a1b987f7deacb36c810e54bcb57)) + + + + + ## [6.35.1-alpha.2](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.1...v6.35.1-alpha.2) (2025-08-29) --- lerna.json @@ -1,5 +1,5 @@ { - "version": "6.35.1-alpha.2", + "version": "6.35.1-alpha.3", "npmClient": "yarn", "changelogPreset": "angular", "command": { --- packages/core-services-allspark/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. +## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) + +**Note:** Version bump only for package @walmart/core-services-allspark + + + + + ## [6.35.1-alpha.2](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.1-alpha.1...v6.35.1-alpha.2) (2025-08-29) **Note:** Version bump only for package @walmart/core-services-allspark --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "6.35.1-alpha.2", + "version": "6.35.1-alpha.3", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/core-widget-registry/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. +## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) + +**Note:** Version bump only for package @walmart/core-widget-registry + + + + + ## [6.35.1-alpha.2](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.1-alpha.1...v6.35.1-alpha.2) (2025-08-29) **Note:** Version bump only for package @walmart/core-widget-registry --- packages/core-widget-registry/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-widget-registry", - "version": "6.35.1-alpha.2", + "version": "6.35.1-alpha.3", "description": "Repo for Me@Walmart related widget registries", "author": "rlane1 <russell.lane@walmart.com>", "license": "ISC", --- packages/me-at-walmart-common/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. +## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) + +**Note:** Version bump only for package @walmart/me-at-walmart-common + + + + + ## [6.35.1-alpha.2](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.1...v6.35.1-alpha.2) (2025-08-29) **Note:** Version bump only for package @walmart/me-at-walmart-common --- packages/me-at-walmart-common/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-common", - "version": "6.35.1-alpha.2", + "version": "6.35.1-alpha.3", "description": "Common utilities and components for Me@Walmat mini apps", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/me-at-walmart-container/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. +## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) + +**Note:** Version bump only for package @walmart/me-at-walmart-container + + + + + ## [6.35.1-alpha.2](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.1...v6.35.1-alpha.2) (2025-08-29) **Note:** Version bump only for package @walmart/me-at-walmart-container --- packages/me-at-walmart-container/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-container", - "version": "6.35.1-alpha.2", + "version": "6.35.1-alpha.3", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version
27fb2251b6c0aac4eefc6222cb684f95668b4bf6
--- package.json @@ -88,7 +88,7 @@ "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.19.0", "@walmart/exception-mini-app": "1.0.16", - "@walmart/facilities-management-miniapp": "0.6.0-beta3", + "@walmart/facilities-management-miniapp": "0.6.0-beta15", "@walmart/feedback-all-spark-miniapp": "0.9.10", "@walmart/financial-wellbeing-feature-app": "1.1.2", "@walmart/functional-components": "2.0.6",
Update package.json
Update package.json
6677d23cf6eb73604483fe86fbfe521683818751
--- targets/US/package.json @@ -113,7 +113,7 @@ "@walmart/iteminfo-mini-app": "7.15.11", "@walmart/learning-mini-app": "20.0.32", "@walmart/manager-approvals-miniapp": "0.2.4", - "@walmart/me-at-walmart-athena-queries": "6.5.0", + "@walmart/me-at-walmart-athena-queries": "6.24.0-alpha.0", "@walmart/me-at-walmart-common": "workspace:^", "@walmart/me-at-walmart-container": "workspace:^", "@walmart/me-at-walmart-core": "workspace:^", --- yarn.lock @@ -6839,7 +6839,7 @@ __metadata: "@walmart/iteminfo-mini-app": "npm:7.15.11" "@walmart/learning-mini-app": "npm:20.0.32" "@walmart/manager-approvals-miniapp": "npm:0.2.4" - "@walmart/me-at-walmart-athena-queries": "npm:6.5.0" + "@walmart/me-at-walmart-athena-queries": "npm:6.24.0-alpha.0" "@walmart/me-at-walmart-common": "workspace:^" "@walmart/me-at-walmart-container": "workspace:^" "@walmart/me-at-walmart-core": "workspace:^"
chore: bump athena queries to drop version
chore: bump athena queries to drop version
f85989cd54b0d7aa6f504d879edd23f3cf81a982
--- package-lock.json @@ -42,8 +42,8 @@ "@walmart/ask-sam-mini-app": "1.17.10", "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.9", - "@walmart/config-components": "4.2.13", - "@walmart/copilot-mini-app": "^3.26.4", + "@walmart/config-components": "4.2.15", + "@walmart/copilot-mini-app": "3.26.4", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5", @@ -8572,9 +8572,9 @@ } }, "node_modules/@walmart/config-components": { - "version": "4.2.13", - "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.2.13.tgz", - "integrity": "sha512-T9PjclUvV2lDXw+tucYgFPmawVVLRndhjyCGY7heDnGypx/pSNOiW+KA/hs/iAPBPHldOUfR82QBeeOAR871SA==", + "version": "4.2.15", + "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.2.15.tgz", + "integrity": "sha512-2pIJIwp0la04WmceNd/RnHADpB83N1CUqY/rlM/xzoZahTCrBmDil+gNbYjineBrXZYkQU4mTSXSvLHklymIYw==", "dependencies": { "reduxsauce": "^1.2.1", "reselect": "^4.1.5" @@ -33217,9 +33217,9 @@ "integrity": "sha512-l2/DFMufZfrJ22AzXkQCZuF4RPb+NvhOyqRK2lzo5qhoERUtunqVikSKYuewZ1mM6zmIYDY4TpDu7RDnX+JVEQ==" }, "@walmart/config-components": { - "version": "4.2.13", - "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.2.13.tgz", - "integrity": "sha512-T9PjclUvV2lDXw+tucYgFPmawVVLRndhjyCGY7heDnGypx/pSNOiW+KA/hs/iAPBPHldOUfR82QBeeOAR871SA==", + "version": "4.2.15", + "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-4.2.15.tgz", + "integrity": "sha512-2pIJIwp0la04WmceNd/RnHADpB83N1CUqY/rlM/xzoZahTCrBmDil+gNbYjineBrXZYkQU4mTSXSvLHklymIYw==", "requires": { "reduxsauce": "^1.2.1", "reselect": "^4.1.5" --- package.json @@ -83,7 +83,7 @@ "@walmart/ask-sam-mini-app": "1.17.10", "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.9", - "@walmart/config-components": "4.2.13", + "@walmart/config-components": "4.2.15", "@walmart/copilot-mini-app": "3.26.4", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4",
config comp version incremeneted
config comp version incremeneted
94ef04d34ab158281d100763a32a4abadddb04b1
--- src/home/index.tsx @@ -2,7 +2,6 @@ import React from 'react'; import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; import {renderDrawerButton} from '@walmart/allspark-foundation/Navigation'; import { - HomeDashboardContainer, HomeHeaderRightContainer, } from '@walmart/me-at-walmart-common'; @@ -16,19 +15,31 @@ import {TaskCard} from './components/TaskCard'; export const HomeFeature = new AllsparkFeatureModule('home', { name: 'Home', - listeners: { - feature: { - onConnect: () => { - HomeDashboardContainer.addMultiple([ - ['GreetingRow', GreetingRow], - ['CovidBanner', CovidBanner], - ['LinkCard', LinkCard], - ['CellularDataSaver', DataSaverWidget], - ['CelebrationCard', CelebrationCard], - ['TaskCard', TaskCard], - ]); - }, + components: { + 'GreetingRow': { + component: GreetingRow, + containerId: 'home_dashboard' + }, + 'CovidBanner': { + component: CovidBanner, + containerId: 'home_dashboard' + }, + 'LinkCard': { + component: LinkCard, + containerId: 'home_dashboard' + }, + 'CellularDataSaver': { + component: DataSaverWidget, + containerId: 'home_dashboard' + }, + 'CelebrationCard': { + component: CelebrationCard, + containerId: 'home_dashboard' }, + 'TaskCard': { + component: TaskCard, + containerId: 'home_dashboard' + } }, screens: { 'home.root': {
refactor: move home components registration from on connect listener to module components
refactor: move home components registration from on connect listener to module components
4a2730e6fc265dd52ee9357fd17687dd2f1dbfdd
--- scripts/sendToTeams.js @@ -35,7 +35,10 @@ console.log('args are', args); const {file, success} = args; -const templateFile = (success) ? './teamsSuccessTemplate.json' : './teamsFailureTemplate.json'; +const templateFile = + success === 'true' + ? './teamsSuccessTemplate.json' + : './teamsFailureTemplate.json'; const templatePayload = require(templateFile);
fix success evaluation
fix success evaluation
ad5c59d565cafb005dd749f6594eeac6dcd22f8e
--- __tests__/managerExperience/components/TeamDetailsRosterInfo.test.tsx @@ -119,26 +119,4 @@ describe('TeamDetailsRosterInfo Component', () => { expect(headerText).toBe(defaultProps.headerText); expect(numberOfAssociates).toBe(defaultProps.numberOfAssociates); }); - - // it('renders correctly with multiple associates', () => { - // const newProps: TeamDetailsRosterInfoProps = { - // ...defaultProps, - // associates: [ - // generateMockAssociate({win: 111}), - // generateMockAssociate({win: 222}), - // generateMockAssociate({win: 333}), - // ], - // }; - // const {getByTestId, toJSON} = renderWithProviders( - // <TeamDetailsRosterInfo {...newProps} />, - // ); - - // //Check for elements by testId - // const headerContainer = getByTestId('headerContainer'); - // const filterChipGroupContainer = getByTestId('filterChipGroupContainer'); - - // expect(headerContainer).toBeTruthy(); - // expect(filterChipGroupContainer).toBeTruthy(); - // expect(toJSON()).toMatchSnapshot(); - // }); });
fix: remove commented code
fix: remove commented code
5350c333c817eee7b4ee280a92d28a687be995d3
--- .looper.codepush.yml @@ -3,8 +3,8 @@ node: ((osx||stable_osx)&&!dualcore) envs: global: variables: - envdev: ENC[NneSb0HR71CeJtD80sXy/m6JzkD4c+HVBTJJ/xMJjJfVVcaz0hhAiMmjGDuhX4UxjxSTEklCperQb85ZFE8ilRNRmv7bAfR6VVAv+MayIEmaS/ucvNe327VtDEsyNoENqsscNo0qQv7+WSag8MDTDihLdtGx8XzP4hutc1XsS7eLn2Oq0mWGe3i1WZ351knoLr6E9AV9PstknW+Zxi6E2RM2yQ6ERUDDXdpxhW7LbxkgqqVXqkP2YAsNK7ovzRjtsLl5AP5A7iRKNI71eic27EQot31BzaZE+1qWwrzuqKB+4X2X7j2f5LUVcMioL/d/PPcJNxrp4CX/vdykS6MDGvb3idGOc68Bu26rwM45CC8=] - envprod: pending + APPCENTER_API_TOKEN_IOS: "%{credentials.secret('appcenter_iOS')}" + APPCENTER_API_TOKEN_ANDROID: "%{credentials.secret('appcenter_android')}" tools: nodejs: @@ -23,6 +23,7 @@ flows: upload: - npm install + - echo $APPCENTER_API_TOKEN_ANDROID - shell: | #!/bin/bash CURRENT_BRANCH=$(git branch --show-current) @@ -36,11 +37,8 @@ flows: echo 'Branch names:' git branch -a echo 'git setup done, moving to node part now' - - echo ${envdev} > env.dev.js - npm install -g appcenter-cli + - appcenter apps list --token $APPCENTER_API_TOKEN_ANDROID pr: - npm install - - npm run lint - - npm run test - - npm run validate
updated keys 2
updated keys 2
8b2fceaeca2aa6eaa350bc449d8df046a9148fa0
--- package.json @@ -90,7 +90,7 @@ "@walmart/exception-mini-app": "0.43.1", "@walmart/facilities-management-miniapp": "0.3.26", "@walmart/feedback-all-spark-miniapp": "0.9.0", - "@walmart/financial-wellbeing-feature-app": "1.0.62", + "@walmart/financial-wellbeing-feature-app": "1.0.63", "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "1.8.17",
bumped financial-wellbeing-feature-app to 1.0.63
bumped financial-wellbeing-feature-app to 1.0.63
9423579dc3f85d0aeecbb633696327984c9de996
--- .husky/prepare-commit-msg @@ -10,4 +10,14 @@ if [ -n "$GIT_SEQUENCE_EDITOR" ]; then exit 0 fi +COMMIT_MSG_FILE="$1" + +# Check if commit message already matches commitlint spec +if npx --no -- commitlint --quiet --edit "$COMMIT_MSG_FILE"; then + echo "Commit message already matches commitlint spec, skipping Commitizen." + exit 0 +fi + +echo -e "Commit message does not match commitlint spec.\n\nRequired format:\n type(scope?): subject\nExample:\n feat(src): ALLSPARK-6416 add new login feature\n\nLaunching Commitizen CLI to help you format your commit message..." + exec </dev/tty && git cz --hook || true --- commitlint.config.ts @@ -3,7 +3,13 @@ import type {UserConfig} from '@commitlint/types' const config: UserConfig = { extends: ['@commitlint/config-conventional'], rules: { - 'subject-case': [0, 'always', 'upper-case'] + 'subject-case': [0, 'always', 'upper-case'], + 'type-enum': [ + 2, + 'always', + ['feat', 'fix', 'docs', 'refactor', 'test', 'build', 'ci', 'chore', 'style'] + ], + 'scope-empty': [0] // scope is an optional field } } --- package.json @@ -436,7 +436,8 @@ "path": "./node_modules/@digitalroute/cz-conventional-changelog-for-jira", "skipDescription": true, "skipScope": false, - "jiraPrefix": "JIRA_PROJECT" + "jiraPrefix": "JIRA_PROJECT", + "jiraOptional": true } } }
chore: make jira optional and amend precommit hook (#4244)
chore: make jira optional and amend precommit hook (#4244) * chore: make jira optional and amend precommit hook * chore: update .husky/prepare-commit-msg
7ac395cb9335a2bb08233b5b2104d32b71266bd5
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.26.0", + "version": "1.27.0", "main": "dist/index.js", "files": [ "dist"
Update the roster mini app version
Update the roster mini app version
cd11a43830bb3d8bb6f01e56640c9cad0b672e9a
--- package-lock.json @@ -3362,9 +3362,9 @@ } }, "@walmart/manager-approvals-miniapp": { - "version": "0.0.32", - "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.32.tgz", - "integrity": "sha512-XSCO6S7sWn9s3IUiBnthIm7hf9YDXeFGExQcDnTJkRsrhENYWMO+fCUNpVOx7EX1R1aH65kQMoE1vLFoHdE35Q==" + "version": "0.0.35", + "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.35.tgz", + "integrity": "sha512-z7FqmH6ZUEUAiPR61yA3BmFunwUTAx01F05RAuu6z8oDu3UzswYWeT5LkLRVUGGclYoO8kBxbVZYc7c2lyQudw==" }, "@walmart/moment-walmart": { "version": "1.0.4",
resolve merge conflicts
resolve merge conflicts
aee8dd5d14e316af2575aa4dca6d1200731c968f
--- packages/core-widget-registry/src/Inbox.ts @@ -1,3 +1,9 @@ import { WidgetRegistry } from '@walmart/allspark-utils'; +import { FunctionComponent } from 'react'; -export const InboxWidgetRegistry = new WidgetRegistry('inbox'); +const INBOX_WIDET_REGISTRY_KEY = 'inbox'; + +type InboxWidgetMap = Record<string, FunctionComponent<any>>; +export const InboxWidgetRegistry = new WidgetRegistry<InboxWidgetMap>( + INBOX_WIDET_REGISTRY_KEY +); --- packages/core-widget-registry/src/index.tsx @@ -2,3 +2,4 @@ export * from './AskSam'; export * from './Core'; export * from './Home'; export * from './Metrics'; +export * from './Inbox';
fix(type): type fix SSMP-4408
fix(type): type fix SSMP-4408
360a808af161f74c1f292f7efd4528667ea38e5b
--- yarn.lock @@ -6428,9 +6428,9 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.14.1" + "@walmart/roster-mini-app": "npm:2.14.2" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.12.2" + "@walmart/wmconnect-mini-app": "npm:2.12.3" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" eslint: "npm:8.22.0" @@ -6610,9 +6610,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.14.1": - version: 2.14.1 - resolution: "@walmart/roster-mini-app@npm:2.14.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-2.14.1.tgz" +"@walmart/roster-mini-app@npm:2.14.2": + version: 2.14.2 + resolution: "@walmart/roster-mini-app@npm:2.14.2::__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-2.14.2.tgz" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6654,7 +6654,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/b8b6ca29338a40fdcc5cbf086e1592bb2a4a2b8b83105c9355208c116b80c76b609cce9ccabf7717097951864ce4bffe5ffe296c22493c950fc729154a87b3f1 + checksum: 10c0/c911fdee81f98cfc3d8d6ef27b163093675ae7fa004baa77e37416e190f99fa5c4851485295f2cb4e8666026c44990c327d6778e0e2f1aef54ae6fac84580f06 languageName: node linkType: hard @@ -6678,9 +6678,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.12.2": - version: 2.12.2 - resolution: "@walmart/wmconnect-mini-app@npm:2.12.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.12.2.tgz" +"@walmart/wmconnect-mini-app@npm:2.12.3": + version: 2.12.3 + resolution: "@walmart/wmconnect-mini-app@npm:2.12.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.12.3.tgz" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6720,7 +6720,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/35f5a714736049c888f57375e4f8af2dc58867a685936f89e6b5d35f8778cb5aa695f9c29ed8ddbf6f84f57c315e4869684612ca8dec8714837fa66868240974 + checksum: 10c0/1b502d03c3a694c92ccd3ad94d5ab60cab0186cf862b0dfbe9bcf7a38d99e7b03e0505c828571490dbd966cbbd02f7bf955d73a651359f0cc842984ae2e86f0e languageName: node linkType: hard
fix(ui): update the my team mini app version smdv-9999
fix(ui): update the my team mini app version smdv-9999
a6e84386cce7ebe27d54adeedff8e8d50a3ec546
--- src/managerExperience/components/FilterChip/FilterChip.tsx @@ -5,22 +5,20 @@ import {Text} from 'react-native'; import {FilterChipProps} from './types'; export const FilterChip = (props: Omit<FilterChipProps, 'children'>) => { + const {isApplied, label, testID} = props; if (props.label === '') return false; return ( <Chip {...props} UNSAFE_style={ - props.isApplied - ? styles.chipContainerActive - : styles.chipContainerInactive + isApplied ? styles.chipContainerActive : styles.chipContainerInactive } - testID={props.testID}> + testID={testID} + selected={isApplied}> <Text - style={ - props.isApplied ? styles.chipTextActive : styles.chipTextInactive - } - accessibilityLabel={props.label}> - {props.label} + style={isApplied ? styles.chipTextActive : styles.chipTextInactive} + accessibilityLabel={label}> + {label} </Text> </Chip> ); --- src/managerExperience/components/FilterChipGroup/FilterChipGroup.tsx @@ -14,9 +14,9 @@ export const FilterChipGroup = ({ handleFilter, }: FilterChipGroupProps) => { const {t} = useTranslation([MANAGER_EXPERIENCE_NAMESPACE]); - const [selectedFilter, setSelectedFilter] = useState<FilterType | undefined>( - FilterType.absent, - ); + const [selectedFilter, setSelectedFilter] = useState< + FilterType | undefined + >(); const handleFilterPress = (filterType: FilterType) => { if (selectedFilter === filterType) {
feat: added selected prop and fixed absent default
feat: added selected prop and fixed absent default
7bcfca4c14bcf6d8a3c36d7c7d17361a43eadb6a
--- src/hooks/teams.ts @@ -83,9 +83,11 @@ export const useGetViewersPrimaryTeamName = () => { }; export const useGetViewersPrimaryWorkGroup = () => { - const viewerTeam: Team[] = useSelector(UserSelectors.getUserTeams); - if (viewerTeam && viewerTeam.length > 0) { - return viewerTeam[0].workgroup?.toLowerCase() || ''; + const viewerTeamId = useGetViewersPrimaryTeamId(); + const teamInfo = useGetTeamById(viewerTeamId); + + if (teamInfo.data && !teamInfo.loading && !teamInfo.error) { + return teamInfo.data.getTeamById?.workgroup?.toLowerCase() || ''; } else { return ''; } --- src/hooks/teams.ts @@ -83,9 +83,11 @@ export const useGetViewersPrimaryTeamName = () => { }; export const useGetViewersPrimaryWorkGroup = () => { - const viewerTeam: Team[] = useSelector(UserSelectors.getUserTeams); - if (viewerTeam && viewerTeam.length > 0) { - return viewerTeam[0].workgroup?.toLowerCase() || ''; + const viewerTeamId = useGetViewersPrimaryTeamId(); + const teamInfo = useGetTeamById(viewerTeamId); + + if (teamInfo.data && !teamInfo.loading && !teamInfo.error) { + return teamInfo.data.getTeamById?.workgroup?.toLowerCase() || ''; } else { return ''; }
update teams get workgroup hook
update teams get workgroup hook
a1f0d27850bb5ace0fb3b37e86eee5f316f84f4d
--- .looper.multibranch.yml @@ -93,6 +93,7 @@ flows: - foreachParallelFailsafe($ENV): - tools(android = ${ANDROID_TOOLS}): - group("Android Build ${value}"): + - (name Hello world with ruler) echo "Hello world with ruler" - (name Bundle Setup) https_proxy=http://sysproxy.wal-mart.com:8080 http_proxy=http://sysproxy.wal-mart.com:8080 $RUBY_PATH/bundle - (name Bundle Update) https_proxy=http://sysproxy.wal-mart.com:8080 http_proxy=http://sysproxy.wal-mart.com:8080 $RUBY_PATH/bundle update - declare(start_time) @@ -105,6 +106,8 @@ flows: build-android-app: - (name Build Android) export EXPO_PUBLIC_APP_VARIANT="${ENV}" && export FASTLANE_DISABLE_COLORS=1 && $RUBY_PATH/bundle exec fastlane build_android # set GRADLE_BUILD_FLAVOUR as Capitalized Env + - (name Analyze Android Bundle Size) export FASTLANE_DISABLE_COLORS=1 && $RUBY_PATH/bundle exec fastlane analyze_android_bundle_size + build-app: # overridden to remove setting gradle build flavor, no longer needed - try:
feat(ruler): allspark-6443 added new stage to trigger size measurement lane
feat(ruler): allspark-6443 added new stage to trigger size measurement lane
b84da06d40106507350b2c05591544752aaff392
--- src/screens/AllTeamsScreen/SupplyChainAllTeamsScreen.tsx @@ -11,9 +11,7 @@ import { } from '@walmart/allspark-foundation-hub'; import {allTeamsScreenStyles as styles} from './styles'; import {rosterDetailScreenStyles as borrowedStyles} from '../RosterDetailScreen/styles'; -import { - useTotalSiteOrTotalStore, -} from '../../hooks'; +import {useTotalSiteOrTotalStore} from '../../hooks'; import {createTeamsSectionsByOpsArea} from '../../utils/allTeams'; import {AllTeamsLoadingScreen} from './AllTeamsLoadingScreen'; import { --- src/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -7,7 +7,7 @@ import {RosterDetailScreenProps} from './types'; import {useNavigation} from '@react-navigation/native'; import {translationClient} from '../../common'; import {renderDrawerButton} from '@walmart/allspark-foundation'; -import { useGetViewersPrimaryTeam } from '@walmart/allspark-foundation-hub'; +import {useGetViewersPrimaryTeam} from '@walmart/allspark-foundation-hub'; export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { const isSiteDC = useSelector(SiteSelectors.getWorkingSiteIsDC); @@ -20,7 +20,8 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { default: 'Roster', fallbackLng: 'en-US', }), - headerLeft: route.params.teamId === primaryTeam?.[0].teamId && renderDrawerButton, + headerLeft: + route.params.teamId === primaryTeam?.[0].teamId && renderDrawerButton, }); }, [navigation]);
Update the roster primary team check
Update the roster primary team check
588483735db8aa3494e1233c023a916d7997af5c
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart", - "version": "1.35.3", + "version": "1.35.4", "main": "index.js", "private": true, "workspaces": [
feat(patch): bump patch version allspark-core
feat(patch): bump patch version allspark-core
a6f22573a591f765677f902cde3abfa193c63805
--- .looper.multibranch.yml @@ -90,3 +90,8 @@ flows: publishFromChanges: - call: preparePackages - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes + + mini-pr: + - (name Branch Check, silent) echo "TBD" + - call: build-npm + - (name Build JS Bundle) ./node_modules/.bin/react-native bundle --entry-file ./targets/US/index.js --bundle-output ./bundle.js --reset-cache
chore: looper template testing
chore: looper template testing
acb531bcb4c9cb4eeee9bd7c5d4e5fc5ba129899
--- src/hooks/roster.ts @@ -69,8 +69,7 @@ export const useGetAssociateId = (userWin: string) => { export const useIsWeeklyScheduleLinkVisible = () => { const RBACState = useSelector(getRbacState); const RMAAppId = useSelector(getRmaAppId); - //TODO: Change the name to have texting namespace. Using legacy app RBAC config - const RMAPermissionsPath = '/ptt/weekly_schedule_link'; + const RMAPermissionsPath = '/texting/weekly_schedule_link'; const RMAViewPermission = 'VIEW'; const user: any = useSelector(UserSelectors.getUser); const teamLeadJobDescriptions = useSelector(teamLeadJobDescriptionsSelector); --- src/redux/selectors.ts @@ -43,8 +43,22 @@ export const getUploadingBlob = createSelector( (state) => state.uploadingBlob, ); -interface RBACAppState { - data: any; //TODO: Add data shape +export type Permissions = { + rn: string; + a: string; + cnds: Array<any>; +}; + +export interface RBACAppState { + data: { + [key: string]: { + permissions: Permissions[]; + groups: { + Local: Array<string>; + }; + roles: any; + }; + }; error: boolean; fetchingPolicy: boolean; loaded: boolean; --- src/hooks/roster.ts @@ -69,8 +69,7 @@ export const useGetAssociateId = (userWin: string) => { export const useIsWeeklyScheduleLinkVisible = () => { const RBACState = useSelector(getRbacState); const RMAAppId = useSelector(getRmaAppId); - //TODO: Change the name to have texting namespace. Using legacy app RBAC config - const RMAPermissionsPath = '/ptt/weekly_schedule_link'; + const RMAPermissionsPath = '/texting/weekly_schedule_link'; const RMAViewPermission = 'VIEW'; const user: any = useSelector(UserSelectors.getUser); const teamLeadJobDescriptions = useSelector(teamLeadJobDescriptionsSelector); --- src/redux/selectors.ts @@ -43,8 +43,22 @@ export const getUploadingBlob = createSelector( (state) => state.uploadingBlob, ); -interface RBACAppState { - data: any; //TODO: Add data shape +export type Permissions = { + rn: string; + a: string; + cnds: Array<any>; +}; + +export interface RBACAppState { + data: { + [key: string]: { + permissions: Permissions[]; + groups: { + Local: Array<string>; + }; + roles: any; + }; + }; error: boolean; fetchingPolicy: boolean; loaded: boolean;
update the weekly schedule policy path
update the weekly schedule policy path
ab99ee67d3e8561f79c506c4ac2012c7801c068a
--- src/auth/ErrorScreen.tsx @@ -183,6 +183,17 @@ export const ErrorScreen: FC<any> = (props) => { </Picker> </View> + {missingFields && formDirty && ( + <View style={styles.requiredErrorContainer}> + <Subheader testID='error-msg' style={styles.requiredError}> + {translate('ssoError.requiredError')} + </Subheader> + <ExclamationCircleFillIcon + color={colors.red['100']} + size={16} + /> + </View> + )} {errorCategory === translate('ssoError.issues.other') && ( <View> <Text style={styles.otherErr}> @@ -205,17 +216,6 @@ export const ErrorScreen: FC<any> = (props) => { /> </View> )} - {missingFields && formDirty && ( - <View style={styles.requiredErrorContainer}> - <Subheader testID='error-msg' style={styles.requiredError}> - {translate('ssoError.requiredError')} - </Subheader> - <ExclamationCircleFillIcon - color={colors.red['100']} - size={16} - /> - </View> - )} </View> <Text style={styles.fieldTitle}>
err msg shift-up
err msg shift-up
cf69fdddb3f82ccd6c89e427aef8b31969a47efc
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.0.4", + "version": "1.0.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/myteam-mini-app", - "version": "1.0.4", + "version": "1.0.5", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", @@ -60,15 +60,15 @@ "@walmart/core-utils": "~2.0.5", "@walmart/functional-components": "~4.0.3", "@walmart/gtp-shared-components": "2.1.3", - "@walmart/impersonation-mini-app": "1.20.6", + "@walmart/impersonation-mini-app": "1.20.7", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-logger": "1.34.8", "@walmart/react-native-scanner-3.0": "0.4.2", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.6.0", - "@walmart/roster-mini-app": "1.0.6", + "@walmart/roster-mini-app": "1.0.7", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.0.6", + "@walmart/wmconnect-mini-app": "1.0.7", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11721,9 +11721,9 @@ } }, "node_modules/@walmart/impersonation-mini-app": { - "version": "1.20.6", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.6.tgz", - "integrity": "sha512-5qaxHHlwLNsI2QOghCAlp1FS3sE0bdJ9DOswgEClQgRdZwFTZTY1F1qWkLmWVdnZm3/k7BTE3RT/Ltfy0rbfxg==", + "version": "1.20.7", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.7.tgz", + "integrity": "sha512-nQdm2UHmllwsY5jYGxdebgT2oXBvrhIVWutDvz1xtYHcD1ZkcSZpa8CQpnltTdeSRy0bJ8K8hfqtPSGTybum5g==", "dev": true, "peerDependencies": { "@react-native-community/masked-view": ">=0.1.10", @@ -11834,9 +11834,9 @@ } }, "node_modules/@walmart/roster-mini-app": { - "version": "1.0.6", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.6.tgz", - "integrity": "sha512-TlkTdqh3AKU6JF5UEiRb5yfgpXrmV8XkH9A8QOOAZATNV1jGBQFKtFh1hPSmcMN9wfq6LKQGn7RY1MZX+9/Ffg==", + "version": "1.0.7", + "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.7.tgz", + "integrity": "sha512-BTbxR+qsokG8Q9qoZVqsrZqzxzywZtu0W09sJCYrXhPZH06fwlgg9/cLAr4UU+LTkUw1dHRazIgBRe9oS/r4XA==", "dev": true, "hasInstallScript": true }, @@ -11863,9 +11863,9 @@ } }, "node_modules/@walmart/wmconnect-mini-app": { - "version": "1.0.6", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.6.tgz", - "integrity": "sha512-1+LEnQr5HCI7BSDxUd75pCRDm8jG4/elNxrD4MzZEUt/bYo7m2g0Z3k4M4WGH/ARlt84clFZPWS9U7OEvoEm7w==", + "version": "1.0.7", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.7.tgz", + "integrity": "sha512-Iq/4/bfx5mJryay8OWGriTi0XqNfwl/qjXF5LEq309XclvBNpMchWLXO4CiDPdnYehWnnvMEuHlY5SHdNHVsEw==", "dev": true, "hasInstallScript": true }, @@ -41006,9 +41006,9 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.20.6", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.6.tgz", - "integrity": "sha512-5qaxHHlwLNsI2QOghCAlp1FS3sE0bdJ9DOswgEClQgRdZwFTZTY1F1qWkLmWVdnZm3/k7BTE3RT/Ltfy0rbfxg==", + "version": "1.20.7", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.7.tgz", + "integrity": "sha512-nQdm2UHmllwsY5jYGxdebgT2oXBvrhIVWutDvz1xtYHcD1ZkcSZpa8CQpnltTdeSRy0bJ8K8hfqtPSGTybum5g==", "dev": true }, "@walmart/me-at-walmart-athena-queries": { @@ -41072,9 +41072,9 @@ } }, "@walmart/roster-mini-app": { - "version": "1.0.6", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.6.tgz", - "integrity": "sha512-TlkTdqh3AKU6JF5UEiRb5yfgpXrmV8XkH9A8QOOAZATNV1jGBQFKtFh1hPSmcMN9wfq6LKQGn7RY1MZX+9/Ffg==", + "version": "1.0.7", + "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.7.tgz", + "integrity": "sha512-BTbxR+qsokG8Q9qoZVqsrZqzxzywZtu0W09sJCYrXhPZH06fwlgg9/cLAr4UU+LTkUw1dHRazIgBRe9oS/r4XA==", "dev": true }, "@walmart/ui-components": { @@ -41089,9 +41089,9 @@ } }, "@walmart/wmconnect-mini-app": { - "version": "1.0.6", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.6.tgz", - "integrity": "sha512-1+LEnQr5HCI7BSDxUd75pCRDm8jG4/elNxrD4MzZEUt/bYo7m2g0Z3k4M4WGH/ARlt84clFZPWS9U7OEvoEm7w==", + "version": "1.0.7", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.7.tgz", + "integrity": "sha512-Iq/4/bfx5mJryay8OWGriTi0XqNfwl/qjXF5LEq309XclvBNpMchWLXO4CiDPdnYehWnnvMEuHlY5SHdNHVsEw==", "dev": true }, "@whatwg-node/events": { --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.0.4", + "version": "1.0.5", "private": false, "main": "dist/index.js", "files": [ @@ -82,15 +82,15 @@ "@walmart/core-utils": "~2.0.5", "@walmart/functional-components": "~4.0.3", "@walmart/gtp-shared-components": "2.1.3", - "@walmart/impersonation-mini-app": "1.20.6", + "@walmart/impersonation-mini-app": "1.20.7", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-logger": "1.34.8", "@walmart/react-native-scanner-3.0": "0.4.2", "@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.6", - "@walmart/roster-mini-app": "1.0.6", + "@walmart/wmconnect-mini-app": "1.0.7", + "@walmart/roster-mini-app": "1.0.7", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0",
Update version
Update version
1d3d1a9b8b0be8b35353bdfd5ab8685d47357698
--- src/home/index.tsx @@ -70,4 +70,8 @@ export const HomeFeature = new AllsparkFeatureModule('home', { // @ts-ignore - not typed for more than two levels deep 'es-MX': esMX, }, + metadata: { + configKey: 'home', + packageName: 'Me@Walmart' + }, });
fix(home): metadata for home page screen (#5339)
fix(home): metadata for home page screen (#5339) Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com>
52d320422170b1402008ee5ed3bb1a6a1f71d907
--- scripts/updateAndroidProjectConfig.sh @@ -70,5 +70,5 @@ echo "Updating Manifest path in react-native.config.js to ${RN_CONFIG_MANIFEST_P # sed -i.bak "s/android: ${RN_CONFIG_PROD_APP_MANIFEST_PATH}|android: ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/" ${RN_CONFIG_JS} && rm ${RN_CONFIG_JS} sed -i.bak -e "s/android: ${RN_CONFIG_PROD_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/g" -e "s/android: ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/g" ${RN_CONFIG_JS} && rm ${RN_CONFIG_JS}.bak -echo "Printing ${APP_MANIFEST}" -cat ${APP_MANIFEST} \ No newline at end of file +echo "Printing ${APP_GRADLE}" +cat ${APP_GRADLE} \ No newline at end of file
Checking build.gradle
Checking build.gradle
daa02b26c98abcca9ec47fbdbe1e240dd7d20d9e
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.40.0", + "version": "1.41.0", "main": "dist/index.js", "files": [ "dist" @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.42.0", + "@walmart/roster-mini-app": "2.43.0", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- src/navigation/index.tsx @@ -8,30 +8,17 @@ import { TEAM_HUB_SCREEN_NAME, DEFAULT_WIDGET_IDS, } from '@walmart/allspark-foundation-hub'; -// import {RosterMiniApp} from '@walmart/roster-mini-app'; import {WarningBanner} from '../components/WarningBanner'; -// import {useUserCanSeeTeamHub} from '../hooks/user'; export * from './types'; export const MyTeamMiniApp = () => { - // const showManagerTeamHub = useUserCanSeeTeamHub(); - - // return showManagerTeamHub ? ( return ( <> <WarningBanner /> <TeamHub /> </> ); - // ) : ( - // <> - // <RosterMiniApp /> - // {/* {rosterFeature.buildAllScreens({ - // Navigator: RosterStack as any, - // })} */} - // </> - // ); }; export const TeamHub = () => { --- yarn.lock @@ -6416,7 +6416,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.42.0" + "@walmart/roster-mini-app": "npm:2.43.0" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6597,9 +6597,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.42.0": - version: 2.42.0 - resolution: "@walmart/roster-mini-app@npm:2.42.0" +"@walmart/roster-mini-app@npm:2.43.0": + version: 2.43.0 + resolution: "@walmart/roster-mini-app@npm:2.43.0" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6641,7 +6641,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/e14399c139f30ec8f57c1e8434e61dd86ac0c94d4dac3812eca492de652d02ba338bc73bcee8edcd724c9351464b655fd67b58ed7576a3ec63f6532ddaeead73 + checksum: 10c0/dac73381c2ce48200f12a1a4475f3b32dce6f4e115152b6c2340a34e5fff3c8013e2f3d56cd2a0e98d21ed9db315e7bfce9848f3e343f210523d3e332f57471e languageName: node linkType: hard
Update roster mini app version
Update roster mini app version
80db4080dfa19ae7f24f4bcbd4a52223717679f5
--- package.json @@ -84,7 +84,7 @@ "@walmart/core-widget-registry": "0.3.2", "@walmart/counts-component-miniapp": "0.0.36", "@walmart/exception-mini-app": "0.42.1", - "@walmart/facilities-management-miniapp": "0.1.1", + "@walmart/facilities-management-miniapp": "0.1.3", "@walmart/feedback-all-spark-miniapp": "0.6.0", "@walmart/functional-components": "2.0.5", "@walmart/gta-react-native-calendars": "0.0.15",
Version bump
Version bump
ccf0d49faaec79cca2c2abfe301e24609e349025
--- packages/allspark-foundation/__tests__/Scanner/AllSparkScanner.test.tsx @@ -4,6 +4,7 @@ import { render } from '../utils'; jest.mock('../../src/Scanner/utils', () => ({ getScannerLicense: jest.fn(), + getScannerToggleConfig: jest.fn(() => ({})), })); describe('AllsparkScanner', () => { --- packages/allspark-foundation/__tests__/Scanner/__snapshots__/AllSparkScanner.test.tsx.snap @@ -4,5 +4,7 @@ exports[`AllsparkScanner should render snapshot 1`] = ` <WmScannerView onScanError={[Function]} onScanReceived={[Function]} + sdk="scandit" + version="v1" /> `; --- packages/allspark-foundation/src/Scanner/AllsparkScanner.tsx @@ -1,10 +1,22 @@ -import React from 'react'; +import React, { useMemo } from 'react'; import { useSelector } from 'react-redux'; // @ts-ignore import { WmScannerView } from '@walmart/react-native-scanner-3.0'; import { ScanError, ScannerProps, ScanPayload } from './types'; -import { getScannerLicense } from './utils'; +import { getScannerLicense, getScannerToggleConfig } from './utils'; + +// Redux selectors to get scanner configuration and license +type ScannerToggleConfig = { + version: string; + sdk: string; +}; + +// Default scanner toggle configuration +const DEFAULT_SCANNER_TOGGLE_CONFIG: ScannerToggleConfig = { + version: 'v1', + sdk: 'scandit', +}; /** * Component that renders a scanner view and handles scanning events. @@ -18,7 +30,17 @@ import { getScannerLicense } from './utils'; * ``` */ export const AllsparkScanner = (props: ScannerProps) => { - // Internal method to handle scan received event + const featureId = props?.featureId ?? ''; + // Get the scanner license from the Redux store + const license = useSelector(getScannerLicense); + + // Get the toggle configuration for the given feature ID + const toggleConfig = useSelector(getScannerToggleConfig); + const { version, sdk } = useMemo( + () => toggleConfig?.[featureId] ?? DEFAULT_SCANNER_TOGGLE_CONFIG, + [toggleConfig, featureId] + ); + const _onScanReceived = ({ nativeEvent: scan, }: { @@ -34,13 +56,12 @@ export const AllsparkScanner = (props: ScannerProps) => { props.onScanError(error); }; - // Get the scanner license from the Redux store - const license = useSelector(getScannerLicense); - return ( <WmScannerView {...props} license={license} + version={version} + sdk={sdk} onScanReceived={_onScanReceived} onScanError={_onScanError} /> --- packages/allspark-foundation/src/Scanner/types.ts @@ -62,6 +62,8 @@ export type ScanError = { export type ScannerProps = PropsWithChildren<{ /** Test ID for the component. */ testID: string; + /** Feature ID for the scanner. */ + featureId?: string; /** Whether the flash is on or off. */ isTorchOn: boolean; /** Whether the scanner is currently scanning. */ --- packages/allspark-foundation/src/Scanner/utils.ts @@ -29,3 +29,8 @@ export const getScannerLicense = createSelector( config?.scanner3LicenseAndroid || fallback?.scanner3LicenseAndroid, }) ); + +export const getScannerToggleConfig = createSelector( + [ConfigSelectors.getData], + (config) => config?.scanner +);
feat: added scanner arch and version toggle (#265)
feat: added scanner arch and version toggle (#265) * added scanner arch and version toggle * lint fix * revert android setting file changes * fix lint * added null safe * fix test * add callback functions * added callbacks
d5bb64d2560e138378f97f3fbdb9c8e2c1cd1f54
--- .looper.multibranch.yml @@ -607,7 +607,7 @@ flows: - var(END_TIME): date +%s - var(TIME_ELAPSED): - echo $(($START_TIME - $END_TIME)) + echo $(($END_TIME - $START_TIME)) - var(MINUTES): echo $((($TIME_ELAPSED%3600)/60)) - var(SECONDS):
Update .looper.multibranch.yml
Update .looper.multibranch.yml
b192073299b0a1af85231e979316c230505b557c
--- package.json @@ -65,7 +65,7 @@ "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@walmart/shelfavailability-mini-app": "0.3.64", "@walmart/allspark-health-survey-mini-app": "0.0.41", - "@walmart/allspark-home-mini-app": "0.4.38", + "@walmart/allspark-home-mini-app": "0.4.60", "@walmart/allspark-me-mini-app": "0.1.0", "@walmart/ask-sam-mini-app": "0.30.10", "@walmart/config-components": "^1.0.26", @@ -79,7 +79,7 @@ "@walmart/inbox-mini-app": "0.0.101", "@walmart/iteminfo-mini-app": "1.0.22", "@walmart/manager-approvals-miniapp": "0.0.40", - "@walmart/metrics-mini-app": "0.4.6", + "@walmart/metrics-mini-app": "0.4.10", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.21", "@walmart/react-native-env": "^0.1.0",
Bumping version for Home and Metrics mini app
Bumping version for Home and Metrics mini app
db258fd7b9472d57b0e109c4aa77b6427fbfbb57
--- __tests__/permissions/__snapshots__/LocationScreenTest.tsx.snap @@ -90,6 +90,7 @@ exports[`LocationScreen matches snapshot 1`] = ` isLoading={false} onPress={[Function]} testID="enableButton" + variant="primary" > continueButton </Button> --- __tests__/permissions/__snapshots__/NotificationsScreenTest.tsx.snap @@ -92,6 +92,7 @@ exports[`NotificationsScreen matches snapshot 1`] = ` isLoading={false} onPress={[Function]} testID="enableButton" + variant="primary" > continueButton </Button> --- src/permissions/LocationScreen.tsx @@ -44,6 +44,7 @@ export const LocationScreen: FC< </Text> </View> <Button + variant='primary' testID='enableButton' onPress={onEnable} isLoading={loading} --- src/permissions/NotificationsScreen.tsx @@ -40,6 +40,7 @@ export const NotificationsScreen: FC<StackScreenProps<RootStackMap>> = () => { </Text> </View> <Button + variant='primary' testID='enableButton' onPress={onEnable} isLoading={loading}
fix(ui): ALLSPARK-5807 add primary variant to continue button (#4045)
fix(ui): ALLSPARK-5807 add primary variant to continue button (#4045) * fix(ui): ALLSPARK-5807 add primary variant to continue button * fix(ui): ALLSPARK-5807 update test snapshots to include variant --------- Co-authored-by: Shubhang Shah <s0s0zug@homeoffice.wal-mart.com>
f1d6b3c2739196f81f95190d8d7066d2c1fac764
--- packages/allspark-graphql-client/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.1.7](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-graphql-client@1.1.6...@walmart/allspark-graphql-client@1.1.7) (2023-01-27) + + +### Bug Fixes + +* add missing type exports. fix type reference. fix codegen reference ([2233a3d](https://gecgithub01.walmart.com/allspark/allspark/commit/2233a3d437fc7df258437afc2a5694bfee601d19)) + + + + + ## [1.1.6](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-graphql-client@1.1.5...@walmart/allspark-graphql-client@1.1.6) (2023-01-26) **Note:** Version bump only for package @walmart/allspark-graphql-client --- packages/allspark-graphql-client/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-graphql-client", - "version": "1.1.6", + "version": "1.1.7", "lockfileVersion": 1, "requires": true, "dependencies": { --- packages/allspark-graphql-client/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-graphql-client", - "version": "1.1.6", + "version": "1.1.7", "description": "> TODO: description", "license": "ISC", "main": "lib/index.js", @@ -33,7 +33,7 @@ "dependencies": { "@apollo/client": "^3.7.3", "@lifeomic/axios-fetch": "3.0.1", - "@walmart/allspark-http-client": "^2.2.6", + "@walmart/allspark-http-client": "^2.3.0", "crypto-js": "~4.1.1", "graphql": "^16.6.0" }, --- packages/allspark-http-client/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.3.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-http-client@2.2.6...@walmart/allspark-http-client@2.3.0) (2023-01-27) + + +### Bug Fixes + +* adjust warning format. fix clone provider props type ([3b88682](https://gecgithub01.walmart.com/allspark/allspark/commit/3b886827b32f93e784341c040583e832ddd47e5d)) + + +### Features + +* add clone provider hoc ([1d6b0e0](https://gecgithub01.walmart.com/allspark/allspark/commit/1d6b0e0f6150daedb6fc284575e65cdd77900de3)) + + + + + ## [2.2.6](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-http-client@2.2.5...@walmart/allspark-http-client@2.2.6) (2023-01-26) --- packages/allspark-http-client/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-http-client", - "version": "2.2.6", + "version": "2.3.0", "lockfileVersion": 2, "requires": true, "packages": { --- packages/allspark-http-client/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-http-client", - "version": "2.2.6", + "version": "2.3.0", "description": "", "author": "rlane1 <russell.lane@walmart.com>", "license": "ISC", --- packages/core-services-allspark/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.3.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.2.6...@walmart/core-services-allspark@2.3.0) (2023-01-27) + + +### Features + +* add link to format athena requests. move base url from graphql http config to http client config ([68a6bad](https://gecgithub01.walmart.com/allspark/allspark-core-services/commit/68a6badff5fdf8392a40637a9d5f35cb946de058)) + + + + + ## [2.2.6](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.2.5...@walmart/core-services-allspark@2.2.6) (2023-01-26) **Note:** Version bump only for package @walmart/core-services-allspark --- packages/core-services-allspark/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.2.6", + "version": "2.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.2.6", + "version": "2.3.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -23,9 +23,9 @@ "author": "", "license": "ISC", "dependencies": { - "@walmart/allspark-graphql-client": "^1.1.6", - "@walmart/allspark-http-client": "^2.2.6", - "@walmart/core-services": "^2.0.3", + "@walmart/allspark-graphql-client": "^1.1.7", + "@walmart/allspark-http-client": "^2.3.0", + "@walmart/core-services": "^2.0.4", "@walmart/core-utils": "^1.3.0", "crypto-js": "~4.1.1", "jwt-decode": "^3.1.2", --- packages/core-services/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/core-services@2.0.3...@walmart/core-services@2.0.4) (2023-01-27) + +**Note:** Version bump only for package @walmart/core-services + + + + + ## [2.0.3](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services@2.0.2...@walmart/core-services@2.0.3) (2023-01-26) **Note:** Version bump only for package @walmart/core-services --- packages/core-services/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services", - "version": "2.0.3", + "version": "2.0.4", "lockfileVersion": 1, "requires": true, "dependencies": { --- packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services", - "version": "2.0.3", + "version": "2.0.4", "description": "", "main": "index.js", "types": "index.d.ts", @@ -19,7 +19,7 @@ "author": "", "license": "ISC", "dependencies": { - "@walmart/allspark-http-client": "^2.2.6", + "@walmart/allspark-http-client": "^2.3.0", "@walmart/core-utils": "^1.3.0", "@walmart/redux-store": "3.1.2", "reduxsauce": "^1.2.1",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-graphql-client@1.1.7 - @walmart/allspark-http-client@2.3.0 - @walmart/core-services@2.0.4 - @walmart/core-services-allspark@2.3.0
394fde5071f4231a7baf79110b7a592ed88ee5ad
--- packages/allspark-foundation-hub/src/SupplyChain/Modals/EditSavedTeamModal/EditSavedTeamsModal.tsx @@ -4,8 +4,8 @@ import { } from '@walmart/allspark-foundation'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { Body } from '@walmart/gtp-shared-components/dist'; -import React, { useCallback, useState } from 'react'; -import { ScrollView, SectionList, View } from 'react-native'; +import React, { useCallback, useRef, useState } from 'react'; +import { Animated, ScrollView, SectionList, View } from 'react-native'; import { useSelector } from 'react-redux'; import { SiteSelectors } from '@walmart/allspark-foundation/Site'; import { trimToFortyCharacters } from '../../../SupplyChain/Utils/utils'; @@ -52,6 +52,7 @@ export const EditSavedTeamsModal = ({ const showSearchInput = useSelector(teamSearchInputEnabled); const division = useSelector(SiteSelectors.getWorkingSiteDivision); const siteNumber = useSelector(SiteSelectors.getWorkingSiteSiteId); + const scrollPosition = useRef(new Animated.Value(0)).current; const teamPreferenceData: string[] = useSelector(SC_ManagerExperienceSelectors.getSavedSiteTeams) || []; @@ -149,12 +150,22 @@ export const EditSavedTeamsModal = ({ ); } + const onScroll = Animated.event( + [ + { + nativeEvent: { contentOffset: { y: scrollPosition } }, + }, + ], + { useNativeDriver: false } + ); + return ( <> <ScrollView stickyHeaderIndices={[0]} style={modalStyles.rootContainer} contentContainerStyle={modalStyles.contentContainer} + onScroll={onScroll} > <ModalHeader title={t('editSavedTeamsModal.title')} --- packages/allspark-foundation-hub/src/SupplyChain/Modals/UpdateTeamsModal/UpdateTeamsModal.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useCallback, useRef, useState } from 'react'; -import { ScrollView, View } from 'react-native'; +import { Animated, ScrollView, View } from 'react-native'; import { Divider } from '@walmart/gtp-shared-components'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { ShiftFilterList } from '../../Components/ShiftFilter/ShiftFilterList'; @@ -71,6 +71,8 @@ export const UpdateTeamsModal = ({ shiftPreferenceData.length === 0 ? ['A1'] : shiftPreferenceData; const [selectedShifts, setSelectedShifts] = useState<string[]>(shiftData); const scrollViewRef = useRef<ScrollView>(null); + const scrollPosition = useRef(new Animated.Value(0)).current; + // eslint-disable-next-line react-hooks/exhaustive-deps const sectionListData = [ ...[ @@ -199,6 +201,15 @@ export const UpdateTeamsModal = ({ ); } + const onScroll = Animated.event( + [ + { + nativeEvent: { contentOffset: { y: scrollPosition } }, + }, + ], + { useNativeDriver: false } + ); + return ( <> <ScrollView @@ -206,6 +217,7 @@ export const UpdateTeamsModal = ({ stickyHeaderIndices={[0]} style={styles.rootContainer} ref={scrollViewRef} + onScroll={onScroll} > <ModalHeader title={t('updateTeamsModal.screenTitle')}
feat(ui): scroll events for modals
feat(ui): scroll events for modals
a64f8d0fad0e8f91067d527f39c6992097f0c6dc
--- packages/allspark-foundation/__tests__/Auth/sagas.test.tsx @@ -14,16 +14,15 @@ jest.mock('../../src/Auth/service', ()=>({ signOut: jest.fn() } })) +beforeEach(() => { + jest.clearAllMocks(); +}); describe('Auth/sagas.ts', () => { const mockGetUser = AuthService.getUser as jest.Mock; const mockSignIn = AuthService.signIn as jest.Mock; const mockSignOut = AuthService.signOut as jest.Mock; const mockFetchToken = AuthService.refreshToken as jest.Mock; - beforeEach(() => { - jest.clearAllMocks(); - }); - it('should call onGetUser when GET_USER action is dispatched', () => { const generator = onGetUser(AuthActionCreators.GET_USER()); const received = generator.next().value; @@ -56,10 +55,6 @@ describe('Auth/sagas.ts', () => { }); describe('waitForSignIn and waitForToken tests', () => { - beforeEach(() => { - jest.clearAllMocks(); - }); - it('waitForSignIn - should wait for SIGN_IN_SUCCESS or SIGN_IN_ERROR if signing in or data is null and no error', () => { const iterator = waitForSignIn(); expect(iterator.next().value).toEqual(select(AuthSelectors.getSigningIn)); --- packages/allspark-foundation/__tests__/Clock/saga.test.ts @@ -11,6 +11,10 @@ jest.mock('../../src/Clock/service', ()=>({ } })) +beforeEach(() => { + jest.clearAllMocks(); +}); + describe('onInit and onFetch tests', () => { const payload = {clock: 'test'} it('should call onInit', ()=>{ @@ -30,12 +34,8 @@ describe('onInit and onFetch tests', () => { describe('waitForClockInit and waitForClockFetch Saga', () => { - beforeEach(() => { - jest.clearAllMocks(); - }); it('should wait for INIT_SUCCESS or INIT_ERROR if clock is initializing or not yet initialized', () => { - const generator = waitForClockInit(); expect(generator.next().value).toEqual(select(ClockSelectors.getInitializing)); expect(generator.next(true).value).toEqual(select(ClockSelectors.getInitialized)); --- packages/allspark-foundation/__tests__/Navigation/DrawerButton.test.tsx @@ -1,57 +0,0 @@ -import React from 'react'; -import { useNavigation } from '@react-navigation/native'; - -import { DrawerButton } from '../../src/Navigation/components/DrawerButton'; -import { useAllsparkDrawer } from '../../src/Navigation/context'; -import { fireEvent, render } from '../utils'; - -jest.mock('../../src/Navigation/context', () => ({ - useAllsparkDrawer: jest.fn(), -})); - -describe('Navigation/components/DrawerButton', () => { - const mockNavigation = { - navigate: jest.fn(), - }; - - test('should render DrawerButton snapshot', async () => { - const props = { style: {}, iconStyle: {}, badgeStyle: {} }; - const mockedDispatch = jest.fn(); - (useAllsparkDrawer as jest.Mock).mockReturnValue({ locked: false }); - (useNavigation as jest.Mock).mockReturnValue({ dispatch: mockedDispatch }); - const { toJSON } = render(<DrawerButton {...props} />); - expect(toJSON()).toMatchSnapshot(); - }); - - test('should render DrawerButton component correctly', async () => { - const props = { style: {}, iconStyle: {}, badgeStyle: {} }; - const mockedDispatch = jest.fn(); - (useAllsparkDrawer as jest.Mock).mockReturnValue({ locked: false }); - (useNavigation as jest.Mock).mockReturnValue({ dispatch: mockedDispatch }); - const { getByTestId } = render(<DrawerButton {...props} />); - expect(getByTestId('navigationMenu')).toBeTruthy(); - fireEvent.press(getByTestId('navigationMenu')); - expect(mockedDispatch).toHaveBeenCalled(); - }); - - test('should not call toggleDrawer when drawer is locked', () => { - const mockDrawer = { locked: true }; - (useAllsparkDrawer as jest.Mock).mockReturnValue(mockDrawer); - const mockedDispatch = jest.fn(); - (useNavigation as jest.Mock).mockReturnValue({ dispatch: mockedDispatch }); - const { getByTestId } = render(<DrawerButton />); - const button = getByTestId('navigationMenu'); - fireEvent.press(button); - expect(mockedDispatch).not.toHaveBeenCalled(); - }); - - test('should pass correct styles to IconButton', () => { - const props = { style: { backgroundColor: 'red' }, iconStyle: { tintColor: 'blue' }, badgeStyle: { bottom: 5 } }; - const mockedDispatch = jest.fn(); - (useAllsparkDrawer as jest.Mock).mockReturnValue({ locked: false }); - (useNavigation as jest.Mock).mockReturnValue({ dispatch: mockedDispatch }); - const { getByTestId } = render(<DrawerButton {...props} />); - const button = getByTestId('navigationMenu'); - expect(button.props.UNSAFE_style).toEqual(props.style); - }); -});
pr fix
pr fix