commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
507306fa0f457bba8fdcf8e2a1c0b8cc42b568f3
--- 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.67", - "@walmart/feedback-all-spark-miniapp": "0.9.43", + "@walmart/feedback-all-spark-miniapp": "0.9.50", "@walmart/financial-wellbeing-feature-app": "1.10.4", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", @@ -8330,9 +8330,9 @@ } }, "node_modules/@walmart/feedback-all-spark-miniapp": { - "version": "0.9.43", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.43.tgz", - "integrity": "sha512-6/R50+Ga6eY7nIqreH8m7KmNEXPz1kQ8DO6/l8J6aGHvTuLRZeFHAH8h3ZsvuWip8/0xUqwd4nyRsd/aeA/g5A==", + "version": "0.9.50", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.50.tgz", + "integrity": "sha512-smgkGKR2rRMz1sfzeYWoN/2tDs74GUXpRfpAnQ4azriRbfI+n6Dh+j4OQ5bDEQxGsstMwG6idsQWTKTfQhf3Pg==", "peerDependencies": { "@react-native-async-storage/async-storage": "^1.19.0", "@react-native-community/datetimepicker": "^6.1.3", @@ -33595,9 +33595,9 @@ "integrity": "sha512-vAn11SgL6thiZdZLdAe1EvJ+gYGSDJa2HBrLPXlTFQgUHtf2+fnnj4SG9bX8mg9/Ax3Hg7IQaiKle3GsdgN2ww==" }, "@walmart/feedback-all-spark-miniapp": { - "version": "0.9.48", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.48.tgz", - "integrity": "sha512-aJzdl4g6cOcNQhHvtcmkWrczuEeU/pkrkL6qJpPa+cq1LnfWQQpLlEM/h0WWVA2rKgXNOSkvDPADBD2+nkb+Nw==" + "version": "0.9.50", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.9.50.tgz", + "integrity": "sha512-smgkGKR2rRMz1sfzeYWoN/2tDs74GUXpRfpAnQ4azriRbfI+n6Dh+j4OQ5bDEQxGsstMwG6idsQWTKTfQhf3Pg==" }, "@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.67", - "@walmart/feedback-all-spark-miniapp": "0.9.48", + "@walmart/feedback-all-spark-miniapp": "0.9.50", "@walmart/financial-wellbeing-feature-app": "1.10.4", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16",
Update android version
Update android version
57fd81d79b98164865bc3121687af7f574bbb483
--- .looper.yml @@ -2,7 +2,7 @@ node: ((osx||stable_osx)&&!dualcore) tools: nodejs: - - 12.4.0 + - 12.22.0 npm: - 6.9.0
chore: update looper node version
chore: update looper node version
97fd2b80dd1c5461e5552176f0ba1bdcda0cb581
--- .looper.yml @@ -12,34 +12,52 @@ envs: scheduling: concurrent -triggers: - - manual: - name: PR - call: pr - - manual: - name: Publish Changed - call: publishFromChanges - - manual: - name: Publish From Package - call: publishFromPackage - # - manual: - # name: Publish All - # call: publishAll - # - manual: - # name: Publish Patch - # call: publishPatch - # - manual: - # name: Publish Minor - # call: publishMinor - # - manual: - # name: Publish Major - # call: publishMajor - - manual: - name: Publish Pre-Release - call: publishPrerelease - - manual: - name: Publish Graduate - call: publishGraduate +branches: + - spec: feature/* + triggers: + - push: + call: canaryRelease + skipAuthor: + - jenkinspan + - svc-looper + - manual: + name: Publish Changed + call: publishFromChanges + - manual: + name: Publish From Package + call: publishFromPackage + - manual: + name: Publish Pre-Release + call: publishPrerelease + - manual: + name: Publish Graduate + call: publishGraduate + - manual: + name: Canary Release + call: canaryRelease + + - spec: main + triggers: + - push: + call: publishFromChanges + skipAuthor: + - jenkinspan + - svc-looper + - manual: + name: Publish Changed + call: publishFromChanges + - manual: + name: Publish From Package + call: publishFromPackage + - manual: + name: Publish Pre-Release + call: publishPrerelease + - manual: + name: Publish Graduate + call: publishGraduate + - manual: + name: Canary Release + call: canaryRelease flows: default: @@ -79,6 +97,11 @@ flows: - call: preparePublish - (name Publish From Changes) HUSKY=0 npx lerna publish patch --yes --force-publish + canaryRelease: + - call: preparePublish + - (name Publish Canary) HUSKY=0 npx lerna publish --canary preminor --preid beta --registry ${REPOSOLNS_NPM_REPO} --yes + + publishMinor: - call: preparePublish - (name Publish From Changes) HUSKY=0 npx lerna publish minor --yes --force-publish --- .yarnrc.yml @@ -5,4 +5,5 @@ logFilters: level: warning nodeLinker: node-modules + npmRegistryServer: "${REPOSOLNS_NPM_REPO}" --- README.md @@ -2,6 +2,16 @@ Allspark is the framework Me@Walmart uses to build container and feature apps in React Native. This mono repo manages the libraries used by the framework and maintains backwards compatability with the previous solutions. +## CI: + +Temporarily, looper can be accessed here: https://ci.walmart.com/job/allspark/job/allspark-core/job/Experiments/job/allspark-clone-multibranch/ + +A new multibranch looper is being set up on the new looper. Use the above looper job to trigger builds from inside the branches. + +### Testing changes + +Canary builds will be automatically built and deployed when changes are pushed to a feature/* branch. Please open the looper above open your branch and get the build version names. You can also publish canary or normal builds from the above looper job. + ## Packages ### Framework --- lerna.json @@ -11,7 +11,7 @@ }, "version": { "message": "chore(version): updating package version", - "allowBranch": ["main", "develop", "patch/*"], + "allowBranch": ["main", "develop", "patch/*", "feature/*"], "conventionalCommits": true, "conventionalPrerelease": false } --- packages/core-services/.gitignore @@ -21,4 +21,4 @@ index.d.ts index.js # readme files were being ignored for some reason -!*.md \ No newline at end of file +!*.md
feat(ci): allspark-5750 multibranch looper with auto publish
feat(ci): allspark-5750 multibranch looper with auto publish feat(ci): add manual trigger feat(ci): bumping node version fix(ci): fix script fix(ci): trying with the e command fix(ci): remove dollar sign fix(ci): lerna instead of yarn fix(ci): npx feat(ci): allow release feat(ci): switching to lerna canary fix(ci): trying git stash feat(ci): dummy commit fix(ci): not from package fix(ci): from package again fix(ci): dummy bump feat(ci): add auto push canary fix: looper fix(ci): looper yml fix(ci): all looper changes fix(ci): looper changes feat(ci): yarn lock fix(doc): updating readme fix(test): updating snapshot fix(ci): removing stash step fix(ci): revert stash step fix(ci): adding git status fix(ci): reverting node version and git diff fix(ci): including the yarnrc change fix(ci): cleanup
3cb6943bc17106c10dc613063d73c0c51bf36182
--- src/hooks/teams.ts @@ -5,6 +5,7 @@ import {useGetTeamsByStoreQuery} from '../queries/getTeamsbyStore'; import {Associate} from '../types'; import {useDailyRoster} from './roster'; import {Team} from '../queries/schema.types'; +import moment from 'moment-timezone'; // import {useGetTeamByIdMock, useGetTeamsByStoreMock} from '../mocks'; export const useGetTeamById = (teamId: string) => { @@ -28,7 +29,7 @@ export const useGetTeamById = (teamId: string) => { }); }; -export const useGetTeamsByStore = (date?: Date) => { +export const useGetTeamsByStore = () => { // return useGetTeamsByStoreMock(); const storeNbr: string | undefined = useSelector( SiteSelectors.getUserWorkingSite, @@ -40,7 +41,11 @@ export const useGetTeamsByStore = (date?: Date) => { // return {loading: false, data: {getTeamsByStore: teamsMock}, error: false}; // comment in if needed for testing return useGetTeamsByStoreQuery({ - variables: {storeNbr: storeNbr!, countryCode: countryCode!, date}, + variables: { + storeNbr: storeNbr!, + date: moment().format('YYYY-MM-DD'), + countryCode: countryCode!, + }, skip: !storeNbr || !countryCode, }); }; --- src/hooks/teams.ts @@ -5,6 +5,7 @@ import {useGetTeamsByStoreQuery} from '../queries/getTeamsbyStore'; import {Associate} from '../types'; import {useDailyRoster} from './roster'; import {Team} from '../queries/schema.types'; +import moment from 'moment-timezone'; // import {useGetTeamByIdMock, useGetTeamsByStoreMock} from '../mocks'; export const useGetTeamById = (teamId: string) => { @@ -28,7 +29,7 @@ export const useGetTeamById = (teamId: string) => { }); }; -export const useGetTeamsByStore = (date?: Date) => { +export const useGetTeamsByStore = () => { // return useGetTeamsByStoreMock(); const storeNbr: string | undefined = useSelector( SiteSelectors.getUserWorkingSite, @@ -40,7 +41,11 @@ export const useGetTeamsByStore = (date?: Date) => { // return {loading: false, data: {getTeamsByStore: teamsMock}, error: false}; // comment in if needed for testing return useGetTeamsByStoreQuery({ - variables: {storeNbr: storeNbr!, countryCode: countryCode!, date}, + variables: { + storeNbr: storeNbr!, + date: moment().format('YYYY-MM-DD'), + countryCode: countryCode!, + }, skip: !storeNbr || !countryCode, }); };
Pulled from develop
Pulled from develop
d8beb7f215b38b3734748bd5a65bfa20baa952e9
--- src/startup/StartupFlow.ts @@ -14,6 +14,7 @@ import {WhastNewActionCreators, WhatsNewTypes} from '../whatsNew/WhatsNewRedux'; import {checkAvailableSurveys} from '../survey/SurveySaga'; import {handleAppReviewPrompt} from '../appReview/sagas'; import {handleSiteIdPrompt} from './UserFlow'; +import {DoNotDisturbAutoResetSaga} from '@walmart/texting-mini-app'; export function* candidateStartupFlow() { // Terms of Use @@ -50,6 +51,9 @@ export function* associateStartupFlow() { // Navigate to Main yield call(resetTo, 'main'); + // Set DoNotDisturb Status + yield call(DoNotDisturbAutoResetSaga); + // Check for forced updates yield put(UpdateCheckActionCreators.checkForUpdates()); yield take(UpdateCheckTypes.CHECK_FOR_UPDATES_COMPLETE);
add dnd startup flow
add dnd startup flow
10967061f60c85a7fa96a2177147d473a91cacb8
--- env.beta.js @@ -44,7 +44,7 @@ export default { scopes: ['openid', 'full'], additionalParameters: { // settings this would force a login every time we sign out and back in - // prompt: 'login', + prompt: 'login', }, clientAuthMethod: 'post', }, --- env.dev.js @@ -33,7 +33,7 @@ export default { scopes: ['openid', 'full'], additionalParameters: { // settings this would force a login every time we sign out and back in - // prompt: 'login', + prompt: 'login', }, clientAuthMethod: 'post', }, --- env.prod.js @@ -44,7 +44,7 @@ export default { scopes: ['openid', 'full'], additionalParameters: { // settings this would force a login every time we sign out and back in - // prompt: 'login', + prompt: 'login', }, clientAuthMethod: 'post', }, --- env.teflon.js @@ -15,6 +15,28 @@ export default { index: 'allspark', format: 'json', }, + associateAuthConfig: { + issuer: 'https://pfedcert.wal-mart.com', + clientId: 'MeAtWMT', + redirectUrl: 'com.walmart.stores.allspark.beta://SSOLogin', + scopes: ['openid', 'full'], + additionalParameters: { + // settings this would force a login every time we sign out and back in + // prompt: 'login', + }, + clientAuthMethod: 'post', + }, + candidateAuthConfig: { + issuer: 'https://pfedcert.wal-mart.com', + clientId: 'WMStage', + redirectUrl: 'com.walmart.stores.allspark.beta://CandidateLogin', + scopes: ['openid', 'full'], + additionalParameters: { + // settings this would force a login every time we sign out and back in + prompt: 'login', + }, + clientAuthMethod: 'post', + }, logLevel: 'debug', internalUrl: 'https://api-proxy.stg.soa-api-proxy.platform.glb.prod.walmart.com',
update auth config to force login prompt
update auth config to force login prompt
0993058bb9491dd8df4a124374c039039e186f5d
--- __tests__/hooks/teams.test.ts @@ -21,10 +21,40 @@ jest.mock('../../src/common', () => ({ ...jest.requireActual('../../src/common'), })); +// Mock react-native before allspark-foundation-hub +jest.mock('react-native', () => { + const RN = jest.requireActual('react-native'); + return { + ...RN, + StyleSheet: { + ...RN.StyleSheet, + hairlineWidth: 1, // Provide a mock value for hairlineWidth + }, + Platform: { + OS: 'ios', // or 'android' + select: (config) => config.ios || config.default, + }, + Settings: { + get: jest.fn(), + set: jest.fn(), + }, + TurboModuleRegistry: { + getEnforcing: jest.fn().mockReturnValue({}), + }, + }; +}); + jest.mock('@walmart/allspark-foundation-hub', () => ({ - ...jest.requireActual('@walmart/allspark-foundation-hub'), + // Instead of loading the actual module, just provide the constants needed for tests MANAGEMENT_TEAM_ID: '1111111', TOTAL_STORE_TEAM_ID: 'total', + MY_TEAMS_TEAM_ID: 'myTeams', + EMP_TYPE_SALARIED: 'S', + EMP_TYPE_HOURLY: 'H', + MANAGEMENT_TEAM_LABEL: 'Management', + TOTAL_STORE_TEAM_LABEL: 'Total store', + TOTAL_SITE_TEAM_ID: 'totalSite', + TOTAL_SITE_TEAM_LABEL: 'Total site', })); jest.mock('react-redux', () => ({ @@ -234,10 +264,10 @@ describe('hooks/teams', () => { }), variables: { includeManagement: true, - businessUnitNumber: Number(mockStoreNbr), - siteNbr: mockStoreNbr, - date: '2023-10-10', - countryCode: mockCountryCode, + businessUnitNumber: expect.any(Number), + siteNbr: expect.any(String), + date: expect.any(String), + countryCode: expect.any(String), }, skip: false, notifyOnNetworkStatusChange: true, --- __tests__/setup.ts @@ -18,6 +18,12 @@ NativeModules.RNCNetInfo = {}; NativeModules.RNGestureHandlerModule = {}; NativeModules.RNDeviceInfo = {}; NativeModules.RNPermissionsModule = {}; +NativeModules.SettingsManager = { + settings: {}, + addListener: jest.fn(), + removeListeners: jest.fn(), + getConstants: jest.fn().mockReturnValue({}), // Add getConstants mock +}; jest.mock('expo-image'); jest.mock('expo-modules-core'); @@ -56,3 +62,9 @@ jest.mock('@walmart/wmconnect-mini-app', () => ({ PresenceProvider: jest.fn(), }, })); + +jest.mock('react-native', () => { + const RN = jest.requireActual('react-native'); + RN.TurboModuleRegistry.get = jest.fn(); + return RN; +});
fix(bug): fix tests for the teams.test.ts test file
fix(bug): fix tests for the teams.test.ts test file
04300dc36ea88bb538073350bab841beab6a9d31
--- package-lock.json @@ -5416,9 +5416,9 @@ "integrity": "sha512-CUovZxH9L3MERTqsWvUJFh9fmjv55vXdt6hfqyokYMZwzGWMBl1Zn6eBR0RbNfdNnKowQE8IZ6Ai+3fuyO+rAw==" }, "@walmart/profile-feature-app": { - "version": "0.0.49", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.0.49.tgz", - "integrity": "sha512-E0nroev/4s0u2/KVsdR/v9LSnlwvd3TxYGDyOEsqFLyGn8Dad1G4MO26gvQbgpAj+GWkx/tK1LFFKLJ1hlKAcw==" + "version": "0.0.50", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.0.50.tgz", + "integrity": "sha512-X9IzXSFtAoT8TMQ9x15ajK0p0QAZzBxORt7fFGyTXNoag+W3nzJ0THlQMupMY0hTsXBn6LHFyscrZIWjt4dRAg==" }, "@walmart/push-to-talk-mini-app": { "version": "1.8.9", @@ -13783,7 +13783,7 @@ "lodash.get": { "version": "4.4.2", "resolved": "https://npme.walmart.com/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=" }, "lodash.isequal": { "version": "4.5.0", @@ -13907,7 +13907,7 @@ "lodash.uniqby": { "version": "4.7.0", "resolved": "https://npme.walmart.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz", - "integrity": "sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==" + "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=" }, "lodash.uppercase": { "version": "4.3.0", @@ -22568,7 +22568,7 @@ "wm-react-native-vector-icons": { "version": "1.0.33", "resolved": "https://npme.walmart.com/wm-react-native-vector-icons/-/wm-react-native-vector-icons-1.0.33.tgz", - "integrity": "sha1-vIAL0WOWBBaAsIuacYHnzsxTQxk=", + "integrity": "sha512-pAcEq6iOVxzKM55qucKOkh2ML3kii4yGJ5YdmMEOcRAGH4fQ1lHa7BETIl+jzX5n1ZVKgWkzmAiH3vw0nkuklQ==", "requires": { "lodash": "^4.0.0", "prop-types": "^15.6.2",
Updated for profile 0.0.50
Updated for profile 0.0.50
fd0078c53aa3557586b821bd83a621a1dd74455e
--- package-lock.json @@ -58,7 +58,7 @@ "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25", - "@walmart/metrics-mini-app": "0.13.2", + "@walmart/metrics-mini-app": "0.13.6", "@walmart/mod-flex-mini-app": "1.9.4", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14", @@ -5493,9 +5493,9 @@ } }, "node_modules/@walmart/metrics-mini-app": { - "version": "0.13.2", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.13.2.tgz", - "integrity": "sha512-qHnAVTgmP9FwkwZFz2iBhTKvRyHd6W8KVhWa6M84dwu+Opm3ysbhexPGgnwZGsL45iUsZUqOc0H88eSfpERAnA==", + "version": "0.13.6", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.13.6.tgz", + "integrity": "sha512-0xJa/i0/wasQHavpUbIjuKJCMY7wUX0f34m9sfS+OhRXY7YyHuUGZ9pgybLZR7GghOneBAx1AupeAcj02s/yyQ==", "dependencies": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", @@ -25244,9 +25244,9 @@ "integrity": "sha512-1mxrkjgtoltK8qzmoiVy9/rViZ/GoViHZG+1uYL1rV3o+ByksY7d8+foyY6BNzDfbg/6W2G24bdRMs7vpNf2qw==" }, "@walmart/metrics-mini-app": { - "version": "0.13.2", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.13.2.tgz", - "integrity": "sha512-qHnAVTgmP9FwkwZFz2iBhTKvRyHd6W8KVhWa6M84dwu+Opm3ysbhexPGgnwZGsL45iUsZUqOc0H88eSfpERAnA==", + "version": "0.13.6", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.13.6.tgz", + "integrity": "sha512-0xJa/i0/wasQHavpUbIjuKJCMY7wUX0f34m9sfS+OhRXY7YyHuUGZ9pgybLZR7GghOneBAx1AupeAcj02s/yyQ==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", --- package.json @@ -100,7 +100,7 @@ "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25", - "@walmart/metrics-mini-app": "0.13.2", + "@walmart/metrics-mini-app": "0.13.6", "@walmart/mod-flex-mini-app": "1.9.4", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14",
Bumping metrics-mini-app version to add wages changes
Bumping metrics-mini-app version to add wages changes
48739779694b7e0b98005c203c9703b790dd5c2b
--- __tests__/scanner/useScannerSdkTypeTest.ts --- src/scanner/useScannerSdkType.tsx
fix: scanner sdk type hook in wrong folder
fix: scanner sdk type hook in wrong folder
9507623ac04d6a1cea8e74719b102e798a2cd2e9
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -37,6 +37,7 @@ import {sortedAssociateList} from '../../utils/associateList'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import { generateTeamShiftRoster, + mapShift, handleViewAssociateSchedule, filterAssociatesByStatusAndSearchInputAndShift, } from '../../utils/rosterDetail'; @@ -246,14 +247,6 @@ export const SupplyChainRosterDetailScreen = ({ function getShiftNumbers(shifts: any, mapShift: any) { return shifts.map((shiftData: any) => mapShift[shiftData]); } - const mapShift = { - A1: 1, - A2: 2, - A3: 3, - B1: 4, - B2: 5, - B3: 6, - }; const shiftNumbers = getShiftNumbers(shift, mapShift); function filterTeamRosterByShiftNumbers( teamRosterData: any, --- src/utils/rosterDetail.tsx @@ -33,6 +33,14 @@ export const userIsManager = (employeeType: string | undefined) => { } return employeeType === EMP_TYPE_SALARIED; }; +export const mapShift = { + A1: 1, + A2: 2, + A3: 3, + B1: 4, + B2: 5, + B3: 6, +}; export const generateTeamRoster = ( currentTeamIds: string[],
Addressing comments
Addressing comments
4f89528096e1381d710bca9bfb5382e116ae720b
--- packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql @@ -1,5 +1,14 @@ -query GetTeamsByStore($countryCode: String!, $date: Date!, $storeNbr: String!) { - getTeamsByStore(countryCode: $countryCode, storeNbr: $storeNbr) { +query GetTeamsByStore( + $countryCode: String! + $date: Date! + $includeManagement: Boolean + $storeNbr: String! +) { + getTeamsByStore( + countryCode: $countryCode + includeManagement: $includeManagement + storeNbr: $storeNbr + ) { __typename members mewAbsentCount(date: $date) @@ -12,4 +21,4 @@ query GetTeamsByStore($countryCode: String!, $date: Date!, $storeNbr: String!) { workgroup workgroupId } -} \ No newline at end of file +}
Adding includeManagement prop
Adding includeManagement prop
f5aebead3393add9ceafe1762d04e4ad19d5afd8
--- packages/allspark-foundation/__tests__/Clock/saga.test.ts @@ -11,7 +11,7 @@ jest.mock('../../src/Clock/service', ()=>({ } })) -describe('Clock/sagas.ts', () => { +describe('onInit and onFetch tests', () => { const payload = {clock: 'test'} it('should call onInit', ()=>{ const getInit = onInit(ClockActionCreators.INIT(payload)); --- packages/allspark-foundation/__tests__/Site/saga.test.ts @@ -10,7 +10,7 @@ jest.mock('../../src/Site/service', ()=>({ fetchWorkingSite:jest.fn(), } })) -describe('Site/sagas.ts', () => { +describe('onFetchHomeSite and onFetchWorkingSite tests', () => { const payload = 'Test' it('onFetchHomeSite should be called correctly', ()=>{ const getFetchHomeSite = onFetchHomeSite(SiteActionCreators.FETCH_HOME_SITE(payload));
code clean up
code clean up
51ca8b86d46514ebc999dd8eee8d9a96bc4b7134
--- targets/US/package.json @@ -84,7 +84,7 @@ "@walmart/allspark-utils": "6.5.0", "@walmart/amp-mini-app": "1.1.98", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.27.5", + "@walmart/ask-sam-mini-app": "1.28.8", "@walmart/associate-listening-mini-app": "1.2.10", "@walmart/attendance-mini-app": "3.96.2", "@walmart/avp-feature-app": "0.10.19", --- yarn.lock @@ -2505,6 +2505,26 @@ __metadata: languageName: node linkType: hard +"@expo/config-plugins@npm:^2.0.0": + version: 2.0.4 + resolution: "@expo/config-plugins@npm:2.0.4" + dependencies: + "@expo/config-types": "npm:^41.0.0" + "@expo/json-file": "npm:8.2.30" + "@expo/plist": "npm:0.0.13" + debug: "npm:^4.3.1" + find-up: "npm:~5.0.0" + fs-extra: "npm:9.0.0" + getenv: "npm:^1.0.0" + glob: "npm:7.1.6" + resolve-from: "npm:^5.0.0" + slash: "npm:^3.0.0" + xcode: "npm:^3.0.1" + xml2js: "npm:^0.4.23" + checksum: 10c0/0cdd76861dacb95f6c4a7b633b0528dbb3d63d5aa8ba25e2cc636d0d9491c8513360bb7920c1fe7fd5b5ddb52317cc566c9e1f5a743b9013a587bd2922cfb531 + languageName: node + linkType: hard + "@expo/config-plugins@npm:~7.9.0": version: 7.9.1 resolution: "@expo/config-plugins@npm:7.9.1" @@ -2530,6 +2550,13 @@ __metadata: languageName: node linkType: hard +"@expo/config-types@npm:^41.0.0": + version: 41.0.0 + resolution: "@expo/config-types@npm:41.0.0" + checksum: 10c0/6c0b41985f234dc02926a6d8273655c9408af3fad46845908c6dd9f271c6600b053e63c48ec9ed65c9e92f7e648050499cac0b4335192a5bbf9ccf5dd6596583 + languageName: node + linkType: hard + "@expo/config-types@npm:^50.0.0, @expo/config-types@npm:^50.0.0-alpha.1": version: 50.0.1 resolution: "@expo/config-types@npm:50.0.1" @@ -2624,6 +2651,18 @@ __metadata: languageName: node linkType: hard +"@expo/json-file@npm:8.2.30": + version: 8.2.30 + resolution: "@expo/json-file@npm:8.2.30" + dependencies: + "@babel/code-frame": "npm:~7.10.4" + fs-extra: "npm:9.0.0" + json5: "npm:^1.0.1" + write-file-atomic: "npm:^2.3.0" + checksum: 10c0/623bc7c08e3406ba3675112666d79523ba47a247f7d2c135a80fdba7d6c7f2c7d5775c97fcc9d361dfaf616a70dfd7532e625879664514943cd6a55d4f3f9e17 + languageName: node + linkType: hard + "@expo/json-file@npm:^8.2.37, @expo/json-file@npm:~8.3.0": version: 8.3.3 resolution: "@expo/json-file@npm:8.3.3" @@ -2706,6 +2745,17 @@ __metadata: languageName: node linkType: hard +"@expo/plist@npm:0.0.13": + version: 0.0.13 + resolution: "@expo/plist@npm:0.0.13" + dependencies: + base64-js: "npm:^1.2.3" + xmlbuilder: "npm:^14.0.0" + xmldom: "npm:~0.5.0" + checksum: 10c0/4b139e6e7e87d41f3426d378210b04da231b5876e11ef0d5b9be2545e50aeaf50bfda19eef492b09a63b3bc97c0bce249cf210e272c9b0fad2637c2ec7efe09e + languageName: node + linkType: hard + "@expo/plist@npm:^0.1.0": version: 0.1.3 resolution: "@expo/plist@npm:0.1.3" @@ -4862,6 +4912,18 @@ __metadata: languageName: node linkType: hard +"@react-native-voice/voice@npm:^3.2.4": + version: 3.2.4 + resolution: "@react-native-voice/voice@npm:3.2.4" + dependencies: + "@expo/config-plugins": "npm:^2.0.0" + invariant: "npm:^2.2.4" + peerDependencies: + react-native: ">= 0.60.2" + checksum: 10c0/841c3ece3534688f9518ba0890740cad89e37bd3feb9d5f9c01991d65304885983ca01eb55590cec3b333f91c040e4ee90492ede3242989a922eee0f8a08bd04 + languageName: node + linkType: hard + "@react-native/assets-registry@npm:0.73.1, @react-native/assets-registry@npm:~0.73.1": version: 0.73.1 resolution: "@react-native/assets-registry@npm:0.73.1" @@ -6636,29 +6698,31 @@ __metadata: languageName: node linkType: hard -"@walmart/ask-sam-mini-app@npm:1.27.5": - version: 1.27.5 - resolution: "@walmart/ask-sam-mini-app@npm:1.27.5" +"@walmart/ask-sam-mini-app@npm:1.28.8": + version: 1.28.8 + resolution: "@walmart/ask-sam-mini-app@npm:1.28.8" dependencies: + "@react-native-voice/voice": "npm:^3.2.4" apisauce: "npm:^1.1.2" numeral: "npm:^2.0.6" + react-native-fs: "npm:^2.20.0" + react-native-sound: "npm:^0.11.2" reduxsauce: "npm:^1.2.0" peerDependencies: + "@apollo/client": ">=3.7.3" "@react-native/gradle-plugin": ">=0.73.4" "@react-navigation/native": ">=6.0.0" "@react-navigation/stack": ">=6.0.0" "@terrylinla/react-native-sketch-canvas": "*" + "@walmart/allspark-foundation": "*" "@walmart/ask-sam-chat-components": ">=0.2.9" - "@walmart/core-services": ">=1.4.11" - "@walmart/core-utils": ">=1.2" - "@walmart/core-widget-registry": ">=0.2" + "@walmart/core-services": ">=6.1.0" "@walmart/gtp-shared-components": ">=2.2.1" "@walmart/redux-store": ">=3.1.4" "@walmart/schedule-mini-app": "*" "@walmart/ui-components": ">=1.5" "@walmart/wfm-ui": "*" axios: ">=1.2.6" - axios-cache-adapter: ">=2.7.3" expo: 50.0.17 expo-linear-gradient: ">=12.7.2" lodash: ">=4.17" @@ -6684,7 +6748,7 @@ __metadata: react-native-wm-voice-text: ">=0.3" reselect: ">=4" victory-native: ">=36.5" - checksum: 10c0/06d23e045e5513f802a79d1e43fb1c807ef5091ddddab4a82f14914f66387eadd40dfdb5193790cea4f42fa82bc2a19321f4eb5d008db4fbec5a201b60e85462 + checksum: 10c0/eb331f11773fffc980d09d3c9d111f5662daf15db6b9432aeecb0fb351db08cc36f712cdd4d7bbcf1da54e0b9d142ddb50ab201f7dbffce0f4afcfd38922e1f6 languageName: node linkType: hard @@ -7760,7 +7824,7 @@ __metadata: "@walmart/allspark-utils": "npm:6.5.0" "@walmart/amp-mini-app": "npm:1.1.98" "@walmart/ask-sam-chat-components": "npm:^0.2.7" - "@walmart/ask-sam-mini-app": "npm:1.27.5" + "@walmart/ask-sam-mini-app": "npm:1.28.8" "@walmart/associate-listening-mini-app": "npm:1.2.10" "@walmart/attendance-mini-app": "npm:3.96.2" "@walmart/avp-feature-app": "npm:0.10.19" @@ -16364,6 +16428,17 @@ __metadata: languageName: node linkType: hard +"json5@npm:^1.0.1": + version: 1.0.2 + resolution: "json5@npm:1.0.2" + dependencies: + minimist: "npm:^1.2.0" + bin: + json5: lib/cli.js + checksum: 10c0/9ee316bf21f000b00752e6c2a3b79ecf5324515a5c60ee88983a1910a45426b643a4f3461657586e8aeca87aaf96f0a519b0516d2ae527a6c3e7eed80f68717f + languageName: node + linkType: hard + "json5@npm:^2.2.2, json5@npm:^2.2.3": version: 2.2.3 resolution: "json5@npm:2.2.3" @@ -20061,6 +20136,15 @@ __metadata: languageName: node linkType: hard +"react-native-sound@npm:^0.11.2": + version: 0.11.2 + resolution: "react-native-sound@npm:0.11.2" + peerDependencies: + react-native: ">=0.8.0" + checksum: 10c0/823014876fead0034c4aecaab70c1cd32b26a1bfaef2283d5d689ceff20b226e1d53de991cc5baa98f21bd1081d3322d027093a70ea31336c4da95cb4bc03bab + languageName: node + linkType: hard + "react-native-splash-screen@npm:^3.3.0": version: 3.3.0 resolution: "react-native-splash-screen@npm:3.3.0" @@ -24590,6 +24674,16 @@ __metadata: languageName: node linkType: hard +"xml2js@npm:^0.4.23": + version: 0.4.23 + resolution: "xml2js@npm:0.4.23" + dependencies: + sax: "npm:>=0.6.0" + xmlbuilder: "npm:~11.0.0" + checksum: 10c0/a3f41c9afc46d5bd0bea4070e5108777b605fd5ce2ebb978a68fd4c75513978ad5939f8135664ffea6f1adb342f391b1ba1584ed7955123b036e9ab8a1d26566 + languageName: node + linkType: hard + "xml@npm:^1.0.1": version: 1.0.1 resolution: "xml@npm:1.0.1" @@ -24625,6 +24719,13 @@ __metadata: languageName: node linkType: hard +"xmldom@npm:~0.5.0": + version: 0.5.0 + resolution: "xmldom@npm:0.5.0" + checksum: 10c0/68e81d96ffdae8366d0d8888196b960aadd526896897aab3c579a70625e396fdc2e14305aeb77a786598c6a46a2df36276dc9cfe0b8f22ccab68cff543d5fec7 + languageName: node + linkType: hard + "xpath@npm:^0.0.34": version: 0.0.34 resolution: "xpath@npm:0.0.34"
bumped ask sam version for rebranding changes
bumped ask sam version for rebranding changes
dd1ad268a25b0d494b5b4a752f8641a5923d8ab2
--- package-lock.json @@ -4301,9 +4301,9 @@ "integrity": "sha512-/Loo946gQcW/DKlKMV+6ZaQvst2+KxmJGX2sGX/E3aL7oCFCvhVlY9Id2RcUfuWYmzjiT+BX3IM5zpVZ81AAoA==" }, "@walmart/manager-approvals-miniapp": { - "version": "0.0.59", - "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.59.tgz", - "integrity": "sha512-UWciGlPmDkMLM0BvZzvEdYrg8iHagGxhvrBwdrgTDeK1SsX8TCPNgMq/1cVdkuk0wdhcaiTTf6DLi4d6AAcWFw==" + "version": "0.0.60", + "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.0.60.tgz", + "integrity": "sha512-/cEqGwnlQpRipCJpMhP+9ekHx+/vbfEYftcGkLvS0HVpRAA1adwsxf1mDpfmqQRrwMidRVfuJ+rJJr45KxnOTQ==" }, "@walmart/metrics-mini-app": { "version": "0.7.65", --- package.json @@ -86,7 +86,7 @@ "@walmart/ims-print-services-ui": "0.1.28", "@walmart/inbox-mini-app": "0.37.0", "@walmart/iteminfo-mini-app": "4.1.8", - "@walmart/manager-approvals-miniapp": "0.0.59", + "@walmart/manager-approvals-miniapp": "0.0.60", "@walmart/metrics-mini-app": "0.7.65", "@walmart/moment-walmart": "1.0.4", "@walmart/payrollsolution_miniapp": "0.121.0",
Bump manager approval version
Bump manager approval version
069b93175d84d86be95f1559c260481ff72cf66f
--- ios/Podfile.lock @@ -403,7 +403,7 @@ PODS: - React-Core - react-native-pdf (6.2.2): - React-Core - - react-native-ptt-module (1.5.51): + - react-native-ptt-module (1.5.52): - PTT (= 0.7.13-rc.2) - React - react-native-safe-area-context (3.3.2): @@ -963,7 +963,7 @@ SPEC CHECKSUMS: react-native-netinfo: 77d133105df525d4a11f10fcaa8d0b8883ea6429 react-native-pager-view: 311c10a4eead1be627cad59062aa059d8108b943 react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f - react-native-ptt-module: fa2c56135b48c1f3fa0237c00ade0a3baf4bb0c0 + react-native-ptt-module: b87e3571bc4e872fdcbd281df41bd0886f522533 react-native-safe-area-context: 5cf05f49df9d17261e40e518481f2e334c6cd4b5 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444 --- package-lock.json @@ -4341,9 +4341,9 @@ "integrity": "sha512-KuJZ9iZmpMq6BxWoSB0VePjLjdQEgGbJgXs0mwWqjpryfnfhk9tUHaEvwgps53CEcS67hsGK0XbENH4SSD+L0Q==" }, "@walmart/push-to-talk-mini-app": { - "version": "0.5.78", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.78.tgz", - "integrity": "sha512-pxIcPClTF+dSDYo9xZaPRlMbgoBnZfjo+lR/b3Stuj9cOfZ1Jfbuh/Zaqm91G57++XqmY5EjxAaDeDrdg/tnVQ==" + "version": "0.5.81", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.81.tgz", + "integrity": "sha512-qSyhRQO4PnA7tDqDcNKbWA5/egDBAIHdHB1k4JyOCN9+Jm3HBKacd0GTxflwkmIIJc2u/2lehOB9bSmMj9SDqw==" }, "@walmart/react-native-collapsible": { "version": "1.5.3", @@ -16950,9 +16950,9 @@ "integrity": "sha512-PO99dptMocEfUSS3SM7gY6UqophaBxizKjnZ7FcEwa+H4ONVxTk310/JCXJ9vdNunomgpxHluKRXnApfm9Md1w==" }, "react-native-ptt-module": { - "version": "1.5.51", - "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.5.51.tgz", - "integrity": "sha512-JBuuOr9HimjDbI9MzdkJXwszkctlFo5279i9/QnQ16RERcd5rVG2dM69JqBVmSIXNF58Eh2I/I/kkAxGhVuzUg==" + "version": "1.5.52", + "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.5.52.tgz", + "integrity": "sha512-+qZvoZIdNSYxAdnAnDJOqrAvUZkPclY9b31kWKOZF6qGKPFxD+OiM79skZvgq7EtBdOGkoU0ArLGqxCP+hBlxA==" }, "react-native-qrcode-svg": { "version": "6.0.6", --- package.json @@ -90,7 +90,7 @@ "@walmart/metrics-mini-app": "0.4.14", "@walmart/moment-walmart": "1.0.4", "@walmart/price-changes-mini-app": "1.0.5", - "@walmart/push-to-talk-mini-app": "0.5.78", + "@walmart/push-to-talk-mini-app": "0.5.81", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.28.0", "@walmart/react-native-shared-navigation": "^0.4.0", @@ -143,7 +143,7 @@ "react-native-pdf": "^6.2.0", "react-native-permissions": "3.0.0", "react-native-popup-menu": "^0.15.9", - "react-native-ptt-module": "1.5.51", + "react-native-ptt-module": "1.5.52", "react-native-qrcode-svg": "^6.0.6", "react-native-reanimated": "^1.10.2", "react-native-safe-area-context": "^3.3.0",
updating core to latest ptt versions
updating core to latest ptt versions
78f2dedfb3486e9c26689b4be2aa396c62141c5c
--- packages/core-widget-registry/src/Metrics.ts @@ -58,4 +58,4 @@ export const MetricsWidgetRegistry = { * @example * import {MetricsContainer} from '@walmart/me-at-walmart-common'; */ -export const useMetricsWidgetRegistry = MetricsWidgetRegistry; +export const useMetricsWidgetRegistry = () => MetricsWidgetRegistry;
fix: metric registry hook proxy not a function
fix: metric registry hook proxy not a function
d31ad2fc51269996ab71d74cd978ea0d98c077f9
--- .looper.multibranch.yml @@ -46,4 +46,4 @@ flows: mini-pr: # - (name Branch Check, silent) echo "TBD" - call: build-npm - - (name Build JS Bundle for ${market}) ./node_modules/.bin/react-native bundle --entry-file ./index.js --bundle-output ./bundle.js --reset-cache + - (name Build JS Bundle for ${market}) npm run bundle-js --- package.json @@ -17,6 +17,7 @@ "android": "expo run:android", "build-packages": "yarn workspaces foreach --all --topological-dev run build", "build": "yarn workspaces foreach --all --topological-dev run build", + "bundle-js": "expo export --no-bytecode --clear", "check-expo-libs": "expo install --check", "certify-booted-sim": "scripts/certifyBootedSim.sh", "coverage": "echo 'Skipping tests to test native builds' > test-report.xml || jest --coverage",
chore: update build js looper flow to expo equivalent
chore: update build js looper flow to expo equivalent
bd89d798cfbccba03306085944b72f6d2c664c36
--- src/redux/selectors.ts @@ -2,6 +2,16 @@ import {createSelector} from 'reselect'; import {UserSelectors, GlobalState} from '@walmart/redux-store'; import {encryptUserId} from '../utils'; import {CCMFallbacks} from '../ccmFallbacks'; +import {isNil} from 'lodash'; + +export const getCCMBooleanStr = ( + ccmProperty: string | boolean | number | undefined, + ccmFallback: boolean, +) => { + return !isNil(ccmProperty) + ? ccmProperty?.toString()?.toLowerCase() === 'true' + : ccmFallback; +}; export const getEncryptedUserId = createSelector( [UserSelectors.getUserWIN], @@ -21,41 +31,34 @@ export const warningMessageContent = createSelector( export const shouldDisplayWarningBanner = createSelector( [getMyTeamConfigData], (state) => - state?.shouldDisplayWarningBanner?.toString()?.toLowerCase() === 'true' ?? - CCMFallbacks.shouldDisplayWarningBanner, + getCCMBooleanStr( + state?.shouldDisplayWarningBanner, + CCMFallbacks.shouldDisplayWarningBanner, + ), ); export const showViewTimeClock = createSelector( [getMyTeamConfigData], (state) => - state?.showViewTimeClock?.toString()?.toLowerCase() === 'true' ?? - CCMFallbacks.showViewTimeClock, + getCCMBooleanStr(state?.showViewTimeClock, CCMFallbacks.showViewTimeClock), ); -export const displayDND = createSelector( - [getMyTeamConfigData], - (state) => - state?.showDND?.toString()?.toLowerCase() === 'true' ?? - CCMFallbacks.showDND, +export const displayDND = createSelector([getMyTeamConfigData], (state) => + getCCMBooleanStr(state?.showDND, CCMFallbacks.showDND), ); export const displayClockStatus = createSelector( [getMyTeamConfigData], (state) => - state?.showClockStatus?.toString()?.toLowerCase() === 'true' ?? - CCMFallbacks.showClockStatus, + getCCMBooleanStr(state?.showClockStatus, CCMFallbacks.showClockStatus), ); -export const displayAvatar = createSelector( - [getMyTeamConfigData], - (state) => - state?.showAvatar?.toString()?.toLowerCase() === 'true' ?? - CCMFallbacks.showAvatar, +export const displayAvatar = createSelector([getMyTeamConfigData], (state) => + getCCMBooleanStr(state?.showAvatar, CCMFallbacks.showAvatar), ); export const displaySearchIcon = createSelector( [getMyTeamConfigData], (state) => - state?.showSearchIcon?.toString()?.toLowerCase() === 'true' ?? - CCMFallbacks.showSearchIcon, + getCCMBooleanStr(state?.showSearchIcon, CCMFallbacks.showSearchIcon), );
update selectors
update selectors
b9504a2f6f1da88e46e712d82fa54cb50b5be64a
--- packages/allspark-foundation/__mocks__/react-native-async-storage/async-storage.js @@ -0,0 +1,13 @@ +module.exports = { + ...jest.requireActual('@react-native-async-storage/async-storage'), + getItem: jest.fn(), + setItem: jest.fn(), + removeItem: jest.fn(), + mergeItem: jest.fn(), + multiGet: jest.fn(), + multiSet: jest.fn(), + multiMerge: jest.fn(), + multiRemove: jest.fn(), + getAllKeys: jest.fn(), + }; + \ No newline at end of file --- packages/allspark-foundation/__tests__/LocalStorage/client.test.tsx @@ -1,17 +1,7 @@ import { LocalStorageClient } from '../../src/LocalStorage/client'; import AsyncStorage from '@react-native-async-storage/async-storage'; -jest.mock('@react-native-async-storage/async-storage', () => ({ - getItem: jest.fn(), - setItem: jest.fn(), - removeItem: jest.fn(), - mergeItem: jest.fn(), - multiGet: jest.fn(), - multiSet: jest.fn(), - multiMerge: jest.fn(), - multiRemove: jest.fn(), - getAllKeys: jest.fn(), -})); +jest.mock('@react-native-async-storage/async-storage'); describe('LocalStorageClient', () => { let client;
moving local storage lib to global dir
moving local storage lib to global dir
2e64eb64a4bb137098e7324c3dce808470c446e2
--- packages/allspark-foundation-hub/src/HubFeature/Store/HubHeader/types.ts @@ -3,4 +3,5 @@ export type HeaderTypes = { subText: string; backgroundColor?: string; textColor?: string; + noPadding?: boolean; };
Adding noPadding to the type
Adding noPadding to the type
064dd15ffaad64c2cb2a92830de6b2a877e8c26f
--- sonar-project.properties @@ -6,6 +6,5 @@ sonar.host.url=http://sonar.looper.prod.walmartlabs.com sonar.sources=src sonar.tests=__tests__ sonar.exclusions=src/images -sonar.test.inclusions=__tests__/**/*Test.ts,__tests__/**/*Test.tsx sonar.sourceEncoding=UTF-8 -sonar.javascript.lcov.reportPaths=coverage/lcov.info \ No newline at end of file +sonar.typescript.lcov.reportPaths=coverage/lcov.info
Chore/sonar config (#28)
Chore/sonar config (#28) * edited sonar properties * updated sonar props * removed report path as sonar PR test failed. * edited sonar properties file. * trying sonar tests coverage to show up.
34c04befdf0ae45221ea65d3610d682fd24a4d28
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "3.8.3", + "version": "3.8.4", "main": "dist/index.js", "files": [ "dist", @@ -93,7 +93,7 @@ "@walmart/react-native-scanner-3.0": "patch:@walmart/react-native-scanner-3.0@npm%3A0.15.8#~/.yarn/patches/@walmart-react-native-scanner-3.0-npm-0.15.8-6fb92a01bb.patch", "@walmart/react-native-sumo-sdk": "patch:@walmart/react-native-sumo-sdk@npm%3A2.8.0#~/.yarn/patches/@walmart-react-native-sumo-sdk-npm-2.8.0-31dfe1d845.patch", "@walmart/ui-components": "1.26.3-423-05e66f8", - "@walmart/wmconnect-mini-app": "3.7.3", + "@walmart/wmconnect-mini-app": "3.7.4", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0", --- yarn.lock @@ -8429,7 +8429,7 @@ __metadata: "@walmart/react-native-scanner-3.0": "patch:@walmart/react-native-scanner-3.0@npm%3A0.15.8#~/.yarn/patches/@walmart-react-native-scanner-3.0-npm-0.15.8-6fb92a01bb.patch" "@walmart/react-native-sumo-sdk": "patch:@walmart/react-native-sumo-sdk@npm%3A2.8.0#~/.yarn/patches/@walmart-react-native-sumo-sdk-npm-2.8.0-31dfe1d845.patch" "@walmart/ui-components": "npm:1.26.3-423-05e66f8" - "@walmart/wmconnect-mini-app": "npm:3.7.3" + "@walmart/wmconnect-mini-app": "npm:3.7.4" babel-jest: "npm:^29.6.3" chance: "npm:^1.1.11" crypto-js: "npm:~4.2.0" @@ -8521,9 +8521,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:3.7.3": - version: 3.7.3 - resolution: "@walmart/wmconnect-mini-app@npm:3.7.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-3.7.3.tgz" +"@walmart/wmconnect-mini-app@npm:3.7.4": + version: 3.7.4 + resolution: "@walmart/wmconnect-mini-app@npm:3.7.4::__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-3.7.4.tgz" peerDependencies: "@walmart/allspark-foundation": ">=7.12.0" "@walmart/gtp-shared-components": ^2.3.0-rc.0 @@ -8535,7 +8535,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/c141e2d04ca7248dea60c346f6f87d612d3334d1f513723ee55612d59cd4080d5b3f8486673743d456fc91c58b038849d340119c8ba99288c9b492342679f6f7 + checksum: 10c0/b0a44b17cac0728ab9be3825e3249a101b4c0dc191beb38f5e8ab8ec07455f8ac971d4e7d7b0af7120b162d43024dbacde0e6c9e4e0147a40a4cfd8d1bfcc070 languageName: node linkType: hard
feat(ui): update graphql queries
feat(ui): update graphql queries
ba8bc0c48d9b18b225b0b4f8470cfef37bbbfe7e
--- targets/US/package.json @@ -91,7 +91,7 @@ "@walmart/avp-shared-library": "0.10.1", "@walmart/backroom-mini-app": "1.7.4", "@walmart/calling-mini-app": "0.5.17", - "@walmart/checkout-mini-app": "4.0.9", + "@walmart/checkout-mini-app": "4.0.10", "@walmart/compass-sdk-rn": "5.19.15", "@walmart/config-components": "4.4.5", "@walmart/core-services": "~6.5.2", --- yarn.lock @@ -6153,9 +6153,9 @@ __metadata: languageName: node linkType: hard -"@walmart/checkout-mini-app@npm:4.0.9": - version: 4.0.9 - resolution: "@walmart/checkout-mini-app@npm:4.0.9" +"@walmart/checkout-mini-app@npm:4.0.10": + version: 4.0.10 + resolution: "@walmart/checkout-mini-app@npm:4.0.10" dependencies: "@stomp/stompjs": "npm:^7.0.0" cpc-input: "npm:^1.7.28" @@ -6178,8 +6178,6 @@ __metadata: "@walmart/allspark-authentication": "*" "@walmart/allspark-foundation": "*" "@walmart/allspark-utils": "*" - "@walmart/core-services": ">=2" - "@walmart/functional-components": ">=2" "@walmart/gtp-shared-components": ">=2" "@walmart/me-at-walmart-common": "*" "@walmart/react-native-scanner-3.0": ">=0.3.0" @@ -6193,11 +6191,9 @@ __metadata: react-native-device-info: ^8.4.9 react-native-flipper: ^0.191.0 react-native-safe-area-context: "*" - react-native-wm-network: "*" - react-native-wm-telemetry: ">=6" react-redux: ^8.1.3 redux: ^4.0.5 - checksum: 10c0/3166b66ff3abf03e551f95e22acb1120f7c534f8523c2250529b385b32b6783e94a5b6ad63e9fa6f43b76f65579d0ba116257b72bcd12ae056c8ceee52f217c1 + checksum: 10c0/2e4672a576ef35206fb9b951439b77a765ff5e075459948cf8ad665935e485eabb90970dbb65830cfdd4335779880c25391a6caf7bbd26fb7255c56f8a6ae218 languageName: node linkType: hard @@ -7007,7 +7003,7 @@ __metadata: "@walmart/avp-shared-library": "npm:0.10.1" "@walmart/backroom-mini-app": "npm:1.7.4" "@walmart/calling-mini-app": "npm:0.5.17" - "@walmart/checkout-mini-app": "npm:4.0.9" + "@walmart/checkout-mini-app": "npm:4.0.10" "@walmart/compass-sdk-rn": "npm:5.19.15" "@walmart/config-components": "npm:4.4.5" "@walmart/core-services": "npm:~6.5.2"
removed deprecated dependencies CO 4.0.10
removed deprecated dependencies CO 4.0.10
e3f5032de2f7dc0130bf4e2d8d6eb3b809217b5a
--- src/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -195,7 +195,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { const teamRoster = rosterData ? (generateTeamRoster( - teamState.teamIds?.[0], + teamState.teamIds, rosterData, currentTeam, selectedTeamIds, --- src/utils/rosterDetail.tsx @@ -1,6 +1,5 @@ import { EMP_TYPE_SALARIED, - MY_TEAMS_TEAM_ID, TOTAL_STORE_TEAM_ID, Images as teamImageIcon, } from '@walmart/allspark-foundation-hub'; @@ -34,7 +33,7 @@ export const userIsManager = (employeeType: string | undefined) => { }; export const generateTeamRoster = ( - currentTeamId: string, + currentTeamIds: string[], rosterData: GetDailyRosterQuery | undefined, currentTeam: Team | undefined | null, userTeamIds: string[], @@ -55,11 +54,11 @@ export const generateTeamRoster = ( }); } - if (currentTeamId === TOTAL_STORE_TEAM_ID) { + if (currentTeamIds.includes(TOTAL_STORE_TEAM_ID)) { return dailyRoster; } - if (currentTeamId === MY_TEAMS_TEAM_ID) { + if (currentTeamIds === userTeamIds) { const userTeams = allTeams?.filter((team) => userTeamIds.includes(team?.teamId ?? ''), );
Update roster filter count and roster list
Update roster filter count and roster list
549e76bb64965d44885e2dde0119d637be3f9649
--- src/hooks/teams.ts @@ -1,13 +1,16 @@ import {useSelector} from 'react-redux'; -import {SiteSelectors} from '@walmart/redux-store'; +import {SiteSelectors, UserSelectors} from '@walmart/redux-store'; import {useGetTeamByIdQuery} from '../queries/getTeamById'; import {Associate} from '../types'; import {useDailyRoster} from './roster'; +import {Team} from '../queries/schema.types'; import moment from 'moment-timezone'; import getTeamsByStoreMockResponse from './tempGetTeamsByStoreResponse'; export const useGetTeamById = (teamId: string) => { - const storeNbr: string | undefined = '4108'; + const storeNbr: string | undefined = useSelector( + SiteSelectors.getUserWorkingSite, + ); const countryCode: string | undefined = useSelector( SiteSelectors.getSiteCountry, ); @@ -46,7 +49,9 @@ export const useGetRosterByTeam = (teamId: string) => { const teamMembers = teamData?.getTeamById?.members || []; const teamRoster = rosterData?.getDailyRoster?.filter((associate) => - associate?.associateId ? teamMembers.includes('EJR0039.S04108') : false, + associate?.associateId + ? teamMembers.includes(associate.associateId) + : false, ) as Associate[]; return { @@ -58,15 +63,13 @@ export const useGetRosterByTeam = (teamId: string) => { }; export const useGetViewersPrimaryTeamId = () => { - // const viewerTeamIds: string[] = useSelector(UserSelectors.getUserTeamIds); - // return viewerTeamIds.length > 0 ? viewerTeamIds[0] : ''; - return '1000329'; + const viewerTeamIds: string[] = useSelector(UserSelectors.getUserTeamIds); + return viewerTeamIds.length > 0 ? viewerTeamIds[0] : ''; }; export const useGetViewersPrimaryTeamName = () => { - // const viewerTeam: Team[] = useSelector(UserSelectors.getUserTeams); - // return viewerTeam && viewerTeam.length > 0 ? viewerTeam[0].teamName : ''; - return 'Deli/Bakery'; + const viewerTeam: Team[] = useSelector(UserSelectors.getUserTeams); + return viewerTeam && viewerTeam.length > 0 ? viewerTeam[0].teamName : ''; }; export const useGetViewersPrimaryWorkGroup = () => { --- src/hooks/teams.ts @@ -1,13 +1,16 @@ import {useSelector} from 'react-redux'; -import {SiteSelectors} from '@walmart/redux-store'; +import {SiteSelectors, UserSelectors} from '@walmart/redux-store'; import {useGetTeamByIdQuery} from '../queries/getTeamById'; import {Associate} from '../types'; import {useDailyRoster} from './roster'; +import {Team} from '../queries/schema.types'; import moment from 'moment-timezone'; import getTeamsByStoreMockResponse from './tempGetTeamsByStoreResponse'; export const useGetTeamById = (teamId: string) => { - const storeNbr: string | undefined = '4108'; + const storeNbr: string | undefined = useSelector( + SiteSelectors.getUserWorkingSite, + ); const countryCode: string | undefined = useSelector( SiteSelectors.getSiteCountry, ); @@ -46,7 +49,9 @@ export const useGetRosterByTeam = (teamId: string) => { const teamMembers = teamData?.getTeamById?.members || []; const teamRoster = rosterData?.getDailyRoster?.filter((associate) => - associate?.associateId ? teamMembers.includes('EJR0039.S04108') : false, + associate?.associateId + ? teamMembers.includes(associate.associateId) + : false, ) as Associate[]; return { @@ -58,15 +63,13 @@ export const useGetRosterByTeam = (teamId: string) => { }; export const useGetViewersPrimaryTeamId = () => { - // const viewerTeamIds: string[] = useSelector(UserSelectors.getUserTeamIds); - // return viewerTeamIds.length > 0 ? viewerTeamIds[0] : ''; - return '1000329'; + const viewerTeamIds: string[] = useSelector(UserSelectors.getUserTeamIds); + return viewerTeamIds.length > 0 ? viewerTeamIds[0] : ''; }; export const useGetViewersPrimaryTeamName = () => { - // const viewerTeam: Team[] = useSelector(UserSelectors.getUserTeams); - // return viewerTeam && viewerTeam.length > 0 ? viewerTeam[0].teamName : ''; - return 'Deli/Bakery'; + const viewerTeam: Team[] = useSelector(UserSelectors.getUserTeams); + return viewerTeam && viewerTeam.length > 0 ? viewerTeam[0].teamName : ''; }; export const useGetViewersPrimaryWorkGroup = () => {
reverting some changes to teams hook with mock
reverting some changes to teams hook with mock
392476ca51be3253ee85df2cc83e51cd6eabf879
--- targets/US/package.json @@ -127,7 +127,7 @@ "@walmart/native-rfid-scanner": "4.0.16", "@walmart/onewalmart-miniapp": "1.0.27", "@walmart/pay-stub-miniapp": "0.20.11", - "@walmart/payrollsolution_miniapp": "0.145.31", + "@walmart/payrollsolution_miniapp": "0.145.33", "@walmart/price-changes-mini-app": "1.11.2", "@walmart/profile-feature-app": "1.138.5", "@walmart/react-native-cookies": "1.0.1", --- yarn.lock @@ -7481,7 +7481,7 @@ __metadata: "@walmart/native-rfid-scanner": "npm:4.0.16" "@walmart/onewalmart-miniapp": "npm:1.0.27" "@walmart/pay-stub-miniapp": "npm:0.20.11" - "@walmart/payrollsolution_miniapp": "npm:0.145.31" + "@walmart/payrollsolution_miniapp": "npm:0.145.33" "@walmart/price-changes-mini-app": "npm:1.11.2" "@walmart/profile-feature-app": "npm:1.138.5" "@walmart/react-native-cookies": "npm:1.0.1" @@ -7915,12 +7915,12 @@ __metadata: languageName: node linkType: hard -"@walmart/payrollsolution_miniapp@npm:0.145.31": - version: 0.145.31 - resolution: "@walmart/payrollsolution_miniapp@npm:0.145.31::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fpayrollsolution_miniapp%2F-%2F%40walmart%2Fpayrollsolution_miniapp-0.145.31.tgz" +"@walmart/payrollsolution_miniapp@npm:0.145.33": + version: 0.145.33 + resolution: "@walmart/payrollsolution_miniapp@npm:0.145.33::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fpayrollsolution_miniapp%2F-%2F%40walmart%2Fpayrollsolution_miniapp-0.145.33.tgz" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/059206097065fbbb91f60c633e723019ef290d8610d24b080cf27a1ee7cc1a176ebae4bba90b0a941d0b9d27df78348463a65a60647b6d60e11fd7c358cd68c3 + checksum: 10c0/06bb2a6955013667b6b1642ed656a27cd0c320a26c2ccd5d51275c72491397a090cf3c4023aa7a9f87fb53b8a615f05542bac84009bad1de60e9462c70c36fa0 languageName: node linkType: hard
direct deposit bump version (#3982)
direct deposit bump version (#3982) * bump version * bump version --------- Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
d4f336c8a0fbf9dc89439857e47cac823a8aa30e
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/BannersTest.tsx.snap @@ -11,12 +11,16 @@ exports[`ConnectivityBanner does not render when connectivity 1`] = `null`; exports[`ConnectivityBanner renders when no connectivity 1`] = `<ConnectivityBanner />`; -exports[`ImpersonationBanner does not render when impersonating and on myTeam route 1`] = ` +exports[`ImpersonationBanner does not render when impersonating and on myTeam route 1`] = `null`; + +exports[`ImpersonationBanner does not render when not impersonating regardless of route 1`] = ` <IndicatorBar title="impersonation.mode" /> `; -exports[`ImpersonationBanner does not render when not impersonating regardless of route 1`] = `null`; - -exports[`ImpersonationBanner renders banner when impersonating and not on myTeam route 1`] = `null`; +exports[`ImpersonationBanner renders banner when impersonating and not on myTeam route 1`] = ` +<IndicatorBar + title="impersonation.mode" +/> +`; --- src/navigation/AssociateHallwayNav/Banners.tsx @@ -27,7 +27,7 @@ export const ImpersonationBanner = (props: NavigationBannerProps) => { return route === 'myTeam' ? false : impersonated; }, [route, impersonated]); - return !isImpersonated ? ( + return isImpersonated ? ( <IndicatorBar title={t('impersonation.mode')} /> ) : null; };
fix: fix impersonation banner showing incorrectly
fix: fix impersonation banner showing incorrectly
becb553e35a03d51024094ec5b483c141a8559f8
--- android/app/build.gradle @@ -135,7 +135,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 129 - versionName "1.0.11" + versionName "1.0.12" } splits { abi { --- ios/AllSpark/Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.0.11</string> + <string>1.0.12</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> --- package-lock.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.0.11", + "version": "1.0.12", "lockfileVersion": 1, "requires": true, "dependencies": { --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.0.11", + "version": "1.0.12", "private": true, "scripts": { "firebase:dev": "cp ./ios/GoogleService-Info-Dev.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-dev.json ./android/app/google-services.json",
version bump for TestFlight build (#479)
version bump for TestFlight build (#479) Co-authored-by: Hitesh Arora <>
73a688c0effc36d261a09baa06209fb1f19ad64a
--- package.json @@ -63,7 +63,7 @@ "@redux-saga/testing-utils": "^1.1.3", "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", - "@walmart/shelfavailability-mini-app": "0.3.45", + "@walmart/shelfavailability-mini-app": "0.3.46", "@walmart/allspark-health-survey-mini-app": "0.0.41", "@walmart/allspark-home-mini-app": "0.4.0", "@walmart/allspark-me-mini-app": "0.1.0",
0.3.46 dev build
0.3.46 dev build
268b7585177c3f539bb2df6c4c083ea5fdeaffc0
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Component/TeamSelectionList.tsx @@ -2,7 +2,8 @@ import React, { useMemo } from 'react'; import { View, Text, SectionList } from 'react-native'; import { RenderTeamSelectionListItems } from './RenderTeamSelectionListItem'; import { teamSelectionListStyles as styles } from '../styles'; -import { Area, Team, TeamSelectionListProps } from '../types'; +import { Team, TeamSelectionListProps } from '../types'; +import { areaTeamMap } from '../mockData'; import { Header } from '../../../Hub/Header'; import { colors } from '@walmart/gtp-shared-components'; import { ListHeader } from './ListHeader'; @@ -12,31 +13,6 @@ import { HeaderSubText, } from '../Constants/TeamSelectionConstants'; -export const areaTeamMap: Record<Area, Team[]> = { - 'Admin & Support': ['Admin & Support'], - 'Digital': ['Digital', 'Digital Overnight'], - 'Food & Consumables': [ - 'Deli & Bakery', - 'Food & Consumables', - 'Health & Beauty', - 'Meat & Produce', - ], - 'Front End': ['Asset Protection', 'Front End'], - 'Fuel': ['Fuel'], - 'General Merchandise': [ - 'Apparel', - 'Auto Care Center', - 'Entertainment', - 'Hardlines', - 'Home', - 'Seasonal', - ], - 'Management': ['Management'], - 'Pharmacy': ['Pharmacy'], - 'Stocking': ['Stocking Day 1', 'Stocking Day 2', 'Stocking Overnight'], - 'Vision Center': ['Vision Center'], -}; - export const TeamSelectionList = ({ areas, selectedTeams, --- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Component/TeamSelectionListItem.tsx @@ -32,7 +32,6 @@ export const TeamSelectionListItem = ({ </View> <View style={styles.checkboxContainer}> {isPrimaryTeam && ( - //TODO: use chip component from gtp <View style={styles.primaryTeamContainer}> <Text style={styles.primaryTeamText}>{PrimaryTeam}</Text> </View> --- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Screens/TeamSelection.tsx @@ -1,7 +1,7 @@ import React, { useState, useMemo } from 'react'; import { Area, Team as TeamName } from '../types'; import { TeamSelectionList } from '../Component/TeamSelectionList'; -import { areaTeamMap } from '../Component/TeamSelectionList'; +import { areaTeamMap } from '../mockData'; export const TeamSelection = () => { // TODO: areas, myArea and primaryTeam come from API --- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/mockData.ts @@ -0,0 +1,26 @@ +import { Area, Team } from './types'; + +export const areaTeamMap: Record<Area, Team[]> = { + 'Admin & Support': ['Admin & Support'], + 'Digital': ['Digital', 'Digital Overnight'], + 'Food & Consumables': [ + 'Deli & Bakery', + 'Food & Consumables', + 'Health & Beauty', + 'Meat & Produce', + ], + 'Front End': ['Asset Protection', 'Front End'], + 'Fuel': ['Fuel'], + 'General Merchandise': [ + 'Apparel', + 'Auto Care Center', + 'Entertainment', + 'Hardlines', + 'Home', + 'Seasonal', + ], + 'Management': ['Management'], + 'Pharmacy': ['Pharmacy'], + 'Stocking': ['Stocking Day 1', 'Stocking Day 2', 'Stocking Overnight'], + 'Vision Center': ['Vision Center'], +};
Adding mock data to separate folder
Adding mock data to separate folder
d1b0b795d05613961331e01da976fae6bb8a39f2
--- ios/Podfile.lock @@ -261,7 +261,7 @@ PODS: - Permission-Notifications (3.6.1): - RNPermissions - PromisesObjC (2.2.0) - - PTT (1.10.0-alpha-14): + - PTT (1.10.0-rc-01): - Alamofire (= 5.6.4) - BinaryCodable (~> 0.2.1) - CocoaAsyncSocket (~> 7.6.3) @@ -530,8 +530,8 @@ PODS: - React-Core - react-native-pdf (6.6.2): - React-Core - - react-native-ptt-module (1.10.0-alpha-26): - - PTT (= 1.10.0-alpha-14) + - react-native-ptt-module (1.10.0-rc-02): + - PTT (= 1.10.0-rc-01) - React - react-native-render-html (6.3.4): - React-Core @@ -1189,7 +1189,7 @@ SPEC CHECKSUMS: Permission-LocationWhenInUse: 3ba99e45c852763f730eabecec2870c2382b7bd4 Permission-Notifications: 150484ae586eb9be4e32217582a78350a9bb31c3 PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef - PTT: a1119568fdf12d43dfd9b745771d90966a331837 + PTT: f36af434177e607116125fc3121f1453a876c782 RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda RCTRequired: db184d894eed9e15f1fa80c3372595b7ec360580 RCTTypeSafety: c9bf4c53ad246e4c94a49d91353ed19a8df5952f @@ -1222,7 +1222,7 @@ SPEC CHECKSUMS: react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461 react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa - react-native-ptt-module: 6fe62af3a4a2a7fe77b9ef58094afef4c512f692 + react-native-ptt-module: 86f4ac28c873f448349e20da4a5f8d7235eef25c react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de react-native-scanner-3.0: a0549e6f451262c91e545d3b69a6b9d8cf2ac1eb --- package-lock.json @@ -65,7 +65,7 @@ "@walmart/payrollsolution_miniapp": "0.130.34", "@walmart/price-changes-mini-app": "1.8.7", "@walmart/profile-feature-app": "0.143.0", - "@walmart/push-to-talk-mini-app": "1.10.20", + "@walmart/push-to-talk-mini-app": "1.10.36", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", @@ -135,7 +135,7 @@ "react-native-pdf": "^6.6.2", "react-native-permissions": "3.6.1", "react-native-popup-menu": "^0.16.0", - "react-native-ptt-module": "1.10.0-alpha-26", + "react-native-ptt-module": "1.10.0-rc-02", "react-native-qrcode-svg": "^6.1.2", "react-native-reanimated": "^2.14.4", "react-native-render-html": "^6.3.4", @@ -7736,9 +7736,9 @@ } }, "node_modules/@walmart/push-to-talk-mini-app": { - "version": "1.10.20", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-1.10.20.tgz", - "integrity": "sha512-F9NgEXtPLbqLn0LM5G3IvbFMQuuI5H9Br1H7VYsC9sg2VkAQ8vQjd5hiK2TPPRCvuO7j3SXMCKczDVFV2dUhTg==", + "version": "1.10.36", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-1.10.36.tgz", + "integrity": "sha512-vkepbveXXWUt+eC7VFfSjdoXHKebTt3SKPJR2aasXj78BtRJmtZPjgCJCXuBrj2gHE+/kWJp82tFZJPXkflPpg==", "license": "UNLICENSED", "peerDependencies": { "@react-native-community/async-storage": "^1.11.0", @@ -7768,7 +7768,7 @@ "react-native-image-picker": "4.8.5", "react-native-loudness": "^2.0.0", "react-native-pager-view": "^5.4.9", - "react-native-ptt-module": "1.10.0-alpha-26", + "react-native-ptt-module": "1.10.0-rc-02", "react-native-reanimated": "2.12.0", "react-native-safe-area-context": "^3.3.0", "react-native-screens": "^3.10.0", @@ -23586,9 +23586,9 @@ "license": "ISC" }, "node_modules/react-native-ptt-module": { - "version": "1.10.0-alpha-26", - "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.10.0-alpha-26.tgz", - "integrity": "sha512-TcTku1d5a8bd5c9LGZ6hAmrA5F50CreFAhXMgnRZCkyvhQJTq3O7C0KpiyUKi5cCkkD/qEX0a3dXTKNGSa7A/w==", + "version": "1.10.0-rc-02", + "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.10.0-rc-02.tgz", + "integrity": "sha512-RsRIVjNW1MCNUyztp/Gdqb0knkfloicfAfQEiHG7ETopTjm6sWg8m50wTvNkagjbWj4u4FCq5y0dvlrpjRnTcA==", "license": "MIT" }, "node_modules/react-native-qrcode-svg": { @@ -33927,9 +33927,9 @@ "integrity": "sha512-TAX4y7MMHEwzauVB/rjCUhmZbLoF/TQNtscyWPj6vLUKA2rFTWUsZ/yB5+Ykcld/1syBPHPFkdbRstdTxvndZw==" }, "@walmart/push-to-talk-mini-app": { - "version": "1.10.20", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-1.10.20.tgz", - "integrity": "sha512-F9NgEXtPLbqLn0LM5G3IvbFMQuuI5H9Br1H7VYsC9sg2VkAQ8vQjd5hiK2TPPRCvuO7j3SXMCKczDVFV2dUhTg==" + "version": "1.10.36", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-1.10.36.tgz", + "integrity": "sha512-vkepbveXXWUt+eC7VFfSjdoXHKebTt3SKPJR2aasXj78BtRJmtZPjgCJCXuBrj2gHE+/kWJp82tFZJPXkflPpg==" }, "@walmart/react-native-encrypted-storage": { "version": "1.1.3", @@ -44778,9 +44778,9 @@ "integrity": "sha512-xRS7mRh0exwu7Iw8PPVHdM11d13A/KzYjy0/fZx3zVtxISxPkNaDGayau6oa7HqO3Nj0oS9ulFCYjcQfG6vahA==" }, "react-native-ptt-module": { - "version": "1.10.0-alpha-26", - "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.10.0-alpha-26.tgz", - "integrity": "sha512-TcTku1d5a8bd5c9LGZ6hAmrA5F50CreFAhXMgnRZCkyvhQJTq3O7C0KpiyUKi5cCkkD/qEX0a3dXTKNGSa7A/w==" + "version": "1.10.0-rc-02", + "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.10.0-rc-02.tgz", + "integrity": "sha512-RsRIVjNW1MCNUyztp/Gdqb0knkfloicfAfQEiHG7ETopTjm6sWg8m50wTvNkagjbWj4u4FCq5y0dvlrpjRnTcA==" }, "react-native-qrcode-svg": { "version": "6.2.0", --- package.json @@ -107,7 +107,7 @@ "@walmart/payrollsolution_miniapp": "0.130.34", "@walmart/price-changes-mini-app": "1.8.7", "@walmart/profile-feature-app": "0.143.0", - "@walmart/push-to-talk-mini-app": "1.10.20", + "@walmart/push-to-talk-mini-app": "1.10.36", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", @@ -177,7 +177,7 @@ "react-native-pdf": "^6.6.2", "react-native-permissions": "3.6.1", "react-native-popup-menu": "^0.16.0", - "react-native-ptt-module": "1.10.0-alpha-26", + "react-native-ptt-module": "1.10.0-rc-02", "react-native-qrcode-svg": "^6.1.2", "react-native-reanimated": "^2.14.4", "react-native-render-html": "^6.3.4",
Push to talk mini app package update
Push to talk mini app package update
2c33f467d80b440e04c8c40f40794386a02398c6
--- ios/Podfile.lock @@ -709,8 +709,8 @@ PODS: - RNWMSSOLibrary (1.1.0): - AppAuth - React - - SSO (= 1.1.4) - - SSO (1.1.4): + - SSO (= 1.1.5) + - SSO (1.1.5): - AppAuth - Starscream (3.0.6) - Yoga (1.14.0) @@ -1025,8 +1025,8 @@ SPEC CHECKSUMS: RNSketchCanvas: 6939b18677cd1794151cc3d8eb5a0a2158a4a05b RNSVG: ce9d996113475209013317e48b05c21ee988d42e RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59 - RNWMSSOLibrary: 03b3bb3f7263d227aba4b8e850a53e36b1ca3d9a - SSO: f057bb55a8ba5c6f04215925542d3420ec5a0e09 + RNWMSSOLibrary: 78ffa8e6b3a515b4bce44b0ee17fe74daeee9cba + SSO: 6e2ce260ff8736be5c909fbe53823f4dad32dade Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
updated podfile.lock (#108)
updated podfile.lock (#108)
2d7c6db8fe7917bfbcdf2bf6bac3341c0e3e037c
--- packages/allspark-authentication/src/Authentication.ts @@ -166,10 +166,12 @@ export class AllsparkAuthentication { const { retryErrors } = this._config.refresh; const willRetry = retryErrors.includes(error.code); - - this._runErrorEvent('TOKEN_REFRESH_RETRY_ERROR', error, { - willRetry: String(willRetry), - }); + if (willRetry) { + // log only if retry is going to be performed + this._runErrorEvent('TOKEN_REFRESH_RETRY_ERROR', error, { + willRetry: String(willRetry), + }); + } return willRetry; };
Chore: update log condition for retry
Chore: update log condition for retry
d4e2301187b28014bbd1efc5b2492a4aae23c414
--- src/components/AssociateList/AssociateListItem.tsx @@ -2,7 +2,7 @@ import React, {useMemo} from 'react'; import {View, Text} from 'react-native'; import namecase from 'namecase'; import {associateListItemStyles} from './styles'; -import {colors, Icons, Link} from '@walmart/gtp-shared-components'; +import {colors, Icons, Link, Body} from '@walmart/gtp-shared-components'; import {StatusChip} from '../StatusChip'; import {AssociateListItemProps} from './types'; import { @@ -12,6 +12,7 @@ import { encryptUserId, formatSchedule, transformWfmSchedule, + formatTime } from '../../utils'; import {useSelector} from 'react-redux'; import {SiteSelectors} from '@walmart/allspark-foundation/Site'; @@ -43,15 +44,15 @@ export const AssociateListItem = ({ const isClockedIn = associateIsClockedIn(associate); // Use appropriate name based on site type - const associateName = isSiteDC - ? `${namecase(associate.firstName || '')} ${namecase( - associate.lastName || '', - )}`.trim() - : namecase(associateDisplayName(associate).slice(0, 20)); + const associateName = + // isSiteDC + // ? `${namecase(associate.firstName || '')} ${namecase( + // associate.lastName || '', + // )}`.trim() + // : + namecase(associateDisplayName(associate).slice(0, 20)); - const associateJobDescription = isSiteDC - ? associate.jobCategoryCodeDesc - : associate.jobCategoryCodeDesc; + const associateJobDescription = associate.jobCategoryCodeDesc; const associateHourlySchedule = namecase( formatSchedule(associate.storeSchedule), @@ -83,15 +84,6 @@ export const AssociateListItem = ({ associate?.storeSchedule && associate?.storeSchedule?.length > 0; // Get clock information for DC sites - const formatTime = (time: string) => { - return new Date(time) - .toLocaleTimeString([], { - hour: 'numeric', - minute: '2-digit', - hour12: true, - }) - .toLowerCase(); - }; const scheduleTime = useMemo(() => { if (!isSiteDC || !associate.schedule?.[0]) return ''; @@ -141,18 +133,18 @@ export const AssociateListItem = ({ /> )} <View style={styles.associateInfoContainer}> - <Text testID='associate-list-item-name' style={styles.associateName}> + <Body testID='associate-list-item-name' > {associateName} - </Text> + </Body> {showJobDescription && ( - <Text style={styles.plainText}> + <Body> {namecase(associateJobDescription)} - </Text> + </Body> )} {isSiteDC ? ( <View style={styles.associateSchedule}> <Icons.ClockIcon color={colors.gray['160']} /> - <Text style={styles.plainText}>{scheduleTime}</Text> + <Body >{scheduleTime}</Body> </View> ) : ( <> @@ -161,9 +153,9 @@ export const AssociateListItem = ({ testID='manager-schedule-info' style={styles.associateSchedule}> <Icons.ClockIcon color={colors.gray['160']} /> - <Text style={styles.plainText}> + <Body > {associateManagerSchedule} - </Text> + </Body> </View> ) : ( showHourlySchedule && @@ -172,9 +164,9 @@ export const AssociateListItem = ({ testID='hourly-schedule-info' style={styles.associateSchedule}> <Icons.ClockIcon color={colors.gray['160']} /> - <Text style={styles.plainText}> + <Body> {associateHourlySchedule} - </Text> + </Body> </View> ) )} @@ -185,7 +177,7 @@ export const AssociateListItem = ({ onPress={handleViewSchedule} testID={`view-schedule-btn-${associate.associateId}`} UNSAFE_style={styles.viewScheduleButton}> - <Text>{t('rosterScreen.associateRosterItem.viewSchedule')}</Text> + <Body>{t('rosterScreen.associateRosterItem.viewSchedule')}</Body> </Link> ) : null} </View> --- src/screens/RosterDetailScreen/mocks/types/supplyChain.ts @@ -42,12 +42,10 @@ export interface SupplyChainTeam { export interface SupplyChainTeamResponse { teams: SupplyChainTeam; - errors: any[]; } export interface SupplyChainTeamsByStoreResponse { teams: SupplyChainTeam[]; - errors: any[]; } export interface SupplyChainBusinessUnit { --- src/utils/user.ts @@ -177,3 +177,13 @@ export const getScheduleStartAndEndTime = (scheduleInfo: any) => { schedEndTime: schedEndTime, }; }; + +export const formatTime = (time: string) => { + return new Date(time) + .toLocaleTimeString([], { + hour: 'numeric', + minute: '2-digit', + hour12: true, + }) + .toLowerCase(); +};
address PR comments
address PR comments
1ab05d1d789529417788090bc96f91b89ce97939
--- package.json @@ -173,7 +173,7 @@ "@walmart/shop-gnfr-mini-app": "1.0.454", "@walmart/sidekick-mini-app": "4.276.1", "@walmart/store-feature-orders": "1.35.6", - "@walmart/talent-performance-mini-app": "1.2.7", + "@walmart/talent-performance-mini-app": "1.2.13", "@walmart/talent-preboarding-mini-app": "1.0.63", "@walmart/talent-preboarding-shared-utils": "^0.1.114", "@walmart/taskit-mini-app": "5.52.12", --- yarn.lock @@ -8907,7 +8907,7 @@ __metadata: "@walmart/shop-gnfr-mini-app": "npm:1.0.454" "@walmart/sidekick-mini-app": "npm:4.276.1" "@walmart/store-feature-orders": "npm:1.35.6" - "@walmart/talent-performance-mini-app": "npm:1.2.7" + "@walmart/talent-performance-mini-app": "npm:1.2.13" "@walmart/talent-preboarding-mini-app": "npm:1.0.63" "@walmart/talent-preboarding-shared-utils": "npm:^0.1.114" "@walmart/taskit-mini-app": "npm:5.52.12" @@ -9919,9 +9919,9 @@ __metadata: languageName: node linkType: hard -"@walmart/talent-performance-mini-app@npm:1.2.7": - version: 1.2.7 - resolution: "@walmart/talent-performance-mini-app@npm:1.2.7::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftalent-performance-mini-app%2F-%2F%40walmart%2Ftalent-performance-mini-app-1.2.7.tgz" +"@walmart/talent-performance-mini-app@npm:1.2.13": + version: 1.2.13 + resolution: "@walmart/talent-performance-mini-app@npm:1.2.13::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftalent-performance-mini-app%2F-%2F%40walmart%2Ftalent-performance-mini-app-1.2.13.tgz" dependencies: "@walmart/apq-client-wrapper": "npm:0.2.4" peerDependencies: @@ -9943,7 +9943,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/60d935bd8eb4b02642ae0bd7f067a422d22898ca47aa6dd48dd227ac5984002015bbe09961bc5675781b1e196eae3d0227f476d7467a5b9ca349537f67c85d83 + checksum: 10c0/ce62adea7cf8145d546c4f600ef9a909c8226af8403f79267cb3061a3618cd1ac251661a343dd67d308a67de5e55bf5a33c79bed158f49f3e0b6f25c4faa603e languageName: node linkType: hard
chore: update @walmart/talent-performance-mini-app to version 1.2.13 (#5383)
chore: update @walmart/talent-performance-mini-app to version 1.2.13 (#5383) Co-authored-by: Ajay Kumar Chittemsetti - a0c0zov <Ajaykumar.Chittemset@walmart.com> Co-authored-by: JAE SHIM - j0s0v4g <Jae.Shim0@walmart.com> Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com>
649fbb37c295c15952e2d46a9da95cf89ea61b40
--- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/index.tsx @@ -1,7 +1,7 @@ -import React from 'react'; +import React, { useCallback } from 'react'; import { TouchableOpacity, View } from 'react-native'; import { HubWidgetTypes } from './types'; -import { HubWidgetStyles } from './styles'; +import { HubWidgetStyles, scale } from './styles'; import { Icons, Button, @@ -9,6 +9,7 @@ import { Heading, colors, Alert, + Skeleton, } from '@walmart/gtp-shared-components'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { FEATURE_ID } from '../../constant'; @@ -27,12 +28,47 @@ export const HubWidget = ({ variant, routeName, routeParams, + refresh, }: HubWidgetTypes) => { const styles = HubWidgetStyles(); const IconComponent = Icons[iconName]; const showShortIntro = shortIntro && variant !== 'restricted'; const { t } = useAllsparkTranslation(FEATURE_ID); + const renderHubWidgetSkeleton = useCallback( + () => ( + <> + <View style={styles.skeletonContainer}> + <Skeleton variant='rectangle' height={scale(20)} width={scale(300)} /> + <Skeleton + variant='rectangle' + height={scale(20)} + width={scale(300)} + UNSAFE_style={styles.skeletonOuterContainer} + /> + <Skeleton + variant='rectangle' + height={scale(50)} + width={scale(300)} + UNSAFE_style={styles.skeletonOuterContainer} + /> + <Skeleton + variant='rectangle' + height={scale(50)} + width={scale(300)} + UNSAFE_style={styles.skeletonOuterContainer} + /> + <Skeleton variant='rectangle' height={scale(20)} width={scale(300)} /> + </View> + </> + ), + [styles] + ); + + if (refresh) { + return renderHubWidgetSkeleton(); + } + return ( <View style={styles.container}> {/* HEADER */} --- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/styles.ts @@ -1,6 +1,18 @@ -import { StyleSheet } from 'react-native'; +import { Dimensions, StyleSheet } from 'react-native'; import { colors } from '@walmart/gtp-shared-components'; +const { width, height } = Dimensions.get('window'); + +// devices >= 5 inch +const guidelineBaseWidth = 350; +const guidelineBaseHeight = 680; +const scale = (size: number) => (width / guidelineBaseWidth) * size; +const verticalScale = (size: number) => (height / guidelineBaseHeight) * size; +const moderateScale = (size: number, factor = 0.5) => + size + (scale(size) - size) * factor; + +export { scale, verticalScale, moderateScale }; + export const HubWidgetStyles = () => StyleSheet.create({ container: { @@ -69,4 +81,14 @@ export const HubWidgetStyles = () => restrictedContainer: { paddingTop: 16, }, + skeletonContainer: { + justifyContent: 'center', + alignItems: 'center', + marginHorizontal: 5, + marginTop: 20, + gap: 5, + }, + skeletonOuterContainer: { + margin: 10, + }, }); --- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/types.ts @@ -20,6 +20,7 @@ interface HubWidgetBaseTypes { infoText?: string; routeName: string; routeParams?: { [key: string]: any } | undefined; + refresh?: boolean; } interface HubWidgetActionalable extends HubWidgetBaseTypes {
feat(ui): Update the refresh logic
feat(ui): Update the refresh logic
46085af4ec93c06207ff0ab44e75be219b3a1708
--- package-lock.json @@ -51,9 +51,9 @@ "@walmart/financial-wellbeing-feature-app": "1.6.3", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", - "@walmart/gtp-shared-components": "2.0.5", + "@walmart/gtp-shared-components": "2.0.6", "@walmart/impersonation-mini-app": "1.18.1", - "@walmart/ims-print-services-ui": "2.2.3", + "@walmart/ims-print-services-ui": "2.4.0", "@walmart/inbox-mini-app": "0.83.3", "@walmart/iteminfo-mini-app": "7.2.2", "@walmart/manager-approvals-miniapp": "0.2.2", @@ -2504,7 +2504,9 @@ } }, "node_modules/@livingdesign/tokens": { - "version": "0.61.0", + "version": "0.63.0", + "resolved": "https://npme.walmart.com/@livingdesign/tokens/-/tokens-0.63.0.tgz", + "integrity": "sha512-4dkQPXuSXJv3QFEf4MNiaqgiqlr6QxNJoAeyZlCBpRD5CXxbZPRdRv8kTKPO5Cifmuvd7+y2Lyfapk6DPAfzrQ==", "license": "UNLICENSED" }, "node_modules/@microsoft/recognizers-text-data-types-timex-expression": { @@ -5254,13 +5256,13 @@ } }, "node_modules/@walmart/gtp-shared-components": { - "version": "2.0.5", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.0.5.tgz", - "integrity": "sha512-x2C3xao1HmXfwaAmsbuTOyYuCSTDR/lkbWDzmALY9HKFXBWcb4J84LYm+X3GFkbkwpzyjZJ1kxxEfRhek5uviQ==", + "version": "2.0.6", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.0.6.tgz", + "integrity": "sha512-riPUltPH+2Q8KNcx6/ua1F4k4Eou8AzMsMTE2byGAHCGTSA0b9o2MS+Jmkdpp+9JndiolvdbXzwmSva8MADQoA==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { - "@livingdesign/tokens": "0.61.0", + "@livingdesign/tokens": "0.63.0", "@walmart/gtp-shared-icons": "1.0.6", "lodash": "^4.17.15", "moment": "^2.29.4", @@ -5313,7 +5315,9 @@ } }, "node_modules/@walmart/ims-print-services-ui": { - "version": "2.2.3", + "version": "2.4.0", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.4.0.tgz", + "integrity": "sha512-ZdxUVkzLfTN2R78J9gS0k3t0k8fME+PuFa5bxJD1VfxXnCshF/c9N+ndGmffLtgh0Ae+jAKVOWuplSLes43nfQ==", "peerDependencies": { "@react-native-firebase/analytics": ">=10.5.1", "@react-native-firebase/app": ">=10.5.0", @@ -5322,7 +5326,7 @@ "@react-native-firebase/perf": ">=10.5.1", "@react-navigation/native": ">=6.0.0", "@walmart/functional-components": ">=1.0.22", - "@walmart/gtp-shared-components": ">=2.0.0", + "@walmart/gtp-shared-components": ">=2.0.6", "@walmart/react-native-logger": ">=1.17.0", "@walmart/ui-components": ">=1.1.11", "i18next": "^22.0.1", @@ -23785,7 +23789,9 @@ } }, "@livingdesign/tokens": { - "version": "0.61.0" + "version": "0.63.0", + "resolved": "https://npme.walmart.com/@livingdesign/tokens/-/tokens-0.63.0.tgz", + "integrity": "sha512-4dkQPXuSXJv3QFEf4MNiaqgiqlr6QxNJoAeyZlCBpRD5CXxbZPRdRv8kTKPO5Cifmuvd7+y2Lyfapk6DPAfzrQ==" }, "@microsoft/recognizers-text-data-types-timex-expression": { "version": "1.3.0", @@ -25275,11 +25281,11 @@ } }, "@walmart/gtp-shared-components": { - "version": "2.0.5", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.0.5.tgz", - "integrity": "sha512-x2C3xao1HmXfwaAmsbuTOyYuCSTDR/lkbWDzmALY9HKFXBWcb4J84LYm+X3GFkbkwpzyjZJ1kxxEfRhek5uviQ==", + "version": "2.0.6", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.0.6.tgz", + "integrity": "sha512-riPUltPH+2Q8KNcx6/ua1F4k4Eou8AzMsMTE2byGAHCGTSA0b9o2MS+Jmkdpp+9JndiolvdbXzwmSva8MADQoA==", "requires": { - "@livingdesign/tokens": "0.61.0", + "@livingdesign/tokens": "0.63.0", "@walmart/gtp-shared-icons": "1.0.6", "lodash": "^4.17.15", "moment": "^2.29.4", @@ -25306,7 +25312,9 @@ "integrity": "sha512-Cyp0VN7Ak+CgLd2RxCEVsJZDtVuQHy/ghtRyyOYm4VW+sw2UuvMXSV6qwzLMRPomEIi2KL3XdaYjNTl3m82DSQ==" }, "@walmart/ims-print-services-ui": { - "version": "2.2.3" + "version": "2.4.0", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.4.0.tgz", + "integrity": "sha512-ZdxUVkzLfTN2R78J9gS0k3t0k8fME+PuFa5bxJD1VfxXnCshF/c9N+ndGmffLtgh0Ae+jAKVOWuplSLes43nfQ==" }, "@walmart/inbox-mini-app": { "version": "0.83.3", --- package.json @@ -93,9 +93,9 @@ "@walmart/financial-wellbeing-feature-app": "1.6.3", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", - "@walmart/gtp-shared-components": "2.0.5", + "@walmart/gtp-shared-components": "2.0.6", "@walmart/impersonation-mini-app": "1.18.1", - "@walmart/ims-print-services-ui": "2.2.3", + "@walmart/ims-print-services-ui": "2.4.0", "@walmart/inbox-mini-app": "0.83.3", "@walmart/iteminfo-mini-app": "7.2.2", "@walmart/manager-approvals-miniapp": "0.2.2",
updated print new version and gtp 2.0.6
updated print new version and gtp 2.0.6
81cb9dc4668c2a7152a52a241325f1d32a70fbaf
--- package-lock.json @@ -4282,9 +4282,9 @@ "integrity": "sha512-Vpwrt460LPca7ZGjDrDezorVnr+WebRntHaUGkAhIDVVfna0P3wyJcRnr18/hged+q/3f6NmYfZgB3ZaGxGlgg==" }, "@walmart/inbox-mini-app": { - "version": "0.34.0-beta.3", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.34.0-beta.3.tgz", - "integrity": "sha512-Sqp+rKfZGG07GlDTMeoptMzwY2PqKgQZ6mYe/yaFdMeZEGOEXsJ4yc9O6eYaRMQ2xnbPRF6cti2D4YMY5v8d9w==" + "version": "0.35.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.35.0.tgz", + "integrity": "sha512-f2Y0d8Cmu7N6gvO8c5985AWYZ5kXI83cH6P7tN/ojgrJEcLFPAD/D8+YVVO4kyIQxydDcLGNDbZt3K3xxe1sDQ==" }, "@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.34.0-beta.3", + "@walmart/inbox-mini-app": "0.35.0", "@walmart/iteminfo-mini-app": "4.1.3", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.7.65",
version bump
version bump
e5b93239e1d80c89023c693f6df6e9d9d904ab87
--- targets/US/ios/AllSpark.xcodeproj/project.pbxproj @@ -608,10 +608,10 @@ "${PODS_XCFRAMEWORKS_BUILD_DIR}/WebexSDK/Wxc/wbxaecodec.framework/wbxaecodec", "${PODS_XCFRAMEWORKS_BUILD_DIR}/WebexSDK/Wxc/wbxaudioengine.framework/wbxaudioengine", "${PODS_XCFRAMEWORKS_BUILD_DIR}/WebexSDK/Wxc/WebexSDK.framework/WebexSDK", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/ZebraRfidiOSSdk/ZebraRfidSdkFramework.framework/ZebraRfidSdkFramework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/compass-sdk-ios/compass_sdk_ios.framework/compass_sdk_ios", "${PODS_XCFRAMEWORKS_BUILD_DIR}/compass-sdk-rn/IPSFramework.framework/IPSFramework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/native-rfid-scanner/ZebraRfidSdkFramework.framework/ZebraRfidSdkFramework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -626,10 +626,10 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wbxaecodec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wbxaudioengine.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebexSDK.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZebraRfidSdkFramework.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/compass_sdk_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IPSFramework.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZebraRfidSdkFramework.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; --- targets/US/ios/Podfile.lock @@ -1011,8 +1011,9 @@ PODS: - nanopb/encode (= 2.30909.1) - nanopb/decode (2.30909.1) - nanopb/encode (2.30909.1) - - native-rfid-scanner (3.10.10): + - native-rfid-scanner (3.12.1): - React-Core + - ZebraRfidiOSSdk (~> 0.1.9) - OpenSSL-Universal (1.1.1100) - Osiris (0.8.3-rc.6) - OsirisBarcode (0.8.3-rc.6): @@ -2282,6 +2283,7 @@ PODS: - wifi-store-locator (1.4.1): - React-Core - Yoga (1.14.0) + - ZebraRfidiOSSdk (0.1.9) - zxing-cpp (2.15.14-rc.3) DEPENDENCIES: @@ -2515,6 +2517,7 @@ SPEC REPOS: - SSZipArchive - TOCropViewController - WebexSDK + - ZebraRfidiOSSdk EXTERNAL SOURCES: boost: @@ -2824,7 +2827,7 @@ SPEC CHECKSUMS: libvmaf: 27f523f1e63c694d14d534cd0fddd2fab0ae8711 libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 - native-rfid-scanner: df5045d2b4ed1a41719bedf44b2a02eefde4fe4a + native-rfid-scanner: dbaf6a5b64975e382782c7d45c9f05b015874f36 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c Osiris: 1b52d1f11f9c38f81e2a9c5764583639455043ab OsirisBarcode: 8c40bffbc0a2016de00607f6b2512389d2f0e8cd @@ -2948,9 +2951,10 @@ SPEC CHECKSUMS: walmart-react-native-sumo-sdk: 49d6a1873b29b2279433bd4346755206ac60e1fd WebexSDK: 8a46648ec5992f1a10de5375e91df35750275445 wifi-store-locator: 501fca0a220c725ed93ab403635c0f246a8ce7e3 - Yoga: c716aea2ee01df6258550c7505fa61b248145ced + Yoga: 47d399a73c0c0caa9ff824e5c657eae31215bfee + ZebraRfidiOSSdk: 7e4eec426a4fd95a40e68d75fc9633ea96224b0c zxing-cpp: fcaae9c9427f24066af415055963582be8200d05 PODFILE CHECKSUM: e45caceff59820fc357600d6b2277634c8242734 -COCOAPODS: 1.15.2 +COCOAPODS: 1.14.3 --- targets/US/package.json @@ -121,7 +121,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.1.22", "@walmart/myteam-mini-app": "1.12.0", - "@walmart/native-rfid-scanner": "3.10.10", + "@walmart/native-rfid-scanner": "3.12.1", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.3", "@walmart/payrollsolution_miniapp": "0.141.19", @@ -139,7 +139,7 @@ "@walmart/receipt-check-miniapp": "1.24.2", "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.15.0", - "@walmart/rfid-scan-mini-app": "2.4.4", + "@walmart/rfid-scan-mini-app": "2.6.3", "@walmart/rn-receiving-mini-app": "2.4.13", "@walmart/roster-mini-app": "2.9.0", "@walmart/schedule-mini-app": "0.118.2", --- yarn.lock @@ -7036,7 +7036,7 @@ __metadata: "@walmart/moment-walmart": "npm:1.0.4" "@walmart/money-auth-shared-components": "npm:0.1.22" "@walmart/myteam-mini-app": "npm:1.12.0" - "@walmart/native-rfid-scanner": "npm:3.10.10" + "@walmart/native-rfid-scanner": "npm:3.12.1" "@walmart/onewalmart-miniapp": "npm:1.0.24" "@walmart/pay-stub-miniapp": "npm:0.15.3" "@walmart/payrollsolution_miniapp": "npm:0.141.19" @@ -7054,7 +7054,7 @@ __metadata: "@walmart/receipt-check-miniapp": "npm:1.24.2" "@walmart/redux-store": "npm:~6.3.28" "@walmart/returns-mini-app": "npm:4.15.0" - "@walmart/rfid-scan-mini-app": "npm:2.4.4" + "@walmart/rfid-scan-mini-app": "npm:2.6.3" "@walmart/rn-receiving-mini-app": "npm:2.4.13" "@walmart/roster-mini-app": "npm:2.9.0" "@walmart/schedule-mini-app": "npm:0.118.2" @@ -7412,13 +7412,13 @@ __metadata: languageName: node linkType: hard -"@walmart/native-rfid-scanner@npm:3.10.10": - version: 3.10.10 - resolution: "@walmart/native-rfid-scanner@npm:3.10.10" +"@walmart/native-rfid-scanner@npm:3.12.1": + version: 3.12.1 + resolution: "@walmart/native-rfid-scanner@npm:3.12.1" peerDependencies: react: "*" react-native: "*" - checksum: 10c0/9ca3bac6e620888d1c770ed4507c1a7f0d58838aafa21ee80c64a45d73c8939ffa1f130281ae0a48f6fcf25acee1aff3c3cbed8d8ff71c36e9d5ffb8f5295e3c + checksum: 10c0/ddc9430052f6430551e8fb87c54cf8c6038716d88b1f6a3492fccadc060cfaad09b881296f8bba1235490e5b10b779f43f7b122c3663e36a9f49b60d62b4bed4 languageName: node linkType: hard @@ -7739,30 +7739,34 @@ __metadata: languageName: node linkType: hard -"@walmart/rfid-scan-mini-app@npm:2.4.4": - version: 2.4.4 - resolution: "@walmart/rfid-scan-mini-app@npm:2.4.4" +"@walmart/rfid-scan-mini-app@npm:2.6.3": + version: 2.6.3 + resolution: "@walmart/rfid-scan-mini-app@npm:2.6.3" 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/gtp-shared-components": ">=2.2.4" "@walmart/ims-print-services-ui": ^2.10.3 - "@walmart/native-rfid-scanner": ">=3.10.10" + "@walmart/native-rfid-scanner": ">=3.12.1" "@walmart/react-native-scanner-3.0": ">=0.3.0" "@walmart/redux-store": ">=3.7.0" "@walmart/ui-components": ">=1.15.1" + i18next: ">=23.6.0" react: "*" + react-i18next: ">=13.3.1" react-native: "*" react-native-ble-manager: ">=11.0.4" react-native-circular-progress: ">=1.3.7" react-native-new-snap-carousel: ">=3.9.3" react-native-permissions: ">=3.6.0" + react-native-reanimated: ">=3.12.1" + react-native-safe-area-context: ">=4.8.2" react-redux: ">=8.0.4" redux: ">=4.1.2" reselect: ">=4.0.0" uuid: ">=3.3.2" - checksum: 10c0/362464cebf34761736efce1639eeda42835450a008861fecce516634ffdd14851daa8255414d9d68e26cf4c95d0d7d177fa4233933fcf99c1b4066219b0cfec5 + checksum: 10c0/c70f66ddeef42c49e20410d4808b07d834abbd837567a7aa0b25bf31be1a1b1c83f1e35dc751605ce1a50ab9f818bb4a7a23ef83d9f0dd0baddd7cb42d9d7215 languageName: node linkType: hard
Update @walmart/rfid-scan-mini-app to 2.6.3 and @walmart/native-rfid-scanner to 3.12.1
Update @walmart/rfid-scan-mini-app to 2.6.3 and @walmart/native-rfid-scanner to 3.12.1
ffa4f05b8b8728f3e1186e10600aab88f143887c
--- packages/allspark-foundation/src/Elements/AllsparkElement.tsx @@ -49,7 +49,11 @@ export class AllsparkElement<P extends Object, E extends string = string> { private _eventManager = new EventManager<{ change: string; }>(['change']); - private Template: FC<ElementRecord<P>>; + + /** + * The component used to render the element. + */ + public Template: FC<ElementRecord<P>>; constructor(Template: FC<ElementRecord<P>>) { this.Template = Template; @@ -117,7 +121,7 @@ export class AllsparkElement<P extends Object, E extends string = string> { /** * Returns an interface for interacting with a specific element record. - * @param id - The ID of the element to interact with. + * @param id - The ID of the record to interact with. * @example * const MyElement = AllsparkElements.createElement('MyElement', (props) => { * const { id, value } = props; @@ -125,15 +129,15 @@ export class AllsparkElement<P extends Object, E extends string = string> { * }); * * // Access specific record - * const Element1 = MyElement.Element('element-1', {value: ''}); + * const Record1 = MyElement.Record('element-1', {value: ''}); * * // Add record - * Element1.update({ value: 'Hello World' }); + * Record1.update({ value: 'Hello World' }); * * // Clear record back to initial state - * Element1.clear(); + * Record1.clear(); */ - public Element = <K extends E>(id: K, initial: P) => { + public Record = <K extends E>(id: K, initial: P) => { this._records.set(id, { id, ...initial, @@ -279,6 +283,75 @@ class ElementManager< return element; }; + /** + * Renders a single record for a created element. + * @param props.element - The ID of the element to render. + * @param props.record - The ID of the record to render. + * @example + * <AllsparkElement.Container element="MyElement" record="element-1" /> + */ + public Container = <K extends keyof Elements>(props: { + element: K; + record: IDS[K]; + }) => { + const { element, record } = props; + const Element = this._elements[element]; + return <Element.Container id={record} />; + }; + + /** + * Renders multiple records for a created element. + * @param props.element - The ID of the element to render. + * @param props.limit - The maximum number of elements to display. + * @param props.method - The method for displaying elements. Default is 'lifo'. + * @example + * <AllsparkElement.List element="MyElement" limit={3} method="lifo" /> + */ + public List = <K extends keyof Elements>( + props: { element: K } & ListProps + ) => { + const { element, ...rest } = props; + const Element = this._elements[element]; + return <Element.List {...rest} />; + }; + + /** + * Returns an interface for interacting with a specific element record. + * @param elementId - The ID of the AllsparkElement instance to interact with. + * @param id - The ID of the record to interact with. + * @param initial - The initial props for the record. + * @example + * const ElementRecord = AllsparkElements.Record('MyElement', 'element-1', { value: '' }); + * + * // Render element-1 + * <ElementRecord.Container /> + * + * // Update element-1 + * ElementRecord.update({ value: 'Hello World' }); + */ + public Record = <K extends keyof Elements>( + elementId: K, + id: IDS[K], + initial: Elements[K] + ) => this._elements[elementId].Record(id, initial); + + /** + * Use an element template directly to render the component with provided props. + * @param props.element - The ID of the element to render. + * @param prop.x - The component props fro the selected element + * @example + * <AllsparkElement.Template element="MyElement" value="Hello World" /> + */ + public Template = <K extends keyof Elements>( + props: { element: K } & Elements[K] + ) => { + const { element, ...rest } = props; + const Element = this._elements[element]; + return ( + <Element.Template id='template' {...(rest as unknown as Elements[K])} /> + ); + }; + /** * Adds a record to an AllsparkElement instance. * @param elementId - The ID of the AllsparkElement instance to add the record to. --- packages/allspark-foundation/src/Elements/Badges.tsx @@ -35,6 +35,6 @@ export const AllsparkBadges = AllsparkElements.createElement( /** * The specific element interface for the badge shown on the drawer button. */ -export const AllsparkDrawerBadge = AllsparkBadges.Element('Allspark.Drawer', { +export const AllsparkDrawerBadge = AllsparkBadges.Record('Allspark.Drawer', { value: '', }); --- packages/allspark-foundation/src/Elements/README.md @@ -37,7 +37,7 @@ const Messages = AllsparkElements.createElement( ); ``` -### Placing an AllsparkElement +### Rendering an AllsparkElement An `AllsparkElement` can be displayed in two ways. Either as a single element `Container` or as a list of elements `List`. @@ -143,3 +143,54 @@ declare global { } } ``` + +### Using AllsparkElement Template + +Sometimes you may wish to access the underlying component of an `AllsparkElement` directly. This can be done with the `AllsparkElement.Template` component. + +This allows AllsparkElements to be used as a component registry. One Feature or Container can create an element and another can use it indirectly. + +```tsx +// On element instance +<Messages.Template value='Hello World' /> + +// with AllsparkElements +<AllsparkElements element='Me@Walmart.Messages' value='Hello World' /> +``` + +The example is simple, but imagine the created element being a smart component that handles its own data fetching, navigation, etc. The consuming feature or container would only need to know the element name and props. + +### AllsparkElements.Record + +This is a method provided to simplify interaction with a particular element record. + +This is helpful for when you have a limited number of defined records and have to access particular ones often. + +```tsx +const Message1Record = Messages.Record('message-1', {value: ''}); + +// Will render the 'message-1' record without having to specify the id +<Message1Record.Container /> + +// Will update the 'message-1' record without having to specify the id +Message1Record.update({ value: 'Hello World' }); + +// Will clear the 'message-1' record without having to specify the id +Message1Record.clear(); +``` + +A better example may be how we internally use this for easy interaction with the Drawer badge...which is one of the Badges element records: + +```tsx +// Specify the record id and the initial props +const AllsparkDrawerBadge = Badges.Record('Allspark.Drawer', { value: undefined }); + +// Renders the drawer badge +<AllsparkDrawerBadge.Container /> + +// Updates the drawer badge +AllsparkDrawerBadge.update({...}); + +// Clears the drawer badge +AllsparkDrawerBadge.clear(); +```
feat: add template access to allspark elements. update docs
feat: add template access to allspark elements. update docs
43df3b6bebc6e11c965317841cda9cb2ee859387
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -30,6 +30,10 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects component="ScheduleMiniApp" name="scheduleScreen" /> + <Screen + component={[Function]} + name="myTeam" + /> <Screen component="FeedbackMiniApp" name="Feedback" @@ -336,6 +340,10 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects component="ScheduleMiniApp" name="scheduleScreen" /> + <Screen + component={[Function]} + name="myTeam" + /> <Screen component="FeedbackMiniApp" name="Feedback"
update snapshot
update snapshot
9cbd7d0a6d306905e7fd130fcf20922a8111fc9e
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.25.8](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.7...@walmart/allspark-foundation-hub@1.25.8) (2025-12-08) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.25.7](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.25.6...@walmart/allspark-foundation-hub@1.25.7) (2025-12-08) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.25.7", + "version": "1.25.8", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.16.6](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.16.5...@walmart/allspark-foundation@7.16.6) (2025-12-08) + +### Bug Fixes + +- ALLSPARK-7337 translation persistence issue ([1679027](https://gecgithub01.walmart.com/allspark/allspark/commit/167902759fc68369058102299b9c7419ca966e5c)) + ## [7.16.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.16.4...@walmart/allspark-foundation@7.16.5) (2025-12-08) **Note:** Version bump only for package @walmart/allspark-foundation --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "7.16.5", + "version": "7.16.6", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/my-walmart-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.6.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.6.4...@walmart/my-walmart-hub@1.6.5) (2025-12-08) + +**Note:** Version bump only for package @walmart/my-walmart-hub + ## [1.6.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/my-walmart-hub@1.6.3...@walmart/my-walmart-hub@1.6.4) (2025-12-08) **Note:** Version bump only for package @walmart/my-walmart-hub --- packages/my-walmart-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/my-walmart-hub", - "version": "1.6.4", + "version": "1.6.5", "description": "My Walmart Hub - A comprehensive hub framework for building dynamic widget-based interfaces", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation@7.16.6 - @walmart/allspark-foundation-hub@1.25.8 - @walmart/my-walmart-hub@1.6.5
0ec5bfa5ea65ac754e0d554a0b5d3f9994deb48a
--- package-lock.json @@ -3634,9 +3634,9 @@ } }, "@walmart/ui-components": { - "version": "1.1.68", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.1.68.tgz", - "integrity": "sha512-yDK234JlCjNzZs83opaU3fcAu53lq3S0pcJipCkd42jv24ianl73YgL9vgdJNZguRaJI0eMZoipAmkIUFXSDlg==", + "version": "1.1.69", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.1.69.tgz", + "integrity": "sha512-+nSbiS9ZTs/VJ12OpYxKr6wtwbj6lSWiBEjS2HrSpcKQnKRSR6p4u0RAq/4ILGbME5frADL8Wipf/Kgh0HuUdQ==", "requires": { "react-native-calendars": "1.299.0" } --- package.json @@ -96,7 +96,7 @@ "@walmart/redux-store": "^1.0.15", "@walmart/schedule-mini-app": "0.4.4", "@walmart/settings-mini-app": "1.3.8", - "@walmart/ui-components": "1.1.68", + "@walmart/ui-components": "1.1.69", "@walmart/shelfavailability-mini-app": "0.5.0", "@walmart/time-clock-mini-app": "0.4.23", "@walmart/welcomeme-mini-app": "0.30.4",
SSMP-2424
SSMP-2424
36ae70b4da4f90fb3701c62b9e29a8dba776011c
--- packages/core-services/AppConfig/index.tsx @@ -1,5 +1,7 @@ import React, { forwardRef, useImperativeHandle } from 'react'; import { useSelector } from 'react-redux'; +import { createSelector } from 'reselect'; + import { AllsparkConfigService, ConfigData, @@ -149,6 +151,14 @@ export const getDeferredAppConfigContext = async () => ConfigService; */ export const useAppConfig = () => useContainerService('config'); +const getLegacyAppConfigState = createSelector( + [ConfigSelectors.getState], + (state) => ({ + ...state, + appConfigInitSuccess: state.initialized, + }) +); + /** * @deprecated use `ConfigSelectors` from "@walmart/allspark-foundation/Config" instead * @example @@ -157,7 +167,7 @@ export const useAppConfig = () => useContainerService('config'); * * const config = useSelector(ConfigSelectors.getState); */ -export const useAppConfigState = () => useSelector(ConfigSelectors.getState); +export const useAppConfigState = () => useSelector(getLegacyAppConfigState); /** * @deprecated use `ConfigState` from "@walmart/allspark-foundation/Config" instead
fix: app config state hook wasnt backwards compatible
fix: app config state hook wasnt backwards compatible
b16417bfc7f7fa5ba289f803817ffc5016ba541c
--- android/app/build.gradle @@ -97,7 +97,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 927 - versionName "1.20.0" + versionName "1.21.0" } signingConfigs { --- ios/AllSpark/Info.plist @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.20.0</string> + <string>1.21.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> --- package-lock.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.20.0", + "version": "1.21.0", "lockfileVersion": 3, "requires": true, "packages": { --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.20.0", + "version": "1.21.0", "private": true, "scripts": { "android": "react-native run-android",
update version to 1.21.0
update version to 1.21.0
225687f854a484a1c72bf5c80a81ca817e2fbada
--- package.json @@ -76,7 +76,7 @@ "@walmart/ask-sam-mini-app": "^0.41.8", "@walmart/config-components": "3.0.2", "@walmart/core-services": "~1.0.14", - "@walmart/core-services-allspark": "^1.4.91", + "@walmart/core-services-allspark": "~1.4.91", "@walmart/core-utils": "^1.0.8", "@walmart/counts-component-miniapp": "0.0.35", "@walmart/exception-mini-app": "0.41.1",
Update package.json to use tilde
Update package.json to use tilde
d97d40f7b567f59bc4c93c99bef60dba345eb2bb
--- package-lock.json @@ -66,6 +66,7 @@ "@walmart/metrics-mini-app": "0.15.14", "@walmart/mod-flex-mini-app": "1.11.6", "@walmart/moment-walmart": "1.0.4", + "@walmart/money-auth-shared-components": "0.0.2", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.10.15", "@walmart/payrollsolution_miniapp": "0.131.15", @@ -8818,6 +8819,31 @@ "moment": "^2.24.0" } }, + "node_modules/@walmart/money-auth-shared-components": { + "version": "0.0.2", + "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.0.2.tgz", + "integrity": "sha512-Fjffkr8jkDC3UjkXsbf/A5TYj7jZdQeWyVHDuDpWE+tPvmtk+nfur0MVSgKthI/rwiSZTbakWtdgt5ClQLjCbw==", + "hasInstallScript": true, + "dependencies": { + "crypto-js": "^3.3.0", + "react-native-drop-shadow": "^0.0.6" + }, + "peerDependencies": { + "@react-navigation/native": "^6.0.0", + "@react-navigation/stack": "^6.1.0", + "@walmart/functional-components": "^1.0.34", + "@walmart/gtp-shared-components": "^2.0.6", + "@walmart/react-native-logger": "^1.9.0", + "@walmart/react-native-shared-navigation": "^0.2.0", + "@walmart/redux-store": "^1.0.12", + "react": "^17.0.2", + "react-native": "^0.66.4", + "react-native-connect-sso-redux": "^1.0.1", + "react-native-wm-telemetry": "^0.3.0", + "react-redux": "^7.2.1", + "redux": "^4.0.5" + } + }, "node_modules/@walmart/onewalmart-miniapp": { "version": "1.0.16", "resolved": "https://npme.walmart.com/@walmart/onewalmart-miniapp/-/onewalmart-miniapp-1.0.16.tgz", @@ -23085,6 +23111,18 @@ "react-native": "*" } }, + "node_modules/react-native-drop-shadow": { + "version": "0.0.6", + "resolved": "https://npme.walmart.com/react-native-drop-shadow/-/react-native-drop-shadow-0.0.6.tgz", + "integrity": "sha512-eIFZoU7yhr90xB0/Gfuolt/Eelk0F+ohy3piutuYFA+xJx1xtJ/t9xWaaTPwTGXK+56CTnp8mAX4VPDz464NZg==", + "license": "MIT", + "dependencies": { + "logkitty": "^0.7.1" + }, + "peerDependencies": { + "react-native": ">=0.61.5" + } + }, "node_modules/react-native-elements": { "version": "3.4.2", "hasInstallScript": true, @@ -34419,6 +34457,15 @@ "@walmart/moment-walmart": { "version": "1.0.4" }, + "@walmart/money-auth-shared-components": { + "version": "0.0.2", + "resolved": "https://npme.walmart.com/@walmart/money-auth-shared-components/-/money-auth-shared-components-0.0.2.tgz", + "integrity": "sha512-Fjffkr8jkDC3UjkXsbf/A5TYj7jZdQeWyVHDuDpWE+tPvmtk+nfur0MVSgKthI/rwiSZTbakWtdgt5ClQLjCbw==", + "requires": { + "crypto-js": "^3.3.0", + "react-native-drop-shadow": "^0.0.6" + } + }, "@walmart/onewalmart-miniapp": { "version": "1.0.16", "resolved": "https://npme.walmart.com/@walmart/onewalmart-miniapp/-/onewalmart-miniapp-1.0.16.tgz", @@ -44402,6 +44449,14 @@ "react-native-device-info": { "version": "10.3.0" }, + "react-native-drop-shadow": { + "version": "0.0.6", + "resolved": "https://npme.walmart.com/react-native-drop-shadow/-/react-native-drop-shadow-0.0.6.tgz", + "integrity": "sha512-eIFZoU7yhr90xB0/Gfuolt/Eelk0F+ohy3piutuYFA+xJx1xtJ/t9xWaaTPwTGXK+56CTnp8mAX4VPDz464NZg==", + "requires": { + "logkitty": "^0.7.1" + } + }, "react-native-elements": { "version": "3.4.2", "requires": { --- package.json @@ -107,6 +107,7 @@ "@walmart/metrics-mini-app": "0.15.14", "@walmart/mod-flex-mini-app": "1.11.6", "@walmart/moment-walmart": "1.0.4", + "@walmart/money-auth-shared-components": "0.0.2", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.10.15", "@walmart/payrollsolution_miniapp": "0.131.15",
bump version
bump version
bd2928b13a05fb5e5aa995856f4e49076746d3e3
--- packages/allspark-foundation-hub/__mocks__/@walmart/allspark-foundation/User.js @@ -16,6 +16,9 @@ module.exports = { getOriginalUserWorkingSite: jest.fn(), getPreferredFullName: jest.fn(), getOriginalUser: jest.fn(), + getIsUserPeopleLead: jest.fn(), + getIsUserTeamLead: jest.fn(), + getIsUserSalaried: jest.fn(), }, UserActionCreators: { FETCH_SUCCESS: jest.fn().mockImplementation(() => jest.fn()), --- packages/allspark-foundation-hub/__tests__/HubFeature/TeamOnboarding/OnboardingContext.test.tsx @@ -0,0 +1,97 @@ +jest.useFakeTimers(); +import React from 'react'; +import { render } from '../../utils'; +import { OnboardingProvider } from '../../../src/HubFeature/Onboarding/TeamOnboarding/OnboardingContext'; +import { View } from 'react-native'; +import { UserSelectors } from '@walmart/allspark-foundation/User'; +import * as hooks from '../../../src/HubFeature/Hooks/useUserPreferences'; +import { useSelector } from 'react-redux'; +import { LoggerService } from '@walmart/allspark-foundation'; + +jest.mock('@walmart/allspark-foundation', () => ({ + ...jest.requireActual('@walmart/allspark-foundation'), + LoggerService: { + getContainerInstance: jest.fn().mockImplementation(() => ({ + info: jest.fn(), + error: jest.fn(), + })), + }, +})); +const MockChild = () => <View testID='Mock.Child' />; + +jest.mock('react-redux', () => ({ + ...jest.requireActual('react-redux'), + useSelector: jest.fn(), +})); + +describe('OnboardingContext', () => { + afterEach(jest.resetAllMocks); + it('renders OnboardingProvider with passed in children', () => { + ( + UserSelectors.getIsUserPeopleLead as unknown as jest.Mock + ).mockReturnValueOnce(true); + const mockSetState = jest.fn(); + let mockGetState; + jest.spyOn(React, 'useCallback').mockImplementationOnce((fn) => { + mockGetState = true; + return fn(); + }); + jest + .spyOn(React, 'useState') + .mockImplementationOnce(() => [mockGetState, mockSetState]); + + const { getByTestId } = render( + <OnboardingProvider> + <MockChild /> + </OnboardingProvider> + ); + const child = getByTestId('Mock.Child'); + expect(child).toBeDefined(); + console.log(mockGetState); + mockSetState(); + expect(mockSetState).toHaveBeenCalled(); + }); + + it('useEffect to log exception when userPreferences fails', () => { + const mockLogHandler = jest.fn(); + const mockRef = { + error: jest.fn(), + info: mockLogHandler, + }; + + jest + .spyOn(React, 'useRef') + .mockImplementationOnce(() => ({ current: mockRef })); + + (LoggerService.getContainerInstance as jest.Mock).mockImplementation( + () => ({ ...mockRef }) + ); + (useSelector as jest.Mock).mockReturnValueOnce(true); + + //@ts-ignore + jest.spyOn(hooks, 'useUserPreferences').mockImplementationOnce(() => ({ + data: { + associatePreferences: { + __typename: 'AssociatePreferences', + meAtWalmartPreferences: { + __typename: 'MeAtWalmartPreferences', + managerExperiencePreferences: { + __typename: 'ManagerExperiencePreferences', + myTeams: null, + }, + }, + }, + }, + })); + + const { getByTestId } = render( + <OnboardingProvider> + <MockChild /> + </OnboardingProvider> + ); + const child = getByTestId('Mock.Child'); + expect(child).toBeDefined(); + mockRef.error(); + expect(mockRef.error).toHaveBeenCalled(); + }); +}); --- packages/allspark-foundation-hub/src/HubFeature/Onboarding/TeamOnboarding/OnboardingContext.tsx @@ -9,9 +9,9 @@ import React, { import { useUserPreferences } from '../../Hooks/useUserPreferences'; import { LoggerService, - UserSelectors, useTelemetryService, } from '@walmart/allspark-foundation'; +import { UserSelectors } from '@walmart/allspark-foundation/User'; import { useDispatch, useSelector } from 'react-redux'; import { ManagerExperienceCreators } from '../../Redux'; @@ -36,26 +36,24 @@ export const OnboardingProvider = ({ children }: any) => { const teamSwitcherTelemetryRef = useRef(teamSwitcherTelemetry); const dispatch = useDispatch(); + const getMyTeamData = async () => { + try { + const myTeams = + await data?.associatePreferences?.meAtWalmartPreferences + ?.managerExperiencePreferences?.myTeams; + loggerRef.current.info('Team data fetched successfully'); + return myTeams; + } catch (error: any) { + loggerRef.current.error('Error:', error); + teamSwitcherTelemetryRef.current.logEvent('preference_data_error_event', { + message: 'Onboarding failed', + }); + throw error; + } + }; + useEffect(() => { if (eligibleForOnboarding) { - const getMyTeamData = async () => { - try { - const myTeams = - await data?.associatePreferences?.meAtWalmartPreferences - ?.managerExperiencePreferences?.myTeams; - loggerRef.current.info('Team data fetched successfully'); - return myTeams; - } catch (error: any) { - loggerRef.current.error('Error:', error); - teamSwitcherTelemetryRef.current.logEvent( - 'preference_data_error_event', - { - message: 'Onboarding failed', - } - ); - throw error; - } - }; getMyTeamData() .then((myTeamData) => { if (myTeamData !== undefined) {
feat(ui): unit tests for onboarding contezxt
feat(ui): unit tests for onboarding contezxt
639164c007e57c928c1bd5fc702c79df0e43db0c
--- package-lock.json @@ -80,7 +80,7 @@ "@walmart/schedule-mini-app": "0.37.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.16", - "@walmart/taskit-mini-app": "2.34.6", + "@walmart/taskit-mini-app": "2.39.0", "@walmart/time-clock-mini-app": "2.98.0", "@walmart/topstock-mini-app": "1.0.6", "@walmart/ui-components": "1.15.0", @@ -5994,7 +5994,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.34.6", + "version": "2.39.0", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.39.0.tgz", + "integrity": "sha512-sp0dKQGh0yvQth5Gw6zj9tzrRfeZtOxjwKkO5AsEcbr60jy1N0JEsKx3QMjB+7A6A0Pw+rj8zSzqBBEK7K4C1g==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -25382,7 +25384,9 @@ "version": "1.5.16" }, "@walmart/taskit-mini-app": { - "version": "2.34.6" + "version": "2.39.0", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.39.0.tgz", + "integrity": "sha512-sp0dKQGh0yvQth5Gw6zj9tzrRfeZtOxjwKkO5AsEcbr60jy1N0JEsKx3QMjB+7A6A0Pw+rj8zSzqBBEK7K4C1g==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -122,7 +122,7 @@ "@walmart/schedule-mini-app": "0.37.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.16", - "@walmart/taskit-mini-app": "2.34.6", + "@walmart/taskit-mini-app": "2.39.0", "@walmart/time-clock-mini-app": "2.98.0", "@walmart/topstock-mini-app": "1.0.6", "@walmart/ui-components": "1.15.0", --- patches/@walmart+taskit-mini-app+2.34.6.patch @@ -1,10 +0,0 @@ -diff --git a/node_modules/@walmart/taskit-mini-app/src/utils/localStorage.ts b/node_modules/@walmart/taskit-mini-app/src/utils/localStorage.ts -index 4893442..a15ddd7 100644 ---- a/node_modules/@walmart/taskit-mini-app/src/utils/localStorage.ts -+++ b/node_modules/@walmart/taskit-mini-app/src/utils/localStorage.ts -@@ -1,4 +1,4 @@ --import AsyncStorage from '@react-native-community/async-storage'; -+import AsyncStorage from '@react-native-async-storage/async-storage'; - - class LocalStorage { - async get(key: string): Promise<any> {
updated taskit version with asyncUpgrade
updated taskit version with asyncUpgrade
e64ef46f37f39fc11111293667e1657f4f03bfd1
--- core/__tests__/settings/versions/__snapshots__/VersionsListTest.tsx.snap @@ -20,7 +20,7 @@ exports[`VersionsList 1`] = ` [ { "data": [], - "title": "Me@Walmart", + "title": "MyWalmart", "version": null, }, ] @@ -65,7 +65,7 @@ exports[`VersionsList 1`] = ` size="medium" weight="700" > - appNames.Me@Walmart + appNames.MyWalmart </Body> <Body size="medium" --- core/src/settings/versions/VersionsList.tsx @@ -15,7 +15,6 @@ import { ContainerSelectors, LibraryInfo, } from '@walmart/allspark-foundation/Container'; -import {EnvironmentSelectors} from '@walmart/allspark-foundation/Environment'; import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; import {Divider} from '@walmart/gtp-shared-components'; @@ -42,15 +41,11 @@ const styles = StyleSheet.create({ }); const getVersionList = createSelector( - [ - ContainerSelectors.getLibraries, - ContainerSelectors.getVersion, - EnvironmentSelectors.getContainerName, - ], - (libraries, appVersion, container) => { + [ContainerSelectors.getLibraries, ContainerSelectors.getVersion], + (libraries, appVersion) => { return [ { - title: container, + title: 'MyWalmart', //TODO change the containerName to MyWalmart in the environment file version: appVersion, data: libraries, },
App name fixed part of rebranding
App name fixed part of rebranding
05cdb55621ed339ce08d8c7ba1aee5a88e20235f
--- docs/roster-testing-scenarios.md
chore(ui): update testing doc
chore(ui): update testing doc
5b4652c4055cf5b10e76a2b8aa59fb1bb5cc6a4a
--- patches/@walmart+me-at-walmart-container+6.0.16.patch @@ -0,0 +1,26 @@ +diff --git a/node_modules/@walmart/me-at-walmart-container/lib/graphql/policies.js b/node_modules/@walmart/me-at-walmart-container/lib/graphql/policies.js +index 97c7d27..05193da 100644 +--- a/node_modules/@walmart/me-at-walmart-container/lib/graphql/policies.js ++++ b/node_modules/@walmart/me-at-walmart-container/lib/graphql/policies.js +@@ -48,6 +48,21 @@ exports.TypePolicies = { + keyFields: ['associateId'], + merge: true, + }, ++ NotificationPreferences: { ++ merge: true, ++ }, ++ DisplayPreferences: { ++ merge: true, ++ }, ++ MeAtWalmartPreferences: { ++ merge: true, ++ }, ++ AssociatePreferences: { ++ merge: true, ++ }, ++ Punch: { ++ merge: true, ++ }, + // TODO: Added by Learning. Add at mini app level. + AssociateJobDetail: { + merge: true,
update cache policy
update cache policy
3398cdcde7745d90a87d75fd0ca92f356011bc56
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -109,11 +109,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects name="Feedback" /> <Screen - component={ - { - "ReceivingRootApp": "ReceivingRootApp", - } - } name="Receiving" /> <Screen @@ -474,11 +469,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects name="Feedback" /> <Screen - component={ - { - "ReceivingRootApp": "ReceivingRootApp", - } - } name="Receiving" /> <Screen
Test cases failure - Fixed
Test cases failure - Fixed
9c7bc03fa24992add6227316518f1f2bbec2e8af
--- app.config.US.ts @@ -291,7 +291,7 @@ const CONFIG: ExpoConfig = { ExpoPlugins.withWebexSDK, ExpoPlugins.withWifiStoreLocator, ExpoPlugins.withWorkManagerInitializer, - './plugins/withRuler', // Custom plugin for Ruler integration + ExpoPlugins.withRuler, ], // [ // "expo-dev-launcher", --- plugins/withGradleDependencies.ts @@ -1,45 +0,0 @@ -import { - ConfigPlugin, - withProjectBuildGradle, - WarningAggregator, -} from '@expo/config-plugins'; - -import {mergeContents} from '@expo/config-plugins/build/utils/generateCode'; - -type GradleDependencyProps = { - tag: string; - dependencies: string[]; -}; - -const withGradleDependencies: ConfigPlugin<GradleDependencyProps> = ( - config, - props -) => { - return withProjectBuildGradle(config, (config) => { - if (config.modResults.language !== 'groovy') { - WarningAggregator.addWarningAndroid( - 'withProjectGradleDependencies', - 'Cannot automatically configure project build.gradle if it\'s not groovy' - ); - return config; - } - - console.log( - '[ ' + props.tag + '] applying dependencies to android/build.gradle', - props - ); - - config.modResults.contents = mergeContents({ - tag: props.tag, - src: config.modResults.contents, - newSrc: props.dependencies.join('\n'), - anchor: /dependencies(?:\s+)?\{/, - offset: 1, - comment: '//', - }).contents; - - return config; - }); -}; - -export default withGradleDependencies; --- plugins/withRuler.ts @@ -1,38 +0,0 @@ -import {ConfigPlugin, withAppBuildGradle} from '@expo/config-plugins'; -import withGradleDependencies from './withGradleDependencies'; -import {mergeContents} from '@expo/config-plugins/build/utils/generateCode'; - -const withRuler: ConfigPlugin = (config) => { - config = withGradleDependencies(config, { - tag: 'ruler-dependencies', - dependencies: ['classpath \'com.spotify.ruler:ruler-gradle-plugin:2.0.0-beta-3\''], - }); - - config = withAppBuildGradle(config, (config) => { - const plugins = [ - '// @generated by withRuler', - 'apply plugin: "com.spotify.ruler"', - `ruler { - abi.set("arm64-v8a") - locale.set("en") - screenDensity.set(480) - sdkVersion.set(34) - }` - ]; - - config.modResults.contents = mergeContents({ - tag: 'ruler-plugins', - src: config.modResults.contents, - newSrc: plugins.join('\n'), - anchor: '', - offset: 1, - comment: '//', - }).contents; - - return config; - }); - - return config; -}; - -export default withRuler;
feat(ruler): updated plugin call
feat(ruler): updated plugin call
90cb2196a2ea7beffc97cf34c96faa3f737ee2da
--- packages/me-at-walmart-container/__tests__/services/site/querySiteInfo.test.ts @@ -114,12 +114,12 @@ describe('querySiteInfo', () => { ); expect( MeAtWalmartLoggerService.getContainerInstance().debug, - ).toHaveBeenCalledWith('Successfully fetched store configs.', { + ).toHaveBeenCalledWith('Successfully fetched store configs from athena.', { site: mockStoreNumber, }); }); - it('should handle errors, log them, and throw error', async () => { + it('should handle errors, log them, and fallback to BFF', async () => { (AllsparkLocalStorage.get as jest.Mock).mockReturnValue(null); (AllsparkGraphQLClient.query as jest.Mock).mockRejectedValue( Error('Mock Error'), @@ -127,10 +127,10 @@ describe('querySiteInfo', () => { (WmConfig.getValue as jest.Mock).mockReturnValue({ asBoolean: () => false, }); + const bffServiceSpy = jest.spyOn(Site, 'fetchSiteInfo'); - await expect( - querySiteInfo(mockStoreNumber, mockCountryCode), - ).rejects.toThrow('Mock Error'); + await querySiteInfo(mockStoreNumber, mockCountryCode); + // Will no more throw the error but fallback on BFF. A different error could be thrown by BFF. expect(AllsparkLocalStorage.get).toHaveBeenCalledWith( 'storage-storeConfig-US-12345', ); @@ -146,27 +146,27 @@ describe('querySiteInfo', () => { }); expect( MeAtWalmartLoggerService.getContainerInstance().error, - ).toHaveBeenCalledWith('Failed to fetch store configs', { + ).toHaveBeenCalledWith('Failed to fetch store configs from athena, trying bff', { message: 'Mock Error', site: mockStoreNumber, countryCode: mockCountryCode, }); + expect(bffServiceSpy).toHaveBeenCalled(); }); it("doesn't check cache if forceRefresh is true", async () => { (AllsparkGraphQLClient.query as jest.Mock).mockRejectedValue( - Error('Mock Error'), + Error('Mock Error athena'), ); (WmConfig.getValue as jest.Mock).mockReturnValue({ asBoolean: () => false, }); + jest.spyOn(Site, 'fetchSiteInfo'); jest.spyOn(AllsparkLocalStorage, 'get'); - await expect( - querySiteInfo(mockStoreNumber, mockCountryCode, true), - ).rejects.toThrow('Mock Error'); + await querySiteInfo(mockStoreNumber, mockCountryCode, true), expect(AllsparkLocalStorage.get).not.toHaveBeenCalled(); }); - it('throws error if the response returns with null and no store data', async () => { + it('Logs error if the response comes back with null or no store data. Fallsback to bff.', async () => { const mockData = { businessUnitByCountryAndNumber: null, }; @@ -174,16 +174,21 @@ describe('querySiteInfo', () => { data: mockData, errors: [], }); - await expect( - querySiteInfo(mockStoreNumber, mockCountryCode), - ).rejects.toThrow(`No store data found`); + (WmConfig.getValue as jest.Mock).mockReturnValue({ + asBoolean: () => false, + }); + const bffServiceSpy = jest.spyOn(Site, 'fetchSiteInfo') + + await querySiteInfo(mockStoreNumber, mockCountryCode); + expect( MeAtWalmartLoggerService.getContainerInstance().error, - ).toHaveBeenCalledWith(`Failed to fetch store configs`, { + ).toHaveBeenCalledWith(`Failed to fetch store configs from athena, trying bff`, { message: 'No store data found', site: mockStoreNumber, countryCode: mockCountryCode, }); + expect(bffServiceSpy).toHaveBeenCalledWith(mockStoreNumber, false); }); it('calls bff if useBffStoreConfig is true', async () => { const mockUseBffStoreConfig = true; --- packages/me-at-walmart-container/src/services/site/querySiteInfo.ts @@ -83,7 +83,7 @@ export const querySiteInfo = async ( }, ); MeAtWalmartLoggerService.getContainerInstance().debug( - 'Successfully fetched store configs.', + 'Successfully fetched store configs from athena.', { site, }, @@ -92,13 +92,13 @@ export const querySiteInfo = async ( return parsedStoreData; } catch (error) { MeAtWalmartLoggerService.getContainerInstance().error( - 'Failed to fetch store configs', + 'Failed to fetch store configs from athena, trying bff', { message: (error as Error).message, site, countryCode, }, ); - throw error; + return fetchSiteInfo(site, forceRefresh); } };
storeConfigs fallback to bff if athena fails
storeConfigs fallback to bff if athena fails
d467d324924aa3d0bbf66e28fe5b907e2cfe3bca
--- packages/me-at-walmart-athena-queries/src/schema.graphql @@ -7733,7 +7733,7 @@ type Query { getAssociateById(id: String!, idType: idType = WIN): Associate getAssociateByIds(associateIds: [String!]!): [WorkdayAssociate]! getAssociateByWinAndSSN(id: String!, ssn: String!): ProfileDetails - GetForYouHeaderAssociateDetails(id: String!, idType: idType = WIN, startDate: String!, endDate: String!, businessUnitNumber: Int!, country: String!): Associate + GetForYouHeaderAssociateDetails(id: String!, idType: idType = USERID, startDate: String!, endDate: String!, businessUnitNumber: Int!, country: String!): Associate getAssociateFilters(associateFilterInput: GetAssociateFiltersInput): GetAssociateFiltersResponse! getAssociateProfilePic(associateId: String!, size: ProfilePictureSize): ProfilePicture getAssociateTimeOffRequests(input: TimeOffRequestListInput): [TimeOffRequestDetail] --- packages/me-at-walmart-athena-queries/src/schema.types.ts @@ -7204,7 +7204,7 @@ export type QueryGetForYouHeaderAssociateDetailsArgs = { idType?: InputMaybe<IdType>; startDate: Scalars['Date']['input']; endDate: Scalars['Date']['input']; - bussinessUnitNumber: InputMaybe<Scalars['Int']['input']>; + businessUnitNumber: InputMaybe<Scalars['Int']['input']>; country: InputMaybe<Scalars['String']['input']>; };
fix(graphql): fix typo
fix(graphql): fix typo
f7e8a20f6ad5c488833918cdefe56d0b236b540c
--- .yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch @@ -1,12 +0,0 @@ -diff --git a/dist/redux/selectors/index.js b/dist/redux/selectors/index.js -index d49d43bf964d8848119c5709e654918000d58daf..f6713a53955b109095fbb84305d20bd1c7298e59 100644 ---- a/dist/redux/selectors/index.js -+++ b/dist/redux/selectors/index.js -@@ -44,6 +44,6 @@ exports.scanner3LicenseAndroidSelector = scanner3LicenseAndroidSelector; - const scanner3LicenseiOSSelector = (state) => state?.appConfig?.data?.core?.scanner3LicenseIOS ?? ''; - exports.scanner3LicenseiOSSelector = scanner3LicenseiOSSelector; - const bottomNavConfigSelector = (state) => { -- return state?.navConfig?.data?.data?.find((navs) => navs?.type === 'BOTTOMNAV'); -+ return state.navConfig?.data?.BOTTOMNAV; - }; - exports.bottomNavConfigSelector = bottomNavConfigSelector; --- targets/US/package.json @@ -146,7 +146,7 @@ "@walmart/shelfavailability-mini-app": "1.5.33", "@walmart/sidekick-mini-app": "4.67.15", "@walmart/store-feature-orders": "1.26.12", - "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch", + "@walmart/taskit-mini-app": "4.17.7", "@walmart/time-clock-mini-app": "2.400.0", "@walmart/topstock-mini-app": "1.15.20", "@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch", --- yarn.lock @@ -6819,7 +6819,7 @@ __metadata: "@walmart/shelfavailability-mini-app": "npm:1.5.33" "@walmart/sidekick-mini-app": "npm:4.67.15" "@walmart/store-feature-orders": "npm:1.26.12" - "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch" + "@walmart/taskit-mini-app": "npm:4.17.7" "@walmart/time-clock-mini-app": "npm:2.400.0" "@walmart/topstock-mini-app": "npm:1.15.20" "@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch" @@ -7722,21 +7722,12 @@ __metadata: languageName: node linkType: hard -"@walmart/taskit-mini-app@npm:3.3.0": - version: 3.3.0 - resolution: "@walmart/taskit-mini-app@npm:3.3.0" - peerDependencies: - "@walmart/allspark-foundation": "*" - checksum: 10c0/2653dedf1ee21886b54194598fa88219dbf74e46e5c0b33d718de6f7fcf944e866ae7687c21034262245f74b2b7f2509dce3edea3aafd189e32356524fa5aacc - languageName: node - linkType: hard - -"@walmart/taskit-mini-app@patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch": - version: 3.3.0 - resolution: "@walmart/taskit-mini-app@patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch::version=3.3.0&hash=0b4439" +"@walmart/taskit-mini-app@npm:4.17.7": + version: 4.17.7 + resolution: "@walmart/taskit-mini-app@npm:4.17.7" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/94201755bb14eabc07271726b76ca443a91462084999880cadab28825c4b7ba204e0bb00643efda28157301c7e1e9f1111ca2bd766906ab23f2a38e203f0b73b + checksum: 10c0/1f19711dd2fa395dc7d51d9283f2f487d9d651d4a4b730070e9f812aa2b6aa0701edc63da2fd13095c5ac9835866f072f6731f2b2b0f33f5552cf0ca0bfee38c languageName: node linkType: hard
bump notes mini app version for feature build
bump notes mini app version for feature build
73c9576ea1ec1d535bc342e32d0cc61a7c35d062
--- package-lock.json @@ -55,7 +55,7 @@ "@walmart/impersonation-mini-app": "1.19.1", "@walmart/ims-print-services-ui": "2.5.1", "@walmart/inbox-mini-app": "0.84.1", - "@walmart/iteminfo-mini-app": "7.3.4", + "@walmart/iteminfo-mini-app": "7.4.0", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25", "@walmart/metrics-mini-app": "0.12.10", @@ -5332,7 +5332,9 @@ } }, "node_modules/@walmart/iteminfo-mini-app": { - "version": "7.3.4", + "version": "7.4.0", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.4.0.tgz", + "integrity": "sha512-xUJUr5NHMhMdLjg8DMp4yUHoUSl4sNLQfCmrSd8EeJ6BfV2gVFBBGPjaEG4g8R1SicjgwrlmA5geNAWF/UwAYg==", "peerDependencies": { "@react-native-community/netinfo": ">=9.3.6", "@react-native-firebase/analytics": ">=15.1.1", @@ -25250,7 +25252,9 @@ } }, "@walmart/iteminfo-mini-app": { - "version": "7.3.4" + "version": "7.4.0", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.4.0.tgz", + "integrity": "sha512-xUJUr5NHMhMdLjg8DMp4yUHoUSl4sNLQfCmrSd8EeJ6BfV2gVFBBGPjaEG4g8R1SicjgwrlmA5geNAWF/UwAYg==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.4" --- package.json @@ -97,7 +97,7 @@ "@walmart/impersonation-mini-app": "1.19.1", "@walmart/ims-print-services-ui": "2.5.1", "@walmart/inbox-mini-app": "0.84.1", - "@walmart/iteminfo-mini-app": "7.3.4", + "@walmart/iteminfo-mini-app": "7.4.0", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25", "@walmart/metrics-mini-app": "0.12.10",
updated iteminfo version with DSL verbiage change
updated iteminfo version with DSL verbiage change
4ba071fc0fbbe67837f074a6fbb3595e7a69ce52
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.19.10](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.19.9...@walmart/allspark-foundation-hub@1.19.10) (2025-10-28) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.19.9](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.19.8...@walmart/allspark-foundation-hub@1.19.9) (2025-10-27) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.19.9", + "version": "1.19.10", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.5.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.5.1...@walmart/allspark-foundation@7.5.2) (2025-10-28) + +### Bug Fixes + +- **translation:** select method did not support all valid use cases ([c26d8d9](https://gecgithub01.walmart.com/allspark/allspark/commit/c26d8d9642412f8d8b34dd5cbb7b0b196376f425)) + ## [7.5.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.5.0...@walmart/allspark-foundation@7.5.1) (2025-10-27) **Note:** Version bump only for package @walmart/allspark-foundation --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "7.5.1", + "version": "7.5.2", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/me-at-walmart-geolocation/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.3.10](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-geolocation@1.3.9...@walmart/me-at-walmart-geolocation@1.3.10) (2025-10-28) + +**Note:** Version bump only for package @walmart/me-at-walmart-geolocation + ## [1.3.9](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-geolocation@1.3.8...@walmart/me-at-walmart-geolocation@1.3.9) (2025-10-27) **Note:** Version bump only for package @walmart/me-at-walmart-geolocation --- packages/me-at-walmart-geolocation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-geolocation", - "version": "1.3.9", + "version": "1.3.10", "description": "Geofencing, location tracking and location services for me@ apps", "author": "m0n09mr <maksym.novakh@walmart.com>", "main": "./lib/cjs/index.js",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation@7.5.2 - @walmart/allspark-foundation-hub@1.19.10 - @walmart/me-at-walmart-geolocation@1.3.10
ca463e5c466f6e1c01ab373c339002cd43978df7
--- package-lock.json @@ -53,7 +53,7 @@ "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.67", "@walmart/feedback-all-spark-miniapp": "0.9.43", - "@walmart/financial-wellbeing-feature-app": "1.13.3", + "@walmart/financial-wellbeing-feature-app": "1.13.4", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.10", @@ -8360,9 +8360,9 @@ } }, "node_modules/@walmart/financial-wellbeing-feature-app": { - "version": "1.13.3", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.13.3.tgz", - "integrity": "sha512-GNBpaCms3EQvvN7zNRHdpRiEKPfOZforA8pDR8EfeleVuc/zTVEis388vNSDxXB3Vhm6v+SpeuOFwCrXuQpbXg==", + "version": "1.13.4", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.13.4.tgz", + "integrity": "sha512-gJnLioShJTQsi5aKF9w3OrUWSOrVklxVN9q00nUwugTzyh2n8M+uALsrXBGbEWh6KZdftxptbbSirUgVYAMabw==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33600,9 +33600,9 @@ "integrity": "sha512-6/R50+Ga6eY7nIqreH8m7KmNEXPz1kQ8DO6/l8J6aGHvTuLRZeFHAH8h3ZsvuWip8/0xUqwd4nyRsd/aeA/g5A==" }, "@walmart/financial-wellbeing-feature-app": { - "version": "1.13.3", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.13.3.tgz", - "integrity": "sha512-GNBpaCms3EQvvN7zNRHdpRiEKPfOZforA8pDR8EfeleVuc/zTVEis388vNSDxXB3Vhm6v+SpeuOFwCrXuQpbXg==" + "version": "1.13.4", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.13.4.tgz", + "integrity": "sha512-gJnLioShJTQsi5aKF9w3OrUWSOrVklxVN9q00nUwugTzyh2n8M+uALsrXBGbEWh6KZdftxptbbSirUgVYAMabw==" }, "@walmart/functional-components": { "version": "4.0.3", --- package.json @@ -94,7 +94,7 @@ "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.67", "@walmart/feedback-all-spark-miniapp": "0.9.43", - "@walmart/financial-wellbeing-feature-app": "1.13.3", + "@walmart/financial-wellbeing-feature-app": "1.13.4", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.10",
bumped financial-wellbeing-feature-app to 1.13.4
bumped financial-wellbeing-feature-app to 1.13.4
fb77b4c67a681758ee286a271a7235ebaeb54377
--- android/app/src/debug/java/com/walmart/stores/allspark/beta/ReactNativeFlipper.java @@ -4,7 +4,7 @@ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.walmart.stores.allspark.beta; +package com.allspark; import android.content.Context; import com.facebook.flipper.android.AndroidFlipperClient;
merge conflicts from main 2
merge conflicts from main 2
aa0312c18498b4ca26e6cc0d46c96a92e9273595
--- __tests__/appReview/sagasTest.ts @@ -0,0 +1,30 @@ +import {call, select} from 'redux-saga/effects'; +import onReview from 'react-native-wm-app-review'; +import {handleAppReviewPrompt, DEFAULT_CONFIG} from '../../src/appReview/sagas'; +import {getCoreAppConfig} from '../../src/redux/SharedSelectors'; + +jest.mock('react-native-wm-app-review', () => ({ + __esModule: true, + default: jest.fn(), +})); + +describe('handleAppReviewPrompt', () => { + const config = { + enable: true, + displayInterval: 15, + }; + + it('works as expected with defined config', () => { + const iterator = handleAppReviewPrompt(); + expect(iterator.next().value).toEqual(select(getCoreAppConfig)); + expect(iterator.next({['app-review']: config}).value).toEqual( + call(onReview, config), + ); + }); + + it('works as expected with default config', () => { + const iterator = handleAppReviewPrompt(); + expect(iterator.next().value).toEqual(select(getCoreAppConfig)); + expect(iterator.next({}).value).toEqual(call(onReview, DEFAULT_CONFIG)); + }); +}); --- src/appReview/sagas.ts @@ -3,11 +3,13 @@ import onReview from 'react-native-wm-app-review'; import {FeatureAppConfig} from '@walmart/redux-store'; import {getCoreAppConfig} from '../redux/SharedSelectors'; +export const DEFAULT_CONFIG = { + enable: true, + displayInterval: 90, +}; + export function* handleAppReviewPrompt() { const config: FeatureAppConfig = yield select(getCoreAppConfig); - const appReviewConfig = config['app-review'] || { - enable: true, - displayInterval: 90, - }; + const appReviewConfig = config['app-review'] || DEFAULT_CONFIG; yield call(onReview, appReviewConfig); }
add review saga tests
add review saga tests
d4458101411b3677d245b4d70ca642a7d841ac0a
--- package-lock.json @@ -4343,9 +4343,9 @@ "integrity": "sha512-qJaaKPSs5rNbukmidrZoqqWylzPX1nos0NwavGpgMjfCIvRuAE83yxNgNMV2KNP8y42YfNhEQlMJ5dCnsg/vWw==" }, "@walmart/push-to-talk-mini-app": { - "version": "0.5.87", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.87.tgz", - "integrity": "sha512-6J38PVdD02IHHk1unG8PDAHehBhiSjM4AOnUOO8y0ozYUOeTG8Ryg5bQ35iIeUUQqswPFMkxiK2fm3xmA8TAmw==" + "version": "0.5.88", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.88.tgz", + "integrity": "sha512-jZekzZKcTYMplqt6/yu7VS7L/z9roaHc+w/w0eBR3wut9DDingV9RsHsl+uSB7qAIJmveIp24pt/ZxtC7SXdRA==" }, "@walmart/react-native-collapsible": { "version": "1.5.3",
updating package lock
updating package lock
73238c5e6c2073ecab1c2435b4704c7607bba6e1
--- package.json @@ -4,10 +4,10 @@ "private": true, "scripts": { "android": "react-native run-android", - "android:beta": "yarn run env:beta && react-native run-android --variant=betaDebug", - "android:dev": "yarn run env:dev && react-native run-android --variant=devDebug", - "android:prod": "yarn run env:prod && react-native run-android --variant=prodDebug", - "android:teflon": "yarn run env:teflon && react-native run-android --variant=teflonDebug", + "android:beta": "yarn run env:beta && react-native run-android --mode=betaDebug", + "android:dev": "yarn run env:dev && react-native run-android --mode=devDebug", + "android:prod": "yarn run env:prod && react-native run-android --mode=prodDebug", + "android:teflon": "yarn run env:teflon && react-native run-android --mode=teflonDebug", "androidConfig:beta": "sh scripts/updateAndroidProjectConfig.sh Beta", "androidConfig:dev": "sh scripts/updateAndroidProjectConfig.sh Dev", "androidConfig:prod": "sh scripts/updateAndroidProjectConfig.sh Prod",
fix: replace variant for android run script
fix: replace variant for android run script
2f24a0b76cbe5aa00aba4e8dda4d2993d9a7a5a6
--- src/notification.ts @@ -13,6 +13,8 @@ export const onTextMessageNotification = (event?: SumoPushEvent) => { const rootContainerScreen = 'texting'; const appContainerRootScreen = 'texting.root'; const messagesScreen = 'texting.messages'; + const mockRemoteURL = + '/directedvoice/ptt/v1/azure/us-100/recording-b1ecfc63-92eb-47d8-8e6c-39d0591c465a.m4a'; //TODO: conditionally set audio autoplay by checking for audio data in response payload navigate(rootContainerScreen, { @@ -22,7 +24,7 @@ export const onTextMessageNotification = (event?: SumoPushEvent) => { screen: messagesScreen, params: { channelPath: channelPath, - audioMessageForAutoplay: 'an audio uri to download and play from', + audioMessageForAutoplay: mockRemoteURL, }, }, }); --- src/screens/MessagesScreen.tsx @@ -27,6 +27,7 @@ import { getChannelTypeFromPath, } from '../channels/transforms'; import {ChannelTypes} from '../channels'; +import {fetchResource} from "../services/blob"; const styles = StyleSheet.create({ container: { @@ -179,10 +180,11 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { connectToChannel().then(startMessageSubscription); //TODO: Add utility method to check this resource format and make sure it is a valid audio message - if (audioMessageForAutoplay) { - console.log( - 'Do automatic playback of most recent message if it is an audio message', - ); + if (audioMessageForAutoplay.length > 0) { + fetchResource(audioMessageForAutoplay).then((resp) => { + console.log('The fetched resource for the autoplay'); + console.log(resp); + }); } return () => { --- src/notification.ts @@ -13,6 +13,8 @@ export const onTextMessageNotification = (event?: SumoPushEvent) => { const rootContainerScreen = 'texting'; const appContainerRootScreen = 'texting.root'; const messagesScreen = 'texting.messages'; + const mockRemoteURL = + '/directedvoice/ptt/v1/azure/us-100/recording-b1ecfc63-92eb-47d8-8e6c-39d0591c465a.m4a'; //TODO: conditionally set audio autoplay by checking for audio data in response payload navigate(rootContainerScreen, { @@ -22,7 +24,7 @@ export const onTextMessageNotification = (event?: SumoPushEvent) => { screen: messagesScreen, params: { channelPath: channelPath, - audioMessageForAutoplay: 'an audio uri to download and play from', + audioMessageForAutoplay: mockRemoteURL, }, }, }); --- src/screens/MessagesScreen.tsx @@ -27,6 +27,7 @@ import { getChannelTypeFromPath, } from '../channels/transforms'; import {ChannelTypes} from '../channels'; +import {fetchResource} from "../services/blob"; const styles = StyleSheet.create({ container: { @@ -179,10 +180,11 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { connectToChannel().then(startMessageSubscription); //TODO: Add utility method to check this resource format and make sure it is a valid audio message - if (audioMessageForAutoplay) { - console.log( - 'Do automatic playback of most recent message if it is an audio message', - ); + if (audioMessageForAutoplay.length > 0) { + fetchResource(audioMessageForAutoplay).then((resp) => { + console.log('The fetched resource for the autoplay'); + console.log(resp); + }); } return () => {
successful fetch of resource from remote push
successful fetch of resource from remote push
d0e73e79d178f9510b47c859c46f264d5097539e
--- package-lock.json @@ -4258,9 +4258,9 @@ "integrity": "sha512-JxHvDDHlr99T3sIHX3ThGdU5UdlVkDGMQecK8drdlB824HcaUp0a47yvSoO8x7Xr/sWUQF45fLYawmvi7Pwl1g==" }, "@walmart/inbox-mini-app": { - "version": "0.26.0-beta.2", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.26.0-beta.2.tgz", - "integrity": "sha512-Bu9wTm2M9qC3hiqmImYONdxY5kRQ4vi8qu6VF/f2zojxjYVqKGKhhmx+eyiNC0VcBmtO3RHKOVO5+knrPTm2YQ==" + "version": "0.26.0-beta.3", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.26.0-beta.3.tgz", + "integrity": "sha512-/urZ3i+B0MrnJzmxpwOW14e9BZssuYzjfW3Y1nRJ1niRCewCSmd1sgIkQHHieXtmvLMnEck0zDOdDoBeZxCBkQ==" }, "@walmart/iteminfo-mini-app": { "version": "4.0.10", --- 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.13", - "@walmart/inbox-mini-app": "0.26.0-beta.2", + "@walmart/inbox-mini-app": "0.26.0-beta.3", "@walmart/iteminfo-mini-app": "4.0.10", "@walmart/manager-approvals-miniapp": "0.0.59", "@walmart/metrics-mini-app": "0.5.21",
update version to beta-3
update version to beta-3
cb61f660cacc2f3f918aa7b3fe8dea747b288edf
--- package-lock.json @@ -3359,9 +3359,9 @@ "integrity": "sha512-jplu8SFzqVj1xWNlxMrPmR3oelBdyNBeQHJOr5YM7p7yqAWBiYO2jt9HyUkZCzRkEhrjjDufk9J5K9OJC1GhKA==" }, "@walmart/iteminfo-mini-app": { - "version": "1.0.16", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-1.0.16.tgz", - "integrity": "sha512-5GZY5iiaehj3eGSJ7dUl/40jGmytAn7S66SG01JUyxdoDT3KRnkC28Yk1owi3T+gXZ5/0Hq8a66BEYdNTXCkAA==", + "version": "1.0.17", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-1.0.17.tgz", + "integrity": "sha512-q29a/g7ym27zNvROhL7fTerTq5SFLn0PL3TnEAGHdUVQ+QomEv1jiASBJOksqeDyZrHWFegSLbRUMwHNAKJGcg==", "requires": { "react-native-chart-kit": "6.6.1" } --- package.json @@ -77,7 +77,7 @@ "@walmart/impersonation-mini-app": "1.0.15", "@walmart/ims-print-services-ui": "0.0.19", "@walmart/inbox-mini-app": "0.0.96", - "@walmart/iteminfo-mini-app": "1.0.16", + "@walmart/iteminfo-mini-app": "1.0.17", "@walmart/manager-approvals-miniapp": "0.0.39", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.21",
Fixing header for pixel 4a and lines being cut off
Fixing header for pixel 4a and lines being cut off
e11659f3183123f4ca0118efeb10b388bf3ddca4
--- src/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -398,6 +398,23 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { ); }; + const renderListItem = ({item, index}: {item: Associate; index: number}) => { + if (dataLoading) { + return <AssociateListLoading />; + } + return ( + <View style={styles.associateListContainer}> + <AssociateListItem + associate={item} + isLastItem={index === filteredAssociates.length} + handleViewSchedule={() => { + handleViewAssociateSchedule(item, storeId, countryCode); + }} + /> + </View> + ); + }; + useEffect(() => { const associatesFiltered = filterAssociatesByStatusAndSearchInput( teamRoster, @@ -504,17 +521,7 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { ListEmptyComponent={ dataLoading ? <AssociateListLoading /> : renderListEmptyComponent() } - renderItem={({item, index}) => ( - <View style={styles.associateListContainer}> - <AssociateListItem - associate={item} - isLastItem={index === filteredAssociates.length} - handleViewSchedule={() => { - handleViewAssociateSchedule(item, storeId, countryCode); - }} - /> - </View> - )} + renderItem={renderListItem} refreshControl={ <RefreshControl refreshing={state.refreshing}
Update roster details screen loading
Update roster details screen loading
6e7d8f370b0bf7da4de49838c3bd196041f85080
--- src/auth/ErrorScreen.tsx @@ -160,6 +160,7 @@ export const ErrorScreen: FC<any> = (props) => { !errSelectValid && styles.errorBorder, ]}> <Picker + testID='pickerTest' selectedValue={errorCategory} style={!errorCategory && styles.placeholder} onValueChange={(itemValue, index) => { @@ -175,6 +176,7 @@ export const ErrorScreen: FC<any> = (props) => { return ( <Picker.Item key={index} + testID={'pickerItem' + index} label={errTranslate} value={errTranslate} /> @@ -194,30 +196,30 @@ export const ErrorScreen: FC<any> = (props) => { /> </View> )} - {errorCategory === translate('ssoError.issues.other') && ( - <View> - <Text style={styles.otherErr}> - {translate('ssoError.otherIssue.q1')} - </Text> - <CheckboxItemGroup - items={getOptions(Q1Options)} - style={styles.otherErr} - selectedIds={selectedQ1Options} - onSelect={(id) => setselectedQ1Options(id)} - /> - <Text style={styles.otherErr}> - {translate('ssoError.otherIssue.q2')} - </Text> - <RadioItemGroup - items={getOptions(Q2Options)} - style={styles.otherErr} - selectedId={selectedQ2Option} - onSelect={(id) => setSelectedQ2Option(id)} - /> - </View> - )} </View> + {errorCategory === translate('ssoError.issues.other') && ( + <View> + <Text style={styles.otherErr}> + {translate('ssoError.otherIssue.q1')} + </Text> + <CheckboxItemGroup + items={getOptions(Q1Options)} + style={styles.otherErr} + selectedIds={selectedQ1Options} + onSelect={(id) => setselectedQ1Options(id)} + /> + <Text style={styles.otherErr}> + {translate('ssoError.otherIssue.q2')} + </Text> + <RadioItemGroup + items={getOptions(Q2Options)} + style={styles.otherErr} + selectedId={selectedQ2Option} + onSelect={(id) => setSelectedQ2Option(id)} + /> + </View> + )} <Text style={styles.fieldTitle}> {translate('ssoError.optional')} </Text>
err msg shift-up
err msg shift-up
c2cd26ef4d4d370c2e5ee1b0aa5fc5a0baf7bb07
--- .github/pull_request_template.md @@ -8,15 +8,23 @@ PR/Template Process for Allspark-core: [Link](https://confluence.walmart.com/pag ## Links to JIRA tickets: -## Please describe the changes, problems and solutions this PR is addressing: - +## PR Type: +pr_agent:type +## Please describe the changes, problems and solutions this PR is addressing: +pr_agent:summary ## Please provide comparision diff of changes from mini app github: (Example: [v2.2.0...octocat:v2.3.3](https://github.com/octocat/linguist/compare/v2.2.0...octocat:v2.3.3) , How to do [comparision](https://docs.github.com/en/repositories/releasing-projects-on-github/comparing-releases)) +## Changes walkthrough 📝: +pr_agent:walkthrough ## App changes +### Feature flags +Please list out the feature flags configured in CCM for the features in this PR + + ### Types of changes What types of changes does your code introduce? _Put an `x` in the boxes that apply_
feat(template): ALLSPARK-6366 PR teamplate update
feat(template): ALLSPARK-6366 PR teamplate update
b487d926d0d7c4534871f2cf4f14d0e5748340c1
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 187 + versionCode 196 versionName "1.1.0" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>187</string> + <string>196</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key>
updating version code
updating version code
66a2d3b10bdc93e97d23685ba46fbc910841562d
--- android/app/src/main/java/com/walmart/stores/allspark/beta/IntentWakeupReceiver.kt @@ -10,6 +10,7 @@ import android.util.Log class IntentWakeupReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { val intentAction = intent.action + Log.d("PTT Core", intent.action ?: "") if (XCOVER_KEY_INTENT_BETA == intentAction || XCOVER_KEY_INTENT_PROD == intentAction) { val starterIntent = Intent(context, MainActivity::class.java) starterIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
adding back one of the removed logs
adding back one of the removed logs
84b8f78c9b0c6798611cf43af21b680e9cc2a3d1
--- targets/US/package.json @@ -142,7 +142,7 @@ "@walmart/roster-mini-app": "2.4.0", "@walmart/schedule-mini-app": "0.114.2", "@walmart/shelfavailability-mini-app": "1.5.26", - "@walmart/shop-gnfr-mini-app": "1.0.95", + "@walmart/shop-gnfr-mini-app": "1.0.99", "@walmart/store-feature-orders": "1.26.9", "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.0.2#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.0.2-4cbd5b8e6d.patch", "@walmart/time-clock-mini-app": "2.395.0", --- yarn.lock @@ -6749,7 +6749,7 @@ __metadata: "@walmart/roster-mini-app": "npm:2.4.0" "@walmart/schedule-mini-app": "npm:0.114.2" "@walmart/shelfavailability-mini-app": "npm:1.5.26" - "@walmart/shop-gnfr-mini-app": "npm:1.0.95" + "@walmart/shop-gnfr-mini-app": "npm:1.0.99" "@walmart/store-feature-orders": "npm:1.26.9" "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.0.2#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.0.2-4cbd5b8e6d.patch" "@walmart/time-clock-mini-app": "npm:2.395.0" @@ -7590,9 +7590,9 @@ __metadata: languageName: node linkType: hard -"@walmart/shop-gnfr-mini-app@npm:1.0.95": - version: 1.0.95 - resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.95" +"@walmart/shop-gnfr-mini-app@npm:1.0.99": + version: 1.0.99 + resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.99" dependencies: "@testing-library/react-native": "npm:^12.5.1" react-native-drop-shadow: "npm:^1.0.0" @@ -7606,7 +7606,7 @@ __metadata: "@walmart/gtp-shared-components": ^2.0.0 react: ^18.2.0 react-native: ~0.70.5 - checksum: 10c0/74464e677b43ae1dc1853c5f198be9108b5972e003e486c29c11e47201a7ca1c77cb655436ce345a32590739fdf0570ab0cccd33d179f01dff5d91fb4cab68e7 + checksum: 10c0/33a1fcafc43b3491c724786d8c8fd5a5e253287d53c603af73a29f3013155753f67ff869cf1dd5827056245b5a6530aa6b55147c5283e85ae235af52b7689385 languageName: node linkType: hard
Version 1.0.99
Version 1.0.99
16e0ee50bc3ea7ba6abe87efbe553f2c991a408c
--- package-lock.json @@ -5064,9 +5064,9 @@ } }, "@walmart/allspark-neon-core": { - "version": "0.1.29", - "resolved": "https://npme.walmart.com/@walmart/allspark-neon-core/-/allspark-neon-core-0.1.29.tgz", - "integrity": "sha512-cN6NCvTVApgS+XbQXhGS5J7W7rjoa26sh7/5qERnAedZzvZPoHY9gHobC8bdSdzBqImHaGQkaoNvjhq7uihJZw==" + "version": "0.1.31", + "resolved": "https://npme.walmart.com/@walmart/allspark-neon-core/-/allspark-neon-core-0.1.31.tgz", + "integrity": "sha512-SCQFcGc3IHLT8b0xFRjhSd0bidmlNBcK8/rCnKmSAXZ3Z351jbqzYsutJ/ZEiR9nlP9Qu9tAWXSos2UnYFut3w==" }, "@walmart/amp-mini-app": { "version": "0.2.13", @@ -5442,9 +5442,9 @@ } }, "@walmart/price-changes-mini-app": { - "version": "1.5.5", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.5.5.tgz", - "integrity": "sha512-uk83daFcpMYwrKAgfQrkgW74m91NUIq1MiHmZCZVzWD8d1cSFi/MI/h/rgNLwiIPCvX4YuDF/hxQvNL1sFS0XQ==" + "version": "1.5.6", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.5.6.tgz", + "integrity": "sha512-MffeaUsYZ4uPaTyNmxoQybFZyD4Of+RPG2BX3Hk2vWn3hwlw/4PvqHAE8xsIRL0YPEu6s/wsilUpBYEugGGLhQ==" }, "@walmart/profile-feature-app": { "version": "0.0.71", --- package.json @@ -76,7 +76,7 @@ "@walmart/OneWalmart-MiniApp": "1.0.11", "@walmart/allspark-health-survey-mini-app": "0.0.44", "@walmart/allspark-home-mini-app": "0.6.10", - "@walmart/allspark-neon-core": "0.1.29", + "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.2.8", @@ -104,7 +104,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/pay-stub-miniapp": "0.8.6", "@walmart/payrollsolution_miniapp": "0.127.5", - "@walmart/price-changes-mini-app": "1.5.5", + "@walmart/price-changes-mini-app": "1.5.6", "@walmart/profile-feature-app": "0.0.71", "@walmart/push-to-talk-mini-app": "1.8.15", "@walmart/react-native-encrypted-storage": "1.1.3",
Bump price-changes 1.5.6 and neon 0.1.31
Bump price-changes 1.5.6 and neon 0.1.31
9ee33175a35a6bb287393ef885a5046801b8a6c5
--- package-lock.json @@ -37,7 +37,7 @@ "@walmart/amp-mini-app": "1.0.11", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.52", - "@walmart/attendance-mini-app": "0.48.0", + "@walmart/attendance-mini-app": "0.49.0", "@walmart/config-components": "4.0.2", "@walmart/core-services": "~1.4.11", "@walmart/core-services-allspark": "~2.2.2", @@ -4818,9 +4818,9 @@ } }, "node_modules/@walmart/attendance-mini-app": { - "version": "0.48.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.48.0.tgz", - "integrity": "sha512-wG55FXO9D/4EuUCM86iu6UNpVNgpAyHgw5L48Q48jf7OtWXqC/NiEM7sISiendWzaUbUInIc1l/K3wyWU4h26w==", + "version": "0.49.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.49.0.tgz", + "integrity": "sha512-s9oI+iAWmsiVmIWsxTvB8dMJKA6+6Np1lVe/bP0faXNpoXzrIG0dgwpljD9urXc30J14EG4lZMKgZxL+OSRLVQ==", "dependencies": { "@walmart/gta-react-native-calendars": "0.0.16", "moment-timezone": "0.5.40", @@ -25232,9 +25232,9 @@ } }, "@walmart/attendance-mini-app": { - "version": "0.48.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.48.0.tgz", - "integrity": "sha512-wG55FXO9D/4EuUCM86iu6UNpVNgpAyHgw5L48Q48jf7OtWXqC/NiEM7sISiendWzaUbUInIc1l/K3wyWU4h26w==", + "version": "0.49.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.49.0.tgz", + "integrity": "sha512-s9oI+iAWmsiVmIWsxTvB8dMJKA6+6Np1lVe/bP0faXNpoXzrIG0dgwpljD9urXc30J14EG4lZMKgZxL+OSRLVQ==", "requires": { "@walmart/gta-react-native-calendars": "0.0.16", "moment-timezone": "0.5.40", --- package.json @@ -79,7 +79,7 @@ "@walmart/amp-mini-app": "1.0.11", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.52", - "@walmart/attendance-mini-app": "0.48.0", + "@walmart/attendance-mini-app": "0.49.0", "@walmart/config-components": "4.0.2", "@walmart/core-services": "~1.4.11", "@walmart/core-services-allspark": "~2.2.2",
version update for AMA to 0.49.0
version update for AMA to 0.49.0
a948e2fb8d15f9204227214acad451252cd152a7
--- __tests__/__snapshots__/index.test.tsx.snap @@ -1,30 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MyTeamMiniApp should render as expected 1`] = ` -<Navigator> - <Screen - component={[Function]} - name="myTeam.rosterDetail" - options={ - { - "cardStyle": { - "backgroundColor": "rgba(0, 0, 0, 0)", - }, - "headerShown": false, - } - } - /> - <Screen - component={[Function]} - name="myTeam.allTeams" - options={ - { - "cardStyle": { - "backgroundColor": "rgba(0, 0, 0, 0)", - }, - "headerShown": false, - } - } - /> -</Navigator> -`; +exports[`MyTeamMiniApp should render as expected 1`] = `<Navigator />`; --- __tests__/setup.ts @@ -25,9 +25,6 @@ jest.mock('react-native-reanimated', () => { }); jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper'); -jest.mock('@walmart/roster-mini-app', () => - jest.requireActual('@walmart/roster-mini-app'), -); jest.mock('@walmart/gtp-shared-components', () => ({ ...jest.requireActual('@walmart/gtp-shared-components'), @@ -51,6 +48,11 @@ jest.mock('expo-modules-core', () => { }; }); +jest.mock('@walmart/roster-mini-app', () => ({ + ...jest.doMock('@walmart/roster-mini-app'), + buildAllScreens: jest.fn(), +})); + jest.mock('expo-image', () => jest.requireActual('expo-image')); jest.mock('@walmart/allspark-foundation-hub/HubFeature/Store', () => ({
Update my team mini app version
Update my team mini app version
3f99468b2b111e30de086a4b6eddd3ed47e05c01
--- graphql.yml @@ -1,6 +1,9 @@ schemaVersion: '1.0.0' enableGating: true teamRostersProductId: 1824 +notify: + slack: + channelName: 'smdv-miniapp' applications: - name: 'ROSTER-MINIAPP' applicationKey: 'ROSTER-MINIAPP'
feat(ui): added notification channel name
feat(ui): added notification channel name
33a0438d36830b867f539a45d878e61b140fb392
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.23.0", + "version": "2.24.0", "main": "dist/index.js", "files": [ "dist" @@ -85,7 +85,7 @@ "@typescript-eslint/parser": "^5.37.0", "@walmart/allspark-authentication": "6.1.4", "@walmart/allspark-foundation": "6.27.4", - "@walmart/allspark-foundation-hub": "1.2.23", + "@walmart/allspark-foundation-hub": "1.2.24", "@walmart/allspark-graphql-client": "^1.4.6", "@walmart/allspark-http-client": "6.1.4", "@walmart/config-components": "4.4.0", --- yarn.lock @@ -5914,9 +5914,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.2.23": - version: 1.2.23 - resolution: "@walmart/allspark-foundation-hub@npm:1.2.23" +"@walmart/allspark-foundation-hub@npm:1.2.24": + version: 1.2.24 + resolution: "@walmart/allspark-foundation-hub@npm:1.2.24" dependencies: "@reduxjs/toolkit": "npm:^1.9.7" "@shopify/flash-list": "npm:~1.6.4" @@ -5932,7 +5932,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/9d43bc8576aa58bf12b9cf70226c11f9d3a27c76a90d32fe343997cac99b79ec1228875018486de11b8c1f463503770930b0fbcdd3f81bb7f59b083d3946f1e5 + checksum: 10c0/ffe4f457c909f82e23a8674562fe08c20c1a4f68b24350534ef2c0c62eb414fa0416dcc81e81b0ff287a6428508ad5e09e6c1acff1eb8cc537510813803c978a languageName: node linkType: hard @@ -6383,7 +6383,7 @@ __metadata: "@typescript-eslint/parser": "npm:^5.37.0" "@walmart/allspark-authentication": "npm:6.1.4" "@walmart/allspark-foundation": "npm:6.27.4" - "@walmart/allspark-foundation-hub": "npm:1.2.23" + "@walmart/allspark-foundation-hub": "npm:1.2.24" "@walmart/allspark-graphql-client": "npm:^1.4.6" "@walmart/allspark-http-client": "npm:6.1.4" "@walmart/config-components": "npm:4.4.0"
Update the roster mini app version
Update the roster mini app version
309c6fce24ffd4a989c54bfb2147dc8756a165c8
--- src/Translations/locales/en-US.json @@ -346,5 +346,21 @@ "yourTeam.clockedOutSubtitle":"You must be clocked in to access more information about your team.", "yourTeam.headerTitle": "Your Team", "yourTeam.tabAccessibilityLabel": "Your team", - "yourTeam.tabTitle": "Your team" + "yourTeam.tabTitle": "Your team", + "walkthrough.continue": "Continue", + "walkthrough.done": "Get Started", + "walkthrough.intro.description": "Learn how latest changes help you work with confidence and serve customers better than ever.", + "walkthrough.intro.getStarted": "Continue", + "walkthrough.intro.homepageLink": "Not now, take me to the homepage", + "walkthrough.intro.title": "Get to know the new MyWalmart", + "walkthrough.next": "Next", + "walkthrough.notNow": "Not now, take me to the homepage", + "walkthrough.step1.description": "Tab the new floating button to open Sidekick Assistant. It's now on most screens!", + "walkthrough.step1.title": "Access Sidekick Assistant,\n anywhere, anytime.", + "walkthrough.step2.description": "A new homepage, personalized \"For You\", with your next best actions and things to know to help you stay connected.", + "walkthrough.step2.title": "All your actions, in one place.", + "walkthrough.step3.description": "Maximize the impact of your team by seeing all the work on one screen and manage it all in real time.", + "walkthrough.step3.title": "A plan for your team today", + "walkthrough.step4.description": "Celebrate with your team, see today's roster, message your team, and more.", + "walkthrough.step4.title": "A team space, to connect and grow together." }
feat(walk): walkthrough translations
feat(walk): walkthrough translations
a4508a95fb03f724f4c04251092a896cc3071112
--- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.0.0-alpha.2", + "version": "1.0.0-alpha.3", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts",
feat(ui): Update new version for hub
feat(ui): Update new version for hub
8c4340e5f1ad378ef8985d1ab6435a688005ba6c
--- package-lock.json @@ -12920,9 +12920,9 @@ } }, "react-native-wm-barcode": { - "version": "2.25.0", - "resolved": "https://npme.walmart.com/react-native-wm-barcode/-/react-native-wm-barcode-2.25.0.tgz", - "integrity": "sha512-xmSBA8p4Zol8ANcEytrb3cGukmnVCbVqRzRFXKOcKH1LPMVn/wnWEQ0itu8x24k4/guMa/Mf8vagstrCjAnMGg==" + "version": "2.28.0", + "resolved": "https://npme.walmart.com/react-native-wm-barcode/-/react-native-wm-barcode-2.28.0.tgz", + "integrity": "sha512-vtYsT6w93kjbBfQgFsP32M2WvMjalwLZnv7x7qpu8weOxaZ+cwsJruPV+sbJbwCBDMJVmQSq/KDqNb9DAjgITQ==" }, "react-native-wm-config": { "version": "0.1.1", --- package.json @@ -142,7 +142,7 @@ "react-native-video": "^5.1.0-alpha8", "react-native-view-shot": "^3.1.2", "react-native-webview": "^10.7.0", - "react-native-wm-barcode": "2.25.0", + "react-native-wm-barcode": "2.28.0", "react-native-wm-config": "^0.1.1", "react-native-wm-network": "^0.1.0", "react-native-wm-notification": "^1.0.0",
updated scanner version
updated scanner version
c9d56857722617f4d29b3bdd20a974e3428f4fd4
--- __tests__/auth/ErrorScreenTest.tsx @@ -7,6 +7,8 @@ import { PrimaryButton, LinkButton, Dropdown, + CheckboxItemGroup, + RadioItemGroup, } from '@walmart/gtp-shared-components'; import {ErrorScreen} from '../../src/auth/ErrorScreen'; import {logger} from '../../src/services/Logger'; @@ -176,6 +178,10 @@ describe('ErrorScreen', () => { //@ts-ignore .mockImplementation(jest.fn((task) => (interactionTask = task))); + const checkboxItemGroup = component.root.findByType(CheckboxItemGroup); + checkboxItemGroup.props.onSelect('Sign in was not displayed'); + const radioItemGroup = component.root.findByType(RadioItemGroup); + radioItemGroup.props.onSelect('Personal device'); const SubmitButton = component.root.findByType(PrimaryButton); SubmitButton.props.onPress();
unit test for radio-button and checkbox
unit test for radio-button and checkbox
386594a12cffe3566eff22875e885596f04b3c97
--- packages/me-at-walmart-container/src/redux/logger.ts @@ -53,8 +53,6 @@ export function* onEnvironmentSet() { yield call(MeAtWalmartLogger.setConfig, env.logger as LoggerConfig); - MeAtWalmartLogger.setSessionInfo(SESSION_ID); - if (env.logger.logLevel) { yield call(setDefaultLogLevel, env.logger.logLevel); } --- packages/me-at-walmart-container/src/services/logger.ts @@ -15,6 +15,7 @@ import { LoggerConfig as FoundationLoggerConfig, LoggerServiceCreator, } from '@walmart/allspark-foundation/Logger'; +import { SESSION_ID } from '../session'; export type { TLogLevelOverride }; @@ -157,6 +158,9 @@ export const MeAtWalmartLoggerService = LoggerServiceCreator( export type IMeAtWalmartLoggerService = typeof MeAtWalmartLoggerService; +// Set session ID immediately. Seems cloning before doing this causes clone to not have session info. +DefaultLogger.setSessionInfo(SESSION_ID); + const ContainerLogger = MeAtWalmartLoggerService.createFeatureInstance('container');
fix: session id not on container loggers
fix: session id not on container loggers
12eded07ba7e46bf91c9eed02e580d9590f7aff5
--- package-lock.json @@ -2047,12 +2047,12 @@ "integrity": "sha512-VbikbxTpoOVaAnI6DzSXQbM3pBxjgqv0834EgclZinTGkhRLpZ5UcADaK5cqNoxmQYyPkzi+9Fk1McF/wehdiQ==" }, "@walmart/schedule-mini-app": { - "version": "0.2.24", - "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.2.24.tgz", - "integrity": "sha512-OspNU+goor9H9jzZ3HRT2NUa0+5ofZ25tcD0tzlWbDTLixqm2tISiV0pPQdl+eVSVKzYPO0sayBVKpAX8HerdQ==", + "version": "0.2.27", + "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.2.27.tgz", + "integrity": "sha512-ZoBchwGBFwewn6MYYHdvkf0SJyjkuSKoEwfTNUy/gblUFk/BH0Lw4MK6edQ3zm4H1wlkdtJWfc7wDxCuJMosXw==", "requires": { "@walmart/moment-walmart": "^1.0.4", - "@walmart/wfm-ui": "^0.1.22", + "@walmart/wfm-ui": "^0.1.24", "react-native-tab-view": "^2.15.2", "reselect": "^4.0.0", "wfm-allspark-data-library": "0.0.10" @@ -2081,9 +2081,9 @@ } }, "@walmart/wfm-ui": { - "version": "0.1.23", - "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.1.23.tgz", - "integrity": "sha512-2TfUCpn2dzcQRs606seGdFPpHFxZEguxErdiJ3MhWkiLTa1j2jvaHo71tU7OI0ZNJxSAMBv4w2hUzuGhALf6ZQ==", + "version": "0.1.24", + "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.1.24.tgz", + "integrity": "sha512-4BERH90s0dRUqpCs/lsKcEDEl4ubk/BPINfU7TCs2ClRUpeE2m/LCXTs+UcpbHCi6kcwljeCw+TDeaW28U2Txg==", "requires": { "@walmart/gtp-shared-components": "^0.2.2", "@walmart/moment-walmart": "1.0.3", --- package.json @@ -49,18 +49,20 @@ "@walmart/feedback-all-spark-miniapp": "0.0.29", "@walmart/functional-components": "^1.0.22", "@walmart/gtp-shared-components": "^0.2.2", + "@walmart/inbox-mini-app": "0.0.18", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.0.47", "@walmart/react-native-env": "^0.1.0", "@walmart/react-native-logger": "^1.17.0", "@walmart/react-native-shared-navigation": "^0.2.0", "@walmart/redux-store": "^1.0.7", - "@walmart/schedule-mini-app": "0.2.24", + "@walmart/schedule-mini-app": "0.2.27", "@walmart/settings-mini-app": "1.1.7", "@walmart/time-clock-mini-app": "0.0.21", "@walmart/ui-components": "^1.0.77", "i18next": "^19.7.0", "intl": "^1.2.5", + "javascript-time-ago": "^2.3.3", "lodash": "^4.17.20", "react": "16.13.1", "react-i18next": "^11.7.3", @@ -107,9 +109,7 @@ "rn-fetch-blob": "^0.12.0", "seamless-immutable": "^7.1.4", "semver": "^7.3.4", - "victory-native": "^35.0.1", - "@walmart/inbox-mini-app": "0.0.18", - "javascript-time-ago": "^2.3.3" + "victory-native": "^35.0.1" }, "devDependencies": { "@babel/core": "^7.8.4",
Chore/schedule vqa (#182)
Chore/schedule vqa (#182) * adding schedule view vqa * updated package.json * changed fonts in schedule-mini-app Co-authored-by: Kateryna Palchykova <k0p03fa@m-c02xt902jg5j.homeoffice.wal-mart.com> Co-authored-by: Anthony Helms - awhelms <awhelms@wal-mart.com> Co-authored-by: Kateryna Palchykova <k0p03fa@m-c02xt902jg5j.attlocal.net>
c13190b6ffb546cd7a346f603616db1cd80e8fda
--- Gemfile @@ -12,4 +12,5 @@ eval_gemfile(plugins_path) if File.exist?(plugins_path) # Cocoapods 1.15 introduced a bug which break the build. We will remove the upper # bound in the template on Cocoapods with next React Native release. gem 'cocoapods', '>= 1.13', '< 1.15' -gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' \ No newline at end of file +gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' +gem 'xcodeproj', '1.27.0'
pin gem to 1.27.0
pin gem to 1.27.0
96b733d95199d2dcfd49f66d85ae2ecae3b133bc
--- package-lock.json @@ -46,7 +46,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-beta2", + "@walmart/facilities-management-miniapp": "0.6.0-beta3", "@walmart/feedback-all-spark-miniapp": "0.9.10", "@walmart/financial-wellbeing-feature-app": "1.1.2", "@walmart/functional-components": "2.0.6", @@ -5070,9 +5070,9 @@ } }, "node_modules/@walmart/facilities-management-miniapp": { - "version": "0.6.0-beta2", - "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.6.0-beta2.tgz", - "integrity": "sha512-J8AP6cqWvy50U0xBoEslzkf7SvmQtgAXmTclfJRfych9ifTqMTn6HmffQV1nKT/kzedQa4s/w5FkeTlIU/rJHw==", + "version": "0.6.0-beta3", + "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.6.0-beta3.tgz", + "integrity": "sha512-izBIkmc4wUNkP0GkPMnyz7o4K0PIkpU/ds1tQQOZDiRqHhwvCo8Da4gXO0CgUL23UPO/mNtN4mp1Ce8RQZ2ROQ==", "hasInstallScript": true, "peerDependencies": { "@react-native-community/async-storage": "^1.12.1", @@ -25324,9 +25324,9 @@ "integrity": "sha512-mzesUeNPUwAWFUrFs6104aZ3NCM5eXa2uD8TrjL+BV+ZVgYG/A58k1xUUxNayw26w7Z41J7m4bxA9ctgNiNVMQ==" }, "@walmart/facilities-management-miniapp": { - "version": "0.6.0-beta2", - "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.6.0-beta2.tgz", - "integrity": "sha512-J8AP6cqWvy50U0xBoEslzkf7SvmQtgAXmTclfJRfych9ifTqMTn6HmffQV1nKT/kzedQa4s/w5FkeTlIU/rJHw==" + "version": "0.6.0-beta3", + "resolved": "https://npme.walmart.com/@walmart/facilities-management-miniapp/-/facilities-management-miniapp-0.6.0-beta3.tgz", + "integrity": "sha512-izBIkmc4wUNkP0GkPMnyz7o4K0PIkpU/ds1tQQOZDiRqHhwvCo8Da4gXO0CgUL23UPO/mNtN4mp1Ce8RQZ2ROQ==" }, "@walmart/feedback-all-spark-miniapp": { "version": "0.9.10", --- 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-beta2", + "@walmart/facilities-management-miniapp": "0.6.0-beta3", "@walmart/feedback-all-spark-miniapp": "0.9.10", "@walmart/financial-wellbeing-feature-app": "1.1.2", "@walmart/functional-components": "2.0.6",
Updating package.json - @walmart/facilities-management-miniapp to 0.6.0-beta3
Updating package.json - @walmart/facilities-management-miniapp to 0.6.0-beta3
46baf195827d0568781a7365f23b8231a6cc8e75
--- package.json @@ -302,7 +302,7 @@ } }, "transformIgnorePatterns": [ - "<rootDir>/node_modules/(?!(react-native|@walmart/core-utils|@walmart/core-services|@walmart/core-services-allspark|@walmart/gtp-shared-components|@react-native-community/picker|@walmart/redux-store|@react-native-firebase|react-native-gesture-handler|@react-native|@living-design|@react-native-community/datetimepicker)/)" + "<rootDir>/node_modules/(?!(react-native|@walmart/core-utils|@walmart/core-services|@walmart/core-services-allspark|@walmart/gtp-shared-components|@react-native-community/picker|@walmart/redux-store|@react-native-firebase|react-native-gesture-handler|@react-native|@living-design|@react-native-community/datetimepicker|@testing-library)/)" ], "moduleNameMapper": { "@walmart/react-native-logger/(.*)": "<rootDir>/__tests__/__mocks__/@walmart/react-native-logger.js",
chore: looper fix
chore: looper fix
181f6d1f7f298a5167505db66bad60f0ad8c135a
--- package.json @@ -145,7 +145,7 @@ "@walmart/react-native-shared-navigation": "~6.3.28", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.8.0", - "@walmart/react-native-webex-sdk": "0.9.12", + "@walmart/react-native-webex-sdk": "0.9.16", "@walmart/receipt-check-miniapp": "1.34.4", "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.17.10", --- yarn.lock @@ -8361,7 +8361,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:~6.3.28" "@walmart/react-native-store-map": "npm:0.3.7" "@walmart/react-native-sumo-sdk": "npm:2.8.0" - "@walmart/react-native-webex-sdk": "npm:0.9.12" + "@walmart/react-native-webex-sdk": "npm:0.9.16" "@walmart/receipt-check-miniapp": "npm:1.34.4" "@walmart/redux-store": "npm:~6.3.28" "@walmart/returns-mini-app": "npm:4.17.10" @@ -8926,14 +8926,14 @@ __metadata: languageName: node linkType: hard -"@walmart/react-native-webex-sdk@npm:0.9.12": - version: 0.9.12 - resolution: "@walmart/react-native-webex-sdk@npm:0.9.12::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.9.12.tgz" +"@walmart/react-native-webex-sdk@npm:0.9.16": + version: 0.9.16 + resolution: "@walmart/react-native-webex-sdk@npm:0.9.16::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.9.16.tgz" peerDependencies: react: "*" react-native: "*" react-native-logger: "*" - checksum: 10c0/e2b91564513e3fe28fb65feb8acf5a74da34e6ec4e136c8a3e456f92b1e048a384b08821a802c0c39dbee24fdd813d87d19a8ed7f7e6cdc6281d3a967740f7ac + checksum: 10c0/e1755df30c6a611edb61a439e96c2b2d5e2fa71419ac29d2a0f7bdf30bef5f2b2f1bf52f66705da5fa66cd4ef4a0af52d76e3d50d2a82a56b38ce233b435dfae languageName: node linkType: hard
fix(Calling): CONAS-2410 - iOS Crash fix
fix(Calling): CONAS-2410 - iOS Crash fix
c5e313c2a4f718e67ff36a6dd3e151b1e878441a
--- __tests__/managerExperience/components/__snapshots__/FilterChip.test.tsx.snap @@ -2,12 +2,13 @@ exports[`FilterChip renders active filter chip correctly 1`] = ` <View + accessibilityLabel="Filter by 9 Clocked in" accessibilityRole="togglebutton" accessibilityState={ { "busy": undefined, "checked": undefined, - "disabled": false, + "disabled": undefined, "expanded": undefined, "selected": true, } @@ -88,7 +89,6 @@ exports[`FilterChip renders active filter chip correctly 1`] = ` } > <Text - accessibilityLabel="9 Clocked in" style={ { "color": "#fff", @@ -103,12 +103,13 @@ exports[`FilterChip renders active filter chip correctly 1`] = ` exports[`FilterChip renders inactive filter chip correctly 1`] = ` <View + accessibilityLabel="Filter by 9 Clocked in" accessibilityRole="togglebutton" accessibilityState={ { "busy": undefined, "checked": undefined, - "disabled": false, + "disabled": undefined, "expanded": undefined, "selected": false, } @@ -198,7 +199,6 @@ exports[`FilterChip renders inactive filter chip correctly 1`] = ` } > <Text - accessibilityLabel="9 Clocked in" style={ { "color": "#2e2f32", --- __tests__/managerExperience/components/__snapshots__/FilterChipGroup.test.tsx.snap @@ -13,12 +13,13 @@ exports[`FilterChipGroup matches snapshot 1`] = ` } > <View + accessibilityLabel="Filter by 135 Clocked in" accessibilityRole="togglebutton" accessibilityState={ { "busy": undefined, "checked": undefined, - "disabled": false, + "disabled": undefined, "expanded": undefined, "selected": false, } @@ -35,7 +36,7 @@ exports[`FilterChipGroup matches snapshot 1`] = ` collapsable={false} focusable={true} isApplied={false} - label="135 rosterScreen.filters.clockedIn" + label="135 Clocked in" onBlur={[Function]} onClick={[Function]} onFocus={[Function]} @@ -108,24 +109,24 @@ exports[`FilterChipGroup matches snapshot 1`] = ` } > <Text - accessibilityLabel="135 rosterScreen.filters.clockedIn" style={ { "color": "#2e2f32", } } > - 135 rosterScreen.filters.clockedIn + 135 Clocked in </Text> </Text> </View> <View + accessibilityLabel="Filter by 7 Tardy" accessibilityRole="togglebutton" accessibilityState={ { "busy": undefined, "checked": undefined, - "disabled": false, + "disabled": undefined, "expanded": undefined, "selected": false, } @@ -142,7 +143,7 @@ exports[`FilterChipGroup matches snapshot 1`] = ` collapsable={false} focusable={true} isApplied={false} - label="7 rosterScreen.filters.tardy" + label="7 Tardy" onBlur={[Function]} onClick={[Function]} onFocus={[Function]} @@ -215,24 +216,24 @@ exports[`FilterChipGroup matches snapshot 1`] = ` } > <Text - accessibilityLabel="7 rosterScreen.filters.tardy" style={ { "color": "#2e2f32", } } > - 7 rosterScreen.filters.tardy + 7 Tardy </Text> </Text> </View> <View + accessibilityLabel="Filter by 12 Absent" accessibilityRole="togglebutton" accessibilityState={ { "busy": undefined, "checked": undefined, - "disabled": false, + "disabled": undefined, "expanded": undefined, "selected": false, } @@ -249,7 +250,7 @@ exports[`FilterChipGroup matches snapshot 1`] = ` collapsable={false} focusable={true} isApplied={false} - label="12 rosterScreen.filters.absent" + label="12 Absent" onBlur={[Function]} onClick={[Function]} onFocus={[Function]} @@ -322,14 +323,13 @@ exports[`FilterChipGroup matches snapshot 1`] = ` } > <Text - accessibilityLabel="12 rosterScreen.filters.absent" style={ { "color": "#2e2f32", } } > - 12 rosterScreen.filters.absent + 12 Absent </Text> </Text> </View> --- src/managerExperience/components/FilterChip/FilterChip.tsx @@ -14,10 +14,10 @@ export const FilterChip = (props: Omit<FilterChipProps, 'children'>) => { isApplied ? styles.chipContainerActive : styles.chipContainerInactive } testID={testID} - selected={isApplied}> - <Text - style={isApplied ? styles.chipTextActive : styles.chipTextInactive} - accessibilityLabel={label}> + selected={isApplied} + accessibilityLabel={`Filter by ${label}`} + accessibilityState={{selected: isApplied}}> + <Text style={isApplied ? styles.chipTextActive : styles.chipTextInactive}> {label} </Text> </Chip>
feat: added accessibility state and updated label
feat: added accessibility state and updated label
172064f4a006ccf9414a47a4d3bde57f0793b231
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "3.1.0-alpha.3", + "version": "3.1.0-alpha.4", "main": "dist/index.js", "files": [ "dist", @@ -88,9 +88,9 @@ "@walmart/react-native-logger": "1.35.0", "@walmart/react-native-scanner-3.0": "0.10.4", "@walmart/react-native-sumo-sdk": "2.8.0", - "@walmart/roster-mini-app": "3.3.0-alpha.3", + "@walmart/roster-mini-app": "3.3.0-alpha.4", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "3.2.0-alpha.3", + "@walmart/wmconnect-mini-app": "3.2.0-alpha.4", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0", --- yarn.lock @@ -6318,9 +6318,9 @@ __metadata: "@walmart/react-native-logger": "npm:1.35.0" "@walmart/react-native-scanner-3.0": "npm:0.10.4" "@walmart/react-native-sumo-sdk": "npm:2.8.0" - "@walmart/roster-mini-app": "npm:3.3.0-alpha.3" + "@walmart/roster-mini-app": "npm:3.3.0-alpha.4" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:3.2.0-alpha.3" + "@walmart/wmconnect-mini-app": "npm:3.2.0-alpha.4" babel-jest: "npm:^29.6.3" chance: "npm:^1.1.11" crypto-js: "npm:~4.2.0" @@ -6425,9 +6425,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:3.3.0-alpha.3": - version: 3.3.0-alpha.3 - resolution: "@walmart/roster-mini-app@npm:3.3.0-alpha.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.3.0-alpha.3.tgz" +"@walmart/roster-mini-app@npm:3.3.0-alpha.4": + version: 3.3.0-alpha.4 + resolution: "@walmart/roster-mini-app@npm:3.3.0-alpha.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.3.0-alpha.4.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ~52.0.46 @@ -6438,7 +6438,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/6bc19834fdc6dac5e8ce1d2dfab8bdb18afa589e3aa67b385868266b5deb22bcde9f7b9b42889c7b3a29c32fcf20bc13cf3679165d8325aa359138fbe618b73d + checksum: 10c0/f6ac9c67f70dd71c0a9b0661b5004ddcb14a080fefc457f620d733797485a623e766147d7231bf9181aae3be5e699a329a1fd5b808f6e2b49062c5c54a120749 languageName: node linkType: hard @@ -6462,9 +6462,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:3.2.0-alpha.3": - version: 3.2.0-alpha.3 - resolution: "@walmart/wmconnect-mini-app@npm:3.2.0-alpha.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-3.2.0-alpha.3.tgz" +"@walmart/wmconnect-mini-app@npm:3.2.0-alpha.4": + version: 3.2.0-alpha.4 + resolution: "@walmart/wmconnect-mini-app@npm:3.2.0-alpha.4::__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-3.2.0-alpha.4.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" expo: ~52.0.46 @@ -6475,7 +6475,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/0fd5dd299abe3b0a05996c5ce71d8e092969a5243abc9d57f22e78ff8d84021c536d38cbce4db2d5e57471f20f598268aec9749e8f52674254c6bdf5132218fc + checksum: 10c0/caacd0d342aee015360fea98c39054c837a045e21df2945eaf64ebc94ab85801250b6fa83603e4f4ac85018dcf66acf7d32ec6a3cc77f2bd67b275355dfe508b languageName: node linkType: hard
feat(ui): updating versions for drop 33
feat(ui): updating versions for drop 33
5ffc1317a27d82c61fd84ea6c6a401ac8af30cb5
--- src/screens/SearchScreen.tsx @@ -15,11 +15,17 @@ import {RecentSearchHistory} from '../components/RecentSearchHistory'; import { AssociateListRenderItem, AssociateRosterItem, + RosterActionButton, } from '../components/Roster/types'; import {AssociateListItem} from '../components/Roster/AssociateListItem'; import namecase from 'namecase'; -import {useDispatch} from 'react-redux'; +import {useDispatch, useSelector} from 'react-redux'; import {rosterSlice} from '../redux/reducer'; +import {getEncryptedUserId} from '../redux/selectors'; +import {navigateToMessageScreen} from '@walmart/wmconnect-mini-app'; +import {SiteSelectors} from '@walmart/redux-store'; +import {ROSTER_I18N_NAMESPACE} from '../translations'; +import {useTranslation} from 'react-i18next'; const RECENT_SEARCH_HISTORY_KEY = `${LOCAL_STORAGE_KEY_PREFIX}_recent_search_history`; @@ -80,6 +86,9 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { const {data} = useDailyRoster(); const allAssociates = (data?.getDailyRoster || []) as Associate[]; + const storeId: string = useSelector(SiteSelectors.getUserWorkingSite); + const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); + const [associates, setAssociates] = useState<Associate[]>([]); const [recentSearchHistory, setRecentSearchHistory] = useState<Array<string>>( [], @@ -156,22 +165,24 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { } //TODO: Determine glue logic between search screen and wmconnect actions in myteam app - const tmpMessageBtn = { - i18nLabel: 'Message', - action: (associateRosterItem: AssociateRosterItem) => { - const name = associateDisplayName(associateRosterItem); - const associateName = namecase(name.slice(0, 20)); - dispatch(rosterSlice.actions.SET_SEARCH_TEXT('')); - storeAssociateName(associateName); + const associateActionButtons: RosterActionButton[] = [ + { + i18nLabel: t('rosterScreen.associateRosterItem.messageBtn'), + action: (associateRosterItem) => { + const name = associateDisplayName(associateRosterItem); + const associateName = namecase(name.slice(0, 20)); + dispatch(rosterSlice.actions.SET_SEARCH_TEXT('')); + storeAssociateName(associateName); + navigateToMessageScreen(storeId, associateRosterItem); + }, }, - }; - + ]; return ( <AssociateListItem associate={associate} roundTopCorners={isTopRow} roundBottomCorners={isLastRow} - actionButtons={[tmpMessageBtn]} + actionButtons={associateActionButtons} /> ); };
Integrate message button
Integrate message button
363fe886f1ab5a6ff4eb4a637b3015152fdc4581
--- __tests__/core/initSSOTest.ts @@ -0,0 +1,93 @@ +import WmTelemetry from 'react-native-wm-telemetry'; +import { + SSOPingFedEvents, + ssoEventEmitter, + SSOPingFedEventData, +} from 'react-native-ssmp-sso-allspark'; +import { + addSSOListeners, + ssoTelemetryEventListener, +} from '../../src/core/initSSO'; +import {logger} from '../../src/services/Logger'; +import {SSO_APP} from '../../src/types/telemetryConstants'; + +jest.mock('../../src/services/Logger', () => ({ + logger: { + info: jest.fn(), + error: jest.fn(), + }, +})); + +describe('addSSOListeners', () => { + it('sets env, redirect uri, and gets existing user', async () => { + addSSOListeners(); + + expect(ssoEventEmitter.addListener).toHaveBeenCalledWith( + SSOPingFedEvents.name, + ssoTelemetryEventListener, + ); + }); +}); + +describe('ssoTelemetryEventListener', () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + + it('handles error events', () => { + const event = { + action: SSOPingFedEvents.types.error, + error: 'oops', + } as SSOPingFedEventData; + + ssoTelemetryEventListener(event); + + expect(WmTelemetry.logEvent).toHaveBeenCalledWith( + SSO_APP, + 'error_encountered', + { + error: event.error, + }, + ); + expect(logger.error).toHaveBeenCalledWith('Error event from SSO', { + message: event.error, + }); + }); + + it('handles sign out events', () => { + const event = { + action: SSOPingFedEvents.types.signedOut, + } as SSOPingFedEventData; + + ssoTelemetryEventListener(event); + + expect(WmTelemetry.logEvent).toHaveBeenCalledWith(SSO_APP, 'sign_out', {}); + expect(logger.info).toHaveBeenCalledWith('Sign out event from SSO', {}); + }); + + it('handles auth success events', () => { + const event = { + action: SSOPingFedEvents.types.authSuccess, + } as SSOPingFedEventData; + + ssoTelemetryEventListener(event); + + expect(WmTelemetry.logEvent).toHaveBeenCalledWith(SSO_APP, 'successful', { + isPreHire: 'false', + }); + expect(logger.info).toHaveBeenCalledWith('User sign in succeeded', {}); + }); + + it('handles user changed events', () => { + const event = { + action: SSOPingFedEvents.types.userChanged, + } as SSOPingFedEventData; + + ssoTelemetryEventListener(event); + + expect(WmTelemetry.logEvent).toHaveBeenCalledWith(SSO_APP, 'successful', { + isPreHire: 'false', + }); + expect(logger.info).toHaveBeenCalledWith('User change succeeded', {}); + }); +});
initSSOTest.ts file adding it
initSSOTest.ts file adding it
3ab306caedfcd16b557d9b4f96c1668da8c567b6
--- .looper.multibranch.yml @@ -651,7 +651,7 @@ flows: prepare-npm-project: - withcache('yarn-cache'): - call: node-steps - - (name Set NPM Env) yarns run firebase:dev && cp env.dev.js env.js + - (name Set Env) yarn run firebase:dev && cp env.dev.js env.js validate-npm-project: - try: @@ -852,7 +852,7 @@ flows: native-common: - try: - - (name Set NPM Env) npm run env:${ENV} + - (name Set Env) yarn run env:${ENV} - call: build-app # - call: app-size-operations - exposeVars(package.json)
Fixes
Fixes
561a425304d1a5c3748121c6ff41670a5bc695ae
--- src/hooks/teams.ts @@ -1,7 +1,6 @@ import {useSelector} from 'react-redux'; import {SiteSelectors, UserSelectors} from '@walmart/redux-store'; import {useGetTeamByIdQuery} from '../queries/getTeamById'; -import {useGetTeamsByStoreQuery} from '../queries/getTeamsbyStore'; import {Associate} from '../types'; import {useDailyRoster} from './roster'; import {Team} from '../queries/schema.types'; --- src/queries/getTeamById.ts @@ -22,6 +22,8 @@ export type GetTeamByIdQuery = { site?: string | null; teamId?: string | null; teamName?: string | null; + workgroup?: string | null; + workgroupId?: string | null; } | null; }; --- src/utils/teams.ts @@ -0,0 +1,18 @@ +import {Team} from '../types'; +import {isNil} from 'lodash'; + +type GroupedTeamData = { + [key: string]: Team[]; +}; + +const groupTeamsByWorkgroupTransform = (teams: Team[]) => { + return teams.reduce((groupedTeamData: GroupedTeamData, teamDataEntry) => { + const workgroup = teamDataEntry?.workgroup || 'Other'; + + if (!isNil(groupedTeamData[workgroup] === null)) { + groupedTeamData[workgroup] = []; + } + groupedTeamData[workgroup].push(teamDataEntry); + return groupedTeamData; + }, {}); +}; --- src/hooks/teams.ts @@ -1,7 +1,6 @@ import {useSelector} from 'react-redux'; import {SiteSelectors, UserSelectors} from '@walmart/redux-store'; import {useGetTeamByIdQuery} from '../queries/getTeamById'; -import {useGetTeamsByStoreQuery} from '../queries/getTeamsbyStore'; import {Associate} from '../types'; import {useDailyRoster} from './roster'; import {Team} from '../queries/schema.types'; --- src/queries/getTeamById.ts @@ -22,6 +22,8 @@ export type GetTeamByIdQuery = { site?: string | null; teamId?: string | null; teamName?: string | null; + workgroup?: string | null; + workgroupId?: string | null; } | null; }; --- src/utils/teams.ts @@ -0,0 +1,18 @@ +import {Team} from '../types'; +import {isNil} from 'lodash'; + +type GroupedTeamData = { + [key: string]: Team[]; +}; + +const groupTeamsByWorkgroupTransform = (teams: Team[]) => { + return teams.reduce((groupedTeamData: GroupedTeamData, teamDataEntry) => { + const workgroup = teamDataEntry?.workgroup || 'Other'; + + if (!isNil(groupedTeamData[workgroup] === null)) { + groupedTeamData[workgroup] = []; + } + groupedTeamData[workgroup].push(teamDataEntry); + return groupedTeamData; + }, {}); +};
groupingTeamData into work groups
groupingTeamData into work groups
b5872160b69d19a37cc586bb9f09aa1495fce8e1
--- src/hooks/roster.ts @@ -34,7 +34,7 @@ export const useDailyRoster = () => { }, errorPolicy: 'all', notifyOnNetworkStatusChange: true, - fetchPolicy: 'network-only', // For the first query execution + fetchPolicy: 'cache-first', // For the first query execution nextFetchPolicy: 'cache-and-network', // For the subsequent query execution skip: !storeId || !countryCode, context: getGraphQLConfig(envConfig), --- src/hooks/roster.ts @@ -34,7 +34,7 @@ export const useDailyRoster = () => { }, errorPolicy: 'all', notifyOnNetworkStatusChange: true, - fetchPolicy: 'network-only', // For the first query execution + fetchPolicy: 'cache-first', // For the first query execution nextFetchPolicy: 'cache-and-network', // For the subsequent query execution skip: !storeId || !countryCode, context: getGraphQLConfig(envConfig),
update fetch policy
update fetch policy
450bce10ad877167c662836c4b0b75ee84ca179f
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/defaultLayout.ts @@ -1,4 +1,6 @@ export const defaultLayout = { - teamName: 'default', - widgets: [{ name: 'roster', rank: 1, enable: true }], + ['0000000']: { + teamName: 'roster', + widgets: [{ name: 'roster', rank: 1, enable: true }], + }, };
feat(ui): showing roster widget as default if ccm fails
feat(ui): showing roster widget as default if ccm fails
45564b7f7f10b1437e6c7a8f495bba802a0e41d3
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 21 + versionCode 22 versionName "1.0.1" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>21</string> + <string>22</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>21</string> + <string>22</string> </dict> </plist>
Incrementing build number
Incrementing build number
0224a594b60600e3c586d83eb9c830cbf8f5e0c3
--- package-lock.json @@ -3193,9 +3193,9 @@ "integrity": "sha512-R+Kkr3KRExpa59xqPkVPF66+zGo88oZiqbfFx+BzrIJE6eUTUKTGCeiidVci+xjmfSnp6TKrMUkRBxh2b/GffA==" }, "@walmart/time-clock-mini-app": { - "version": "0.1.47", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.1.47.tgz", - "integrity": "sha512-J6UkJCpxMOHUUDhFZwqlqhINLb6lMtF3kSrkOYeyTMBZb6qvpuIgZ4NNkfeRpMmFQjK2v//A2zeoJEpEOhzyvw==", + "version": "0.1.48", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.1.48.tgz", + "integrity": "sha512-K0iAhtaBzJhVCOqVyZ2Q1HTcFGDg+i+yup+qWNoFiCqTM2I0dR/Lx07MikGQnwrCw6HrNOGbzN4FD4hQhrJVNQ==", "requires": { "@react-native-community/datetimepicker": "^3.0.3", "javascript-time-ago": "^2.3.4", --- package.json @@ -77,7 +77,7 @@ "@walmart/redux-store": "^1.0.12", "@walmart/schedule-mini-app": "0.2.59", "@walmart/settings-mini-app": "1.1.20", - "@walmart/time-clock-mini-app": "0.1.47", + "@walmart/time-clock-mini-app": "0.1.48", "@walmart/ui-components": "1.0.100", "@walmart/welcomeme-mini-app": "0.5.27", "i18next": "^19.7.0",
Pointing to Azure API Proxy endpoint (#415)
Pointing to Azure API Proxy endpoint (#415) Controlled via CCM Co-authored-by: Hitesh Arora <>
9fc17354cca80551382a4e4d66b93da5589c4233
--- package.json @@ -90,7 +90,7 @@ "@walmart/exception-mini-app": "1.0.16", "@walmart/facilities-management-miniapp": "0.5.22", "@walmart/feedback-all-spark-miniapp": "0.9.10", - "@walmart/financial-wellbeing-feature-app": "1.3.0", + "@walmart/financial-wellbeing-feature-app": "1.3.1", "@walmart/functional-components": "2.0.6", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "2.0.3",
bumped financial-wellbeing-feature-app to 1.3.1
bumped financial-wellbeing-feature-app to 1.3.1