commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
4785939c65bd7c020e84fd55a64eec945fbf0838
--- src/queries/getAssociateClockStatus.graphql @@ -5,6 +5,8 @@ query GetAssociateClockStatus($id: String!, $idType: idType = USERID) { punch { __typename clockStatus + clockStatusDesc + lastPunchType } } } \ No newline at end of file --- src/queries/getAssociateClockStatus.ts @@ -14,7 +14,12 @@ export type GetAssociateClockStatusQuery = { getAssociateById?: { __typename: 'Associate'; associateId: string; - punch?: {__typename: 'Punch'; clockStatus?: string | null} | null; + punch?: { + __typename: 'Punch'; + clockStatus?: string | null; + clockStatusDesc?: string | null; + lastPunchType?: string | null; + } | null; } | null; }; @@ -26,6 +31,8 @@ export const GetAssociateClockStatusDocument = gql` punch { __typename clockStatus + clockStatusDesc + lastPunchType } } } --- src/queries/getAssociateName.graphql @@ -8,5 +8,7 @@ query GetAssociateName($id: String!, $idType: idType = USERID) { preferredFirstName preferredFullName preferredLastName + userId + win } } \ No newline at end of file --- src/queries/getAssociateName.ts @@ -20,6 +20,8 @@ export type GetAssociateNameQuery = { preferredFirstName?: string | null; preferredFullName?: string | null; preferredLastName?: string | null; + userId?: string | null; + win?: number | null; } | null; }; @@ -34,6 +36,8 @@ export const GetAssociateNameDocument = gql` preferredFirstName preferredFullName preferredLastName + userId + win } } `; --- src/queries/getDailyRoster.graphql @@ -16,10 +16,15 @@ query GetDailyRoster($countryCode: String!, $days: Int!, $startDate: Date!, $sto fullName jobCategoryCodeDesc lastName + lastName + preferredFirstName + preferredFullName + preferredLastName punch { __typename clockStatus clockStatusDesc + lastPunchType } userId win --- src/queries/getDailyRoster.ts @@ -20,6 +20,9 @@ export type GetDailyRosterQuery = { fullName?: string | null; jobCategoryCodeDesc?: string | null; lastName?: string | null; + preferredFirstName?: string | null; + preferredFullName?: string | null; + preferredLastName?: string | null; userId?: string | null; win?: number | null; absentData?: { @@ -30,6 +33,7 @@ export type GetDailyRosterQuery = { __typename: 'Punch'; clockStatus?: string | null; clockStatusDesc?: string | null; + lastPunchType?: string | null; } | null; } | null> | null; }; @@ -58,10 +62,15 @@ export const GetDailyRosterDocument = gql` fullName jobCategoryCodeDesc lastName + lastName + preferredFirstName + preferredFullName + preferredLastName punch { __typename clockStatus clockStatusDesc + lastPunchType } userId win --- src/queries/schema.graphql @@ -7160,6 +7160,7 @@ type RoleAndOrgs { Cost Center Name """ costCenterName: String + departmentName: String """ Detailed Role Assignment --- src/queries/schema.types.ts @@ -4749,6 +4749,7 @@ export type RoleAndOrgs = { costCenterGroup?: Maybe<Array<Maybe<CostCenterGroup>>>; /** Cost Center Name */ costCenterName?: Maybe<Scalars['String']>; + departmentName?: Maybe<Scalars['String']>; /** Detailed Role Assignment */ detailedRoleAssignment?: Maybe<Array<Maybe<Scalars['String']>>>; /** Direct Reports */ --- src/queries/getAssociateClockStatus.graphql @@ -5,6 +5,8 @@ query GetAssociateClockStatus($id: String!, $idType: idType = USERID) { punch { __typename clockStatus + clockStatusDesc + lastPunchType } } } \ No newline at end of file --- src/queries/getAssociateClockStatus.ts @@ -14,7 +14,12 @@ export type GetAssociateClockStatusQuery = { getAssociateById?: { __typename: 'Associate'; associateId: string; - punch?: {__typename: 'Punch'; clockStatus?: string | null} | null; + punch?: { + __typename: 'Punch'; + clockStatus?: string | null; + clockStatusDesc?: string | null; + lastPunchType?: string | null; + } | null; } | null; }; @@ -26,6 +31,8 @@ export const GetAssociateClockStatusDocument = gql` punch { __typename clockStatus + clockStatusDesc + lastPunchType } } } --- src/queries/getAssociateName.graphql @@ -8,5 +8,7 @@ query GetAssociateName($id: String!, $idType: idType = USERID) { preferredFirstName preferredFullName preferredLastName + userId + win } } \ No newline at end of file --- src/queries/getAssociateName.ts @@ -20,6 +20,8 @@ export type GetAssociateNameQuery = { preferredFirstName?: string | null; preferredFullName?: string | null; preferredLastName?: string | null; + userId?: string | null; + win?: number | null; } | null; }; @@ -34,6 +36,8 @@ export const GetAssociateNameDocument = gql` preferredFirstName preferredFullName preferredLastName + userId + win } } `; --- src/queries/getDailyRoster.graphql @@ -16,10 +16,15 @@ query GetDailyRoster($countryCode: String!, $days: Int!, $startDate: Date!, $sto fullName jobCategoryCodeDesc lastName + lastName + preferredFirstName + preferredFullName + preferredLastName punch { __typename clockStatus clockStatusDesc + lastPunchType } userId win --- src/queries/getDailyRoster.ts @@ -20,6 +20,9 @@ export type GetDailyRosterQuery = { fullName?: string | null; jobCategoryCodeDesc?: string | null; lastName?: string | null; + preferredFirstName?: string | null; + preferredFullName?: string | null; + preferredLastName?: string | null; userId?: string | null; win?: number | null; absentData?: { @@ -30,6 +33,7 @@ export type GetDailyRosterQuery = { __typename: 'Punch'; clockStatus?: string | null; clockStatusDesc?: string | null; + lastPunchType?: string | null; } | null; } | null> | null; }; @@ -58,10 +62,15 @@ export const GetDailyRosterDocument = gql` fullName jobCategoryCodeDesc lastName + lastName + preferredFirstName + preferredFullName + preferredLastName punch { __typename clockStatus clockStatusDesc + lastPunchType } userId win --- src/queries/schema.graphql @@ -7160,6 +7160,7 @@ type RoleAndOrgs { Cost Center Name """ costCenterName: String + departmentName: String """ Detailed Role Assignment --- src/queries/schema.types.ts @@ -4749,6 +4749,7 @@ export type RoleAndOrgs = { costCenterGroup?: Maybe<Array<Maybe<CostCenterGroup>>>; /** Cost Center Name */ costCenterName?: Maybe<Scalars['String']>; + departmentName?: Maybe<Scalars['String']>; /** Detailed Role Assignment */ detailedRoleAssignment?: Maybe<Array<Maybe<Scalars['String']>>>; /** Direct Reports */
feat: update queries for required fields
feat: update queries for required fields
b369b19f5cb8ef4ca28754e5469b8b1dc8ec9ca3
--- .looper-pr.yml @@ -30,3 +30,4 @@ envs: MONO_REPO_BASE_BRANCH: develop AUTHOR: temp SLACK_CHANNEL: "smdv-miniapp" + --- README.md @@ -1,6 +1,6 @@ # @walmart/wmconnect-mini-app -This is a template for creating a feature app in Typescript. For additional information about creating a feature app which utilizes Me@Walmart as its conatiner, please reference [this page](https://gecgithub01.walmart.com/pages/allspark/allspark/docs/allspark%20onboarding/onboarding-create-feature-app/) for additional information. +This is a template for creating a feature app in Typescript. For additional information about creating a feature app which utilizes Me@Walmart as its container, please reference [this page](https://gecgithub01.walmart.com/pages/allspark/allspark/docs/allspark%20onboarding/onboarding-create-feature-app/) for additional information. ## Getting started
fix(ui): update readme and looper
fix(ui): update readme and looper
ae271e22899b151a52a322505867ff6c1f4f90dc
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/financial-wellbeing-feature-app": "1.23.2", "@walmart/functional-components": "6.0.16", "@walmart/gta-react-native-calendars": "0.6.0", - "@walmart/gtp-shared-components": "2.2.1-rc.0", + "@walmart/gtp-shared-components": "2.2.1", "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.10.3", "@walmart/inbox-mini-app": "0.92.10", @@ -11612,9 +11612,9 @@ "license": "MIT" }, "node_modules/@walmart/gtp-shared-components": { - "version": "2.2.1-rc.0", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.2.1-rc.0.tgz", - "integrity": "sha512-9sZ3/aiJWX33g6ffUGhl3yx3F91CuPuVqNQCX+sp01t+JPVgTJPz6Vmo8bzeRdD/O6DUQkVIHBs6t4Xaq8AnrQ==", + "version": "2.2.1", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.2.1.tgz", + "integrity": "sha512-SDfK8XTxCggr/jRZGSMi1Zs6ru2byyuXe0SK15Nsueiil9+VsQ8pdlKAI2fhj+l+EmlEmw2lbhcIsLlLfB/Tbg==", "license": "Apache-2.0", "dependencies": { "@livingdesign/tokens": "0.63.0", --- package.json @@ -107,7 +107,7 @@ "@walmart/financial-wellbeing-feature-app": "1.23.2", "@walmart/functional-components": "6.0.16", "@walmart/gta-react-native-calendars": "0.6.0", - "@walmart/gtp-shared-components": "2.2.1-rc.0", + "@walmart/gtp-shared-components": "2.2.1", "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.10.3", "@walmart/inbox-mini-app": "0.92.10", @@ -372,7 +372,7 @@ "@walmart/financial-wellbeing-feature-app": "1.23.2", "@walmart/functional-components": "6.0.16", "@walmart/gta-react-native-calendars": "0.6.0", - "@walmart/gtp-shared-components": "2.2.1-rc.0", + "@walmart/gtp-shared-components": "2.2.1", "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.10.3", "@walmart/inbox-mini-app": "0.92.10",
Update GTP to 2.2.1
Update GTP to 2.2.1
29ac6215edb62f3f561b0060eceabcedbd264794
--- targets/US/android/app/build.gradle @@ -190,6 +190,28 @@ android { // @customization - Dynamic mini app features dynamicFeatures.add(':compass_dynamic_module') dynamicFeatures.add(':webex_dynamic_module') + packagingOptions { + exclude("META-INF/INDEX.LIST") + exclude("META-INF/LICENSE.md") + exclude("META-INF/LICENSE-notice.md") + exclude("META-INF/*") + exclude("META-INF/DEPENDENCIES") + pickFirst 'lib/x86/libc++_shared.so' + pickFirst 'lib/x86_64/libc++_shared.so' + pickFirst 'lib/armeabi-v7a/libc++_shared.so' + pickFirst 'lib/arm64-v8a/libc++_shared.so' + pickFirst 'lib/x86/libfbjni.so' + pickFirst 'lib/x86_64/libfbjni.so' + pickFirst 'lib/armeabi-v7a/libfbjni.so' + pickFirst 'lib/arm64-v8a/libfbjni.so' + } + + configurations { + all { + exclude group: "com.google.protobuf", module: "protobuf-javalite" + exclude group: "com.google.firebase", module: "protolite-well-known-types" + } + } } dependencies {
Fixed duplicate classes error
Fixed duplicate classes error
596dd501c5589174c0894d979138d1d6807e51e8
--- .yarn/patches/@walmart-allspark-foundation-npm-6.27.6-de69585fd7.patch @@ -0,0 +1,30 @@ +diff --git a/Container/AllsparkContainer.js b/Container/AllsparkContainer.js +index 9d11a09dd36c095681901aaadce4f3a650a629cb..e041cc9f173f1c979d3c300dab6e1497d977f7ec 100644 +--- a/Container/AllsparkContainer.js ++++ b/Container/AllsparkContainer.js +@@ -292,11 +292,7 @@ class AllsparkContainer { + const preRender = async () => { + this.connectFeatures(config); + }; +- const onUnmount = () => { +- // @ts-ignore - connect capabilites could be specified but it would make no difference +- this.features.disconnect(config); +- }; +- return (<allspark_utils_1.RenderGuard preRender={preRender} onUnmount={onUnmount}> ++ return (<allspark_utils_1.RenderGuard preRender={preRender}> + {children} + </allspark_utils_1.RenderGuard>); + }; +@@ -310,11 +306,7 @@ class AllsparkContainer { + const features = getFeatures(); + this.addAndConnectFeatures(features); + }; +- const onUnmount = () => { +- const features = getFeatures(); +- features.forEach((feature) => feature.disconnect()); +- }; +- return (<allspark_utils_1.RenderGuard preRender={preRender} onUnmount={onUnmount}> ++ return (<allspark_utils_1.RenderGuard preRender={preRender}> + {children} + </allspark_utils_1.RenderGuard>); + }; --- package.json @@ -145,7 +145,7 @@ "@types/seamless-immutable": "^7.1.16", "@types/semver": "^7.3.4", "@types/uuid": "^8.3.0", - "@walmart/allspark-foundation": "6.27.6", + "@walmart/allspark-foundation": "patch:@walmart/allspark-foundation@npm%3A6.27.6#~/.yarn/patches/@walmart-allspark-foundation-npm-6.27.6-de69585fd7.patch", "@walmart/allspark-foundation-hub": "1.2.10", "@walmart/allspark-graphql-client": "~6.3.28", "@walmart/allspark-http-client": "~6.3.28", --- targets/US/package.json @@ -76,7 +76,7 @@ "@terrylinla/react-native-sketch-canvas": "patch:@terrylinla/react-native-sketch-canvas@npm%3A0.8.0#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch", "@walmart/allspark-authentication": "~6.4.1", "@walmart/allspark-cope-key-listener": "0.0.18", - "@walmart/allspark-foundation": "6.27.6", + "@walmart/allspark-foundation": "patch:@walmart/allspark-foundation@npm%3A6.27.6#~/.yarn/patches/@walmart-allspark-foundation-npm-6.27.6-de69585fd7.patch", "@walmart/allspark-foundation-hub": "1.2.10", "@walmart/allspark-graphql-client": "~6.3.28", "@walmart/allspark-http-client": "~6.3.28", --- yarn.lock @@ -6523,6 +6523,102 @@ __metadata: languageName: node linkType: hard +"@walmart/allspark-foundation@patch:@walmart/allspark-foundation@npm%3A6.27.6#~/.yarn/patches/@walmart-allspark-foundation-npm-6.27.6-de69585fd7.patch": + version: 6.27.6 + resolution: "@walmart/allspark-foundation@patch:@walmart/allspark-foundation@npm%3A6.27.6#~/.yarn/patches/@walmart-allspark-foundation-npm-6.27.6-de69585fd7.patch::version=6.27.6&hash=ef6922" + dependencies: + "@apollo/client": "npm:^3.8.6" + "@graphql-codegen/cli": "npm:^5.0.0" + "@graphql-codegen/near-operation-file-preset": "npm:^2.5.0" + "@graphql-codegen/typescript": "npm:^4.0.1" + "@graphql-codegen/typescript-operations": "npm:^4.0.1" + "@graphql-codegen/typescript-react-apollo": "npm:^4.1.0" + "@reduxjs/toolkit": "npm:^1.9.7" + "@types/node-fetch": "npm:^2.6.9" + "@walmart/allspark-utils": "npm:^6.5.1" + axios: "npm:~1.6.0" + axios-cache-interceptor: "npm:^1.3.2" + crypto-js: "npm:~4.2.0" + graphql: "npm:^16.8.1" + i18next: "npm:^23.6.0" + json-to-pretty-yaml: "npm:^1.2.2" + lodash: "npm:~4.17.21" + namecase: "npm:^1.1.2" + react-hook-form: "npm:^7.38.0" + react-i18next: "npm:^13.3.1" + react-native-modalfy: "npm:^3.5.2" + react-redux: "npm:^8.1.3" + redux: "npm:^4.2.1" + redux-saga: "npm:^1.2.3" + typed-redux-saga: "npm:^1.5.0" + peerDependencies: + "@react-native-async-storage/async-storage": "*" + "@react-native-community/datetimepicker": "*" + "@react-native-community/netinfo": 11.x + "@react-native-firebase/analytics": 17.x + "@react-native-firebase/app": 17.x + "@react-native-picker/picker": "*" + "@react-navigation/drawer": 6.x + "@react-navigation/native": 6.x + "@react-navigation/stack": 6.x + "@walmart/allspark-graphql-client": ">=6.3" + "@walmart/allspark-http-client": ">=6.3" + "@walmart/core-services": ">=6.5" + "@walmart/core-utils": ">=6.3" + "@walmart/functional-components": ">=6.3" + "@walmart/gtp-shared-components": ">=2" + "@walmart/react-native-env": ">=6.3" + "@walmart/react-native-scanner-3.0": ">=0.6.3" + "@walmart/react-native-shared-navigation": ">=6.3" + "@walmart/react-native-sumo-sdk": ^2.7.0 + "@walmart/react-native-wm-network": ">=6.3" + "@walmart/react-native-wm-notification": ">=6.3" + "@walmart/react-native-wm-telemetry": ">=6.3" + "@walmart/redux-store": ">=6.3" + react: "*" + react-native: "*" + react-native-apollo-devtools-client: "*" + react-native-drop-shadow: "*" + react-native-flipper: "*" + react-native-gesture-handler: 2.x + react-native-get-random-values: 1.x + react-native-permissions: 3.x + react-native-reanimated: 3.x + react-native-safe-area-context: 4.x + react-native-screens: 3.x + peerDependenciesMeta: + "@walmart/allspark-graphql-client": + optional: true + "@walmart/allspark-http-client": + optional: true + "@walmart/core-services": + optional: true + "@walmart/core-utils": + optional: true + "@walmart/functional-components": + optional: true + "@walmart/react-native-env": + optional: true + "@walmart/react-native-shared-navigation": + optional: true + "@walmart/react-native-wm-network": + optional: true + "@walmart/react-native-wm-notification": + optional: true + "@walmart/react-native-wm-telemetry": + optional: true + "@walmart/redux-store": + optional: true + react-native-apollo-devtools-client: + optional: true + react-native-flipper: + optional: true + bin: + allspark-generate-graphql: cli/generate.js + checksum: 10c0/b1d8f92a590e3d1d88e8fbbc03a79f6f8d4e52835a4d9bbf77a3a545dd4121cfd805d35de8a7c81a1eb506385434994eaabc1ade4f1fe4063841f49571dc06c4 + languageName: node + linkType: hard + "@walmart/allspark-graphql-client@npm:~6.3.28": version: 6.3.38 resolution: "@walmart/allspark-graphql-client@npm:6.3.38" @@ -7752,7 +7848,7 @@ __metadata: "@types/uuid": "npm:^8.3.0" "@walmart/allspark-authentication": "npm:~6.4.1" "@walmart/allspark-cope-key-listener": "npm:0.0.18" - "@walmart/allspark-foundation": "npm:6.27.6" + "@walmart/allspark-foundation": "patch:@walmart/allspark-foundation@npm%3A6.27.6#~/.yarn/patches/@walmart-allspark-foundation-npm-6.27.6-de69585fd7.patch" "@walmart/allspark-foundation-hub": "npm:1.2.10" "@walmart/allspark-graphql-client": "npm:~6.3.28" "@walmart/allspark-http-client": "npm:~6.3.28"
fix: add temporary patch to remove unnecessary feature disconnect implementation
fix: add temporary patch to remove unnecessary feature disconnect implementation
e2b286d3cfdd87cf67ea27ce3ee0cf5cfbc0f9eb
--- ios/Podfile.lock @@ -556,7 +556,7 @@ PODS: - React-Core - react-native-wm-app-review (0.4.0): - React-Core - - react-native-wm-vizpick-shell (1.1.2-rc.7): + - react-native-wm-vizpick-shell (1.1.2-rc.9): - React - react-native-wm-voice-text (1.0.1): - React @@ -1231,7 +1231,7 @@ SPEC CHECKSUMS: react-native-view-shot: 792829857bbb23a9c8acdad9a640554bdee397a3 react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581 react-native-wm-app-review: eff89fab61d28c3bf7106419717d4aeb6c5aa6f2 - react-native-wm-vizpick-shell: baf8478f591d8be8f6dad307f5730fb3dbe8b99a + react-native-wm-vizpick-shell: b8ac31392ef523d9aa036e869f875a74b36c4c0c react-native-wm-voice-text: 0658ee8e9d8e9e3df0f48dd49115f804ac0e8896 React-perflogger: cce000b5caa4bcecbb29ee9cfdb47f26202d2599 React-RCTActionSheet: ba29f52a82d970e2aba5804490ecaea587c7a751 --- package-lock.json @@ -81,7 +81,7 @@ "@walmart/shelfavailability-mini-app": "1.5.13", "@walmart/taskit-mini-app": "2.24.5", "@walmart/time-clock-mini-app": "2.49.0", - "@walmart/topstock-mini-app": "0.0.2-feat-d8d1080", + "@walmart/topstock-mini-app": "0.0.2-feat-8919a81", "@walmart/ui-components": "1.10.1", "@walmart/welcomeme-mini-app": "0.76.0", "@walmart/wfm-ui": "0.2.26", @@ -161,7 +161,7 @@ "react-native-wm-network": "0.2.0", "react-native-wm-notification": "2.0.1", "react-native-wm-telemetry": "0.4.0", - "react-native-wm-vizpick-shell": "1.1.2-rc.7", + "react-native-wm-vizpick-shell": "1.1.2-rc.9", "react-native-wm-voice-text": "1.0.1", "react-redux": "^8.0.4", "realm": "11.2.0", @@ -6099,9 +6099,9 @@ "license": "GPL-3.0-or-later" }, "node_modules/@walmart/topstock-mini-app": { - "version": "0.0.2-feat-d8d1080", - "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-0.0.2-feat-d8d1080.tgz", - "integrity": "sha512-/TDN2TDcV11dYCR+myOxp3ociv/Gmxl/MOd86UTA9c2U05gQ/UdOHzHgkre3FIyLgzZwh6HEvGnDOKRwNHXCfg==", + "version": "0.0.2-feat-8919a81", + "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-0.0.2-feat-8919a81.tgz", + "integrity": "sha512-OSgcXxk2LDEdKeiL9+fEjAbiEA/UiZWETY5wwcp55EWNBDERGqrvTH0bDzFxggMWMmWZQXjpsxOwFoV/aXc6IQ==", "dependencies": { "javascript-time-ago": "^2.5.7" }, @@ -18357,9 +18357,9 @@ } }, "node_modules/react-native-wm-vizpick-shell": { - "version": "1.1.2-rc.7", - "resolved": "https://npme.walmart.com/react-native-wm-vizpick-shell/-/react-native-wm-vizpick-shell-1.1.2-rc.7.tgz", - "integrity": "sha512-dSPBh7AQ0IgDi1y/i2dC9EBqfDA32gPbiLC1ua9vi/Y9Y3kqwzvugUbVfJrTAKNxpoAlvfjOBWXDLO605jZXLQ==", + "version": "1.1.2-rc.9", + "resolved": "https://npme.walmart.com/react-native-wm-vizpick-shell/-/react-native-wm-vizpick-shell-1.1.2-rc.9.tgz", + "integrity": "sha512-1km/T9yKVPCkkA1oc4U7hVhM9a6jEe92NESOIH0KFrWcC8Slk0HZHnxyI8rGqBtHIchotmIFAWGM+cLGQ6U2pg==", "license": "UNLICENSED" }, "node_modules/react-native-wm-voice-text": { @@ -25406,9 +25406,9 @@ "version": "1.0.4" }, "@walmart/topstock-mini-app": { - "version": "0.0.2-feat-d8d1080", - "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-0.0.2-feat-d8d1080.tgz", - "integrity": "sha512-/TDN2TDcV11dYCR+myOxp3ociv/Gmxl/MOd86UTA9c2U05gQ/UdOHzHgkre3FIyLgzZwh6HEvGnDOKRwNHXCfg==", + "version": "0.0.2-feat-8919a81", + "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-0.0.2-feat-8919a81.tgz", + "integrity": "sha512-OSgcXxk2LDEdKeiL9+fEjAbiEA/UiZWETY5wwcp55EWNBDERGqrvTH0bDzFxggMWMmWZQXjpsxOwFoV/aXc6IQ==", "requires": { "javascript-time-ago": "^2.5.7" } @@ -33222,9 +33222,9 @@ "version": "0.4.0" }, "react-native-wm-vizpick-shell": { - "version": "1.1.2-rc.7", - "resolved": "https://npme.walmart.com/react-native-wm-vizpick-shell/-/react-native-wm-vizpick-shell-1.1.2-rc.7.tgz", - "integrity": "sha512-dSPBh7AQ0IgDi1y/i2dC9EBqfDA32gPbiLC1ua9vi/Y9Y3kqwzvugUbVfJrTAKNxpoAlvfjOBWXDLO605jZXLQ==" + "version": "1.1.2-rc.9", + "resolved": "https://npme.walmart.com/react-native-wm-vizpick-shell/-/react-native-wm-vizpick-shell-1.1.2-rc.9.tgz", + "integrity": "sha512-1km/T9yKVPCkkA1oc4U7hVhM9a6jEe92NESOIH0KFrWcC8Slk0HZHnxyI8rGqBtHIchotmIFAWGM+cLGQ6U2pg==" }, "react-native-wm-voice-text": { "version": "1.0.1" --- package.json @@ -123,7 +123,7 @@ "@walmart/shelfavailability-mini-app": "1.5.13", "@walmart/taskit-mini-app": "2.24.5", "@walmart/time-clock-mini-app": "2.49.0", - "@walmart/topstock-mini-app": "0.0.2-feat-d8d1080", + "@walmart/topstock-mini-app": "0.0.2-feat-8919a81", "@walmart/ui-components": "1.10.1", "@walmart/welcomeme-mini-app": "0.76.0", "@walmart/wfm-ui": "0.2.26", @@ -203,7 +203,7 @@ "react-native-wm-network": "0.2.0", "react-native-wm-notification": "2.0.1", "react-native-wm-telemetry": "0.4.0", - "react-native-wm-vizpick-shell": "1.1.2-rc.7", + "react-native-wm-vizpick-shell": "1.1.2-rc.9", "react-native-wm-voice-text": "1.0.1", "react-redux": "^8.0.4", "realm": "11.2.0",
build(update): update shell & mini version
build(update): update shell & mini version
ff21053a82c1bca150f0f5c5bff9867efa3a5e1d
--- android/app/build.gradle @@ -339,6 +339,7 @@ dependencies { implementation "com.google.android.play:feature-delivery:2.0.1" implementation 'com.squareup.okhttp3:okhttp:4.9.3' + implementation 'com.squareup.okio:okio:3.2.0' debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { exclude group:'com.facebook.flipper'
okio dependency
okio dependency
92c7d677eb9f3c54f723d0861891cc2981e8c08a
--- package-lock.json @@ -3283,9 +3283,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.30.3", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.30.3.tgz", - "integrity": "sha512-5nCZsi6U+kWWUTj5QHoQDuxRGpe5cxQiwbMD4BPWoOk9dFr1VSwCMdph5NdgXatS3fHggJzfNOvfLs7/IVqVow==", + "version": "0.30.4", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.30.4.tgz", + "integrity": "sha512-hJCH7pIPAOZ/+SyopxSE1ziqHdR30ijmbOsR2+ijxwzRtqkPmcK3WuzvZj8mWlJETYI7m/RfKtJc2Qpg2bakKA==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", --- package.json @@ -67,7 +67,7 @@ "@walmart/allspark-home-mini-app": "0.4.21", "@walmart/metrics-mini-app": "0.0.27", "@walmart/allspark-me-mini-app": "0.1.0", - "@walmart/ask-sam-mini-app": "0.30.3", + "@walmart/ask-sam-mini-app": "0.30.4", "@walmart/config-components": "^1.0.26", "@walmart/counts-component-miniapp": "0.0.13", "@walmart/exception-mini-app": "0.28.0",
Incrementing ask sam version
Incrementing ask sam version
212900893f6376f49ac88cbe397908d445280a89
--- packages/allspark-foundation-hub/src/HubFeature/TeamListItem/TeamListItem.tsx @@ -106,6 +106,7 @@ export const TeamListItem = ({ checked={isSelected} disabled={checkboxDisabled} testID={`team-selection-checkbox-${teamName}`} + onPress={handlePress} /> )} {showTeamSelectionNavArrow && iconType === 'navArrow' && (
Update checkbox on team selection screen
Update checkbox on team selection screen
b557514e3a28c2d422a7e1039e7d9f5f4c261839
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.123.0", + "@walmart/profile-feature-app": "0.124.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -5694,9 +5694,9 @@ } }, "node_modules/@walmart/profile-feature-app": { - "version": "0.123.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.123.0.tgz", - "integrity": "sha512-gLYV7ody2zDu1cn8cOQ6gv8uO0L5TaHPlP+GD/rZbexCz8eMMNDpf79XkZf6OlHcuKyof/QWfHTMkj5vVWoKsA==", + "version": "0.124.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.124.0.tgz", + "integrity": "sha512-yAG4ZvLiyQkt6lxnVVH+opFFc2hNhs0XkOM8JeDOTl4EeAvHGCAsYnup4ybuBdrAemXYhRRUygPmzMbsrTYtPQ==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/bottom-tabs": "^6.0.0", @@ -25334,9 +25334,9 @@ "integrity": "sha512-TIzjXjT8jlsb/OrY7WPr4xUv5RsCsnNN0wwjawIwOHurrZtrFn8f/WjwkY8e6zUC3AlZ4QsHdaKqCD/pfkgGPg==" }, "@walmart/profile-feature-app": { - "version": "0.123.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.123.0.tgz", - "integrity": "sha512-gLYV7ody2zDu1cn8cOQ6gv8uO0L5TaHPlP+GD/rZbexCz8eMMNDpf79XkZf6OlHcuKyof/QWfHTMkj5vVWoKsA==" + "version": "0.124.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.124.0.tgz", + "integrity": "sha512-yAG4ZvLiyQkt6lxnVVH+opFFc2hNhs0XkOM8JeDOTl4EeAvHGCAsYnup4ybuBdrAemXYhRRUygPmzMbsrTYtPQ==" }, "@walmart/push-to-talk-mini-app": { "version": "1.8.59", --- package.json @@ -107,7 +107,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.123.0", + "@walmart/profile-feature-app": "0.124.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0",
Bump profile-feature-app to 0.124.0
Bump profile-feature-app to 0.124.0
68f83e07e35e9c356852d2c3771ec7468a07dea3
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -140,6 +140,9 @@ exports[`AssociateHallwayNav matches snapshot 1`] = ` <Screen name="PttTexting" /> + <Screen + name="PTT.MessagesList.ButtonSheet.Screen" + /> <Screen component="WhatsNewModal" name="WhatsNewModal" @@ -302,6 +305,9 @@ exports[`AssociateHallwayNav matches snapshot when time value are undefined 1`] <Screen name="PttTexting" /> + <Screen + name="PTT.MessagesList.ButtonSheet.Screen" + /> <Screen component="WhatsNewModal" name="WhatsNewModal"
test case update
test case update
39422bb48f6bc2cb63bdd4576133591d5ef6bd18
--- package-lock.json @@ -48,7 +48,7 @@ "@walmart/exception-mini-app": "1.4.2", "@walmart/facilities-management-miniapp": "0.6.42", "@walmart/feedback-all-spark-miniapp": "0.9.33", - "@walmart/financial-wellbeing-feature-app": "1.10.2", + "@walmart/financial-wellbeing-feature-app": "1.10.3", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.6", @@ -5191,9 +5191,9 @@ } }, "node_modules/@walmart/financial-wellbeing-feature-app": { - "version": "1.10.2", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.10.2.tgz", - "integrity": "sha512-0HwKFOvRvP4Q6oFFkuXRsyt4Y3IK7zK0EdrOSVO5kwc2XvdedcTfSBqfbCeQcTer/D6JK9MFSTv/bwGEgPk3PQ==", + "version": "1.10.3", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.10.3.tgz", + "integrity": "sha512-9d7TLy70BXbF4ixoqjYvJBYkgb8U9SO6qgd22hRxFEsO3uR6BYtfR74yYgJPrwpqAVoqRDidRIj+323Ps6H1YA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -25178,9 +25178,9 @@ "version": "0.9.33" }, "@walmart/financial-wellbeing-feature-app": { - "version": "1.10.2", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.10.2.tgz", - "integrity": "sha512-0HwKFOvRvP4Q6oFFkuXRsyt4Y3IK7zK0EdrOSVO5kwc2XvdedcTfSBqfbCeQcTer/D6JK9MFSTv/bwGEgPk3PQ==" + "version": "1.10.3", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.10.3.tgz", + "integrity": "sha512-9d7TLy70BXbF4ixoqjYvJBYkgb8U9SO6qgd22hRxFEsO3uR6BYtfR74yYgJPrwpqAVoqRDidRIj+323Ps6H1YA==" }, "@walmart/functional-components": { "version": "4.0.3", --- package.json @@ -90,7 +90,7 @@ "@walmart/exception-mini-app": "1.4.2", "@walmart/facilities-management-miniapp": "0.6.42", "@walmart/feedback-all-spark-miniapp": "0.9.33", - "@walmart/financial-wellbeing-feature-app": "1.10.2", + "@walmart/financial-wellbeing-feature-app": "1.10.3", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.6",
bumped financial-wellbeing-feature-app to 1.10.3
bumped financial-wellbeing-feature-app to 1.10.3
f70d8a896621d346328db49e0a0302e4ed32c49b
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.15.21", + "version": "1.15.23", "main": "dist/index.js", "files": [ "dist" @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.12.22", + "@walmart/roster-mini-app": "2.12.24", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- yarn.lock @@ -6497,7 +6497,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.12.22" + "@walmart/roster-mini-app": "npm:2.12.24" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6678,9 +6678,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.12.22": - version: 2.12.22 - resolution: "@walmart/roster-mini-app@npm:2.12.22" +"@walmart/roster-mini-app@npm:2.12.24": + version: 2.12.24 + resolution: "@walmart/roster-mini-app@npm:2.12.24" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6722,7 +6722,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/303638a2f29f4065f197793eea6b9a275fadd30ba2058ea7bf130264c1abbc4df535b1fa3f3c62c1f936ea355b836389b0771f50bf347b797023363e970bdb30 + checksum: 10c0/ead6e4c1997cf674c5c27e8b9719015ec23aa2bfc2355cb78d6346d18d8de1e9d8746bdffce455dedcd656bb17c29683bc90f3e9ac807ac8409c2f73642887ee languageName: node linkType: hard
Update the merge changes
Update the merge changes
007baa59018bba4c15d907445cf7fbb9d34baf46
--- .looper.yml @@ -24,4 +24,4 @@ flows: - (name Yarn Version) yarn --version - yarn install - yarn run lint - - yarn run coverage \ No newline at end of file + - yarn run coverage
feat(ui): dummy commit
feat(ui): dummy commit
52972f608f13a08de23abd275a0eb11e2ead6d66
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingScreen.tsx @@ -20,6 +20,8 @@ import { import { useOnboardingContext } from './OnboardingContext'; import { ManagerExperienceCreators } from '../../../Store/Redux/actions'; import { useDispatch } from 'react-redux'; +import { useSelector } from 'react-redux'; +import { hubHeaderEnabled } from '../../Redux'; export const OnboardingScreen = () => { const { t } = useAllsparkTranslation(FEATURE_ID); @@ -34,6 +36,7 @@ export const OnboardingScreen = () => { const [sections, setSearchedsections] = useState<typeof sortedSections>(sortedSections); + const showHubHeader = useSelector(hubHeaderEnabled); const handleSearchInput = useCallback( (input: string) => { @@ -109,19 +112,21 @@ export const OnboardingScreen = () => { return ( <> <ScrollView contentContainerStyle={styles.rootContainer}> - <RosterPageHeader - title={t('dashboard.header.title')} - subText={t('dashboard.header.subTitle')} - imageContent={Images['0000000']} - backgroundColorOverride={styles.headerContainer} - fontSize={24} - links={[ - { - label: t('dashboard.skipLink'), - onPress: handleSkip, - }, - ]} - /> + {showHubHeader && ( + <RosterPageHeader + title={t('dashboard.header.title')} + subText={t('dashboard.header.subtitle')} + imageContent={Images['0000000']} + backgroundColorOverride={styles.headerContainer} + fontSize={24} + links={[ + { + label: t('dashboard.skipLink'), + onPress: handleSkip, + }, + ]} + /> + )} <Divider /> <View style={styles.filterList}> <ShiftFilterList
feat: added feature flags for header and filter
feat: added feature flags for header and filter
19d9b1f3be4f14734a2e4bf04c1481c06547c608
--- android/app/src/main/assets/fonts/icomoon.ttf Binary files a/android/app/src/main/assets/fonts/icomoon.ttf and b/android/app/src/main/assets/fonts/icomoon.ttf differ --- ios/icomoon.ttf Binary files a/ios/icomoon.ttf and b/ios/icomoon.ttf differ
icomoon.ttf for shelf availability icon
icomoon.ttf for shelf availability icon
c8a7455897417fa141dd4ce57186851a9652919b
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 99 + versionCode 100 versionName "1.0.8" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>99</string> + <string>100</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key>
Incrementing build number
Incrementing build number
2f9108650d7b2b43e29b0c7d60012ced5960777d
--- package-lock.json @@ -4475,9 +4475,9 @@ } }, "@walmart/taskit-mini-app": { - "version": "0.239.0-rc.3", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.239.0-rc.3.tgz", - "integrity": "sha512-S6ikrFDNCREzw0thhzKZOwlZGLEiAqEa+8O3mRrK0JLDCCvWGzok8Qzu2t7ZXy8M3LzXzHtVwKG7dOJBy0Q4Gw==" + "version": "0.239.0-rc.4", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.239.0-rc.4.tgz", + "integrity": "sha512-PCp72S6siT3IX1wN1nlllMwcQkBXNWLvLl/P0gcBPkpNY3eCx+rZGGe37GcJ+pTzYad2+qGSwWFtLO/DMDHxRA==" }, "@walmart/time-clock-mini-app": { "version": "0.4.32", --- package.json @@ -101,7 +101,7 @@ "@walmart/schedule-mini-app": "0.12.0", "@walmart/settings-mini-app": "1.6.0", "@walmart/shelfavailability-mini-app": "0.8.3", - "@walmart/taskit-mini-app": "0.239.0-rc.3", + "@walmart/taskit-mini-app": "0.239.0-rc.4", "@walmart/time-clock-mini-app": "0.4.32", "@walmart/ui-components": "1.3.0-rc.14", "@walmart/welcomeme-mini-app": "0.46.0",
upgrading taskit version
upgrading taskit version
198581e02f3cb34a2b5cc965734b6632b7986539
--- package-lock.json @@ -3338,9 +3338,9 @@ "integrity": "sha512-53F4Ig1Bd7bMzwgmq0OnDa+T3PKdi0wyyTDg67F9mvdRn05Le+EVv6Dji8fft8XE8hGmgK5sjwpTuarBmnDsVQ==" }, "@walmart/exception-mini-app": { - "version": "0.35.0-rc.0", - "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.35.0-rc.0.tgz", - "integrity": "sha512-DwE5+TvBdwIV2cLOv2YYXg02PcBp52x18ckvA5L3yPBOrmhS5ACaKVf+wSNyFnBwYfgk7xZ6qFFBpEDz4v0+AA==" + "version": "0.36.0-rc.0", + "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.36.0-rc.0.tgz", + "integrity": "sha512-sZhiIk1Q8wF/wXHUs1BoTrTF6G1/60yvl0fg5EnCloYOaCR9cRveK+WYTXt6GFrWXLl0zdDv8pmDlfJqydVOyQ==" }, "@walmart/feedback-all-spark-miniapp": { "version": "0.0.58", --- package.json @@ -76,7 +76,7 @@ "@walmart/ask-sam-mini-app": "0.30.15", "@walmart/config-components": "^1.0.31", "@walmart/counts-component-miniapp": "0.0.20", - "@walmart/exception-mini-app": "0.35.0-rc.0", + "@walmart/exception-mini-app": "0.36.0-rc.0", "@walmart/feedback-all-spark-miniapp": "0.0.58", "@walmart/functional-components": "1.0.32", "@walmart/gta-react-native-calendars": "0.0.15",
version update to fix bug PEW-259
version update to fix bug PEW-259
822520541b650d4b36741f34da648504cc8f4f20
--- .looper.yml @@ -22,4 +22,4 @@ flows: - (name Yarn Version) yarn --version - yarn install - yarn run lint - - yarn run coverage \ No newline at end of file + # - yarn run coverage \ No newline at end of file --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.15.0-alpha.10", + "version": "1.15.0-alpha.11", "main": "dist/index.js", "files": [ "dist" @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.12.0-alpha.12", + "@walmart/roster-mini-app": "2.12.0-alpha.13", "@walmart/ui-components": "1.15.1", "@walmart/wmconnect-mini-app": "2.7.0", "babel-jest": "^29.2.1", --- yarn.lock @@ -6439,7 +6439,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.12.0-alpha.12" + "@walmart/roster-mini-app": "npm:2.12.0-alpha.13" "@walmart/ui-components": "npm:1.15.1" "@walmart/wmconnect-mini-app": "npm:2.7.0" babel-jest: "npm:^29.2.1" @@ -6621,9 +6621,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.12.0-alpha.12": - version: 2.12.0-alpha.12 - resolution: "@walmart/roster-mini-app@npm:2.12.0-alpha.12" +"@walmart/roster-mini-app@npm:2.12.0-alpha.13": + version: 2.12.0-alpha.13 + resolution: "@walmart/roster-mini-app@npm:2.12.0-alpha.13" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6665,7 +6665,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/dc9e75ee2d97dfcdaf2d808f646d628a789f62a3ad7d6bae31dccb519fd005e3e312884a92b9a7ef6a7f856db0b3449219286a3960c09bb7e9c6ee8ca9a53698 + checksum: 10c0/7995fe71f7c92e489c1777a613b831b15b71eb200bd2684d0192024e737935d93a85fe9239409960a80f3354514ebea97b269d63a5cbe2e238838d95515d5bac languageName: node linkType: hard
Update my team version
Update my team version
650f88052110744436b7446b044150951c953218
--- __tests__/navigation/AssociateHallwayNav/Tabs/HomeStackNavTest.tsx @@ -47,6 +47,7 @@ describe('InboxHeaderRight', () => { describe('HomeStackNav', () => { it('matches snapshot', () => { mockUseSelector.mockReturnValueOnce(true); // inbox header enabled + mockUseSelector.mockReturnValueOnce({userId: 'swalton3'}); //user mockUseSelector.mockReturnValueOnce(true); // task badge const component = create(<HomeStackNav />); expect(component.toJSON()).toMatchSnapshot(); @@ -65,8 +66,16 @@ describe('HomeStackNav', () => { it('matches snapshot with inbox disabled', () => { mockUseSelector.mockReturnValueOnce(false); // inbox header enabled + mockUseSelector.mockReturnValueOnce({userId: 'swalton3'}); //user mockUseSelector.mockReturnValueOnce(true); // task badge const component = create(<HomeStackNav />); expect(component.toJSON()).toMatchSnapshot(); }); + + it('matches snapshot when user is not present', () => { + mockUseSelector.mockReturnValueOnce(false); // inbox header enabled + mockUseSelector.mockReturnValueOnce(null); //user + const component = create(<HomeStackNav />); + expect(component.toJSON()).toMatchSnapshot(); + }); }); --- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/HomeStackNavTest.tsx.snap @@ -121,7 +121,7 @@ exports[`HomeStackNav matches snapshot 3`] = ` </View> `; -exports[`HomeStackNav matches snapshot with inbox disabled 1`] = ` +exports[`HomeStackNav matches snapshot when user is not present 1`] = ` <Navigator screenOptions={ Object { @@ -211,6 +211,19 @@ exports[`HomeStackNav matches snapshot with inbox disabled 1`] = ` </Navigator> `; +exports[`HomeStackNav matches snapshot with inbox disabled 1`] = ` +<View + style={ + Object { + "flex": 1, + "justifyContent": "center", + } + } +> + <Spinner /> +</View> +`; + exports[`InboxHeaderRight matches snapshot when disabled 1`] = `null`; exports[`InboxHeaderRight matches snapshot with count 1`] = ` --- src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -21,8 +21,6 @@ import { } from '@walmart/time-clock-mini-app'; import {TorInboxNavPropsData} from '@walmart/time-clock-mini-app/dist/containers/TorInboxScreen/types'; import WmTelemetry from 'react-native-wm-telemetry'; -import {NavigationTheme} from '../../../core/AllsparkTheme'; -import {getInboxHeaderEnabled} from '../../../navConfig/NavConfigRedux'; import { SalesItemizedScreen, PresubItemizedScreen, @@ -30,6 +28,10 @@ import { MetricsFtprInfoModalScreen, MetricsFtprTabNavigation, } from '@walmart/metrics-mini-app'; +import {UserSelectors} from '@walmart/redux-store'; +import {Spinner} from '@walmart/gtp-shared-components'; +import {NavigationTheme} from '../../../core/AllsparkTheme'; +import {getInboxHeaderEnabled} from '../../../navConfig/NavConfigRedux'; export const styles = StyleSheet.create({ badge: { @@ -43,6 +45,10 @@ export const styles = StyleSheet.create({ top: 0, right: -4, }, + loadingView: { + flex: 1, + justifyContent: 'center', + }, }); type HomeRouteParams = { @@ -76,6 +82,16 @@ export const InboxHeaderRight = () => { export const HomeStackNav = () => { const [t] = useTranslation('common'); const inboxHeaderEnabled = useSelector(getInboxHeaderEnabled); + const user = useSelector(UserSelectors.getUser); + + if (!user) { + return ( + <View style={styles.loadingView}> + <Spinner /> + </View> + ); + } + return ( <HomeStack.Navigator screenOptions={{headerMode: 'float', headerShown: true, header: Header}}> --- src/startup/SsoSagas.ts @@ -156,6 +156,7 @@ export function* handleUserInfo() { ); if (cachedUser) { + logger.info('User info pulled from cache', {}); yield call(userActions.getUserSuccess, cachedUser); } else { const response: {data: KGraphResult} = yield retry( @@ -170,6 +171,7 @@ export function* handleUserInfo() { const user = {...authUser, ...userInfo}; yield call(userActions.getUserSuccess, user); + logger.info('User info fetched successfully', {}); yield call(cacheUserInfo, user); } } catch (error) {
Delaying home tab render when user is undefined. Adding info logs to user info saga
Delaying home tab render when user is undefined. Adding info logs to user info saga
a930e1617da8cab949f46ac097c5680ca01e039b
--- package.json @@ -116,7 +116,7 @@ "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/schedule-mini-app": "0.24.0", "@walmart/settings-mini-app": "1.8.0", - "@walmart/shelfavailability-mini-app": "1.2.3", + "@walmart/shelfavailability-mini-app": "1.2.4-SNAPSHOT.0", "@walmart/taskit-mini-app": "0.34.5", "@walmart/time-clock-mini-app": "0.13.1", "@walmart/ui-components": "1.4.0",
SA-263 bugfix for high TPS of service call
SA-263 bugfix for high TPS of service call
ee40edf889ad87bf42802419d00d586fffd724c3
--- src/components/Roster/index.tsx @@ -1,5 +1,24 @@ -import React from 'react'; +import React, { useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { RefreshControl, StyleSheet, View } from "react-native"; +import {Alert, Body, Spinner} from '@walmart/gtp-shared-components'; +import { FlashList } from "@shopify/flash-list"; +import { FilterValue, RosterFilters } from "../../containers/RosterFilters"; +import { TeamChatCard } from "../TeamList"; +import { RosterHeader } from "../RosterHeader"; +import { renderAssociateRosterItem } from "../AssociateRosterItem"; +import { useSafeAreaInsets } from "react-native-safe-area-context"; +import { useTranslation } from "react-i18next"; +import { TEXTING_I18N_NAMESPACE } from "../../translations"; +import { useSelector } from "react-redux"; +import { UserSelectors } from "@walmart/redux-store"; +import { useDailyRoster, useSiteTranslationContext, useUserIsInRoster } from "../../hooks"; +import { Associate } from "../../types"; +import { associateIsAbsent, associateIsClockedIn, sortedAssociateList } from "../../utils"; +import { teamLeadJobDescriptions } from "../../redux/selectors"; +import { analytics } from "../../logger/Analytics"; +import { logger } from "../../logger/Logger"; +/** --- TYPES --**/ type FeatureFlagConfig = { [key: string]: boolean //TODO: enumerate all roster elements / behaviors to specify exact elements to be configured }; @@ -15,6 +34,31 @@ interface RosterProps { teamActions: ActionButton[], } +/** -- STYLES -- **/ +const styles = StyleSheet.create({ + screen: { + flex: 1, + }, + teamCard: { + marginTop: 16, + marginHorizontal: 16, + }, + error: { + margin: 16, + }, + spinner: { + marginTop: 32, + }, + associateRosterItemContainer: { + marginHorizontal: 16, + height: 100, + }, + emptyState: { + marginTop: 24, + alignItems: 'center', + }, +}); + /** * Configurable Roster list that displays all associates and teams within a store or site in the case of distribution * centers. UI actions may be attached to each row item to be associated with each associate or team entity. @@ -24,5 +68,152 @@ interface RosterProps { * @property {ActionButton[]} teamActions - A list of pressable buttons that can be used to execute any action in a team entity */ export const Roster: React.FC<RosterProps> = (props) => { - return null; + const {bottom: bottomInset} = useSafeAreaInsets(); + const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const flashListRef: any = useRef(null); + const currentUserSite: string = useSelector(UserSelectors.getUserSite); + + const {loading, data, error, refetch} = useDailyRoster(); + const allAssociates = (data?.getDailyRoster || []) as Associate[]; + const rosterData = useMemo(() => { + const associateList = (data?.getDailyRoster || []) as Associate[]; + return associateList; + }, [data?.getDailyRoster]); + const clockedInCount = rosterData?.filter(associateIsClockedIn)?.length ?? 0; + const absentCount = rosterData?.filter(associateIsAbsent)?.length ?? 0; + const [associates, setAssociates] = useState<Associate[]>([]); + const teamLeads = useSelector(teamLeadJobDescriptions) as string[]; + const [pullToRefresh, setPullToRefresh] = useState(false); + const loaderOffSet = 10; + const siteTranslationContext = useSiteTranslationContext(); + + const onPullToRefresh = useCallback(() => { + setPullToRefresh(true); + refetch() + .then(() => { + setPullToRefresh(false); + analytics( + 'rosterPullDown', + {message: 'Pull down to refresh successful'}, + 10, + ); + }) + .catch((err: any) => { + logger.error('Error in pull down to refresh on Roster screen: ', { + message: err.toString(), + }); + setPullToRefresh(false); + }); + }, [pullToRefresh]); + + useEffect(() => { + if (data?.getDailyRoster) { + setAssociates(sortedAssociateList(allAssociates, teamLeads)); + } + }, [allAssociates]); + + // Used for reference, does not need to trigger render + const selectedFilter = useRef<FilterValue>(FilterValue.all); + + const extraData = useMemo( + () => ({listLength: associates.length}), + [associates.length], + ); + + const userIsInRoster = useUserIsInRoster(); + + const onFilter = (filteredAssociates: Associate[], filterId: FilterValue) => { + selectedFilter.current = filterId; + setAssociates(sortedAssociateList(filteredAssociates, teamLeads)); + }; + + const handleScrollToTop = () => { + if (flashListRef.current) { + flashListRef.current.scrollToIndex({index: 0}); + } + }; + + const ListEmptyComponent = () => { + if (loading) { + return ( + <Spinner + color='gray' + UNSAFE_style={styles.spinner} + testID={'rosterScreenLoadingSpinner'} + /> + ); + } + + if (error) { + logger.error('error fetching daily roster', {message: error.toString()}); + return ( + <Alert + variant='warning' + children={'Error fetching daily roster'} + UNSAFE_style={styles.error} + /> + ); + } + + // @todo - improve styling and verbiage of empty state use translations for filter once defined + return ( + <View style={styles.emptyState}> + {selectedFilter.current !== FilterValue.all ? ( + <Body>{`No ${selectedFilter.current} users found`}</Body> + ) : ( + <Body>No users found</Body> + )} + </View> + ); + }; + + return ( + <View style={styles.screen}> + <FlashList + ListHeaderComponent={ + <> + {/* @todo - determine if this should be shown on empty state */} + + <RosterFilters + associates={allAssociates} + clockedInCount={clockedInCount} + absentCount={absentCount} + onFilter={onFilter} + /> + {!loading && !userIsInRoster && ( + <Alert variant='warning' UNSAFE_style={styles.error}> + {t('rosterScreen.notInRoster', { + siteId: currentUserSite, + context: siteTranslationContext, + })} + </Alert> + )} + <TeamChatCard + style={styles.teamCard} + scrollToTop={handleScrollToTop} + /> + + {/* @todo - determine if this should be shown on empty state */} + {!!associates.length && <RosterHeader associates={associates} />} + </> + } + ListEmptyComponent={ListEmptyComponent} + data={associates} + extraData={extraData} + refreshing={loading} + estimatedItemSize={100} + renderItem={renderAssociateRosterItem} + contentInset={{bottom: bottomInset}} + showsVerticalScrollIndicator={false} + ref={flashListRef} + refreshControl={ + <RefreshControl + refreshing={pullToRefresh} + onRefresh={onPullToRefresh} + progressViewOffset={loaderOffSet} + /> + } + /> + </View> + ); }
duplicating roster screen logic into new component
duplicating roster screen logic into new component
efd150e768518baf757432bb5099574e8597d5eb
--- packages/me-at-walmart-athena-queries/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. +## [6.29.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@6.29.0...@walmart/me-at-walmart-athena-queries@6.29.1) (2025-01-13) + +**Note:** Version bump only for package @walmart/me-at-walmart-athena-queries + # [6.29.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@6.28.0...@walmart/me-at-walmart-athena-queries@6.29.0) (2025-01-09) ### Features --- packages/me-at-walmart-athena-queries/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-athena-queries", - "version": "6.29.0", + "version": "6.29.1", "description": "> TODO: description", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "",
chore(version): updating package version
chore(version): updating package version - @walmart/me-at-walmart-athena-queries@6.29.1
b2b42aaa84995ca70de55d977f355b2db7e02546
--- package-lock.json @@ -165,7 +165,7 @@ "react-native-vector-icons": "^9.2.0", "react-native-video": "^5.2.1", "react-native-view-shot": "^3.4.0", - "react-native-vision-camera": "3.0.0", + "react-native-vision-camera": "3.6.13", "react-native-webview": "^11.23.1", "react-native-wm-app-review": "0.4.0-rc.1", "react-native-wm-config": "0.1.1", @@ -23948,13 +23948,10 @@ } }, "node_modules/react-native-vision-camera": { - "version": "3.0.0", - "resolved": "https://npme.walmart.com/react-native-vision-camera/-/react-native-vision-camera-3.0.0.tgz", - "integrity": "sha512-pRevZMgusmj8ZcZ6RQRoPLsBoGAKyl+o6bGD248YGvdRmeTEJmW5miNv7+Fby/mcALOEM+O4kK1ZhWMAdOJfrg==", + "version": "3.6.13", + "resolved": "https://npme.walmart.com/react-native-vision-camera/-/react-native-vision-camera-3.6.13.tgz", + "integrity": "sha512-sr8zCKQmkVM7Mo5ZJAwBGe81xiZcvekThSOv/g0QXR5eE5SOxOq7UDCBFzcgrPa3kSpPEqtfa45iQ9Sd/kSKXg==", "license": "MIT", - "dependencies": { - "string-hash-64": "^1.0.3" - }, "peerDependencies": { "react": "*", "react-native": "*", @@ -25510,12 +25507,6 @@ "safe-buffer": "~5.2.0" } }, - "node_modules/string-hash-64": { - "version": "1.0.3", - "resolved": "https://npme.walmart.com/string-hash-64/-/string-hash-64-1.0.3.tgz", - "integrity": "sha512-D5OKWKvDhyVWWn2x5Y9b+37NUllks34q1dCDhk/vYcso9fmhs+Tl3KR/gE4v5UNj2UA35cnX4KdVVGkG1deKqw==", - "license": "MIT" - }, "node_modules/string-length": { "version": "4.0.2", "resolved": "https://npme.walmart.com/string-length/-/string-length-4.0.2.tgz", @@ -42739,12 +42730,9 @@ "version": "3.5.0" }, "react-native-vision-camera": { - "version": "3.0.0", - "resolved": "https://npme.walmart.com/react-native-vision-camera/-/react-native-vision-camera-3.0.0.tgz", - "integrity": "sha512-pRevZMgusmj8ZcZ6RQRoPLsBoGAKyl+o6bGD248YGvdRmeTEJmW5miNv7+Fby/mcALOEM+O4kK1ZhWMAdOJfrg==", - "requires": { - "string-hash-64": "^1.0.3" - } + "version": "3.6.13", + "resolved": "https://npme.walmart.com/react-native-vision-camera/-/react-native-vision-camera-3.6.13.tgz", + "integrity": "sha512-sr8zCKQmkVM7Mo5ZJAwBGe81xiZcvekThSOv/g0QXR5eE5SOxOq7UDCBFzcgrPa3kSpPEqtfa45iQ9Sd/kSKXg==" }, "react-native-webview": { "version": "11.23.1", @@ -43708,11 +43696,6 @@ "safe-buffer": "~5.2.0" } }, - "string-hash-64": { - "version": "1.0.3", - "resolved": "https://npme.walmart.com/string-hash-64/-/string-hash-64-1.0.3.tgz", - "integrity": "sha512-D5OKWKvDhyVWWn2x5Y9b+37NUllks34q1dCDhk/vYcso9fmhs+Tl3KR/gE4v5UNj2UA35cnX4KdVVGkG1deKqw==" - }, "string-length": { "version": "4.0.2", "resolved": "https://npme.walmart.com/string-length/-/string-length-4.0.2.tgz", --- package.json @@ -206,7 +206,7 @@ "react-native-vector-icons": "^9.2.0", "react-native-video": "^5.2.1", "react-native-view-shot": "^3.4.0", - "react-native-vision-camera": "3.0.0", + "react-native-vision-camera": "3.6.13", "react-native-webview": "^11.23.1", "react-native-wm-app-review": "0.4.0-rc.1", "react-native-wm-config": "0.1.1",
updated vision camera
updated vision camera
0dc9a10bedd3275a352e2cf65304d2adbfed9d8e
--- package-lock.json @@ -5172,14 +5172,13 @@ } }, "@walmart/gtp-shared-components": { - "version": "1.8.7", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.7.tgz", - "integrity": "sha512-YQgW7/2gaZgb1nsxpOTo6PJ7pqvd7ljufcTYTPW+BbgqVSW0RDsriNqZ1nT5QtQU2xXiQKafjPB9nk7HEA7Uuw==", + "version": "1.8.8", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.8.tgz", + "integrity": "sha512-Rq6HhZXkrSTrPGYdTQAjj3uVLDNw7Q86Aior4mO4DTgfO+5dRG1yY1ttlAHGH627UksBLd7MxD+AyizaSNHJFQ==", "requires": { "@livingdesign/tokens": "^0.41.0", "lodash": "^4.17.15", - "moment": "^2.29.4", - "react-keyed-flatten-children": "^1.3.0" + "moment": "^2.29.4" } }, "@walmart/impersonation-mini-app": { --- package.json @@ -84,7 +84,7 @@ "@walmart/feedback-all-spark-miniapp": "0.6.0", "@walmart/functional-components": "2.0.3", "@walmart/gta-react-native-calendars": "0.0.15", - "@walmart/gtp-shared-components": "1.8.7", + "@walmart/gtp-shared-components": "1.8.8", "@walmart/impersonation-mini-app": "1.2.0", "@walmart/ims-print-services-ui": "0.1.34", "@walmart/inbox-mini-app": "0.40.0",
gtp version bump to 1.8.8
gtp version bump to 1.8.8
716ca76f6cd6ab83c86b2a417952a2659682458c
--- __tests__/screens/AllTeamsScreen.test.tsx @@ -26,11 +26,11 @@ jest.mock('../../src/hooks', () => ({ // Add mock for gtp-shared-components jest.mock('@walmart/gtp-shared-components', () => { - const React = require('react'); + const ReactModule = require('react'); return { Banner: ({children, onClose, testID}) => - React.createElement('div', {testID, 'data-testid': testID}, [ - React.createElement( + ReactModule.createElement('div', {testID, 'data-testid': testID}, [ + ReactModule.createElement( 'button', { key: 'close', @@ -42,9 +42,9 @@ jest.mock('@walmart/gtp-shared-components', () => { ), children, ]), - Body: ({children}) => React.createElement('span', {}, children), + Body: ({children}) => ReactModule.createElement('span', {}, children), Skeleton: ({height, width, UNSAFE_style}) => - React.createElement('div', { + ReactModule.createElement('div', { style: { height, width, --- __tests__/screens/RosterDetailScreenDisabled.test.tsx @@ -7,12 +7,12 @@ import { // Mock @walmart/gtp-shared-components jest.mock('@walmart/gtp-shared-components', () => { - const React = require('react'); + const ReactModule = require('react'); const ReactNative = require('react-native'); return { Body: ({children, UNSAFE_style, testID}) => - React.createElement( + ReactModule.createElement( ReactNative.Text, { accessibilityRole: 'text',
fix(bug): fix linting warnings
fix(bug): fix linting warnings
ebcadc3666d2a4f46fed9075b1f3b49e8654be8b
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.0.1](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v3.0.0...v3.0.1) (2025-07-01) + + +### Bug Fixes + +* **ui:** update wmconnect and roster version for graphql changes ([8e404b3](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/8e404b33dba57d74bcc776108ac2be302212b027)) + # [1.41.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.40.0...v1.41.0) (2025-06-25) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "3.0.0", + "version": "3.0.1", "main": "dist/index.js", "files": [ "dist",
chore(release): 3.0.1 [skip ci]
chore(release): 3.0.1 [skip ci] ## [3.0.1](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v3.0.0...v3.0.1) (2025-07-01) ### Bug Fixes * **ui:** update wmconnect and roster version for graphql changes ([8e404b3](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/8e404b33dba57d74bcc776108ac2be302212b027))
2e6f592c6f8b685bb6407201bdb0244f16c4d0fc
--- .looper.multibranch.yml @@ -24,8 +24,14 @@ envs: ANDROID_BASE_PATH: targets/US/android branches: - - spec: feature/drop24-asksam + - spec: feature/drop24 triggers: + - manual: + name: Publish Packages (Pre-Release) + call: publishPrerelease + - manual: + name: Publish Packages (Graduate) + call: publishGraduate - manual: name: Build Both Dev call: dev(test)
revert looper build scripts
revert looper build scripts
688ca8d26605ede55c898b817ca04cf30e4c7f6a
--- targets/US/package.json @@ -140,7 +140,7 @@ "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.15.0", "@walmart/rfid-scan-mini-app": "2.4.4", - "@walmart/rn-receiving-mini-app": "2.3.375", + "@walmart/rn-receiving-mini-app": "2.3.378", "@walmart/roster-mini-app": "2.9.0", "@walmart/schedule-mini-app": "0.118.2", "@walmart/shelfavailability-mini-app": "1.5.37", --- yarn.lock @@ -6667,9 +6667,9 @@ __metadata: languageName: node linkType: hard -"@walmart/loadquality-mini-app@npm:1.0.141": - version: 1.0.141 - resolution: "@walmart/loadquality-mini-app@npm:1.0.141" +"@walmart/loadquality-mini-app@npm:1.0.143": + version: 1.0.143 + resolution: "@walmart/loadquality-mini-app@npm:1.0.143" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 @@ -6678,7 +6678,7 @@ __metadata: axios-cache-adapter: ">=2.7.3" react: ^18.2.0 react-native: ~0.70.5 - checksum: 10c0/3e1905cdad103f8cbd0e7307948fe9fe75b1bfee16535da357099f81dc69e5157a9889ea427fd865d37e7d61f45e6761f21159106e8b263f1193df938dde8b9b + checksum: 10c0/679147916a2448a1f111c4d91e7ce85d5a8a07925ffcf05dcb7e5b1d5a085a7b92f3bf8c1ac00fd5424b8960fb3be30221f345395daa583494a14e50d0f10e88 languageName: node linkType: hard @@ -7056,7 +7056,7 @@ __metadata: "@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/rn-receiving-mini-app": "npm:2.3.375" + "@walmart/rn-receiving-mini-app": "npm:2.3.378" "@walmart/roster-mini-app": "npm:2.9.0" "@walmart/schedule-mini-app": "npm:0.118.2" "@walmart/shelfavailability-mini-app": "npm:1.5.37" @@ -7769,12 +7769,12 @@ __metadata: languageName: node linkType: hard -"@walmart/rn-receiving-mini-app@npm:2.3.375": - version: 2.3.375 - resolution: "@walmart/rn-receiving-mini-app@npm:2.3.375" +"@walmart/rn-receiving-mini-app@npm:2.3.378": + version: 2.3.378 + resolution: "@walmart/rn-receiving-mini-app@npm:2.3.378" dependencies: "@walmart/atlas-rn-ui-components": "npm:1.1.17" - "@walmart/loadquality-mini-app": "npm:1.0.141" + "@walmart/loadquality-mini-app": "npm:1.0.143" peerDependencies: "@react-native-clipboard/clipboard": ">=1.14.0" "@react-navigation/native": ^6.0.8 @@ -7797,7 +7797,7 @@ __metadata: react-native-svg: ">=14.1.0" react-native-svg-transformer: ">=1.1.0" react-native-vision-camera: ^2.16.8 - checksum: 10c0/cd8d7d72d7c8c15d6d78dcc50e28922d5505f96341fa0981bc61f2b493171ce411d86b476bb17a78745a2a1e7d7d81ecee96ec26f1899f0879867b81a1cee480 + checksum: 10c0/1dc61a311f17bcc1303a8d205b065da44774d956eec90b39a423b713cc09a29a90927680b13f526c9c945f9fdc8d1b7f35a70da58c29f543f45c1369535035e7 languageName: node linkType: hard
Receiving version 2.3.378 - Bug fixes
Receiving version 2.3.378 - Bug fixes
68b174bcbbc39c97a1541e49b37df5fe4261d949
--- packages/allspark-foundation/src/Environment/provider.tsx @@ -18,6 +18,7 @@ export const EnvironmentProvider = ( } as IAllsparkEnvironment); setReady(true); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); return ready ? <>{children}</> : null;
chore: lint fix
chore: lint fix
38971210b836f1736dfdcf7883dccda8ceed9621
--- package.json @@ -125,7 +125,7 @@ "@walmart/me-at-walmart-common": "workspace:^", "@walmart/me-at-walmart-container": "workspace:^", "@walmart/me-at-walmart-geolocation": "1.2.0", - "@walmart/metrics-mini-app": "1.29.14", + "@walmart/metrics-mini-app": "1.29.15", "@walmart/mod-flex-mini-app": "1.29.5", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "2.4.3", --- yarn.lock @@ -8342,7 +8342,7 @@ __metadata: "@walmart/me-at-walmart-common": "workspace:^" "@walmart/me-at-walmart-container": "workspace:^" "@walmart/me-at-walmart-geolocation": "npm:1.2.0" - "@walmart/metrics-mini-app": "npm:1.29.14" + "@walmart/metrics-mini-app": "npm:1.29.15" "@walmart/mod-flex-mini-app": "npm:1.29.5" "@walmart/moment-walmart": "npm:1.0.4" "@walmart/money-auth-shared-components": "npm:2.4.3" @@ -8587,9 +8587,9 @@ __metadata: languageName: node linkType: hard -"@walmart/metrics-mini-app@npm:1.29.14": - version: 1.29.14 - resolution: "@walmart/metrics-mini-app@npm:1.29.14::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmetrics-mini-app%2F-%2F%40walmart%2Fmetrics-mini-app-1.29.14.tgz" +"@walmart/metrics-mini-app@npm:1.29.15": + version: 1.29.15 + resolution: "@walmart/metrics-mini-app@npm:1.29.15::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fmetropolis-npm%2F%40walmart%2Fmetrics-mini-app%2F-%2F%40walmart%2Fmetrics-mini-app-1.29.15.tgz" dependencies: "@walmart/metrics-common": "npm:1.3.9" base-64: "npm:^1.0.0" @@ -8615,7 +8615,7 @@ __metadata: react-native: 0.73.7 react-redux: ">=8.0.4" reduxsauce: ">=1.2.0" - checksum: 10c0/1129e493834afda8d482b7f11cab64d504eb1ea423ed68b6f169f8a154b87dd41dd7acf3720e9b5865a17b7592acd1a9e35d4c013d7b7230421540a8e0ffda0c + checksum: 10c0/8e9e53bc95643533e575c362efb023a965986b0a756bca23f42c67fedc18e68adb8877f72dc9d43dc9cbec14b3f412db02e72788788998e2f11e40c2421f98c1 languageName: node linkType: hard
feat: METRICS-1086 Drop 34 (#4801)
feat: METRICS-1086 Drop 34 (#4801) Co-authored-by: Aroushi Sharma - a0s11tw <Aroushi.Sharma@walmart.com>
fde5baa0bc78562c85ea9f2e84a198722ad4dd24
--- packages/core-services-allspark/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.10.8](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.10.7...@walmart/core-services-allspark@2.10.8) (2023-04-21) + + +### Bug Fixes + +* add more details to graphql error logger link ([13e1dfb](https://gecgithub01.walmart.com/allspark/allspark-core-services/commit/13e1dfbd9d9964f15457b811a9d63a07b6931216)) + + + + + ## [2.10.7](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/@walmart/core-services-allspark@2.10.6...@walmart/core-services-allspark@2.10.7) (2023-04-14) --- packages/core-services-allspark/package-lock.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.10.7", + "version": "2.10.8", "lockfileVersion": 1, "requires": true, "dependencies": { --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "2.10.7", + "version": "2.10.8", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/core-services-allspark@2.10.8
08c23d4635f511985e16e779e3bb9b97baafaabc
--- package-lock.json @@ -5575,9 +5575,9 @@ "integrity": "sha512-YRNp3VcfzWTyDZt6h5hAUK5XTzUrblOZOWUclor4ht/g4E5Oo2sMF8rV5swXlB3QdSQUZwSsU60b01veuR3o6g==" }, "@walmart/returns-mini-app": { - "version": "0.3.0", - "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-0.3.0.tgz", - "integrity": "sha512-DemNcJwvCLwCVKWvHena2qJpfeHv4e/yUdBTLlJCD3a69gYNalvlGCLVPeczPmBbCDRE1GWnKUq3CzPtcKkPOQ==", + "version": "0.3.2", + "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-0.3.2.tgz", + "integrity": "sha512-nsZN+c8POnjygTQpQuNuLi3bgrpiGcEmI6I6JdNqfXfLYgJ87VLzNEn2+DglZdcPWBlt5ZMDdXgVcqMVx5rliw==", "requires": { "@walmart/common-utilities-js": "^1.2.10", "@walmart/virtual-zpl-printer-model": "^0.2.11", --- package.json @@ -117,7 +117,7 @@ "@walmart/receipt-check-miniapp": "1.8.20", "@walmart/redux-store": "2.0.4", "@walmart/refrigeration-alarms-mini-app": "1.35.0", - "@walmart/returns-mini-app": "0.3.0", + "@walmart/returns-mini-app": "0.3.2", "@walmart/schedule-mini-app": "0.26.0", "@walmart/settings-mini-app": "1.10.0", "@walmart/shelfavailability-mini-app": "1.3.1",
bump version returns 0.3.2
bump version returns 0.3.2
4d92b3cf6d60142d1a72ff17bff01729751459df
--- package-lock.json @@ -82,7 +82,7 @@ "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.11", "@walmart/taskit-mini-app": "0.49.6", - "@walmart/time-clock-mini-app": "2.12.0", + "@walmart/time-clock-mini-app": "2.13.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.73.0", "@walmart/wfm-ui": "0.2.26", @@ -6102,9 +6102,9 @@ } }, "node_modules/@walmart/time-clock-mini-app": { - "version": "2.12.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.12.0.tgz", - "integrity": "sha512-0VVwktMtmb/XDmaU5mwkAeLoYxrodJ9my9a1jurnv+nsn/O2ntb447/lQLCtAGs0dcF5V6KePvbsoH1t3oVBDA==", + "version": "2.13.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.13.0.tgz", + "integrity": "sha512-LwAhBUJmxQUCK7Tidbc8WovwoveYC9ECrUyCnZwy85zsMDh19yx9vyFjKtovSbJE8x2a1LjRLiNalBSI3NN6PA==", "hasInstallScript": true, "license": "UNLICENSED", "dependencies": { @@ -25629,9 +25629,9 @@ } }, "@walmart/time-clock-mini-app": { - "version": "2.12.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.12.0.tgz", - "integrity": "sha512-0VVwktMtmb/XDmaU5mwkAeLoYxrodJ9my9a1jurnv+nsn/O2ntb447/lQLCtAGs0dcF5V6KePvbsoH1t3oVBDA==", + "version": "2.13.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.13.0.tgz", + "integrity": "sha512-LwAhBUJmxQUCK7Tidbc8WovwoveYC9ECrUyCnZwy85zsMDh19yx9vyFjKtovSbJE8x2a1LjRLiNalBSI3NN6PA==", "requires": { "@react-navigation/elements": "^1.3.1", "moment-timezone": "0.5.33", --- package.json @@ -124,7 +124,7 @@ "@walmart/settings-mini-app": "1.12.0", "@walmart/shelfavailability-mini-app": "1.5.2", "@walmart/taskit-mini-app": "0.49.6", - "@walmart/time-clock-mini-app": "2.12.0", + "@walmart/time-clock-mini-app": "2.13.0", "@walmart/ui-components": "1.9.0", "@walmart/welcomeme-mini-app": "0.73.0", "@walmart/wfm-ui": "0.2.26",
Update time clock mini app to 2.13.0
Update time clock mini app to 2.13.0
f63a2ac7afafaac42b29d007fce311b4ad0f4121
--- package.json @@ -134,7 +134,7 @@ "@walmart/react-native-barcode-builder": "^1.0.1", "@walmart/react-native-cookies": "1.0.1", "@walmart/react-native-encrypted-storage": "~1.1.3", - "@walmart/react-native-logger": "1.38.0", + "@walmart/react-native-logger": "1.38.1", "@walmart/react-native-scanner-3.0": "0.14.14", "@walmart/react-native-shared-navigation": "~6.3.28", "@walmart/react-native-store-map": "0.3.7", --- yarn.lock @@ -7646,7 +7646,7 @@ __metadata: "@walmart/react-native-barcode-builder": "npm:^1.0.1" "@walmart/react-native-cookies": "npm:1.0.1" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" - "@walmart/react-native-logger": "npm:1.38.0" + "@walmart/react-native-logger": "npm:1.38.1" "@walmart/react-native-scanner-3.0": "npm:0.14.14" "@walmart/react-native-shared-navigation": "npm:~6.3.28" "@walmart/react-native-store-map": "npm:0.3.7" @@ -8135,14 +8135,14 @@ __metadata: languageName: node linkType: hard -"@walmart/react-native-logger@npm:1.38.0": - version: 1.38.0 - resolution: "@walmart/react-native-logger@npm:1.38.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-logger%2F-%2F%40walmart%2Freact-native-logger-1.38.0.tgz" +"@walmart/react-native-logger@npm:1.38.1": + version: 1.38.1 + resolution: "@walmart/react-native-logger@npm:1.38.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-logger%2F-%2F%40walmart%2Freact-native-logger-1.38.1.tgz" peerDependencies: lodash: ^4.17.21 react: "*" react-native: "*" - checksum: 10c0/9ab2c67704672c4b8fe7f4dbb4d655279e3a45352611644fa72a9851108d47dff7e9c434dea72c3e7ca01e0454b0a1b4923a21bd6e0838181687a26a41436e92 + checksum: 10c0/ffa5288f292119cad6604a2ce925d3b29bd0a853e9d34e1f9c3ec9ee406dbff0fe0e6509723ae27d82f1390cfa9a841810109d8a745d333ed9d593aec846102e languageName: node linkType: hard
fix(logger crash fix): VS-9505 logger fix (#4508)
fix(logger crash fix): VS-9505 logger fix (#4508)
78ed4b63ad4c50a53786d4342ca2db6d1078097b
--- src/components/AssociateRosterItem/index.tsx @@ -79,21 +79,34 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { //Todo: Check the logic for 5 limit and reverse the addition, most recent should be on top const storeAssociateName = async () => { const searchHistoryLimit: number = 5; - const storedAssocName = await AsyncStorage.getItem( + const searchHistoryList = await AsyncStorage.getItem( RECENT_SEARCH_HISTORY_KEY, ); - if (storedAssocName) { - const updatedAssociateName = JSON.parse(storedAssocName); + if (searchHistoryList) { + const recentSearchHistoryList = JSON.parse(searchHistoryList); if ( - updatedAssociateName && - !updatedAssociateName.includes(storedAssocName) + recentSearchHistoryList && + !recentSearchHistoryList.includes(associateName) ) { - if (updatedAssociateName.length >= searchHistoryLimit) { - updatedAssociateName.pop(); + if (recentSearchHistoryList.length >= searchHistoryLimit) { + recentSearchHistoryList.pop(); + await AsyncStorage.setItem( + RECENT_SEARCH_HISTORY_KEY, + JSON.stringify([associateName, ...recentSearchHistoryList]), + ); + } else { + await AsyncStorage.setItem( + RECENT_SEARCH_HISTORY_KEY, + JSON.stringify([associateName, ...recentSearchHistoryList]), + ); } + } else { + const filteredRecentSearchHistoryList = recentSearchHistoryList.filter( + (item: string) => item !== associateName, + ); await AsyncStorage.setItem( RECENT_SEARCH_HISTORY_KEY, - JSON.stringify([...updatedAssociateName, associateName]), + JSON.stringify([associateName, ...filteredRecentSearchHistoryList]), ); } } else { --- src/screens/SearchScreen.tsx @@ -241,13 +241,13 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { AsyncStorage.removeItem(RECENT_SEARCH_HISTORY_KEY); }; - //Todo: Fix the individual removal: This one doesnt auto refresh const associateRemoveHandler = (index: number) => { - recentSearchHistory.splice(index, 1); - setRecentSearchHistory(recentSearchHistory); + const updatedRecentSearchHistory = [...recentSearchHistory]; + updatedRecentSearchHistory.splice(index, 1); + setRecentSearchHistory(updatedRecentSearchHistory); AsyncStorage.setItem( RECENT_SEARCH_HISTORY_KEY, - JSON.stringify(recentSearchHistory), + JSON.stringify(updatedRecentSearchHistory), ); }; --- src/components/AssociateRosterItem/index.tsx @@ -79,21 +79,34 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { //Todo: Check the logic for 5 limit and reverse the addition, most recent should be on top const storeAssociateName = async () => { const searchHistoryLimit: number = 5; - const storedAssocName = await AsyncStorage.getItem( + const searchHistoryList = await AsyncStorage.getItem( RECENT_SEARCH_HISTORY_KEY, ); - if (storedAssocName) { - const updatedAssociateName = JSON.parse(storedAssocName); + if (searchHistoryList) { + const recentSearchHistoryList = JSON.parse(searchHistoryList); if ( - updatedAssociateName && - !updatedAssociateName.includes(storedAssocName) + recentSearchHistoryList && + !recentSearchHistoryList.includes(associateName) ) { - if (updatedAssociateName.length >= searchHistoryLimit) { - updatedAssociateName.pop(); + if (recentSearchHistoryList.length >= searchHistoryLimit) { + recentSearchHistoryList.pop(); + await AsyncStorage.setItem( + RECENT_SEARCH_HISTORY_KEY, + JSON.stringify([associateName, ...recentSearchHistoryList]), + ); + } else { + await AsyncStorage.setItem( + RECENT_SEARCH_HISTORY_KEY, + JSON.stringify([associateName, ...recentSearchHistoryList]), + ); } + } else { + const filteredRecentSearchHistoryList = recentSearchHistoryList.filter( + (item: string) => item !== associateName, + ); await AsyncStorage.setItem( RECENT_SEARCH_HISTORY_KEY, - JSON.stringify([...updatedAssociateName, associateName]), + JSON.stringify([associateName, ...filteredRecentSearchHistoryList]), ); } } else { --- src/screens/SearchScreen.tsx @@ -241,13 +241,13 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { AsyncStorage.removeItem(RECENT_SEARCH_HISTORY_KEY); }; - //Todo: Fix the individual removal: This one doesnt auto refresh const associateRemoveHandler = (index: number) => { - recentSearchHistory.splice(index, 1); - setRecentSearchHistory(recentSearchHistory); + const updatedRecentSearchHistory = [...recentSearchHistory]; + updatedRecentSearchHistory.splice(index, 1); + setRecentSearchHistory(updatedRecentSearchHistory); AsyncStorage.setItem( RECENT_SEARCH_HISTORY_KEY, - JSON.stringify(recentSearchHistory), + JSON.stringify(updatedRecentSearchHistory), ); };
update the delete method for each search history item
update the delete method for each search history item
74858386bf65ee4cb823def5ea3395a10a86fbf2
--- __tests__/developerMenu/EnvironmentToggleScreen.test.tsx @@ -13,6 +13,9 @@ jest.mock('@walmart/react-native-encrypted-storage', () => ({ AllsparkLocalStorage: { clear: jest.fn(), set: jest.fn(), + }, + AllsparkNotificationClient :{ + unregister: jest.fn(), } })); --- src/developerMenu/EnvironmentToggleScreen.tsx @@ -1,12 +1,12 @@ import {Platform, View, StyleSheet, DevSettings} from 'react-native'; import {Body, Button, Radio} from '@walmart/gtp-shared-components'; -import {AllsparkEnvironment, AllsparkLocalStorage} from '@walmart/allspark-foundation'; +import {AllsparkEnvironment, AllsparkLocalStorage, AllsparkNotificationClient} from '@walmart/allspark-foundation'; import {SUPPORTED_ENVIRONMENTS, ENVIRONMENT_OVERRIDE} from './constants'; import {useEffect, useState} from 'react'; import EncryptedStorage from '@walmart/react-native-encrypted-storage'; const cleanup = async () => { - // Clear caches + await AllsparkNotificationClient.unregister(); await EncryptedStorage.clear(); await AllsparkLocalStorage.clear(); }
fix: unregister sumo on env toggle (#4884)
fix: unregister sumo on env toggle (#4884)
71bbd77d3d4a6cc4ab485e8dfd8d6a20b662418e
--- ios/Podfile.lock @@ -2904,8 +2904,8 @@ SPEC CHECKSUMS: walmart-react-native-sumo-sdk: a6dc20c0ec3c8ab878886529a0e2fc22e747821c WebexSDK: d652713bd7ad5902e81918121912ba75a0056c3b wifi-store-locator: 501fca0a220c725ed93ab403635c0f246a8ce7e3 - Yoga: 47d399a73c0c0caa9ff824e5c657eae31215bfee + Yoga: c716aea2ee01df6258550c7505fa61b248145ced PODFILE CHECKSUM: fc93c11e2096b0f20e15b7c98c1efea2b0908817 -COCOAPODS: 1.15.2 +COCOAPODS: 1.14.3
reverting yoga and cocopodods changes
reverting yoga and cocopodods changes
458e178e682ba11c79cb0279d42f23e2c2f29b32
--- packages/allspark-foundation/src/Container/ActiveContainerManager.tsx @@ -130,12 +130,20 @@ export class ActiveContainerManager { return this._activeContainer?.features || DEFAULT_FEATURES; } + public enableFeature = (featureId: string) => { + return this._activeContainer?.enableFeature(featureId); + }; + + public disableFeature = (featureId: string) => { + return this._activeContainer?.disableFeature(featureId); + }; + /** * Returns the screen builder component for the features on the active container. * Can be accessed using `ActiveAllsparkContainer.features.Screens`, but this is provided for simplicity. */ public get Screens() { - return this.features.Screens; + return this._activeContainer?.Screens; } } --- packages/allspark-foundation/src/Container/AllsparkContainer.tsx @@ -379,6 +379,18 @@ export class AllsparkContainer< ); }; + public enableFeature = (featureId: string) => { + return this.features.enableFeature(featureId); + }; + + public disableFeature = (featureId: string) => { + return this.features.disableFeature(featureId); + }; + + public get Screens() { + return this.features.Screens; + } + /** * Initialize Allspark environment and clients for container configuration. */ --- packages/allspark-foundation/src/Feature/AllsparkFeatureManager.ts @@ -394,6 +394,9 @@ export class FeatureModuleManager { return this.buildAllScreens(builder); }; + /** + * Utility function to build screen from multiple options. + */ public Screen = ( featureId: string, screenId: string, @@ -402,4 +405,32 @@ export class FeatureModuleManager { const feature = this.getFeature(featureId); return feature?.buildScreen(screenId, builder) || null; }; + + public enableFeature = (featureId: string) => { + const feature = this.getFeature(featureId); + if (!feature) { + throw new Error(`Feature ${featureId} not found`); + } + feature.enable(); + }; + + public disableFeature = (featureId: string) => { + const feature = this.getFeature(featureId); + if (!feature) { + throw new Error(`Feature ${featureId} not found`); + } + feature.disable(); + }; + + /** + * Hook to return whether or not a feature module is enabled. + * Connects to the onEnableChange event for a given feature + */ + public useFeatureEnabled = (featureId: string) => { + const feature = this.getFeature(featureId); + if (!feature) { + throw new Error(`Feature ${featureId} not found`); + } + return feature.useFeatureEnabled(); + }; } --- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx @@ -5,12 +5,17 @@ import { EventManager, ListenerSubscription, RenderGuard, + useRenderOnChange, } from '@walmart/allspark-utils'; import { AllsparkNavigationClient } from '../Navigation'; import { AllsparkNotificationClient } from '../Notification'; import { AllsparkReduxStore } from '../Redux'; import { AllsparkTranslationClient } from '../Translation'; +import { ActiveAllsparkContainer } from '../Container/ActiveContainerManager'; +import { AllsparkComponentContainers } from '../Components'; +import { AllsparkSharedComponents } from '../Components/SharedComponents'; + import { AllsparkModuleConfig, AllsparkModuleResources, @@ -24,9 +29,6 @@ import { InferCapabilityType, InferRecordKey, } from './types'; -import { ActiveAllsparkContainer } from '../Container/ActiveContainerManager'; -import { AllsparkComponentContainers } from '../Components'; -import { AllsparkSharedComponents } from '../Components/SharedComponents'; /** * AllsparkFeatureModule is a class that represents a set of feature capabilities. @@ -701,13 +703,31 @@ export class AllsparkFeatureModule< * Enable the feature module. */ public enable = () => { - this.enabled = true; + if (!this.enabled) { + this.enabled = true; + this._events.runEvent('onEnableChange', true); + } }; /** * Disable the feature module. */ public disable = () => { - this.enabled = false; + if (this.enabled) { + this.enabled = false; + this._events.runEvent('onEnableChange', false); + } + }; + + /** + * Hook to return whether or not the feature module is enabled. + * Connects to the onEnableChange event. + */ + public useFeatureEnabled = () => { + useRenderOnChange({ + addChangeListener: (cb) => this._events.addListener('onEnableChange', cb), + }); + + return this.enabled; }; } --- packages/allspark-foundation/src/Feature/types.ts @@ -241,9 +241,18 @@ export type FeatureEventTypeMap = { * @description Called when the feature capability is disconnected */ onDisconnect: ConnectCapabilities | undefined; + + /** + * @description Called when the feature capability is disconnected + */ + onEnableChange: boolean; }; -export const FEATURE_EVENTS_TYPES = ['onConnect', 'onDisconnect'] as const; +export const FEATURE_EVENTS_TYPES = [ + 'onConnect', + 'onDisconnect', + 'onEnableChange', +] as const; export type ConnectConfig = { featureId?: string;
feat: add feature enable and disable methods to feature manager, container, and active container manager
feat: add feature enable and disable methods to feature manager, container, and active container manager
d348745515404be9932fe040452b96439a39c7e6
--- package-lock.json @@ -41,7 +41,7 @@ "@walmart/amp-mini-app": "1.1.72", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", - "@walmart/attendance-mini-app": "3.22.0", + "@walmart/attendance-mini-app": "3.23.0", "@walmart/avp-feature-app": "0.0.32", "@walmart/avp-shared-library": "0.0.53", "@walmart/calling-mini-app": "0.1.8", @@ -8497,9 +8497,9 @@ } }, "node_modules/@walmart/attendance-mini-app": { - "version": "3.22.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.22.0.tgz", - "integrity": "sha512-RpDTtBr6F2zx43eRZJzj8rsm2V6VfPPWf87+cAIRdQzYZLrZJxxNY+8FuEgWhaUavxFCgT3DyTfwL++ALf1xVA==", + "version": "3.23.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.23.0.tgz", + "integrity": "sha512-dkHzWy5jc2zBNehDvyY4t5Vh9HYU1HAiC7jZ64VeQiEh1O/sWp4Te5gdwOokebltOR7RKcb2sNXlv3SPmRENkw==", "hasInstallScript": true, "dependencies": { "@walmart/wfm-ui": "^0.2.26", @@ -33228,9 +33228,9 @@ } }, "@walmart/attendance-mini-app": { - "version": "3.22.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.22.0.tgz", - "integrity": "sha512-RpDTtBr6F2zx43eRZJzj8rsm2V6VfPPWf87+cAIRdQzYZLrZJxxNY+8FuEgWhaUavxFCgT3DyTfwL++ALf1xVA==", + "version": "3.23.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.23.0.tgz", + "integrity": "sha512-dkHzWy5jc2zBNehDvyY4t5Vh9HYU1HAiC7jZ64VeQiEh1O/sWp4Te5gdwOokebltOR7RKcb2sNXlv3SPmRENkw==", "requires": { "@walmart/wfm-ui": "^0.2.26", "moment-timezone": "0.5.40",
buumping attendance version
buumping attendance version
a5add161ba039967df7f31276454f553d099e1fe
--- package-lock.json @@ -39,7 +39,7 @@ "@walmart/attendance-mini-app": "0.190.2", "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.1.0-rc.4", - "@walmart/copilot-mini-app": "^1.63.0", + "@walmart/copilot-mini-app": "^1.65.3", "@walmart/core-services": "~2.0.19", "@walmart/core-services-allspark": "~2.11.0", "@walmart/core-utils": "~2.0.5", @@ -4935,9 +4935,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "1.63.0", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.63.0.tgz", - "integrity": "sha512-6SNiM+hIWJE1DzckbjsmveDFZQCDjPSEZbld2GH/cAFU1HX7tvlflpn8vg5ieem7TqwI0X+mUadZ7pMzRbHO3w==", + "version": "1.65.3", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.65.3.tgz", + "integrity": "sha512-bcr4GfyRnhEfbV78ycZZfQBmED89FPx7yYfN9gYS6EuGbfuowb08/CJISj3jn8132Xu7t+78rQV4YdykCmDhkw==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -25130,9 +25130,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "1.63.0", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.63.0.tgz", - "integrity": "sha512-6SNiM+hIWJE1DzckbjsmveDFZQCDjPSEZbld2GH/cAFU1HX7tvlflpn8vg5ieem7TqwI0X+mUadZ7pMzRbHO3w==" + "version": "1.65.3", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.65.3.tgz", + "integrity": "sha512-bcr4GfyRnhEfbV78ycZZfQBmED89FPx7yYfN9gYS6EuGbfuowb08/CJISj3jn8132Xu7t+78rQV4YdykCmDhkw==" }, "@walmart/core-services": { "version": "2.0.19", --- package.json @@ -81,7 +81,7 @@ "@walmart/attendance-mini-app": "0.190.2", "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.1.0-rc.4", - "@walmart/copilot-mini-app": "^1.63.0", + "@walmart/copilot-mini-app": "^1.65.3", "@walmart/core-services": "~2.0.19", "@walmart/core-services-allspark": "~2.11.0", "@walmart/core-utils": "~2.0.5",
chore bump copilot@1.65.3
chore bump copilot@1.65.3
1233508a62af790f3758e348bd8875f095ac7089
--- .looper.codepush.yml @@ -47,7 +47,7 @@ flows: - appcenter codepush release-react -a AllSpark-Me-Walmart/AllSpark-Me-Walmart --plist-file ./ios/AllSpark/Info.plist -d dev --description 'looper update' --token $APPCENTER_API_TOKEN_ANDROID - npm run env:beta - appcenter codepush release-react -a AllSpark-Me-Walmart/AllSpark-Android -d beta --description "looper update beta" --token $APPCENTER_API_TOKEN_ANDROID - - appcenter codepush release-react -a AllSpark-Me-Walmart/AllSpark-Me-Walmart --plist-file ./ios/AllSpark/Info.plist -d dev --description 'looper update beta' --token $APPCENTER_API_TOKEN_ANDROID + - appcenter codepush release-react -a AllSpark-Me-Walmart/AllSpark-Me-Walmart --plist-file ./ios/AllSpark/Info.plist -d beta --description 'looper update beta' --token $APPCENTER_API_TOKEN_ANDROID - appcenter logout pr:
git push
git push
24e80533803fde658c6d9a25109878ec299ce1d1
--- package-lock.json @@ -78,7 +78,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.6.0", - "@walmart/receipt-check-miniapp": "1.15.7", + "@walmart/receipt-check-miniapp": "1.17.3", "@walmart/redux-store": "3.5.0", "@walmart/returns-mini-app": "3.9.0", "@walmart/schedule-mini-app": "0.55.0", @@ -9009,9 +9009,9 @@ } }, "node_modules/@walmart/receipt-check-miniapp": { - "version": "1.15.7", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.15.7.tgz", - "integrity": "sha512-IMJq/ol5gBkSWBzBRDIbdDnogYDg/yVpKM4t5m7JcTG5oT1FguEVW0QDXG4ZsUj2A/X0yFkUtsxduKlyy7N8Kg==", + "version": "1.17.3", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.17.3.tgz", + "integrity": "sha512-K9CSiLQK8nZ/pE7VdR1FXctyIPNG82bknAByqWtmhcxEIjKKQqV3sAf0zmIJ39BhE/8HhrWrGlO/t4n7l/5TxA==", "hasInstallScript": true, "dependencies": { "@walmart/tcnumber": "^2.3.3", @@ -9023,12 +9023,8 @@ "xstate": "^4.32.1" }, "peerDependencies": { - "@react-navigation/native": "^6.0.0", - "@react-navigation/stack": "^6.1.0", "@walmart/core-services": "^1.4.11", "@walmart/redux-store": "^2.0.4", - "react": "^17.0.2", - "react-native": "^0.67.4", "react-native-device-info": "^10.3.0", "react-redux": "^7.2.1", "redux": "^4.1.2" @@ -34482,9 +34478,9 @@ "integrity": "sha512-OFaxIHgOFsuiZV7WWlOWoTFLajZuJ3GsSig8TJCqRhGrzVzbESoX8ANIGpvgVHP95+MW8wQEg6Z5gPBaSMXanQ==" }, "@walmart/receipt-check-miniapp": { - "version": "1.15.7", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.15.7.tgz", - "integrity": "sha512-IMJq/ol5gBkSWBzBRDIbdDnogYDg/yVpKM4t5m7JcTG5oT1FguEVW0QDXG4ZsUj2A/X0yFkUtsxduKlyy7N8Kg==", + "version": "1.17.3", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.17.3.tgz", + "integrity": "sha512-K9CSiLQK8nZ/pE7VdR1FXctyIPNG82bknAByqWtmhcxEIjKKQqV3sAf0zmIJ39BhE/8HhrWrGlO/t4n7l/5TxA==", "requires": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", --- package.json @@ -119,7 +119,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.6.0", - "@walmart/receipt-check-miniapp": "1.15.7", + "@walmart/receipt-check-miniapp": "1.17.3", "@walmart/redux-store": "3.5.0", "@walmart/returns-mini-app": "3.9.0", "@walmart/schedule-mini-app": "0.55.0",
update for drop 17 version update
update for drop 17 version update
3a6e758a8f19f181409d49e24e1227afb00ac487
--- package-lock.json @@ -70,7 +70,6 @@ "eslint-plugin-prettier": "^4.2.1", "expo": "^48.0.15", "expo-av": "~13.2.1", - "graphemer": "1.4.0", "husky": "^4.3.0", "i18next": "^22.0.1", "install": "^0.13.0", @@ -14740,13 +14739,6 @@ "dev": true, "license": "ISC" }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "license": "MIT" - }, "node_modules/graphql": { "version": "16.6.0", "resolved": "https://npme.walmart.com/graphql/-/graphql-16.6.0.tgz", @@ -39782,12 +39774,6 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "graphemer": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, "graphql": { "version": "16.6.0", "resolved": "https://npme.walmart.com/graphql/-/graphql-16.6.0.tgz", --- package.json @@ -92,7 +92,6 @@ "eslint-plugin-prettier": "^4.2.1", "expo": "^48.0.15", "expo-av": "~13.2.1", - "graphemer": "1.4.0", "husky": "^4.3.0", "i18next": "^22.0.1", "install": "^0.13.0", --- src/screens/MessagesScreen.tsx @@ -236,24 +236,23 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { }; //TODO: Move this into the API request itself - const convertEmojisToUnicode = (inputString: string) => { - const regex_emoji_detector = /\p{Emoji}/giu; + const convertEmojisToUnicode = (inputString?: string) => { + const regex_emoji_detector = /\p{Extended_Pictographic}/u; const testString = '***** 1 😁 1 22 33 The input 😀😄😀😄 string wh 😆 ere 😃 emojis will be 11 22 33 😅 *****'; - //83 for each //89 if double counted (is is double counted for regular length) //console.log("String length of test: " + testString.length); - //This succefully parses unicode characters [...testString].map((unicodeChar) => { console.log( - unicodeChar + 'isEmoji: ' + regex_emoji_detector.test(unicodeChar), + unicodeChar + ' - isEmoji: ' + regex_emoji_detector.test(unicodeChar), ); return unicodeChar; }); if (isNil(inputString)) return ''; + return inputString; }; --- package-lock.json @@ -70,7 +70,6 @@ "eslint-plugin-prettier": "^4.2.1", "expo": "^48.0.15", "expo-av": "~13.2.1", - "graphemer": "1.4.0", "husky": "^4.3.0", "i18next": "^22.0.1", "install": "^0.13.0", @@ -14740,13 +14739,6 @@ "dev": true, "license": "ISC" }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "license": "MIT" - }, "node_modules/graphql": { "version": "16.6.0", "resolved": "https://npme.walmart.com/graphql/-/graphql-16.6.0.tgz", @@ -39782,12 +39774,6 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "graphemer": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, "graphql": { "version": "16.6.0", "resolved": "https://npme.walmart.com/graphql/-/graphql-16.6.0.tgz", --- package.json @@ -92,7 +92,6 @@ "eslint-plugin-prettier": "^4.2.1", "expo": "^48.0.15", "expo-av": "~13.2.1", - "graphemer": "1.4.0", "husky": "^4.3.0", "i18next": "^22.0.1", "install": "^0.13.0", --- src/screens/MessagesScreen.tsx @@ -236,24 +236,23 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => { }; //TODO: Move this into the API request itself - const convertEmojisToUnicode = (inputString: string) => { - const regex_emoji_detector = /\p{Emoji}/giu; + const convertEmojisToUnicode = (inputString?: string) => { + const regex_emoji_detector = /\p{Extended_Pictographic}/u; const testString = '***** 1 😁 1 22 33 The input 😀😄😀😄 string wh 😆 ere 😃 emojis will be 11 22 33 😅 *****'; - //83 for each //89 if double counted (is is double counted for regular length) //console.log("String length of test: " + testString.length); - //This succefully parses unicode characters [...testString].map((unicodeChar) => { console.log( - unicodeChar + 'isEmoji: ' + regex_emoji_detector.test(unicodeChar), + unicodeChar + ' - isEmoji: ' + regex_emoji_detector.test(unicodeChar), ); return unicodeChar; }); if (isNil(inputString)) return ''; + return inputString; };
succesful match of emoji for detection
succesful match of emoji for detection
b0f7a3c7390417edfac71206b1bfe510e8d937b3
--- __tests__/navigation/AssociateHallwayNav/BannersTest.tsx @@ -28,7 +28,8 @@ jest.mock('../../../src/changeStore/ChangeStoreBanner', () => ({ })); const mockUseSelector = useSelector as jest.Mock; -const mockGetFocusedRouteNameFromRoute = getFocusedRouteNameFromRoute as jest.Mock; +const mockGetFocusedRouteNameFromRoute = + getFocusedRouteNameFromRoute as jest.Mock; describe('ImpersonationBanner', () => { it('renders banner when impersonating and not on myTeam route', () => {
chore: lint fix
chore: lint fix
4e5f0fd1d117ca0a3b70edfc5fd24ddd0e0dc5d3
--- targets/US/package.json @@ -87,8 +87,8 @@ "@walmart/ask-sam-mini-app": "1.24.7", "@walmart/associate-listening-mini-app": "1.2.7", "@walmart/attendance-mini-app": "3.44.0", - "@walmart/avp-feature-app": "0.8.7", - "@walmart/avp-shared-library": "0.8.9", + "@walmart/avp-feature-app": "0.10.2", + "@walmart/avp-shared-library": "0.10.1", "@walmart/backroom-mini-app": "1.5.15", "@walmart/calling-mini-app": "0.5.17", "@walmart/checkout-mini-app": "3.24.0", --- yarn.lock @@ -6035,9 +6035,9 @@ __metadata: languageName: node linkType: hard -"@walmart/avp-feature-app@npm:0.8.7": - version: 0.8.7 - resolution: "@walmart/avp-feature-app@npm:0.8.7" +"@walmart/avp-feature-app@npm:0.10.2": + version: 0.10.2 + resolution: "@walmart/avp-feature-app@npm:0.10.2" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -6046,13 +6046,13 @@ __metadata: react-native: ">=0.72.10" react-redux: ">=8.0.4" redux: ">=4.2.1" - checksum: 10c0/22d635118c7dd18fb389369915748472b632109e3f731e90608da2ef10a71a319edb9c09ad036c57f44c51ecf346676b3d40a3e8a52828d4a072309283248e6b + checksum: 10c0/08ed513e0e2682936e19739bf37ee63869dcb94aeafdf0bd5d03e85decec1c6f5db8b10136925389c83745c11025e614885a0ddc1837c5ff317c511e75d25eea languageName: node linkType: hard -"@walmart/avp-shared-library@npm:0.8.9": - version: 0.8.9 - resolution: "@walmart/avp-shared-library@npm:0.8.9" +"@walmart/avp-shared-library@npm:0.10.1": + version: 0.10.1 + resolution: "@walmart/avp-shared-library@npm:0.10.1" peerDependencies: axios: ^1.3.4 immer: ^9.0.16 @@ -6062,7 +6062,7 @@ __metadata: redux-saga: ^1.1.3 reduxsauce: ^1.2.0 reselect: ^4.1.7 - checksum: 10c0/05ee80e162f585b0427ccf37be01edd6bafa12d4481a33438b2e8389760334809f80e529b2ed6b5356da237f6de4f9e41cbb7d91f14a57a179c0bd4aca3a7c66 + checksum: 10c0/83d3b929ab434690d274b1deefe8a4dfb87e2e14eadd8c5fa7a3a4433fc496aa83f7a2eb1dcaea36c7febe8b83114fc9ca7db9f45285f47f807994d2eeee50c1 languageName: node linkType: hard @@ -6992,8 +6992,8 @@ __metadata: "@walmart/ask-sam-mini-app": "npm:1.24.7" "@walmart/associate-listening-mini-app": "npm:1.2.7" "@walmart/attendance-mini-app": "npm:3.44.0" - "@walmart/avp-feature-app": "npm:0.8.7" - "@walmart/avp-shared-library": "npm:0.8.9" + "@walmart/avp-feature-app": "npm:0.10.2" + "@walmart/avp-shared-library": "npm:0.10.1" "@walmart/backroom-mini-app": "npm:1.5.15" "@walmart/calling-mini-app": "npm:0.5.17" "@walmart/checkout-mini-app": "npm:3.24.0"
bumped avp
bumped avp
086d009a38b64df90d6f5dcb78394e2e08b5e8f5
--- package.json @@ -170,7 +170,7 @@ "@walmart/schedule-mini-app": "5.4.4", "@walmart/shelfavailability-mini-app": "1.7.2", "@walmart/shop-gnfr-mini-app": "1.0.454", - "@walmart/sidekick-mini-app": "4.253.2", + "@walmart/sidekick-mini-app": "4.274.1", "@walmart/store-feature-orders": "1.35.6", "@walmart/talent-performance-mini-app": "1.2.6", "@walmart/talent-preboarding-mini-app": "1.0.63", --- yarn.lock @@ -8932,7 +8932,7 @@ __metadata: "@walmart/schedule-mini-app": "npm:5.4.4" "@walmart/shelfavailability-mini-app": "npm:1.7.2" "@walmart/shop-gnfr-mini-app": "npm:1.0.454" - "@walmart/sidekick-mini-app": "npm:4.253.2" + "@walmart/sidekick-mini-app": "npm:4.274.1" "@walmart/store-feature-orders": "npm:1.35.6" "@walmart/talent-performance-mini-app": "npm:1.2.6" "@walmart/talent-preboarding-mini-app": "npm:1.0.63" @@ -9860,9 +9860,9 @@ __metadata: languageName: node linkType: hard -"@walmart/sidekick-mini-app@npm:4.253.2": - version: 4.253.2 - resolution: "@walmart/sidekick-mini-app@npm:4.253.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fsidekick-mini-app%2F-%2F%40walmart%2Fsidekick-mini-app-4.253.2.tgz" +"@walmart/sidekick-mini-app@npm:4.274.1": + version: 4.274.1 + resolution: "@walmart/sidekick-mini-app@npm:4.274.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fsidekick-mini-app%2F-%2F%40walmart%2Fsidekick-mini-app-4.274.1.tgz" peerDependencies: "@apollo/client": "*" "@react-navigation/native": ^6.0.0 @@ -9881,7 +9881,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/e4c46d2d7074a781ef9262b6f65adcadb36e1db5b2608a00158eb91d19b3d1c84a87f1c83c72eac8684c241c61f1b3f19a30664c41370f909b6a692ecc01a27e + checksum: 10c0/8245e5e9550a9fcec41bed0420470060cc3f5695023edee282c389331d94d329f6f2db365a96c4e4a5b980783beebe31f9aa33fc0de901d7ffbe7426e8d80eef languageName: node linkType: hard
feat: sidekick mini app walmart2.0 (#5117)
feat: sidekick mini app walmart2.0 (#5117) Co-authored-by: Mahabubee Shaik <m0s0nc1@walmart.com> Co-authored-by: Shubham Rajput <shubham.rajput@walmart.com> Co-authored-by: Tejasvi <Tejasvi.Annam@walmart.com> Co-authored-by: Karthik Balasubramanyam <karthik.balasubraman@walmart.com> Co-authored-by: Hariharan Sundaram <121838+h0s0em0@users.noreply.gecgithub01.walmart.com> Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com> Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com> Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
bb44e740c8438ac97c933945b2f936da953933f0
--- .looper.multibranch.yml @@ -242,7 +242,6 @@ branches: rules: - before: - echo "setting git commit vars" - - ls -l /Applications/xcode_version/ - var (GIT_COMMIT_AUTHOR): git log -1 --format="%aN" - var (GIT_COMMIT_MESSAGE): git log --oneline --format=%B -n 1 HEAD | head -n 1 - var (GIT_COMMIT_DATE): git log -1 --date=format:"%a %d-%B, %Y - %r" --format="%ad"
Update .looper.multibranch.yml
Update .looper.multibranch.yml
9e6627feb3beade2b167206e3c5cf0e44fe1d6d0
--- __tests__/__mocks__/@walmart/allspark-foundation/Container.js @@ -1,5 +1,3 @@ -const { features } = require("process"); - module.exports = { ...jest.requireActual('@walmart/allspark-foundation/Container'), ActiveAllsparkContainer: { --- __tests__/navigation/USHallway/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -461,7 +461,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects AskSamScreens ModFlexScreens PriceChangesMiniApp - DigitalLocksMiniAppScreens ManagerExperienceScreens RfidScanScreens ReturnsMiniApp @@ -936,7 +935,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects AskSamScreens ModFlexScreens PriceChangesMiniApp - DigitalLocksMiniAppScreens ManagerExperienceScreens RfidScanScreens ReturnsMiniApp --- __tests__/settings/versions/__snapshots__/VersionsListTest.tsx.snap @@ -20,7 +20,7 @@ exports[`VersionsList 1`] = ` [ { "data": [], - "title": "Me@Walmart (dev)", + "title": "Me@Walmart (undefined)", "version": undefined, }, ] @@ -65,7 +65,7 @@ exports[`VersionsList 1`] = ` size="medium" weight="700" > - appNames.Me@Walmart (dev) + appNames.Me@Walmart (undefined) </Body> <Body size="medium"
chore: fix lint and snapshots
chore: fix lint and snapshots
21a19c90cb8cedc75ef3ef5b9256c442dda71362
--- core/src/navigation/types.ts @@ -11,11 +11,11 @@ import { WhatsNewScreenProps, } from '../whatsNew/types'; -export type RootStackMap<T extends ParamListBase = CoreAssociateStackMap> = { +export type RootStackMap<T extends ParamListBase = {}> = { 'Core.Login': undefined; // Nesting of associate stack within another stack (drawer) is specific to Me@ but think all other containers will follow same pattern 'Core.Main': NavigatorScreenParams<{ - mainStack: NavigatorScreenParams<T> | undefined; + mainStack: NavigatorScreenParams<T & CoreAssociateStackMap> | undefined; }>; WelcomeMeMiniApp: undefined; 'Core.PinAccessScreen': { --- targets/US/src/navigation/AssociateHallwayNav/types.ts @@ -12,7 +12,7 @@ import { DrawerNavigationProp, DrawerScreenProps, } from '@react-navigation/drawer'; -import {CoreAssociateStackMap} from '@walmart/me-at-walmart-core'; +import {CoreAssociateStackMap, RootStackMap} from '@walmart/me-at-walmart-core'; // Top level navigator for associate hallway, a drawer navigator. // Typing of its screens and their navigation params @@ -238,6 +238,6 @@ export type MeStackNavigationProp< // that haven't added their own types yet. declare global { namespace Allspark { - interface ScreenParams extends MainStackMap {} + interface RootParamList extends RootStackMap<MainStackMap> {} } }
chore: navigation type fixes
chore: navigation type fixes
ef17fa70f5fd5a09365561f254dcbc1ecfb29569
--- package-lock.json @@ -4971,9 +4971,9 @@ } }, "@walmart/allspark-home-mini-app": { - "version": "0.5.41", - "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.41.tgz", - "integrity": "sha512-HucvV49G4vnmTCFEkLi5ugQa84ANNaPAGYXdsoKpqZ05eHArnKn3GeqtnjW9vQCLjgzopaDZLRb3F5Fu7Cpsjw==", + "version": "0.5.43", + "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.43.tgz", + "integrity": "sha512-LjavDandAA93PPfDIk48Qnax6/A1z0ziyFtowyBxvidhu7O5pn26InQHO9pq8LlenB8buG8xK7mDFc90pMDFVg==", "requires": { "moment": "^2.29.0", "uuid": "^8.3.1" @@ -5236,9 +5236,9 @@ "integrity": "sha512-v2ttg/v6I7yws8IeuyOu79pBOtRPnZbktrikJGJA5Kqa0D5PHiIYPtW+V/roBqvmfafmizUdHR8kzYITVlColg==" }, "@walmart/metrics-mini-app": { - "version": "0.9.1", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.1.tgz", - "integrity": "sha512-CI8ATHgVE/Btfh48LNcLjMErGX70a9NiRSAp3QX1gM1PcVWYEZMK/ZUNiw9yedr9e4w8BbUuaXJOSObyWeQJ3A==", + "version": "0.9.2", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.2.tgz", + "integrity": "sha512-WFZSEqcViRHVwCWxommrTv+e0ueRbX6c88Wlum1czFCs1FUXcmzEhYO7tng9E9ECc0i45taFvY+0Nl45WtmDEw==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", --- package.json @@ -72,7 +72,7 @@ "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@walmart/allspark-health-survey-mini-app": "0.0.44", - "@walmart/allspark-home-mini-app": "0.5.41", + "@walmart/allspark-home-mini-app": "0.5.43", "@walmart/allspark-neon-core": "0.1.26", "@walmart/ask-sam-mini-app": "^1.0.0", "@walmart/config-components": "3.0.2", @@ -91,7 +91,7 @@ "@walmart/iteminfo-mini-app": "4.2.6", "@walmart/manager-approvals-miniapp": "0.0.60", "@walmart/me-field-mini-app": "^1.1.9", - "@walmart/metrics-mini-app": "0.9.1", + "@walmart/metrics-mini-app": "0.9.2", "@walmart/moment-walmart": "1.0.4", "@walmart/payrollsolution_miniapp": "^0.123.2", "@walmart/price-changes-mini-app": "1.2.3",
bumping metrics and home versions
bumping metrics and home versions
05aab2994544bd2767b14f7218b6533122188b33
--- package-lock.json @@ -12305,9 +12305,9 @@ "integrity": "sha512-pFLFOALEOoeDbiqZH8A79AgpvOMUxW9bi6EKV2mURZMt0VA08E3KKcz0DJTVQJElPhmpb8FhcOFn7hIOA/9JFg==" }, "react-native-sumo-sdk": { - "version": "2.7.4-rc.5", - "resolved": "https://npme.walmart.com/react-native-sumo-sdk/-/react-native-sumo-sdk-2.7.4-rc.5.tgz", - "integrity": "sha512-h55jVZYgyJkZlhze6ZuBpMnhoLsVQyBCdBnumLpagl2MSENw6AqhNZio/cYM9AEgOOdKgYBfjU84NqX//FantQ==" + "version": "2.7.4-rc.7", + "resolved": "https://npme.walmart.com/react-native-sumo-sdk/-/react-native-sumo-sdk-2.7.4-rc.7.tgz", + "integrity": "sha512-/jTsH8UJUUjKWIpwctg/sGFJOZ34E+68CTOe+OMpu377OfeaTCe2dBSq/B1LrmyRGfs/DfswVQgShpnBi9LcIw==" }, "react-native-svg": { "version": "12.1.0", --- package.json @@ -96,7 +96,7 @@ "react-native-sha256": "^1.3.6", "react-native-splash-screen": "^3.2.0", "react-native-ssmp-sso-allspark": "1.0.2", - "react-native-sumo-sdk": "2.7.4-rc.5", + "react-native-sumo-sdk": "2.7.4-rc.7", "react-native-svg": "^12.1.0", "react-native-tab-view": "^2.15.2", "react-native-typing-animation": "^0.1.7",
Sumo version bump (#373)
Sumo version bump (#373) * Sumo version bump * sumo version bump with android fixes. Co-authored-by: Hitesh Arora <>
540d0b5df716fcc0234da85c37a8c83e6ec52352
--- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx @@ -426,6 +426,9 @@ export class AllsparkFeatureModule< Object.entries(flows).forEach(([type, flow]) => { if (flow) { AllsparkWorkClient.registerFlow(type, flow, this.id); + + // support for deprecated container flows + ActiveAllsparkContainer.addFlow(type, flow); } }); }
support for deprecated contianer flows
support for deprecated contianer flows
76a27fe0f6b50b5dde8597344fb9ec84a7234bc1
--- docs/docs/components/icons/icons-core-owned.md @@ -1,5 +1,5 @@ --- -sidebar_position: 3 +sidebar_position: 2 title: Me@Core-Owned Icons custom_edit_url: null --- @@ -9,23 +9,15 @@ There are several Android and iOS specific icons available in the `allspark-core ## iOS Icons These icons are located in the `allspark-core/targets/US/ios/Allspark/Images.xcassets` folder. Most are available in different resolutions. -### Beta App Icon -![](./images/beta-ios.png) +| Name | Image +| - | - +| Beta App Icon | ![](./images/beta-ios.png) +| Dev App Icon | ![](./images/dev-ios.png) +| Teflon App Icon | ![](./images/teflon-ios.png) +| Prod App Icon | ![](./images/prod-ios.png) +| Launcher Icon | ![](./images/beta-ios.png) +| App Logo Icon | ![](./images/AppLogo.png) -### Dev App Icon -![](./images/dev-ios.png) - -### Teflon App Icon -![](./images/teflon-ios.png) - -### Prod App Icon -![](./images/prod-ios.png) - -### App Logo Icon -![](./images/AppLogo.png) - -### Launcher Icon -![](./images/beta-ios.png) ### Spark Icon ![](./images/spark.png) @@ -37,5 +29,5 @@ These icons are located in the `allspark-core/targets/US/android/app/src` folder ### Beta, Dev, Teflon, and Prod Icons Refer to the iOS section, as the icons are very similar for matching build versions. -### Notification Icon -![](./images/ic_notification_small.png) \ No newline at end of file +| Notification Icon | ![](./images/ic_notification_small.png) +| - | - \ No newline at end of file --- docs/docs/components/icons/icons-gtp-owned.md @@ -1,5 +1,5 @@ --- -sidebar_position: 2 +sidebar_position: 1 title: GTP-Owned Icons custom_edit_url: null --- @@ -8,20 +8,13 @@ custom_edit_url: null ## gtp-shared-icons Refer to [this documentation](https://gecgithub01.walmart.com/pages/electrode-mobile-platform/gtp-shared-components/introduction/icons) to see which icons are included in this library. The [gtp-shared-icons library](https://gecgithub01.walmart.com/electrode-mobile-platform/gtp-shared-icons) contains shared Living Design icons for WM React Native apps. The [gtp-shared-components library](https://gecgithub01.walmart.com/electrode-mobile-platform/gtp-shared-components), which is in Allspark, pulls its icons from this library. Some of these icons are also available through i5; these are listed below: -#### ArticleIcon | [welcomeme/icon-first-day](https://i5-me.walmartimages.com/images/welcomeme/icon-first-day-0c62d9067a.png) (i5) -![ArticleIcon](./images/icon-first-day-0c62d9067a.webp) - -#### MoreIcon | [asksam/more](https://i5-me.walmartimages.com/images/asksam/more-237144689e.png) (i5) -![MoreIcon](./images/more-237144689e.webp) - -#### CloseIcon | [core/close-icon](https://i5-me.walmartimages.com/images/core/close-icon-5acb3f778e.png) (i5) -![CloseIcon](./images/close-icon-5acb3f778e.webp) - -#### WalmartProtectionPlanIcon | [teams/ap-team](https://i5-me.walmartimages.com/images/teams/ap-team-f1dbc5c1e0.png) (i5) -![WalmartProtectionPlanIcon](./images/ap-team-f1dbc5c1e0.webp) - -#### ImageIcon | [teams/default-team](https://i5-me.walmartimages.com/images/teams/default-team-8b23f41d6a.png) (i5) -![ImageIcon](./images/default-team-8b23f41d6a.webp) +| GTP Name | i5 Name | Image +| - | - | - +| ArticleIcon | [welcomeme/icon-first-day](https://i5-me.walmartimages.com/images/welcomeme/icon-first-day-0c62d9067a.png) | ![ArticleIcon](./images/icon-first-day-0c62d9067a.webp) +| MoreIcon | [asksam/more](https://i5-me.walmartimages.com/images/asksam/more-237144689e.png) | ![MoreIcon](./images/more-237144689e.webp) +| CloseIcon | [core/close-icon](https://i5-me.walmartimages.com/images/core/close-icon-5acb3f778e.png) | ![CloseIcon](./images/close-icon-5acb3f778e.webp) +| WalmartProtectionPlanIcon | [teams/ap-team](https://i5-me.walmartimages.com/images/teams/ap-team-f1dbc5c1e0.png) | ![WalmartProtectionPlanIcon](./images/ap-team-f1dbc5c1e0.webp) +| ImageIcon | [teams/default-team](https://i5-me.walmartimages.com/images/teams/default-team-8b23f41d6a.png) | ![ImageIcon](./images/default-team-8b23f41d6a.webp) ## Community Icons @@ -29,26 +22,13 @@ Refer to [this documentation](https://gecgithub01.walmart.com/pages/electrode-mo These icons are currently available through [Figma](https://www.figma.com/design/g5cXUtRKO8o0ZEUHyOAQiB/LD-Foundation?node-id=71944-209&node-type=section&t=KciesgAwnuAf30DI-0). Some are available through [i5](https://allspark-images-browser.walmart.com), and these are listed below. A streamlined way to access these icons through a repo is coming soon. ### Community Icons Available Through i5 -#### StoreMap (Figma) | [askSam/map](https://i5-me.walmartimages.com/images/asksam/map-b06f1d5ac3.png) (i5) -![StoreMap](./images/map-b06f1d5ac3.webp) - -#### Currency (Figma) | [welcomeme/icon-feature-payment-currency](https://i5-me.walmartimages.com/images/welcomeme/icon-feature-payment-currency-2ee3c00eb6.png) (i5) -![Currency](./images/icon-feature-payment-currency-2ee3c00eb6.webp) - -#### Apparel (Figma) | [welcomeme/icon-wear](https://i5-me.walmartimages.com/images/welcomeme/icon-wear-75891d28dc.png) (i5) -![Apparel](./images/icon-wear-75891d28dc.webp) - -#### Payment Check (Figma) | [preboarding/payment-icon](https://i5-me.walmartimages.com/images/preboarding/payment-icon-9dfe045850.png) (i5) -![PaymentCheck](./images/payment-icon-9dfe045850.webp) - -#### Vest (Figma) | [preboarding/vest-icon](https://i5-me.walmartimages.com/images/preboarding/vest-icon-46a089a713.png) (i5) -![Vest](./images/vest-icon-46a089a713.webp) - -#### Inbox (Figma) | [sidekick/inbox-icon](https://i5-me.walmartimages.com/images/sidekick/inbox-icon-b097d22db6.png) (i5) -![Inbox](./images/inbox-icon-b097d22db6.webp) - -#### Goal (Figma) | [sidekick/goal-icon-black](https://i5-me.walmartimages.com/images/sidekick/goal-icon-black-a0e7c43f5c.png) (i5) -![Goal](./images/goal-icon-black-a0e7c43f5c.webp) - -#### Pallet Full (Figma) | [metrics/pallet-full](https://i5-me.walmartimages.com/images/metrics/pallet-full-289a7a972a.png) (i5) -![Pallet Full](./images/pallet-full-289a7a972a.webp) \ No newline at end of file +| Community Icon Name | i5 Name | Image +| - | - | - +| StoreMap | [askSam/map](https://i5-me.walmartimages.com/images/asksam/map-b06f1d5ac3.png) | ![StoreMap](./images/map-b06f1d5ac3.webp) +| Currency | [welcomeme/icon-feature-payment-currency](https://i5-me.walmartimages.com/images/welcomeme/icon-feature-payment-currency-2ee3c00eb6.png) | ![Currency](./images/icon-feature-payment-currency-2ee3c00eb6.webp) +| Apparel | [welcomeme/icon-wear](https://i5-me.walmartimages.com/images/welcomeme/icon-wear-75891d28dc.png) | ![Apparel](./images/icon-wear-75891d28dc.webp) +| Payment Check | [preboarding/payment-icon](https://i5-me.walmartimages.com/images/preboarding/payment-icon-9dfe045850.png) | ![PaymentCheck](./images/payment-icon-9dfe045850.webp) +| Vest | [preboarding/vest-icon](https://i5-me.walmartimages.com/images/preboarding/vest-icon-46a089a713.png) | ![Vest](./images/vest-icon-46a089a713.webp) +| Inbox | [sidekick/inbox-icon](https://i5-me.walmartimages.com/images/sidekick/inbox-icon-b097d22db6.png) | ![Inbox](./images/inbox-icon-b097d22db6.webp) +| Goal | [sidekick/goal-icon-black](https://i5-me.walmartimages.com/images/sidekick/goal-icon-black-a0e7c43f5c.png) | ![Goal](./images/goal-icon-black-a0e7c43f5c.webp) +| Pallet Full | [metrics/pallet-full](https://i5-me.walmartimages.com/images/metrics/pallet-full-289a7a972a.png) | ![Pallet Full](./images/pallet-full-289a7a972a.webp) --- docs/docs/components/icons/icons-stock.md @@ -1,5 +1,5 @@ --- -sidebar_position: 1 +sidebar_position: 3 title: Android Stock Icons custom_edit_url: null ---
docs: reformatting for clarity
docs: reformatting for clarity
581aeebd413463202d275da6e0863c147bbeafa3
--- packages/allspark-foundation/package.json @@ -57,7 +57,8 @@ "build:cli": "npm run clean:cli && tsc --project tsconfig.cli.json", "build": "npm run build:lib && npm run build:cli", "clean": "npm run clean:lib && npm run clean:cli", - "link:assets": "npx react-native-asset" + "link:assets": "npx react-native-asset", + "postinstall": "node cli/link" }, "dependencies": { "@apollo/client": "^3.8.6", --- packages/allspark-foundation/src/Elements/README.md @@ -0,0 +1 @@ +# Allspark Elements \ No newline at end of file --- packages/allspark-foundation/src/FeatureRunner/navigation.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { useSelector } from 'react-redux'; -import { Alert, View } from 'react-native'; +import { Alert, Dimensions, View } from 'react-native'; import { StackHeaderProps, createStackNavigator, @@ -173,7 +173,7 @@ export const createFeatureRunnerNavigation = <F extends AllsparkFeatureModule>( headerShown: false, drawerType: 'front', swipeEnabled: !drawer.locked, - drawerStyle: { width: '89%' }, + drawerStyle: { width: Dimensions.get('screen').width * 0.89 }, }} > <Drawer.Screen name='container.root'> --- packages/allspark-foundation/src/LocalStorage/README.md @@ -0,0 +1 @@ +# Local Storage \ No newline at end of file --- packages/allspark-foundation/src/Logger/README.md @@ -0,0 +1 @@ +# Logger \ No newline at end of file --- packages/allspark-foundation/src/Redux/README.md @@ -0,0 +1 @@ +# Allspark Redux Store \ No newline at end of file --- packages/allspark-foundation/src/Telemetry/README.md @@ -0,0 +1 @@ +# Telemetry \ No newline at end of file --- packages/allspark-foundation/src/Translation/README.md @@ -0,0 +1 @@ +# Allspark Translation Client \ No newline at end of file --- packages/allspark-foundation/src/cli/link.js @@ -65,30 +65,20 @@ linkDirectory(`${process.cwd()}/node_modules`).then(() => { `Allspark: Finished linking ${linkedModules.length} modules:'`, linkedModules ); -}); - -// Install gtp-shared-components fonts -exec('npx installFonts', (err, stdout, stderr) => { - if (err) { - console.error(); - console.error('Error:'); - console.error(err); - console.error(); - } - - console.log(stdout); - console.error(stderr); -}); -// Setup iOS Permissions -exec('npx react-native setup-ios-permissions', (err, stdout, stderr) => { - if (err) { - console.error(); - console.error('Error:'); - console.error(err); - console.error(); - } - - console.log(stdout); - console.error(stderr); + // Setup iOS Permissions & Install gtp-shared-components fonts + console.log('Setting up iOS permissions...'); + exec( + 'npx react-native setup-ios-permissions && npx installFonts', + (err, stdout, stderr) => { + if (err) { + console.error(); + console.error('Error:'); + console.error(err); + console.error(); + } + console.log(stdout); + console.error(stderr); + } + ); }); --- packages/me-at-walmart-container/allspark.config.js @@ -54,6 +54,7 @@ module.exports = { ['GoogleDataTransport', ':modular_headers => true'], ['FirebaseInstallations', ':modular_headers => true'], ['FirebaseCoreExtension', ':modular_headers => true'], + ['FirebaseABTesting', ':modular_headers => true'], ], }, },
chore: fixes from testing
chore: fixes from testing
75f185f7dd3c0d927c8a1aba392483414dc141bb
--- src/hooks/user.ts @@ -1,9 +1,13 @@ import {useSelector} from 'react-redux'; import {UserSelectors} from '@walmart/allspark-foundation/User'; +import {UserDomain} from '@walmart/me-at-walmart-common'; export const useUserCanSeeTeamHub = () => { const isPeopleLead: boolean = useSelector(UserSelectors.getIsUserPeopleLead); const isTeamLead: boolean = useSelector(UserSelectors.getIsUserTeamLead); const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried); - return isTeamLead || isSalaried || isPeopleLead; + const userDomain: string | undefined = useSelector(UserSelectors.getDomain); + const isHomeOffice: boolean = + userDomain?.toLowerCase() === UserDomain.homeoffice; + return isTeamLead || isSalaried || isPeopleLead || isHomeOffice; };
Update the navigation for home office
Update the navigation for home office
8de34af468a09059a2f19b1b62c18fd8bc42786b
--- __tests__/changeStore/ChangeStoreModalTest.tsx @@ -90,13 +90,10 @@ describe('ChangeStoreModalTest', () => { const {getByTestId} = render( <ChangeStoreModal {...ChangeStoreModalProps} />, ); - expect(getByTestId('bottomSheetHeaderTitle').props.children).toEqual( - 'changeStore.siteTitle', - ); - + expect(getByTestId('closeButton')).toBeTruthy(); await act(() => mockKeyboardEmitter.runEvent(KeyboardShowEvent, {} as any)); expect(getByTestId('bottomSheetHeaderTitle').props.children).toEqual( - 'changeStore.changeStoreTitle', + 'changeStore.siteTitle', ); }); --- src/changeStore/ChangeStoreInput.tsx @@ -1,6 +1,6 @@ -import React from 'react'; +import React, {memo} from 'react'; import {Controller, useForm} from 'react-hook-form'; -import {View, StyleProp, ViewStyle, StyleSheet} from 'react-native'; +import {View, StyleProp, ViewStyle, StyleSheet,} from 'react-native'; import {TextField, Body, Button} from '@walmart/gtp-shared-components-3'; import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; @@ -8,10 +8,10 @@ import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; const styles = StyleSheet.create({ textField: {flex: 0}, buttonRow: { - marginTop: 8, flexDirection: 'row', alignItems: 'center', justifyContent: 'flex-end', + marginBottom: 16 }, }); @@ -25,7 +25,7 @@ type ChangeStoreSectionProps = { type ChangeStoreFormFields = {siteId: string}; -export const ChangeStoreInput = (props: ChangeStoreSectionProps) => { +export const ChangeStoreInput = memo((props: ChangeStoreSectionProps) => { const {label, style, loading, onSubmit, context} = props; const [t] = useAllsparkTranslation(); @@ -76,4 +76,4 @@ export const ChangeStoreInput = (props: ChangeStoreSectionProps) => { </View> </View> ); -}; +}); --- src/changeStore/ChangeStoreModal.tsx @@ -1,12 +1,12 @@ import React, {useEffect, useRef, useState} from 'react'; import {useDispatch, useSelector} from 'react-redux'; import { - View, Platform, LayoutChangeEvent, Keyboard, StyleSheet, Animated, + View } from 'react-native'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; @@ -46,13 +46,7 @@ const styles = StyleSheet.create({ }, warnings: { marginBottom: 8, - }, - storeInfoKeyboardOpen: { - position: 'absolute', - left: 16, - width: '100%', - top: 30, - }, + } }); export const ChangeStoreModal = ( @@ -95,11 +89,6 @@ export const ChangeStoreModal = ( default: !keyboardOpen, }); - const storeInfoKeyboardOpenStyle = Platform.select({ - ios: styles.storeInfoKeyboardOpen, - default: null, - }); - useEffect(() => { const showSub = Keyboard.addListener(KeyboardShowEvent, (event) => { configureAnimationForEvent(event); @@ -108,6 +97,9 @@ export const ChangeStoreModal = ( const hideSub = Keyboard.addListener(KeyboardHideEvent, (event) => { configureAnimationForEvent(event); + if(Platform.OS === 'ios'){ + setKeyboardOpen(false); + } }); return () => { @@ -186,21 +178,28 @@ export const ChangeStoreModal = ( }), }}> <BottomSheetHeader - title={ - keyboardOpen - ? t('changeStore.changeStoreTitle', {context}) - : t('changeStore.siteTitle', {context}) - } + title={t('changeStore.siteTitle', {context})} backEnabled={keyboardOpen} onBack={onBack} onClose={onClose} - style={[styles.header, keyboardOpen && styles.headerKeyboardOpen]} + style={[styles.header]} /> - {showStoreInfo && ( - <Animated.View + {changeStoreModalEnabled && ( + <> + <ChangeStoreInput + label={t('changeStore.changeStoreTitle', {context})} + onSubmit={onUpdate} + loading={storeInfoLoading} + context={context} + /> + </> + )} + + {showStoreInfo && !keyboardOpen && ( + <View testID='storeInfoWrapper' - style={[{opacity}, keyboardOpen && storeInfoKeyboardOpenStyle]} + style={[{marginBottom: Math.max(24, offsets.bottom), marginTop: 16}]} > <> <StoreInfoWarnings @@ -224,25 +223,7 @@ export const ChangeStoreModal = ( context={context} /> </> - </Animated.View> - )} - - {changeStoreModalEnabled && ( - <> - {!keyboardOpen && <View style={styles.seperator} />} - - <ChangeStoreInput - label={ - keyboardOpen - ? undefined - : t('changeStore.changeStoreTitle', {context}) - } - onSubmit={onUpdate} - loading={storeInfoLoading} - context={context} - style={[{marginBottom: Math.max(24, offsets.bottom)}]} - /> - </> + </View> )} </BottomSheet> );
fix: ALLSPARK-7266 change store keyboard issue (#5050)
fix: ALLSPARK-7266 change store keyboard issue (#5050) Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
62d9eeb98bba1c9a410f1e1aedc501172df94298
--- packages/allspark-foundation/src/Components/TeamOnboarding/TeamSelection/TeamSelectionList.tsx @@ -1,9 +1,16 @@ -import React, { useEffect, useMemo, useState } from 'react'; -import { View, Text, ScrollView } from 'react-native'; -import { TeamSelectionListItem } from './TeamSelectionListItem'; -import { Checkbox } from '@walmart/gtp-shared-components/dist'; +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 { Header } from '../../Hub/Header'; +import { colors } from '@walmart/gtp-shared-components'; +import { ListHeader } from './ListHeader'; +import { + MyArea, + HeaderTitle, + HeaderSubText, +} from '../Constants/TeamSelectionConstants'; export const areaTeamMap: Record<Area, Team[]> = { 'Admin & Support': ['Admin & Support'], @@ -47,65 +54,83 @@ export const TeamSelectionList = ({ ), [areas] ); - const [allTeamsSelected, setAllTeamsSelected] = useState<boolean>( - selectedTeams.length === allAvailableTeams.length - ); - useEffect(() => { - setAllTeamsSelected(selectedTeams.length === allAvailableTeams.length); - }, [allAvailableTeams, selectedTeams]); + const sections = [ + { + title: myArea, + data: areaTeamMap[myArea], + isPrimaryArea: true, + }, + ...areas + .filter((area) => area !== myArea) + .map((area) => ({ + title: area, + data: areaTeamMap[area], + isPrimaryArea: false, + })), + ]; return ( - <ScrollView style={styles.container}> - {userType === 'salariedAssociate' && ( - <> - <View style={styles.headerContainer}> - <Text style={styles.header}>Teams</Text> + //TODO: Add translations to all constants + <View> + <SectionList + style={styles.container} + sections={sections} + keyExtractor={(item, index) => item + index} + ListHeaderComponent={ + <View> + <Header + title={HeaderTitle} + subText={HeaderSubText} + backgroundColor={colors.orange['100']} + textColor={colors.gray['160']} + /> + <View + //TODO: Add a separate component instead of a view + style={{ + height: 8, + backgroundColor: colors.gray['20'], + marginTop: 16, + marginLeft: -16, + marginRight: -16, + }} + /> + <ListHeader + userType={userType} + selectedTeams={selectedTeams} + allAvailableTeams={allAvailableTeams} + handleSelectAll={handleSelectAll} + styles={styles} + /> </View> - <View style={styles.selectAllContainer}> - <Text style={styles.selectTeamsText}>Select all teams</Text> - <Checkbox checked={allTeamsSelected} onPress={handleSelectAll} /> + } + renderSectionHeader={({ section }) => ( + <View> + {section.isPrimaryArea ? ( + <> + <Text style={styles.myArea}>{MyArea}</Text> + <Text style={styles.areaHeader}>{section.title}</Text> + </> + ) : ( + <Text style={styles.areaHeader}>{section.title}</Text> + )} </View> - </> - )} - <View style={styles.myAreaContainaer}> - <Text style={styles.myArea}>My area</Text> - - <Text style={styles.areaHeader}>{myArea}</Text> - {areaTeamMap[myArea].map((team, index) => ( - <TeamSelectionListItem - key={`team-${team}`} - teamName={team} - isLastListItem={index === areaTeamMap[myArea].length - 1} - isSelected={selectedTeams.includes(team)} - isPrimaryTeam={primaryTeam === team} - checkboxDisabled={primaryTeam === team} - toggleSelection={() => handleSelectSingle(team)} - /> - ))} - </View> - - {areas.map((area) => { - const isPrimary = area === myArea; - const areaTeams = areaTeamMap[area]; - return !isPrimary ? ( - <View key={`area-${area}`} style={styles.teamListContainer}> - <Text style={styles.areaHeader}>{area}</Text> - {areaTeams.map((team, index) => ( - <TeamSelectionListItem - key={`team-${team}`} - teamName={team} - isLastListItem={index === areaTeams.length - 1} - isSelected={selectedTeams.includes(team)} - toggleSelection={() => handleSelectSingle(team)} - checkboxDisabled={false} - /> - ))} + )} + renderItem={({ item, index, section }) => ( + <View> + {RenderTeamSelectionListItems({ + teams: [item], + isLastListItem: index === section.data.length - 1, + areaTeamsLength: section.data.length, + isPrimaryArea: section.isPrimaryArea, + selectedTeams, + primaryTeam, + handleSelectSingle, + })} </View> - ) : ( - '' - ); - })} - </ScrollView> + )} + stickySectionHeadersEnabled={false} + /> + </View> ); };
TeamSelection component updates
TeamSelection component updates
894c6c8606d5560784637c92acee04cd97907f9b
--- __tests__/__mocks__/@walmart/allspark-foundation/Components.js @@ -0,0 +1,15 @@ +module.exports = { + AllsparkComponentContainers: { + add: jest.fn(), + create: jest.fn(), + addMultiple: jest.fn(), + }, + AllsparkDynamicComponents: { + create: jest.fn(), + }, + AllsparkBadges: { + update: jest.fn(() => ({})), + addd: jest.fn(), + Template: jest.fn, + }, +};
feat(ui): update widget on myTeam
feat(ui): update widget on myTeam
1a74dd1011a473a1e78a8cbbfd93544de8783635
--- package.json @@ -100,7 +100,7 @@ "@walmart/counts-component-miniapp": "0.2.4", "@walmart/digital-locks-mini-app": "1.2.5", "@walmart/emergency-mini-app": "1.32.5", - "@walmart/exception-mini-app": "1.8.13", + "@walmart/exception-mini-app": "1.8.15", "@walmart/expo-config-plugins": "^0.1.7", "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@0.18.20#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.20-50a670c24b.patch", "@walmart/feedback-all-spark-miniapp": "0.9.75", --- yarn.lock @@ -7748,9 +7748,9 @@ __metadata: languageName: node linkType: hard -"@walmart/exception-mini-app@npm:1.8.13": - version: 1.8.13 - resolution: "@walmart/exception-mini-app@npm:1.8.13::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fexception-mini-app%2F-%2Fexception-mini-app-1.8.13.tgz" +"@walmart/exception-mini-app@npm:1.8.15": + version: 1.8.15 + resolution: "@walmart/exception-mini-app@npm:1.8.15::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fexception-mini-app%2F-%2F%40walmart%2Fexception-mini-app-1.8.15.tgz" peerDependencies: "@walmart/allspark-foundation": "*" "@walmart/allspark-utils": ">=6.5.0" @@ -7774,7 +7774,7 @@ __metadata: reselect: ">=4.1.0" uuid: ">=3.3.2" xdate: ">=0.8.2" - checksum: 10c0/51f79d213da89ae5e0eeb3d39bc6431b60b60619fc8f191b8bc734056a7b2aa1a844aa6cb06d133dd2c16eed44f5b2c0cadd0935ae372522cf1720de170553f0 + checksum: 10c0/7637363114c40402cae7727ec95b3e4f9edeb623c5f684c8003c29c4ab2718b616bf5d7f74963791170798ecc0c242ac3397b033941e20e4ec70d44b64a7fb42 languageName: node linkType: hard @@ -8333,7 +8333,7 @@ __metadata: "@walmart/counts-component-miniapp": "npm:0.2.4" "@walmart/digital-locks-mini-app": "npm:1.2.5" "@walmart/emergency-mini-app": "npm:1.32.5" - "@walmart/exception-mini-app": "npm:1.8.13" + "@walmart/exception-mini-app": "npm:1.8.15" "@walmart/expo-config-plugins": "npm:^0.1.7" "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@0.18.20#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.18.20-50a670c24b.patch" "@walmart/feedback-all-spark-miniapp": "npm:0.9.75"
feat: PEW-1468 Pinpoint - DSL Integration (#4190)
feat: PEW-1468 Pinpoint - DSL Integration (#4190) Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
26bb6bc3cb5ae427855dca77e9c44870e5532aaf
--- __tests__/utils/user-test.ts @@ -5,6 +5,11 @@ import { returnClockedStatusBasedOnSchedule, } from '../../src/utils'; import moment from 'moment'; +import {decryptUserId} from '../../src/utils/user'; +import CryptoJS from 'crypto-js'; +import {OBFUSCATION_PARSE_KEY} from '../../src/utils/user'; +import {isAssociateClockedIn} from '../../src/utils/user'; +import {ClockStatusEnum} from '../../src/utils/ClockStatusEnum'; describe('getScheduleStartAndEndTime', () => { it('start time and end time should follow 12 hour clock', () => {}); @@ -110,3 +115,54 @@ describe('returnClockedStatusBasedOnSchedule', () => { expect(clockedStatus).toBe(false); }); }); + +describe('decryptUserId', () => { + it('returns null if userId is null', () => { + expect(decryptUserId(null)).toBe(null); + }); + + it('returns undefined if userId is undefined', () => { + expect(decryptUserId(undefined)).toBe(undefined); + }); + + it('decrypts the userId correctly', () => { + const encryptedUserId = 'encryptedUserId'; + const decryptedUserId = 'decryptedUserId'; + + const decryptMock = jest + .spyOn(CryptoJS.AES, 'decrypt') + .mockImplementation(() => ({ + toString: () => decryptedUserId, + })); + + expect(decryptUserId(encryptedUserId)).toBe(decryptedUserId); + + expect(decryptMock).toHaveBeenCalledWith( + encryptedUserId, + CryptoJS.enc.Hex.parse(OBFUSCATION_PARSE_KEY), + {mode: CryptoJS.mode.ECB}, + ); + decryptMock.mockRestore(); + }); +}); + +//TODO: Add more tests to cover other scenarios +describe('isAssociateClockedIn', () => { + it('returns false if associate is undefined', () => { + expect(isAssociateClockedIn()).toBe(false); + }); + + it('returns false if associate has no punch data and no schedule data', () => { + const associate = {storeSchedule: [], wfmSchedule: {scheduleWeeks: []}}; + expect(isAssociateClockedIn(associate)).toBe(false); + }); + + it('returns false if associate has unknown clock status and no schedule data', () => { + const associate = { + punch: {clockStatus: ClockStatusEnum.unknown}, + storeSchedule: [], + wfmSchedule: {scheduleWeeks: []}, + }; + expect(isAssociateClockedIn(associate)).toBe(false); + }); +}); --- src/utils/user.ts @@ -7,8 +7,8 @@ import {GetAssociateNameQuery} from '../queries/getAssociateName'; import {Associate, WFMSchedule} from '../types'; import {logger} from '../logger/Logger'; -const OBFUSCATION_KEY = 'texting-mini-app'; //Do not change this -const OBFUSCATION_PARSE_KEY = OBFUSCATION_KEY.padStart(64, '0'); +export const OBFUSCATION_KEY = 'texting-mini-app'; //Do not change this +export const OBFUSCATION_PARSE_KEY = OBFUSCATION_KEY.padStart(64, '0'); export const encryptUserId = (userId: string) => baseEncryptUserId(userId, OBFUSCATION_KEY).replace(/\//g, '\\');
Adding coverage for users util
Adding coverage for users util
d8665fdca460cdf15d56f8c97a68716411e252fd
--- src/screens/MyWalmartV2/Hoc/AssociateRosterDetailHoc.tsx @@ -21,6 +21,7 @@ import {handleViewAssociateSchedule} from '../../../utils/rosterDetail'; import {goToWeeklySchedule} from '../../../navigation/utils'; import {associateIsScheduled} from '../../../utils/user'; import {useUserIsInRoster, useIsImpersonatedOnDev} from '../../../hooks/user'; +import {useRbacConfigWithJobCode, useSalariedOrTeamLeadOrHomeOffice} from '../../../hooks'; // Extended type for our use case that includes the original FilterValue plus additional values type RosterFilterValue = FilterValue | 'all' | ''; @@ -171,6 +172,16 @@ export const AssociateRosterDetailHoc = () => { const viewerTeamIds: (string | null)[] | undefined = useSelector( UserSelectors.getTeamIds ); + const isSalariedOrLead = useSalariedOrTeamLeadOrHomeOffice(); + + + const showStatusChipAndViewSchedule: boolean | undefined = + useRbacConfigWithJobCode(); + + const isStatusChipVisible = siteIsDC + ? isSalariedOrLead + : showStatusChipAndViewSchedule; + // User permissions for Group Message Button const userIsInRoster = useUserIsInRoster(); @@ -197,14 +208,6 @@ export const AssociateRosterDetailHoc = () => { ); }, [associateWINs, selectedTeamName]); - // Check if any associates have schedule data (wfmSchedule or storeSchedule) - const hasScheduleData = useMemo(() => { - return associates.some( - (associate) => - (associate.wfmSchedule && Object.keys(associate.wfmSchedule).length > 0) || - (associate.storeSchedule && associate.storeSchedule.length > 0) - ); - }, [associates]); // Calculate scheduled count (only associates who are actually scheduled for today) const scheduledCount = useMemo(() => { @@ -285,7 +288,7 @@ export const AssociateRosterDetailHoc = () => { isWidget: false as const, headerConfig: { title: !isSalaried ? '' : `Today's roster (${scheduledCount})`, // Show scheduled count, not total associates - ...(isSalaried && hasScheduleData && associates.length > 0 && { + ...(isSalaried && isStatusChipVisible && associates.length > 0 && { textLink: 'Weekly schedule', onWeeklySchedulePress: () => { viewWeeklySchedule(); @@ -309,7 +312,7 @@ export const AssociateRosterDetailHoc = () => { userIsImpersonatedOnDev, onRefresh, }), - [siteIsDC, isSalaried, filteredAssociates, rosterLoading, rosterError, associates.length, searchQuery, rosterFilters, selectedFilter, handleFilterPress, onRefresh, siteId, countryCode, viewWeeklySchedule, hasScheduleData, scheduledCount, isRefreshing, selectedTeamIds, userIsInRoster, userIsImpersonatedOnDev] + [siteIsDC, isSalaried, filteredAssociates, rosterLoading, isRefreshing, rosterError, scheduledCount, isStatusChipVisible, associates.length, searchQuery, rosterFilters, selectedFilter, handleFilterPress, selectedTeamIds, userIsInRoster, userIsImpersonatedOnDev, onRefresh, siteId, countryCode, viewWeeklySchedule] );
feat(ui): updated logic for weekly schedule link
feat(ui): updated logic for weekly schedule link
8a3b3a74d7a6333b03ae8bf379d007c6a71e3e98
--- jest.config.js @@ -9,10 +9,10 @@ module.exports = { ], coverageThreshold: { global: { - statements: 14.07, - branches: 3.51, - functions: 6.02, - lines: 14.27, + statements: 14, + branches: 3.4, + functions: 5.9, + lines: 14, }, }, transformIgnorePatterns: [ --- src/hooks/roster.ts @@ -88,6 +88,10 @@ export const useIsWeeklyScheduleLinkVisible = () => { (item) => item?.rn === RMAPermissionsPath, ); + if (!weeklyScheduleRBACPolicy) { + return false; + } + if (weeklyScheduleRBACPolicy.a === RMAViewPermission) { return true; } --- jest.config.js @@ -9,10 +9,10 @@ module.exports = { ], coverageThreshold: { global: { - statements: 14.07, - branches: 3.51, - functions: 6.02, - lines: 14.27, + statements: 14, + branches: 3.4, + functions: 5.9, + lines: 14, }, }, transformIgnorePatterns: [ --- src/hooks/roster.ts @@ -88,6 +88,10 @@ export const useIsWeeklyScheduleLinkVisible = () => { (item) => item?.rn === RMAPermissionsPath, ); + if (!weeklyScheduleRBACPolicy) { + return false; + } + if (weeklyScheduleRBACPolicy.a === RMAViewPermission) { return true; }
update weeklyschedule link
update weeklyschedule link
01bb59117e25244496dde76ed2a4fae381407866
--- .looper.multibranch.yml @@ -4,7 +4,7 @@ inherit: "job:///metropolis/metroloop/metroloop-parent" ## Whenever you update the nodes, please update it at the two-place, below line & the global variable LOOPER_NODES ## -node: ((osx||stable_osx)&&!MAC-LAB-MINI20&&!MAC-LAB-MINI36) +node: ((osx||stable_osx)&&!MAC-LAB-MINI20&&!MAC-LAB-MINI36&&!MAC-DRFQLAB-MINI29) tools: android: @@ -47,7 +47,7 @@ envs: global: variables: CI: true - LOOPER_NODES: "((osx||stable_osx)&&!MAC-LAB-MINI20&&!MAC-LAB-MINI36)" + LOOPER_NODES: "((osx||stable_osx)&&!MAC-LAB-MINI20&&!MAC-LAB-MINI36&&!MAC-DRFQLAB-MINI29)" GITHUB_TOKEN: "%{credentials.secret('GITHUB_TOKEN')}" TMPDIR: /tmp --- package-lock.json @@ -3062,9 +3062,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.29.4", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.29.4.tgz", - "integrity": "sha512-qmVnpr2i4FoQWXSDhWO5p7vwSjPTDN+rYAIMJq007X/Of61wLyxbDk4UW42kcBWvH+fMhYOBHYo0rOZkwxWRDg==", + "version": "0.29.42", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.29.42.tgz", + "integrity": "sha512-5ZWixYJNPIVDqLpBsS+4susLoSBoyI+F4RahPpct05Bav3t9HQM6S8wwuN0U+q04sVQH+j3P0eNUO9wGvxYgVw==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", --- package.json @@ -66,7 +66,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.39", "@walmart/allspark-home-mini-app": "0.4.0", "@walmart/allspark-me-mini-app": "0.1.0", - "@walmart/ask-sam-mini-app": "0.29.4", + "@walmart/ask-sam-mini-app": "0.29.42", "@walmart/config-components": "1.0.21", "@walmart/feedback-all-spark-miniapp": "0.0.50", "@walmart/functional-components": "1.0.27",
Bumping ask sam version
Bumping ask sam version
f0b470073e0caffc9e9b4af985002c3c35959caa
--- package-lock.json @@ -4400,9 +4400,9 @@ } }, "@walmart/refrigeration-alarms-mini-app": { - "version": "1.26.0", - "resolved": "https://npme.walmart.com/@walmart/refrigeration-alarms-mini-app/-/refrigeration-alarms-mini-app-1.26.0.tgz", - "integrity": "sha512-3lWS8gEQ6eZQiuEJIqpNIBxBUNxaX5RL/Nlvoz/5DHH+PHCGKw6fq73RlJaoCNZ+RRFD2VvNsUX1qzMakybWlA==" + "version": "1.27.0", + "resolved": "https://npme.walmart.com/@walmart/refrigeration-alarms-mini-app/-/refrigeration-alarms-mini-app-1.27.0.tgz", + "integrity": "sha512-aZrfIF35m2e7oaZ4oThudlXPruy8KAK0LsJVMX/I+/lqy/7R191yn09VrISc7QPTFgYkCHHiBKfgWbDGbeCuTA==" }, "@walmart/schedule-mini-app": { "version": "0.11.0", --- package.json @@ -98,7 +98,7 @@ "@walmart/react-native-sumo-sdk": "2.1.0", "@walmart/redux-store": "1.1.26", "@walmart/settings-mini-app": "1.5.0", - "@walmart/refrigeration-alarms-mini-app": "1.26.0", + "@walmart/refrigeration-alarms-mini-app": "1.27.0", "@walmart/schedule-mini-app": "0.11.0", "@walmart/taskit-mini-app": "0.164.0-rc.1", "@walmart/shelfavailability-mini-app": "0.8.0",
Version bump for production url
Version bump for production url
032ee44a7b8336414aff88e42c38a76cc5fff877
--- packages/me-at-walmart-container/__mocks__/@walmart/allspark-foundation/Device.js @@ -0,0 +1,6 @@ +module.exports = { + ...jest.requireActual('@walmart/allspark-foundation/Device'), + DeviceServiceCreator: jest.fn((config) => ({ + fetch: config.fetch, + })), +}; --- packages/me-at-walmart-container/__tests__/services/device.test.ts @@ -11,12 +11,6 @@ import { getBundleId, } from 'react-native-device-info'; -jest.mock('@walmart/allspark-foundation/Device', () => ({ - DeviceServiceCreator: jest.fn((config) => ({ - fetch: config.fetch, - })), -})); - describe('DeviceService', () => { beforeEach(() => { jest.clearAllMocks();
chore: test coverage - top level mock
chore: test coverage - top level mock
3bfe317cf3916545fd19a222e0347095615e9234
--- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/MainTabsNavTest.tsx.snap @@ -9,7 +9,6 @@ exports[`MainTabsNav matches snapshot when disabled from config 1`] = ` "bottom": 14, } } - screenListeners={[Function]} screenOptions={[Function]} > <Screen @@ -31,7 +30,6 @@ exports[`MainTabsNav matches snapshot with badges 1`] = ` "bottom": 14, } } - screenListeners={[Function]} screenOptions={[Function]} > <Screen @@ -99,7 +97,6 @@ exports[`MainTabsNav matches snapshot with inbox shown and badges 1`] = ` "bottom": 14, } } - screenListeners={[Function]} screenOptions={[Function]} > <Screen @@ -157,7 +154,6 @@ exports[`MainTabsNav matches snapshot with no badges 1`] = ` "bottom": 14, } } - screenListeners={[Function]} screenOptions={[Function]} > <Screen --- src/navigation/AssociateHallwayNav/Tabs/index.tsx @@ -148,7 +148,6 @@ export const MainTabsNav = () => { return ( <MainTabs.Navigator safeAreaInsets={{bottom: bottom + 14}} - screenListeners={TabListeners} screenOptions={getOptionsForRoute.bind({config: configMap})}> {home.enabled && <MainTabs.Screen name='home' component={HomeStackNav} />}
Removing tab listeners
Removing tab listeners
ff38ef97d34ae5b6276d4f6c922f47ee4e066fd7
--- src/index.tsx @@ -1,4 +1,4 @@ -import React, {Dispatch, useEffect, useMemo, useReducer} from 'react'; +import React, {Dispatch, useMemo, useReducer} from 'react'; import {useSelector} from 'react-redux'; import {firebase} from '@react-native-firebase/app-check'; import {SiteSelectors, addSagas} from '@walmart/redux-store'; @@ -30,7 +30,6 @@ import { miniAppNotificationRef, } from './notification'; import { - routePushNotification, routePushNotificationSaga, } from './redux/Notifications/sagas'; --- src/notification.ts @@ -6,7 +6,7 @@ import { import {IAllsparkNotification} from '@walmart/core-services-allspark'; import {createRef} from 'react'; import {getStore} from '@walmart/redux-store'; -import {NotificationActions} from "./redux/Notifications"; +import {NotificationActions} from './redux/Notifications'; export const miniAppNotificationRef = createRef< INotificationContext<IAllsparkNotification> --- src/redux/Notifications/sagas.ts @@ -1,9 +1,11 @@ -import {takeLatest} from 'redux-saga/effects'; +import {takeLatest, call} from 'redux-saga/effects'; import {NotificationTypes} from '.'; +import {navigate} from '@walmart/react-native-shared-navigation'; -//TODO: Create proper type export function* routePushNotification(action: any) { const {pushNotificationEvent} = action; + console.log('invoking navigate method...'); + yield call(navigate, 'texting.searchScreen'); console.log( '*** routePushNotification saga invoked, routing based on event payload ***', ); --- src/index.tsx @@ -1,4 +1,4 @@ -import React, {Dispatch, useEffect, useMemo, useReducer} from 'react'; +import React, {Dispatch, useMemo, useReducer} from 'react'; import {useSelector} from 'react-redux'; import {firebase} from '@react-native-firebase/app-check'; import {SiteSelectors, addSagas} from '@walmart/redux-store'; @@ -30,7 +30,6 @@ import { miniAppNotificationRef, } from './notification'; import { - routePushNotification, routePushNotificationSaga, } from './redux/Notifications/sagas'; --- src/notification.ts @@ -6,7 +6,7 @@ import { import {IAllsparkNotification} from '@walmart/core-services-allspark'; import {createRef} from 'react'; import {getStore} from '@walmart/redux-store'; -import {NotificationActions} from "./redux/Notifications"; +import {NotificationActions} from './redux/Notifications'; export const miniAppNotificationRef = createRef< INotificationContext<IAllsparkNotification> --- src/redux/Notifications/sagas.ts @@ -1,9 +1,11 @@ -import {takeLatest} from 'redux-saga/effects'; +import {takeLatest, call} from 'redux-saga/effects'; import {NotificationTypes} from '.'; +import {navigate} from '@walmart/react-native-shared-navigation'; -//TODO: Create proper type export function* routePushNotification(action: any) { const {pushNotificationEvent} = action; + console.log('invoking navigate method...'); + yield call(navigate, 'texting.searchScreen'); console.log( '*** routePushNotification saga invoked, routing based on event payload ***', );
adding navigate method, need to troubleshoot why it is not going to the screen
adding navigate method, need to troubleshoot why it is not going to the screen
2b20a1d2f676d75c15d5c32e35cf5eeef5f4842d
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.128.0", + "@walmart/profile-feature-app": "0.133.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -5693,9 +5693,9 @@ } }, "node_modules/@walmart/profile-feature-app": { - "version": "0.128.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.128.0.tgz", - "integrity": "sha512-WqhH9UovqAPunhyFcuGoOSrIVBGUUs/tmzHyp9D7IpEclTD8rVgkfRTHKHez5/wsES/rcqnhdxjHbtyXiGTArA==", + "version": "0.133.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.133.0.tgz", + "integrity": "sha512-mVvLALSjzNenxZZJQi4UNL8H+R4SLEC+IeSW5gH3AGnRiv/hA8V16j+j/IJWAc7bNos6gNMsUcUHC8QmkYrjUQ==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/bottom-tabs": "^6.0.0", @@ -25323,9 +25323,9 @@ "integrity": "sha512-TIzjXjT8jlsb/OrY7WPr4xUv5RsCsnNN0wwjawIwOHurrZtrFn8f/WjwkY8e6zUC3AlZ4QsHdaKqCD/pfkgGPg==" }, "@walmart/profile-feature-app": { - "version": "0.128.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.128.0.tgz", - "integrity": "sha512-WqhH9UovqAPunhyFcuGoOSrIVBGUUs/tmzHyp9D7IpEclTD8rVgkfRTHKHez5/wsES/rcqnhdxjHbtyXiGTArA==" + "version": "0.133.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.133.0.tgz", + "integrity": "sha512-mVvLALSjzNenxZZJQi4UNL8H+R4SLEC+IeSW5gH3AGnRiv/hA8V16j+j/IJWAc7bNos6gNMsUcUHC8QmkYrjUQ==" }, "@walmart/push-to-talk-mini-app": { "version": "1.8.59", --- package.json @@ -107,7 +107,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.128.0", + "@walmart/profile-feature-app": "0.133.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0",
bump profile-feature-app to 0.133.0
bump profile-feature-app to 0.133.0
3079294ea3b4bbe3e629a1335e9c635d590fda04
--- targets/US/package.json @@ -102,7 +102,7 @@ "@walmart/counts-component-miniapp": "0.1.11", "@walmart/emergency-mini-app": "1.27.7", "@walmart/exception-mini-app": "1.8.4", - "@walmart/facilities-management-miniapp": "0.12.0", + "@walmart/facilities-management-miniapp": "0.12.9", "@walmart/feedback-all-spark-miniapp": "0.9.66", "@walmart/financial-wellbeing-feature-app": "1.23.4", "@walmart/functional-components": "~6.3.20", --- yarn.lock @@ -6423,12 +6423,12 @@ __metadata: languageName: node linkType: hard -"@walmart/facilities-management-miniapp@npm:0.12.0": - version: 0.12.0 - resolution: "@walmart/facilities-management-miniapp@npm:0.12.0" +"@walmart/facilities-management-miniapp@npm:0.12.9": + version: 0.12.9 + resolution: "@walmart/facilities-management-miniapp@npm:0.12.9" peerDependencies: "@walmart/allspark-foundation": "*" - checksum: 10c0/a11ad06527a4714ac4f06a2c45e0d2e6bfd8dfa03c6f449a595eaa0d705ccf1572508d0ad33fffdb870c63222ac52c843e12308394ea3eb619364322d06726fe + checksum: 10c0/4e2b382242b246db6d47b1d546f568f5d638f15e73b5ca59d1d14bcb3c9ee7ecb2ac526ce1203fe3ae779c150b4df4c914b398855466491146ae7869c370e09d languageName: node linkType: hard @@ -7080,7 +7080,7 @@ __metadata: "@walmart/counts-component-miniapp": "npm:0.1.11" "@walmart/emergency-mini-app": "npm:1.27.7" "@walmart/exception-mini-app": "npm:1.8.4" - "@walmart/facilities-management-miniapp": "npm:0.12.0" + "@walmart/facilities-management-miniapp": "npm:0.12.9" "@walmart/feedback-all-spark-miniapp": "npm:0.9.66" "@walmart/financial-wellbeing-feature-app": "npm:1.23.4" "@walmart/functional-components": "npm:~6.3.20"
chore:version bump
chore:version bump
3fbd01f6035b5fbb1fd6659e15ea0f6892fd8e06
--- package-lock.json @@ -3249,9 +3249,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.24.0", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.24.0.tgz", - "integrity": "sha512-vW4XKkd8yVFKRgsU2RT/pthaI8OEdYWtyJRg+LpHSH3ztV0qB6kJyIAv6t3oD61kTWl3vTqP30ivbZUE0ueO4g==" + "version": "0.24.2", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.24.2.tgz", + "integrity": "sha512-/Z0lKbKbpupLy48OfvcWgH1e2PKmR/yV4/gz9LTwmh4LYnRV02X7zTSjR0rNCNALG0x+nKqu5490+/dN9v0Uvg==" }, "@walmart/wfm-ui": { "version": "0.1.50", --- package.json @@ -83,7 +83,7 @@ "@walmart/settings-mini-app": "1.2.3", "@walmart/time-clock-mini-app": "0.3.3", "@walmart/ui-components": "1.1.14", - "@walmart/welcomeme-mini-app": "0.24.0", + "@walmart/welcomeme-mini-app": "0.24.2", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0",
patch update for welcomeMe-mini
patch update for welcomeMe-mini
ddf8d2ebb1506e4070bfcfebeaf9f78ca69b1518
--- package-lock.json @@ -3032,9 +3032,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "0.22.0", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.22.0.tgz", - "integrity": "sha512-UbJ6H30ztF9sYJYMJc4N20UitzVU6Dde7lmP+RUKtkXm6mMLzZfHdQpWRKGs4kMhTUGkXy5ARVuDxTUiZLPcRQ==", + "version": "0.23.0", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.23.0.tgz", + "integrity": "sha512-2skFf6lro77QWa4FNUCzfItOqYvd0E3Vu42S2+ptPJkmnSIj1w/d7ZwnRfN3151QmVI0hPoYgSrJwnjh5AregA==", "requires": { "apisauce": "^1.1.2", "lodash": "^4.17.19", --- package.json @@ -66,7 +66,7 @@ "@walmart/allspark-health-survey-mini-app": "0.0.38", "@walmart/allspark-home-mini-app": "0.4.0", "@walmart/allspark-me-mini-app": "0.1.0", - "@walmart/ask-sam-mini-app": "0.22.0", + "@walmart/ask-sam-mini-app": "0.23.0", "@walmart/config-components": "1.0.21", "@walmart/feedback-all-spark-miniapp": "0.0.50", "@walmart/functional-components": "1.0.27",
Ask sam bump
Ask sam bump
f1a4af27ee6b66d016f649c9f44cf1be3a7128d1
--- package-lock.json @@ -31,7 +31,7 @@ "@react-navigation/stack": "^6.1.0", "@sharcoux/slider": "^6.1.1", "@terrylinla/react-native-sketch-canvas": "0.8.0", - "@walmart/allspark-home-mini-app": "0.6.13", + "@walmart/allspark-home-mini-app": "0.6.14", "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", @@ -4480,9 +4480,9 @@ } }, "node_modules/@walmart/allspark-home-mini-app": { - "version": "0.6.13", - "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.6.13.tgz", - "integrity": "sha512-jWd9z4UtmRXR5OFyPfFXVrZp+jw6xM0DD8y+vpN9w70E6SdNALCJS+H1PfKMVvohMshFilvIcSt698SS2cIErA==", + "version": "0.6.14", + "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.6.14.tgz", + "integrity": "sha512-1Jak0EwsCpGx2yYBXPEL4k+Hew8sRVozFVheoSFw/tbE38VLRGeW53M4okA55fLYouos++EzyLxPnvSwvPly0g==", "peerDependencies": { "@react-navigation/native": "*", "@react-navigation/stack": "*", @@ -24645,9 +24645,9 @@ } }, "@walmart/allspark-home-mini-app": { - "version": "0.6.13", - "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.6.13.tgz", - "integrity": "sha512-jWd9z4UtmRXR5OFyPfFXVrZp+jw6xM0DD8y+vpN9w70E6SdNALCJS+H1PfKMVvohMshFilvIcSt698SS2cIErA==" + "version": "0.6.14", + "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.6.14.tgz", + "integrity": "sha512-1Jak0EwsCpGx2yYBXPEL4k+Hew8sRVozFVheoSFw/tbE38VLRGeW53M4okA55fLYouos++EzyLxPnvSwvPly0g==" }, "@walmart/allspark-neon-core": { "version": "0.1.31", --- package.json @@ -74,7 +74,7 @@ "@sharcoux/slider": "^6.1.1", "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/OneWalmart-MiniApp": "1.0.12", - "@walmart/allspark-home-mini-app": "0.6.13", + "@walmart/allspark-home-mini-app": "0.6.14", "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7",
home mini app version bump for invalid date
home mini app version bump for invalid date
44b199fe2a42989ff97e992d700644e0b3cec9d2
--- yarn.lock @@ -7184,7 +7184,7 @@ __metadata: react-native-error-boundary: "npm:^1.1.6" react-native-flipper: "npm:0.212.0" react-native-fs: "npm:^2.18.0" - react-native-geolocation-service: "npm:^5.3.1" + react-native-geolocation-service: "patch:react-native-geolocation-service@npm%3A5.3.1#~/.yarn/patches/react-native-geolocation-service-npm-5.3.1-4a62ced778.patch" react-native-gesture-handler: "npm:^2.14.0" react-native-get-random-values: "npm:~1.10.0" react-native-haptic-feedback: "npm:^1.14.0"
update yarn.lock
update yarn.lock
1b9fc9e5cde59e9c35da11beeba92626e1171ce0
--- package-lock.json @@ -166,7 +166,7 @@ "react-native-linear-gradient": "2.6.2", "react-native-location-enabler": "^4.1.1", "react-native-loudness": "2.0.0", - "react-native-maps": "~1.10.4", + "react-native-maps": "~1.3.2", "react-native-mask-input": "^1.2.3", "react-native-modal": "^13.0.1", "react-native-new-snap-carousel": "^3.9.3", @@ -33591,15 +33591,12 @@ "license": "Apache-2.0" }, "node_modules/react-native-maps": { - "version": "1.10.4", - "resolved": "https://npme.walmart.com/react-native-maps/-/react-native-maps-1.10.4.tgz", - "integrity": "sha512-m4BbaTkwCPI0T8X7vP2oKX4K23/BmSKFICOMD7HOs+zcpbu+D69mIhCAEuQ0XRrAckf1EarXWsJ5BSpH/lMO2Q==", + "version": "1.3.2", + "resolved": "https://npme.walmart.com/react-native-maps/-/react-native-maps-1.3.2.tgz", + "integrity": "sha512-NB7HGRZOgxxXCWzrhIVucx/bsrEWANvk3DLci1ov4P9MQnEVQYQCCkTxsnaEvO191GeBOCRDyYn6jckqbfMtmg==", "license": "MIT", "dependencies": { - "@types/geojson": "^7946.0.13" - }, - "engines": { - "node": ">=18" + "@types/geojson": "^7946.0.8" }, "peerDependencies": { "react": ">= 17.0.1", --- package.json @@ -208,7 +208,7 @@ "react-native-linear-gradient": "2.6.2", "react-native-location-enabler": "^4.1.1", "react-native-loudness": "2.0.0", - "react-native-maps": "~1.10.4", + "react-native-maps": "~1.3.2", "react-native-mask-input": "^1.2.3", "react-native-modal": "^13.0.1", "react-native-new-snap-carousel": "^3.9.3", @@ -466,7 +466,7 @@ "react-native-inappbrowser-reborn": "^3.7.0", "react-native-linear-gradient": "2.6.2", "react-native-loudness": "2.0.0", - "react-native-maps": "~1.10.4", + "react-native-maps": "~1.3.2", "react-native-modal": "^13.0.1", "react-native-new-snap-carousel": "^3.9.3", "react-native-pager-view": "~6.3.0",
Downgrading react-native-maps
Downgrading react-native-maps
fd04b9343b687c4a536b4cf278727328f223f5a5
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.45.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.44.0...v2.45.0) (2025-06-25) + + +### Features + +* **ui:** update looper yml for testing ([ae6134f](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/ae6134f0e86c45027b1ea3772e79e397bb8aab8a)) + # [2.44.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.43.0...v2.44.0) (2025-06-25) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.44.0", + "version": "2.45.0", "main": "dist/index.js", "files": [ "dist",
chore(release): 2.45.0 [skip ci]
chore(release): 2.45.0 [skip ci] # [2.45.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.44.0...v2.45.0) (2025-06-25) ### Features * **ui:** update looper yml for testing ([ae6134f](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/ae6134f0e86c45027b1ea3772e79e397bb8aab8a))
492f29a298f951771b3a958a69be5152d9542980
--- package-lock.json @@ -76,7 +76,7 @@ "@walmart/react-native-sumo-sdk": "2.5.1", "@walmart/receipt-check-miniapp": "1.12.4", "@walmart/redux-store": "3.1.5", - "@walmart/returns-mini-app": "^1.4.0", + "@walmart/returns-mini-app": "^1.5.0", "@walmart/schedule-mini-app": "0.35.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.13", @@ -216,6 +216,7 @@ "patch-package": "^6.5.0", "prettier": "^2.0.4", "react-native-apollo-devtools-client": "^1.0.4", + "react-native-mask-input": "^1.2.3", "react-native-version": "^4.0.0", "react-test-renderer": "^18.2.0", "solidarity": "^3.0.4", @@ -5890,9 +5891,9 @@ } }, "node_modules/@walmart/returns-mini-app": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-1.4.0.tgz", - "integrity": "sha512-WgF1qeSdptewHVeV0O4raRwhwvnBgyPtPFo3vnuDCC+/K/1EG5rnz6IYpxWiKgQ/Ip1Uia699Vm1PKdQnqImyQ==", + "version": "1.5.0", + "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-1.5.0.tgz", + "integrity": "sha512-O8krTJldYqabXxm3aI3N8ZHbpX7uK8D2D9ySw/J6E8xAFwp8f6ZHtvDLOsU855okL8PH3Zzj5oQBc47jMzIWJw==", "hasInstallScript": true, "dependencies": { "@walmart/common-utilities-js": "^1.2.10", @@ -5916,6 +5917,7 @@ "react": "^16.13.1", "react-native": "^0.70.4", "react-native-html-parser": "^0.1.0", + "react-native-mask-input": "^1.2.3", "react-redux": "^7.2.1", "redux": "^4.0.5" } @@ -17899,6 +17901,17 @@ } } }, + "node_modules/react-native-mask-input": { + "version": "1.2.3", + "resolved": "https://npme.walmart.com/react-native-mask-input/-/react-native-mask-input-1.2.3.tgz", + "integrity": "sha512-RWx+gc1EaBslJWR6dsvGdILJ5XvnvZuyEsgJaH9uAMukB3Z9eOlxra1E7Ovck8NSMVcYWpBB/lzojO4LwqqXgA==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/react-native-material-menu": { "version": "0.4.2", "license": "MIT", @@ -25455,9 +25468,9 @@ } }, "@walmart/returns-mini-app": { - "version": "1.4.0", - "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-1.4.0.tgz", - "integrity": "sha512-WgF1qeSdptewHVeV0O4raRwhwvnBgyPtPFo3vnuDCC+/K/1EG5rnz6IYpxWiKgQ/Ip1Uia699Vm1PKdQnqImyQ==", + "version": "1.5.0", + "resolved": "https://npme.walmart.com/@walmart/returns-mini-app/-/returns-mini-app-1.5.0.tgz", + "integrity": "sha512-O8krTJldYqabXxm3aI3N8ZHbpX7uK8D2D9ySw/J6E8xAFwp8f6ZHtvDLOsU855okL8PH3Zzj5oQBc47jMzIWJw==", "requires": { "@walmart/common-utilities-js": "^1.2.10", "@walmart/virtual-zpl-printer-model": "^0.2.11", @@ -33050,6 +33063,12 @@ "@types/geojson": "^7946.0.8" } }, + "react-native-mask-input": { + "version": "1.2.3", + "resolved": "https://npme.walmart.com/react-native-mask-input/-/react-native-mask-input-1.2.3.tgz", + "integrity": "sha512-RWx+gc1EaBslJWR6dsvGdILJ5XvnvZuyEsgJaH9uAMukB3Z9eOlxra1E7Ovck8NSMVcYWpBB/lzojO4LwqqXgA==", + "dev": true + }, "react-native-material-menu": { "version": "0.4.2", "requires": { --- package.json @@ -118,7 +118,7 @@ "@walmart/react-native-sumo-sdk": "2.5.1", "@walmart/receipt-check-miniapp": "1.12.4", "@walmart/redux-store": "3.1.5", - "@walmart/returns-mini-app": "^1.4.0", + "@walmart/returns-mini-app": "^1.5.0", "@walmart/schedule-mini-app": "0.35.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.13", @@ -282,8 +282,8 @@ "npm-run-all": "^4.1.5", "patch-package": "^6.5.0", "prettier": "^2.0.4", - "react-native-mask-input": "^1.2.3", "react-native-apollo-devtools-client": "^1.0.4", + "react-native-mask-input": "^1.2.3", "react-native-version": "^4.0.0", "react-test-renderer": "^18.2.0", "solidarity": "^3.0.4",
Update to returns 1.5.0
Update to returns 1.5.0
dd029911927b2c736f1f8267a65c6e3aaf3cc555
--- .looper.yml @@ -22,4 +22,4 @@ flows: - (name Yarn Version) yarn --version - yarn install - yarn run lint - - yarn run coverage \ No newline at end of file + # - yarn run coverage \ No newline at end of file
Update roster mini app
Update roster mini app
b0cb48a5d5c77864a82d103d4e42bcb34e18632b
--- packages/allspark-foundation/__tests__/Work/Context.test.tsx @@ -1,30 +0,0 @@ -// ******************************************************** -// DELETE THIS FILE *************************************** -// ******************************************************** - -import { render, fireEvent } from '@testing-library/react-native'; -import { Text, Button } from 'react-native'; -import { WorkProvider, useWorkContext } from '../../src/Work'; -import React from 'react'; - -const TestComponent = () => { - const { actionId, setActionId } = useWorkContext(); - return ( - <> - <Text testID="actionId">{actionId}</Text> - <Button testID="setActionId" onPress={() => setActionId('1234')} title="Set Action Id" /> - </> - ); -}; -describe('Work Provider', () => { - it('provide work context value', () => { - const { getByTestId } = render( - <WorkProvider> - <TestComponent /> - </WorkProvider> - ); - expect(getByTestId('actionId').props.children).toBe(null); - fireEvent.press(getByTestId('setActionId')); - expect(getByTestId('actionId').props.children).toBe('1234'); - }); -}); --- packages/allspark-foundation/src/Container/AllsparkContainer.tsx @@ -51,7 +51,6 @@ import { } from './types'; import { ActiveAllsparkContainer } from './ActiveContainerManager'; import { AllsparkComponentProvider } from '../Components/context'; -import { WorkProvider } from '../Work'; const styles = StyleSheet.create({ gestureRootView: { @@ -488,34 +487,30 @@ export class AllsparkContainer< }; // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - // ******************************************************** - // REVERT THESE CHANGES *********************************** - // ******************************************************** + return ( <SafeAreaProvider> <StatusBar {...DEFAULT_STATUSBAR_PROPS} {...statusBar} /> <GestureHandlerRootView style={styles.gestureRootView}> - <WorkProvider> - <LivingDesignProvider> - <RenderGuard preRender={this._waitForEnvironment}> - <AllsparkReduxProvider> - <TranslationProvider> - <HttpClientSetupGuard> - <GraphQLClientProvider> - <AllsparkNavigationProvider> - <AllsparkComponentProvider components={AllComponents}> - <RenderGuard preRender={this._rootSetup}> - {children} - </RenderGuard> - </AllsparkComponentProvider> - </AllsparkNavigationProvider> - </GraphQLClientProvider> - </HttpClientSetupGuard> - </TranslationProvider> - </AllsparkReduxProvider> - </RenderGuard> - </LivingDesignProvider> - </WorkProvider> + <LivingDesignProvider> + <RenderGuard preRender={this._waitForEnvironment}> + <AllsparkReduxProvider> + <TranslationProvider> + <HttpClientSetupGuard> + <GraphQLClientProvider> + <AllsparkNavigationProvider> + <AllsparkComponentProvider components={AllComponents}> + <RenderGuard preRender={this._rootSetup}> + {children} + </RenderGuard> + </AllsparkComponentProvider> + </AllsparkNavigationProvider> + </GraphQLClientProvider> + </HttpClientSetupGuard> + </TranslationProvider> + </AllsparkReduxProvider> + </RenderGuard> + </LivingDesignProvider> </GestureHandlerRootView> </SafeAreaProvider> ); --- packages/allspark-foundation/src/Work/Context.tsx @@ -1,42 +0,0 @@ -import React, { Dispatch, PropsWithChildren, SetStateAction } from 'react'; -import { noop } from 'lodash'; -import { AllsparkContextCreator } from '../utils'; - -// ******************************************************** -// DELETE THIS FILE *************************************** -// ******************************************************** - - -/** - * Context for Work - */ -export type IWorkContext = { - actionId: string | null; - setActionId: Dispatch<SetStateAction<string | null>>; -}; - -export const { - Context: WorkContext, - Provider: WorkContextProvider, - /** - * @example - * const { actionId, setActionId } = useWorkContext(); - **/ - useContextValue: useWorkContext, -} = AllsparkContextCreator<IWorkContext>('Work', { - actionId: null, - setActionId: noop, -}); - -export const WorkProvider = (props: PropsWithChildren<{}>) => { - const { children } = props; - - const [actionId, setActionId] = React.useState<string | null>(null); - - const value: IWorkContext = { - actionId, - setActionId, - }; - - return <WorkContextProvider value={value}> {children} </WorkContextProvider>; -}; --- packages/allspark-foundation/src/Work/redux.ts @@ -46,10 +46,15 @@ export const { ActionTypes, ActionCreators } = */ export const WorkActionTypes = ActionTypes; + +// ******************************************************** +// REMOVE COMMENT: FIX documentation for WORK_FLOW_START() +// REMOVE COMMENT: WORK_FLOW_START() should accept an argument +// ******************************************************** /** * Action creators for work actions. * @example - * dispatch(WorkActions.WORK_FLOW_COMPLETE()); + * dispatch(WorkActions.WORK_FLOW_START()); */ export const WorkActions = ActionCreators; @@ -63,22 +68,17 @@ export const WorkActions = ActionCreators; */ export const WorkSelectors = generateSelectorsForSlice(workSlice); - -// ************************************ -// HERE ******************************* -// ************************************ - /** - * Type mapping of the container action creators + * Mapped work action creator interface */ -export type IContainerActionCreators = typeof containerSlice.actions; +export type IWorkActionCreators = typeof workSlice.actions; /** - * Type mapping of the container actions + * Mapped work action interface */ -export type IContainerActions = InferActionTypes<IContainerActionCreators>; +export type IWorkActions= InferActionTypes<IWorkActionCreators>; /** - * Type for all possible container actions + * Types of work actions */ -export type IContainerAction = IContainerActions[keyof IContainerActions]; \ No newline at end of file +export type WorkAction = IWorkActions[keyof IWorkActions];
feat: remove context, add action types DWORK-6097
feat: remove context, add action types DWORK-6097
b86b44a58390b32896ea445de403863de1712bb2
--- index.js @@ -7,3 +7,9 @@ import 'intl/locale-data/jsonp/en'; import 'moment/locale/es'; import 'moment/locale/es-mx'; +import {AppRegistry} from 'react-native'; +import {App} from './src'; +import {name as appName} from './app.json'; + +AppRegistry.registerComponent(appName, () => App); + --- src/startup/AssociateStartup.ts @@ -15,9 +15,6 @@ import {cellularDataSaverSagas} from './dataSaverInit'; import {StartupActionCreators} from './StartupRedux'; import {watchForRbacRequest} from '../rbacConfig/RbacSagas'; -import {AppRegistry} from 'react-native'; -import {App} from '../../src'; -import {name as appName} from '../../app.json'; import {registerAskSamWidgets} from '@walmart/metrics-mini-app'; export const useAssociateStartup = () => { @@ -25,7 +22,6 @@ export const useAssociateStartup = () => { const logger = useLogger<IAllsparkLogger>(); const httpClient = useHttpClient(); - AppRegistry.registerComponent(appName, () => App); registerAskSamWidgets(); useRbacConfig(httpClient, logger);
Register Ask Sam Widgets
Register Ask Sam Widgets
be276c9b937c1659c7aedaadd5798e66524e8c0d
--- src/rbacConfig/utility/updateMeganavData.tsx @@ -2,6 +2,21 @@ import Config from '../../../env'; import {RbacConfigState} from '../types'; import _ from 'lodash'; +const navTypeToIndex:any = { + QUICKACTION: 1, + BOTTOMNAV: 2, + SIDENAV: 3, +}; +const RbacPolicyLength:any = { + QUICKACTION:2, //Ex: if splitRbacPolicy is : | QuickAction| AskSam|->Here the length of array is 2 + BOTTOMNAV:2, //Ex: if splitRbacPolicy is : | Bottomnav| Tasks| + SIDENAV:3 //Ex: if splitRbacPolicy is : | Sidenav| Availability| ManagerApproval| +} + +export const sanitize = (value:string) => { + return value?.replace(/[-_' ']/g, '')?.toUpperCase(); +} + /* In this function we iterate over our MegaNavData and try to find out the particular meganNavData index matching with the RbacPolicy data. Once we get that data we can change its @@ -17,70 +32,47 @@ import _ from 'lodash'; --------------------------------------------------------------------------*/ export const compareData = ( - level: number, - meganavData: any, - indexOfNavType: number, splitRbacPolicy: Array<string>, + meganavClonedData: any, + navIndex: number, + level: number, + menus: any, ) => { - let menus = meganavData.data.data[indexOfNavType].navs; + for (let i = 0; i < menus.length; i++) { if ( !( - indexOfNavType === 3 && + navIndex === 3 && level === 2 && menus[i].menuType === 'SEPARATOR' ) && - menus[i].id.replace(/[-_' ']/g, '').toUpperCase() === - splitRbacPolicy[level] + sanitize(menus[i].id) === splitRbacPolicy[level] ) { - /*-----------We have got a matching data here----------------*/ + /*-----------We have got a matching data here. Refer the above comments----------------*/ if ( - splitRbacPolicy.length === 2 || - (splitRbacPolicy.length === 3 && level === 2) + splitRbacPolicy.length === RbacPolicyLength['QUICKACTION'] || + splitRbacPolicy.length === RbacPolicyLength['BOTTOMNAV'] || + (splitRbacPolicy.length === RbacPolicyLength['SIDENAV'] && level === 2) ) { menus[i].enabled = false; - return meganavData; + return meganavClonedData; } else { if (level === 1 && menus[i].enabled === true) { /*-----------Only in the case of Sidenav in which mainMenu is enabled----------------*/ level++; - menus = meganavData.data.data[indexOfNavType].navs[i].subMenus; - i = 0; + menus = meganavClonedData.data.data[navIndex].navs[i].subMenus; + compareData(splitRbacPolicy, meganavClonedData, navIndex, level, menus); } else { - return meganavData; + return meganavClonedData; } } } } - return meganavData; + return meganavClonedData; }; -/* In the getNavData, we are getting three arguments. - Firstly, splitRbacPolicy which is a array of a particular policy. - Secondly, meganavData represents the MeganavData from CCM. - Third, we have indexOfNavType which is 1 for quickaction, 2 for bottomnav - and 3 for sidenav as we get this from the megaNavdata representation ---------------------------------------------------------------------------*/ -/* SplitRbacPolicy can be of length 3 inCase of Sidenav only as it consists - of submenus , whereas QuickAction and Bottomnav don't. ---------------------------------------------------------------------------*/ -export const getNavData = ( - splitRbacPolicy: Array<string>, - meganavData: any, - indexOfNavType: number, -) => { - const level = 1; - const result = compareData( - level, - meganavData, - indexOfNavType, - splitRbacPolicy, - ); - - return result; -}; /* We are updating the meganavData on he bassis of job code. there can be 4 cases possible and we are taking logical AND(&&) of the conditions @@ -96,8 +88,8 @@ export const getNavData = ( const updateMeganavData = (rbacData: RbacConfigState, meganavData: any) => { /* For deep cloning of object Lodash cloneDeep is used -------------------------------------------------------------------*/ - rbacData = _.cloneDeep(rbacData); - meganavData = _.cloneDeep(meganavData); + let rbacClonedData = _.cloneDeep(rbacData); + let meganavClonedData = _.cloneDeep(meganavData); /* rbacPermissions here describes the set of policies along with the actions which we get from RMA via BFF ,ex:[ @@ -108,38 +100,30 @@ const updateMeganavData = (rbacData: RbacConfigState, meganavData: any) => { ---------------------------------------------------------------------*/ const rbacPermissions = - rbacData?.data[Config.RMA_MEGA_NAV_ID]?.permissions || []; + rbacClonedData?.data[Config.RMA_MEGA_NAV_ID]?.permissions || []; + + rbacPermissions.forEach( (policy) => { - for (let index = 0; index < rbacPermissions.length; index++) { - const action = rbacPermissions[index].a; - const RbacPolicy = rbacPermissions[index].rn; - let splitRbacPolicy = RbacPolicy.split('/'); - splitRbacPolicy = splitRbacPolicy.map((item) => - item.replace(/[-_' ']/g, '').toUpperCase(), - ); + const action = policy.a; + const RbacPolicy = policy.rn; + const splitRbacPolicy= sanitize(RbacPolicy)?.split('/')||[]; + const [navType] = splitRbacPolicy; /* Now we will iterate over the meganavData depending on wheather we are concerend with QuickAction or bottomnav or Sidenav Data.We need to only check for the 'DENY' state. The reason is described in the above table -------------------------------------------------------------------------------*/ if (action === 'DENY') { - switch (splitRbacPolicy[0]) { - case 'QUICKACTION': - meganavData = getNavData(splitRbacPolicy, meganavData, 1); - break; - case 'BOTTOMNAV': - meganavData = getNavData(splitRbacPolicy, meganavData, 2); - break; - case 'SIDENAV': - meganavData = getNavData(splitRbacPolicy, meganavData, 3); - break; - default: - break; + const navIndex = navTypeToIndex[navType]; + if (navIndex) { + let menus = meganavClonedData.data.data[navIndex].navs; + meganavClonedData = compareData(splitRbacPolicy, meganavClonedData, navIndex, 1, menus ); } } - } + }) + - return meganavData; + return meganavClonedData; }; export default updateMeganavData;
Changes done which were suggested
Changes done which were suggested
15637b411788e73ae97e36a75d883840e21c8ad3
--- targets/US/__tests__/root/versionsTest.ts @@ -2,8 +2,38 @@ import { shouldBeListed, createPackageDetails, getLibraryData, + getVersionSectionList, + legacyVersionsReducer, } from '../../src/root/versions'; +jest.mock('../../package.json', () => ({ + dependencies: { + '@walmart/ask-sam-mini-app': '1.0.0', + '@walmart/unknown-mini-app': '2.0.0', + '@walmart/profile-feature-app': + 'patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch', + }, +})); + +const EXPECTED_VERSION_LIST = [ + { + name: '@walmart/ask-sam-mini-app', + version: '1.0.0', + }, + { + name: '@walmart/profile-feature-app', + version: '1.138.3-patch', + }, +]; + +const EXPECTED_VERSION_SECTIONS = [ + { + title: 'Me@Walmart', + version: 'unknown', + data: EXPECTED_VERSION_LIST, + }, +]; + describe('shouldBeListed', () => { it('returns true for listed dependency', () => { expect(shouldBeListed('@walmart/ask-sam-mini-app')).toEqual(true); @@ -14,13 +44,42 @@ describe('shouldBeListed', () => { }); }); -test('createPackageDetails', () => { - expect(createPackageDetails('@walmart/ask-sam-mini-app')).toEqual({ - name: '@walmart/ask-sam-mini-app', - version: expect.any(String), +describe('createPackageDetails', () => { + it('should return details for regularly listed dependency', () => { + expect(createPackageDetails('@walmart/ask-sam-mini-app')).toEqual({ + name: '@walmart/ask-sam-mini-app', + version: '1.0.0', + }); + }); + + it('should extract details for patched dependency', () => { + expect(createPackageDetails('@walmart/profile-feature-app')).toEqual({ + name: '@walmart/profile-feature-app', + version: '1.138.3-patch', + }); + }); +}); + +describe('getLibraryData', () => { + it('should return expected dependency information', () => { + expect(getLibraryData()).toEqual(EXPECTED_VERSION_LIST); + }); +}); + +describe('getVersionSectionList', () => { + it('should return expected section list', () => { + expect(getVersionSectionList()).toEqual(EXPECTED_VERSION_SECTIONS); }); }); -test('getVersionData length', () => { - expect(getLibraryData().length).toBeGreaterThan(0); +describe('legacyVersionsReducer', () => { + it('should return state its given if not undefined', () => { + expect(legacyVersionsReducer(EXPECTED_VERSION_SECTIONS)).toEqual( + EXPECTED_VERSION_SECTIONS, + ); + }); + + it('should return expected version sections if state is undefined', () => { + expect(legacyVersionsReducer(undefined)).toEqual(EXPECTED_VERSION_SECTIONS); + }); }); --- targets/US/__tests__/setup.js @@ -6,10 +6,6 @@ NativeModules.RNCNetInfo = {}; NativeModules.RNGestureHandlerModule = {}; NativeModules.RNDeviceInfo = {}; NativeModules.RNPermissionsModule = {}; -// NativeModules.SumoNotificationEvents = {}; -// NativeModules.WMBarcodeScanner = {}; -// NativeModules.WmVoiceText = {}; -// NativeModules.RNFBAppModule = {}; // Default platform for tests. Can override in individual tests. Platform.OS = 'ios'; @@ -40,7 +36,7 @@ const { } = require('@walmart/me-at-walmart-container/lib/translations'); AllsparkTranslationClient.initialize(MeAtWalmartTranslationConfig); -// jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter'); -// -// import mockRNDeviceInfo from "react-native-device-info/jest/react-native-device-info-mock" -// jest.mock("react-native-device-info", () => mockRNDeviceInfo) +const mockRNDeviceInfo = require('react-native-device-info/jest/react-native-device-info-mock'); +jest.mock('react-native-device-info', () => mockRNDeviceInfo); + +jest.mock('react-native-flipper'); --- targets/US/src/root/versions.ts @@ -56,9 +56,18 @@ export const shouldBeListed = (name: string) => LISTED_DEPENDENCIES.includes(name); export const createPackageDetails = (name: string) => { + // Version as listed in the package.json + let version = ALL_DEPENDENCIES[name]; + + // If it's a patch version, extract the version number from it + if (version?.includes('patch:')) { + const patch = version.match(/npm-(\d+\.\d+\.\d+)/)?.[1]; + version = patch ? `${patch}-patch` : 'N/A'; + } + return { - name: name, - version: ALL_DEPENDENCIES[name], + name, + version, }; }; @@ -71,23 +80,24 @@ export const getLibraryData = () => { // --- Legacy Versions Feature --- // -const getVersionSectionList = () => { +export const getVersionSectionList = () => { return [ - [ - { - title: AllsparkEnvironment.getCurrent().containerName, - version: DeviceInfo.getVersion(), - data: getLibraryData(), - }, - ], + { + title: AllsparkEnvironment.getCurrent().containerName, + version: DeviceInfo.getVersion(), + data: getLibraryData(), + }, ]; }; // @backwards-compatability - Version data added to AllsparkEnvironment +export const legacyVersionsReducer = (state: any) => + state || getVersionSectionList(); + export const LegacyVersionsFeature = new AllsparkFeatureModule('versions', { name: 'Legacy Versions', tags: [FeatureTags.root], redux: { - reducer: (state: any) => state || getVersionSectionList(), + reducer: legacyVersionsReducer, }, });
fix: patch version not correctly extracted for version list
fix: patch version not correctly extracted for version list
3c0ec0d2804bcb16d710a36d976635dbeddf7420
--- android/app/src/main/ic_launcher-playstore.png Binary files a/android/app/src/main/ic_launcher-playstore.png and /dev/null differ --- android/app/src/main/ic_launcher_test-playstore.png Binary files a/android/app/src/main/ic_launcher_test-playstore.png and /dev/null differ --- android/app/src/main/res/drawable-hdpi/ic_notification_icon.png Binary files a/android/app/src/main/res/drawable-hdpi/ic_notification_icon.png and b/android/app/src/main/res/drawable-hdpi/ic_notification_icon.png differ --- android/app/src/main/res/drawable-mdpi/ic_notification_icon.png Binary files a/android/app/src/main/res/drawable-mdpi/ic_notification_icon.png and b/android/app/src/main/res/drawable-mdpi/ic_notification_icon.png differ --- android/app/src/main/res/drawable-xhdpi/ic_notification_icon.png Binary files a/android/app/src/main/res/drawable-xhdpi/ic_notification_icon.png and b/android/app/src/main/res/drawable-xhdpi/ic_notification_icon.png differ --- android/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png and b/android/app/src/main/res/drawable-xxhdpi/ic_notification_icon.png differ --- android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png and b/android/app/src/main/res/drawable-xxxhdpi/ic_notification_icon.png differ
fixing notification large icon for prod builds
fixing notification large icon for prod builds
bb96d02480c2c0854c846489cbece885eed8ac25
--- packages/allspark-foundation-hub/src/Shared/Images/images.tsx @@ -168,6 +168,36 @@ export const SupplyChainImages: Record< uri: 'https://i5-me.walmartimages.com/images/supplychain/hauling-amb-bc5ae3b3f2.png', blurhash: 'KlF*yqbd~8kDW?jY^%n~-P', }, + '7000100': { + teamName: 'RSR - Dairy/Deli/Frozen', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hauling-amb-bc5ae3b3f2.png', + blurhash: 'KlF*yqbd~8kDW?jY^%n~-P', + }, + '7000103': { + teamName: 'RSR - Dry Grocery', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hauling-amb-bc5ae3b3f2.png', + blurhash: 'KlF*yqbd~8kDW?jY^%n~-P', + }, + '7000109': { + teamName: 'RSR - Meat/Produce', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hauling-amb-bc5ae3b3f2.png', + blurhash: 'KlF*yqbd~8kDW?jY^%n~-P', + }, + '7000313': { + teamName: 'RSR - Dairy/Deli/Frozen', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hauling-amb-bc5ae3b3f2.png', + blurhash: 'KlF*yqbd~8kDW?jY^%n~-P', + }, + '7000316': { + teamName: 'RSR - Dry Grocery', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hauling-amb-bc5ae3b3f2.png', + blurhash: 'KlF*yqbd~8kDW?jY^%n~-P', + }, + '7000324': { + teamName: 'RSR - Meat/Produce', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hauling-amb-bc5ae3b3f2.png', + blurhash: 'KlF*yqbd~8kDW?jY^%n~-P', + }, '7000131': { teamName: 'Support - Ehs', uri: 'https://i5-me.walmartimages.com/images/supplychain/ehs-56adc1e049.png', @@ -183,6 +213,11 @@ export const SupplyChainImages: Record< uri: 'https://i5-me.walmartimages.com/images/supplychain/maintenance-3e4cdc2301.png', blurhash: 'KSOXXft7~Wxuofay~Wj@Z#', }, + '7000138': { + teamName: 'SUPPORT - Other', + uri: 'https://i5-me.walmartimages.com/images/supplychain/maintenance-3e4cdc2301.png', + blurhash: 'KSOXXft7~Wxuofay~Wj@Z#', + }, '7000096': { teamName: 'Receiving - Staple Stock', uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', @@ -193,6 +228,31 @@ export const SupplyChainImages: Record< uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', blurhash: 'KtL5nA.8xcxvWAWB~UnO${', }, + '7000269': { + teamName: 'Receiving - Dry Grocery', + uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', + blurhash: 'KtL5nA.8xcxvWAWB~UnO${', + }, + '7000082': { + teamName: 'RECEIVING - Dry Grocery', + uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', + blurhash: 'KtL5nA.8xcxvWAWB~UnO${', + }, + '7000094': { + teamName: 'RECEIVING - Meat/Produce', + uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', + blurhash: 'KtL5nA.8xcxvWAWB~UnO${', + }, + '7000261': { + teamName: 'Receiving - Dairy/Deli/Frozen', + uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', + blurhash: 'KtL5nA.8xcxvWAWB~UnO${', + }, + '7000287': { + teamName: 'Receiving - Meat/Produce', + uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', + blurhash: 'KtL5nA.8xcxvWAWB~UnO${', + }, '7000051': { teamName: 'Orderfilling - Pfc', uri: 'https://i5-me.walmartimages.com/images/supplychain/order-filling-amb-996a8a8122.png', @@ -208,6 +268,16 @@ export const SupplyChainImages: Record< uri: 'https://i5-me.walmartimages.com/images/supplychain/break-pack-amb-c351625b7c.png', blurhash: 'K,OpunofT#$yfQS6cGbH=W', }, + '7000155': { + teamName: 'Non Con - (blank)', + uri: 'https://i5-me.walmartimages.com/images/supplychain/break-pack-amb-c351625b7c.png', + blurhash: 'K,OpunofT#$yfQS6cGbH=W', + }, + '7000164': { + teamName: 'Non Con - Staple Stock', + uri: 'https://i5-me.walmartimages.com/images/supplychain/break-pack-amb-c351625b7c.png', + blurhash: 'K,OpunofT#$yfQS6cGbH=W', + }, '7000125': { teamName: 'Shipping - Shp', uri: 'https://i5-me.walmartimages.com/images/supplychain/loading-amb-20a26b0187.png', @@ -218,6 +288,11 @@ export const SupplyChainImages: Record< uri: 'https://i5-me.walmartimages.com/images/supplychain/break-pack-amb-c351625b7c.png', blurhash: 'K,OpunofT#$yfQS6cGbH=W', }, + '7000019': { + teamName: 'BREAKPACK - Staple Stock', + uri: 'https://i5-me.walmartimages.com/images/supplychain/break-pack-amb-c351625b7c.png', + blurhash: 'K,OpunofT#$yfQS6cGbH=W', + }, '7000141': { teamName: 'Support - Quality Assurance', uri: 'https://i5-me.walmartimages.com/images/supplychain/quality-0e53dfde95.png', @@ -228,6 +303,16 @@ export const SupplyChainImages: Record< uri: 'https://i5-me.walmartimages.com/images/supplychain/loading-amb-20a26b0187.png', blurhash: 'KtL5nA.8xcxvWAWB~Ui_${', }, + '7000114': { + teamName: 'SHIPPING - Dairy/Deli/Frozen"', + uri: 'https://i5-me.walmartimages.com/images/supplychain/loading-amb-20a26b0187.png', + blurhash: 'KtL5nA.8xcxvWAWB~Ui_${', + }, + '7000115': { + teamName: 'SHIPPING - Dry Grocery"', + uri: 'https://i5-me.walmartimages.com/images/supplychain/loading-amb-20a26b0187.png', + blurhash: 'KtL5nA.8xcxvWAWB~Ui_${', + }, '7000133': { teamName: 'Support - General Support', uri: 'https://i5-me.walmartimages.com/images/supplychain/systems-195312368e.png', @@ -238,16 +323,61 @@ export const SupplyChainImages: Record< uri: 'https://i5-me.walmartimages.com/images/supplychain/loading-amb-20a26b0187.png', blurhash: 'KtL5nA.8xcxvWAWB~Ui_${', }, + '7000333': { + teamName: 'Shipping - Dairy/Deli/Frozen', + uri: 'https://i5-me.walmartimages.com/images/supplychain/loading-amb-20a26b0187.png', + blurhash: 'KtL5nA.8xcxvWAWB~Ui_${', + }, + '7000335': { + teamName: 'Shipping - Dry Grocery', + uri: 'https://i5-me.walmartimages.com/images/supplychain/loading-amb-20a26b0187.png', + blurhash: 'KtL5nA.8xcxvWAWB~Ui_${', + }, + '7000346': { + teamName: 'Shipping - Meat/Produce', + uri: 'https://i5-me.walmartimages.com/images/supplychain/loading-amb-20a26b0187.png', + blurhash: 'KtL5nA.8xcxvWAWB~Ui_${', + }, '7000137': { teamName: 'Support - Office', uri: 'https://i5-me.walmartimages.com/images/supplychain/hr-09080a34e9.png', blurhash: 'KVL#z+:}_NPE~TD%T2x]-7', }, + '7000358': { + teamName: 'Support - AP', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hr-09080a34e9.png', + blurhash: 'KVL#z+:}_NPE~TD%T2x]-7', + }, + '7000369': { + teamName: 'Support - General Support', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hr-09080a34e9.png', + blurhash: 'KVL#z+:}_NPE~TD%T2x]-7', + }, + '7000374': { + teamName: 'Support - Maintenance', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hr-09080a34e9.png', + blurhash: 'KVL#z+:}_NPE~TD%T2x]-7', + }, + '7000378': { + teamName: 'Support - Other', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hr-09080a34e9.png', + blurhash: 'KVL#z+:}_NPE~TD%T2x]-7', + }, + '7000383': { + teamName: 'Support - Quality Assurance', + uri: 'https://i5-me.walmartimages.com/images/supplychain/hr-09080a34e9.png', + blurhash: 'KVL#z+:}_NPE~TD%T2x]-7', + }, '7000074': { teamName: 'Receiving - Acl', uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', blurhash: 'KtL5nA.8xcxvWAWB~UnO${', }, + '7000272': { + teamName: 'Receiving - Extendable', + uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png', + blurhash: 'KtL5nA.8xcxvWAWB~UnO${', + }, '7000089': { teamName: 'Receiving - Fid', uri: 'https://i5-me.walmartimages.com/images/supplychain/receiving-amb-32e1aa6a1a.png',
feat: add missing team images
feat: add missing team images
4671a22c6af68ce0bb2e90aeb6cdb88ec0ba5424
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.142.0", + "@walmart/profile-feature-app": "0.143.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -5693,9 +5693,9 @@ } }, "node_modules/@walmart/profile-feature-app": { - "version": "0.142.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.142.0.tgz", - "integrity": "sha512-zOFBHL077CoKvJgEljA0pO3QMfRnXy+474GCaaVrvs+XiQMX29BX9FR39r9P8UVsFjqvKceIRZJNZXQ770tA8A==", + "version": "0.143.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.143.0.tgz", + "integrity": "sha512-TAX4y7MMHEwzauVB/rjCUhmZbLoF/TQNtscyWPj6vLUKA2rFTWUsZ/yB5+Ykcld/1syBPHPFkdbRstdTxvndZw==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/bottom-tabs": "^6.0.0", @@ -25323,9 +25323,9 @@ "integrity": "sha512-TIzjXjT8jlsb/OrY7WPr4xUv5RsCsnNN0wwjawIwOHurrZtrFn8f/WjwkY8e6zUC3AlZ4QsHdaKqCD/pfkgGPg==" }, "@walmart/profile-feature-app": { - "version": "0.142.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.142.0.tgz", - "integrity": "sha512-zOFBHL077CoKvJgEljA0pO3QMfRnXy+474GCaaVrvs+XiQMX29BX9FR39r9P8UVsFjqvKceIRZJNZXQ770tA8A==" + "version": "0.143.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.143.0.tgz", + "integrity": "sha512-TAX4y7MMHEwzauVB/rjCUhmZbLoF/TQNtscyWPj6vLUKA2rFTWUsZ/yB5+Ykcld/1syBPHPFkdbRstdTxvndZw==" }, "@walmart/push-to-talk-mini-app": { "version": "1.8.59", --- package.json @@ -107,7 +107,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.142.0", + "@walmart/profile-feature-app": "0.143.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0",
bump profile-feature-app to 0.143.0
bump profile-feature-app to 0.143.0
39d0f8e5260bf03e5ec8db1157a256b59fb72c2d
--- package-lock.json @@ -43,7 +43,7 @@ "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.9", "@walmart/config-components": "4.2.13", - "@walmart/copilot-mini-app": "^3.41.6", + "@walmart/copilot-mini-app": "^3.42.1", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5", @@ -8592,9 +8592,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "3.41.6", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.41.6.tgz", - "integrity": "sha512-/5+I9iV+bkgTdlOHoEvY9RKcRB769iFklDTS2g9V8AN6gWJvl7lhTiyM6/sQCcgr3J3CZy2iflTPGD+8L+tpTQ==", + "version": "3.42.1", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.42.1.tgz", + "integrity": "sha512-k3lGk+YphuvLIzyJzGQKWMqqqic/ze76tjgvo+19AicOOWRITLbAxt3lfMucaMrdouw7hUns5bheG8aGjRrKZA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33223,9 +33223,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "3.41.6", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.41.6.tgz", - "integrity": "sha512-/5+I9iV+bkgTdlOHoEvY9RKcRB769iFklDTS2g9V8AN6gWJvl7lhTiyM6/sQCcgr3J3CZy2iflTPGD+8L+tpTQ==" + "version": "3.42.1", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.42.1.tgz", + "integrity": "sha512-k3lGk+YphuvLIzyJzGQKWMqqqic/ze76tjgvo+19AicOOWRITLbAxt3lfMucaMrdouw7hUns5bheG8aGjRrKZA==" }, "@walmart/core-services": { "version": "2.3.2", --- package.json @@ -84,7 +84,7 @@ "@walmart/attendance-mini-app": "1.62.13", "@walmart/compass-sdk-rn": "5.18.9", "@walmart/config-components": "4.2.13", - "@walmart/copilot-mini-app": "^3.41.6", + "@walmart/copilot-mini-app": "^3.42.1", "@walmart/core-services": "~2.3.0", "@walmart/core-services-allspark": "~2.13.4", "@walmart/core-utils": "~2.0.5",
chore: bump copilot@3.42.1
chore: bump copilot@3.42.1
09d226abf3dfb45c04c477dc861dc8a4f75625bb
--- packages/allspark-foundation-hub/__tests__/HubFeature/__snapshots__/TeamListItem.test.tsx.snap @@ -45,7 +45,7 @@ exports[`TeamListItem renders list item for all teams roster view correctly 1`] } /> <View - accessibilityLabel="Management 93 Clocked in" + accessibilityLabel="Management" accessibilityRole="header" accessible={true} style={ @@ -61,26 +61,13 @@ exports[`TeamListItem renders list item for all teams roster view correctly 1`] "color": "#2e2f32", "fontFamily": "Bogle-Regular", "fontSize": 16, - "fontWeight": "700", + "fontWeight": "400", "lineHeight": 24, } } > Management </Text> - <Text - style={ - { - "color": "#2e2f32", - "fontFamily": "Bogle-Regular", - "fontSize": 14, - "fontWeight": "400", - "lineHeight": 20, - } - } - > - 93 Clocked in - </Text> </View> </View> <View @@ -203,7 +190,7 @@ exports[`TeamListItem renders list item for team selection correctly 1`] = ` } /> <View - accessibilityLabel="Management " + accessibilityLabel="Management" accessibilityRole="header" accessible={true} style={
Update snapshots
Update snapshots
ee2911476e7071a5aeea85830ef760c6087d130f
--- __mocks__/@react-native-community/clipboard.js @@ -1,5 +0,0 @@ -module.exports = { - Clipboard: { - setString: jest.fn() - } -} \ No newline at end of file --- __mocks__/@walmart/gtp-shared-components.js @@ -65,5 +65,8 @@ module.exports = { Checkbox: 'Checkbox', FormGroup: 'FormGroup', ChevronRightIcon: 'ChevronRightIcon', - StyledText: 'StyledText' + StyledText: 'StyledText', + Icons: { + CheckIcon: 'CheckIcon' + } }; --- __mocks__/expo-clipboard.js @@ -0,0 +1,3 @@ +module.exports = { + setStringAsync: jest.fn() +} --- __tests__/settings/versions/VersionsListTest.tsx @@ -1,11 +1,13 @@ import React from 'react'; -import {render, screen} from '@testing-library/react-native'; +import {render, screen, userEvent} from '@testing-library/react-native'; import { keyExtractor, renderVersionRow, renderVersionHeader, VersionsList, + SessionIdRow } from '../../../src/settings/versions/VersionsList'; +import * as Clipboard from 'expo-clipboard'; const route = {} as any; const navigation = {setOptions: jest.fn()} as any; @@ -16,7 +18,7 @@ const AppVersion = { name: 'Package Name', }; -jest.mock('../../../packages/me-at-walmart-container/src/session', () => ('1234')) +jest.mock('../../../packages/me-at-walmart-container/src/session', () => ({SESSION_ID: '1234'})); describe('VersionsList', () => { @@ -51,6 +53,24 @@ describe('VersionsList', () => { render(<VersionsList route={route} navigation={navigation} />); expect(screen.toJSON()).toMatchSnapshot(); }); + + describe('SessionIdRow', () => { + const setup = () => { + const result = render(<SessionIdRow />); + const user = userEvent.setup(); + return {result, user}; + } + + test('calls setStringAsync when sessionId is clicked', async () => { + const {result, user} = setup(); + + const sessionIdText = result.getByTestId('session-id-text'); + await user.press(sessionIdText); + + expect(Clipboard.setStringAsync).toHaveBeenCalledWith('1234'); + expect(result.toJSON()).toMatchSnapshot(); + }); + }); }); --- __tests__/settings/versions/__snapshots__/VersionsListTest.tsx.snap @@ -1,5 +1,52 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`VersionsList SessionIdRow calls setStringAsync when sessionId is clicked 1`] = ` +<View + accessibilityState={ + { + "busy": undefined, + "checked": undefined, + "disabled": undefined, + "expanded": undefined, + "selected": undefined, + } + } + accessibilityValue={ + { + "max": undefined, + "min": undefined, + "now": undefined, + "text": undefined, + } + } + accessible={true} + collapsable={false} + focusable={true} + onClick={[Function]} + onResponderGrant={[Function]} + onResponderMove={[Function]} + onResponderRelease={[Function]} + onResponderTerminate={[Function]} + onResponderTerminationRequest={[Function]} + onStartShouldSetResponder={[Function]} + style={ + { + "marginTop": 8, + "opacity": 1, + } + } +> + <StyledText + color="green" + leading={<CheckIcon />} + size="large" + testID="session-id-text" + > + Session ID: 1234 + </StyledText> +</View> +`; + exports[`VersionsList VersionsList 1`] = ` <View style={ @@ -47,8 +94,9 @@ exports[`VersionsList VersionsList 1`] = ` <StyledText color="gray" size="large" + testID="session-id-text" > - Session ID: undefined + Session ID: 1234 </StyledText> </View> <RCTScrollView --- package.json @@ -182,6 +182,7 @@ "expo-asset": "~11.1.7", "expo-av": "~15.1.7", "expo-build-properties": "~0.14.8", + "expo-clipboard": "~7.1.5", "expo-constants": "~17.1.7", "expo-file-system": "~18.1.11", "expo-font": "~13.3.2", --- src/settings/versions/VersionsList.tsx @@ -20,7 +20,7 @@ import {Divider, Icons, StyledText} from '@walmart/gtp-shared-components'; import Constants from 'expo-constants'; import {VersionRow} from './VersionRow'; import {SESSION_ID} from '../../../packages/me-at-walmart-container/src/session'; -import Clipboard from '@react-native-clipboard/clipboard'; +import * as Clipboard from 'expo-clipboard'; export const keyExtractor = (item: LibraryInfo, index: number) => item.name + index; @@ -38,14 +38,20 @@ export const renderVersionHeader = ({ export const SessionIdRow = () => { const [sessionIdCopied, setSessionIdCopied] = useState(false); - const onCopySessionId = () => { - Clipboard.setString(SESSION_ID); - setSessionIdCopied(true); + const onCopySessionId = async () => { + try { + await Clipboard.setStringAsync(SESSION_ID); + setSessionIdCopied(true); + } catch (error) { + if (__DEV__) { + console.error('Error copying session ID:', error); + } + } }; return ( <TouchableOpacity onPress={onCopySessionId} style={styles.sessionIdContainer}> - <StyledText size='large' color={sessionIdCopied ? 'green' : 'gray'} leading={sessionIdCopied ? <Icons.CheckIcon /> : undefined}> + <StyledText size='large' color={sessionIdCopied ? 'green' : 'gray'} leading={sessionIdCopied ? <Icons.CheckIcon /> : undefined} testID='session-id-text'> {`Session ID: ${SESSION_ID}`} </StyledText> </TouchableOpacity> --- yarn.lock @@ -8521,6 +8521,7 @@ __metadata: expo-atlas: "npm:0.4.0" expo-av: "npm:~15.1.7" expo-build-properties: "npm:~0.14.8" + expo-clipboard: "npm:~7.1.5" expo-constants: "npm:~17.1.7" expo-doctor: "npm:^1.10.1" expo-file-system: "npm:~18.1.11" @@ -13875,6 +13876,17 @@ __metadata: languageName: node linkType: hard +"expo-clipboard@npm:~7.1.5": + version: 7.1.5 + resolution: "expo-clipboard@npm:7.1.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-clipboard%2F-%2Fexpo-clipboard-7.1.5.tgz" + peerDependencies: + expo: "*" + react: "*" + react-native: "*" + checksum: 10c0/44288d70ab84d687c63261eca294f2decc9eb18172d3dadbdbbfd5aa7d814acfb83c9e9e54e0399ea3052ef90a1312564bd79288a411429a2aeb830fffb5f998 + languageName: node + linkType: hard + "expo-constants@npm:~16.0.0": version: 16.0.2 resolution: "expo-constants@npm:16.0.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-constants%2F-%2Fexpo-constants-16.0.2.tgz"
refactor: ALLSPARK-6501 migrate to expo-clipboard (#4930)
refactor: ALLSPARK-6501 migrate to expo-clipboard (#4930) Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
3718cef02585efd3cd9332bdcc6f60b583eb7d8f
--- __tests__/components/SearchHeaderTest.tsx @@ -112,7 +112,7 @@ describe('SearchHeader tests', () => { await waitFor(() => { expect(mockDispatch).toHaveBeenCalledWith({ payload: '', - type: 'roster/SET_SEARCH_TEXT', + type: 'texting/SET_SEARCH_TEXT', }); }); }); --- __tests__/screens/RosterScreen/RosterScreenTest.tsx @@ -6,6 +6,8 @@ const {renderWithProviders} = require('../../harness'); import {StackNavigationProp} from '@react-navigation/stack'; import {TextingNavParamsMap} from '../../../src/navigation'; +//TODO: mock textingMethods from WMConnect + describe('RosterScreen', () => { const mockNavigation = useNavigation() as StackNavigationProp< TextingNavParamsMap, --- __tests__/setup.ts @@ -32,4 +32,8 @@ jest.mock('@walmart/core-services/Logger', () => ({ jest.mock('@walmart/wmconnect-mini-app', () => ({ navigateToMessageScreen: jest.fn(), + textingMethods: { + useStartTeamText: jest.fn(), + useStartStoreText: jest.fn(), + }, }));
adding tests
adding tests
0d0345f590b7b691652932afa2a8a2f7455f012f
--- core/__tests__/__mocks__/@walmart/me-at-walmart-common.js @@ -4,6 +4,10 @@ module.exports = { addMultiple: jest.fn(), add: jest.fn(), }, + RootComponentContainer: { + addMultiple: jest.fn(), + List: 'List', + }, HomeHeaderRightContainer: { Component: 'Component', add: jest.fn(), --- core/__tests__/__mocks__/@walmart/welcomeme-mini-app/dist/translations/index.js @@ -0,0 +1,4 @@ +module.exports = { + ...jest.requireActual('@walmart/welcomeme-mini-app/dist/translations/index'), + addLanguageResources: jest.fn(), + }; \ No newline at end of file --- core/__tests__/features/CallingTest.ts @@ -0,0 +1,55 @@ +import {call, select} from 'redux-saga/effects'; +import {ConfigSelectors} from '@walmart/allspark-foundation/Config'; +import {RootComponentContainer} from '@walmart/me-at-walmart-common'; +import {CallingFeature, handleCallingOnboarding} from '../../src/features/calling'; +import { + callingAppOnboardingFlow, + callingPermissionSagas, +} from '@walmart/calling-mini-app'; + +describe('handleCallingOnboarding', () => { + it('should select container config', () => { + const generator = handleCallingOnboarding(); + expect(generator.next().value).toEqual( + select(ConfigSelectors.getContainerConfig), + ); + const config = { callingOnboardingDisabled: false }; + expect(generator.next(config).value).toEqual( + callingPermissionSagas(), + ); + expect(generator.next().value).toEqual( + call(callingAppOnboardingFlow), + ); + expect(generator.next().done).toBeTruthy(); + }); + + it('should not call callingAppOnboardingFlow if callingOnboardingDisabled is true', () => { + const generator = handleCallingOnboarding(); + expect(generator.next().value).toEqual( + select(ConfigSelectors.getContainerConfig), + ); + const config = { callingOnboardingDisabled: true }; + expect(generator.next(config).value).toEqual( + callingPermissionSagas(), + ); + expect(generator.next().done).toBeTruthy(); + }); +}); + +describe('CallingFeature', () => { + it('should have the correct name', () => { + expect(CallingFeature.name).toBe('Calling'); + }); + it('should add components to RootComponentContainer on connect', () => { + CallingFeature._listeners.feature.onConnect(); + expect(RootComponentContainer.addMultiple).toHaveBeenCalledWith([ + ['calling.minimizedCallView', expect.any(Function)], + ['calling.listeners', expect.any(Function)], + ]); + }); + it('should define screens correctly', () => { + CallingFeature._screens.ConnectedCalling.getComponent(); + expect(CallingFeature._screens.ConnectedCalling.options.presentation).toBe('transparentModal'); + expect(CallingFeature._screens.ConnectedCalling.options.cardStyle).toEqual({ backgroundColor: 'transparent' }); + }); + }); \ No newline at end of file --- core/__tests__/features/feedbackTest.tsx @@ -16,7 +16,17 @@ import { import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; import {ConfigSelectors} from '@walmart/allspark-foundation/Config'; import {AuthActionTypes} from '@walmart/allspark-foundation/Auth'; -import {NAVIGATE_HOME} from '@walmart/me-at-walmart-common'; +import { + HomeDashboardContainer, + IMeAtWalmartEnvironment, + InboxContainer, + NAVIGATE_HOME, +} from '@walmart/me-at-walmart-common'; +import { + SurveySaysCard, + SurveySaysInboxCard, + initFeedback, +} from '@walmart/feedback-all-spark-miniapp'; import {checkAndShowAvailableSurveyAction} from '@walmart/feedback-all-spark-miniapp'; @@ -28,6 +38,7 @@ import { handleSurveyPrompt, startSurveyWatch, surveySagas, + FeedbackFeature, } from '../../src/features/feedback'; describe('surveySagaTests', () => { @@ -150,3 +161,15 @@ describe('surveySagaTests', () => { }); }); }); + +describe('FeedbackFeature', () => { + it('should have the correct name', () => { + expect(FeedbackFeature.name).toBe('Feedback'); + }); + it('should add components on connect', () => { + FeedbackFeature._listeners.feature.onConnect(); + expect(initFeedback).toBeCalled(); + expect(HomeDashboardContainer.add).toHaveBeenCalledWith('SurveySaysCard', SurveySaysCard); + expect(InboxContainer.add).toHaveBeenCalledWith('feedbackSurvey', SurveySaysInboxCard); + }); +}); \ No newline at end of file --- core/__tests__/features/welcomeMeTest.ts @@ -1,3 +1,4 @@ +import {addLanguageResources} from '@walmart/welcomeme-mini-app/dist/translations/index'; import {WelcomeMeFeature} from '../../src/features/welcomeMe'; describe('WelcomeMeFeature', () => { @@ -9,4 +10,8 @@ describe('WelcomeMeFeature', () => { const screenConfig = WelcomeMeFeature.getScreenConfig('WelcomeMeMiniApp'); expect(screenConfig?.getComponent()).toBeDefined(); }); + it('should addLanguageResources called on connect', () => { + WelcomeMeFeature._listeners.feature.onConnect(); + expect(addLanguageResources).toBeCalled(); + }); }); --- core/__tests__/navigation/__snapshots__/RootStackTest.tsx.snap @@ -193,6 +193,7 @@ exports[`RootNav matches snapshot when app accessible 1`] = ` /> </Group> </Navigator> + <List /> </RenderGuard> `; @@ -214,5 +215,6 @@ exports[`RootNav matches snapshot when app not accessible 1`] = ` name="Core.AppBlock" /> </Navigator> + <List /> </RenderGuard> `;
added test cases for feature files
added test cases for feature files
9b98bbedf2d2af6b4ca3b650cb4e9cf92409de59
--- .env.beta @@ -8,4 +8,4 @@ EXPO_DEBUG=false # -- Custom environment variables -- # # For compatability with the existing environment types used in the app. Use NODE_ENV when possible which will match the postfix (beta) -EXPO_PUBLIC_ENV=prod +EXPO_PUBLIC_ENV=beta --- app.config.US.ts @@ -272,8 +272,8 @@ const CONFIG: ExpoConfig = { image: Environment.select({ production: `${__dirname}/assets/images/splash.png`, beta: `${__dirname}/assets/images/splash-beta.png`, - teflon: `${__dirname}/assets/images/splash-beta.png`, - development: `${__dirname}/assets/images/splash-beta.png`, + teflon: `${__dirname}/assets/images/splash-teflon.png`, + development: `${__dirname}/assets/images/splash-dev.png`, default: `${__dirname}/assets/images/splash-beta.png`, }), }, --- assets/images/splash-dev.png Binary files /dev/null and b/assets/images/splash-dev.png differ --- assets/images/splash-teflon.png Binary files /dev/null and b/assets/images/splash-teflon.png differ
feat: add splash screen images for beta and teflon. fix beta env variable
feat: add splash screen images for beta and teflon. fix beta env variable
a1e71c127b9af06f5f2b093f774f611744564ddb
--- core/__tests__/__mocks__/@walmart/rfid-scan-mini-app.js @@ -1,3 +1,6 @@ module.exports = { - RfidScanMiniApp: 'RfidScanMiniApp', + __esModule: true, + default: { + buildAllScreens: () => 'RfidScanScreens' + } }; --- core/__tests__/navigation/USHallway/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -101,15 +101,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects } } /> - <Screen - component={[Function]} - name="RfidScan" - options={ - { - "headerShown": false, - } - } - /> <Screen component={[Function]} name="taskItQuickActions" @@ -659,6 +650,7 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects component={[Function]} name="managerExperience.teamOnboarding" /> + RfidScanScreens </Navigator> `; @@ -763,15 +755,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects } } /> - <Screen - component={[Function]} - name="RfidScan" - options={ - { - "headerShown": false, - } - } - /> <Screen component={[Function]} name="taskItQuickActions" @@ -1321,5 +1304,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects component={[Function]} name="managerExperience.teamOnboarding" /> + RfidScanScreens </Navigator> `; --- core/src/manifest.ts @@ -75,6 +75,7 @@ export const getAssociateFeatures = (): AllsparkFeatureModule[] => { require('@walmart/checkout-mini-app').CheckoutMiniApp, require('@walmart/mod-flex-mini-app').default, require('@walmart/shelfavailability-mini-app').default, + require('@walmart/rfid-scan-mini-app').default, ); } --- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -51,7 +51,7 @@ import { } from '@walmart/profile-feature-app'; import {App as ReceiptCheckMiniApp} from '@walmart/receipt-check-miniapp'; import {ReturnsMiniApp} from '@walmart/returns-mini-app'; -import RfidScanMiniApp from '@walmart/rfid-scan-mini-app'; +import RfidScanFeature from '@walmart/rfid-scan-mini-app'; import ReceivingRootApp from '@walmart/rn-receiving-mini-app'; import ShelfAvailabilityFeature from '@walmart/shelfavailability-mini-app'; import {GNFRApp} from '@walmart/shop-gnfr-mini-app'; @@ -172,15 +172,6 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [ }, clockCheckEnabled: true, }, - { - featureId: 'rfid', - name: 'RfidScan', - component: RfidScanMiniApp, - options: { - headerShown: false, - }, - clockCheckEnabled: true, - }, { featureId: MINI_APPS.TASKIT, name: 'taskItQuickActions', @@ -625,6 +616,10 @@ export const MainStackNav = () => { {managerExperienceFeature.buildAllScreens({ Navigator: MainStack as any, })} + + {RfidScanFeature.buildAllScreens({ + Navigator: MainStack as any, + })} </MainStack.Navigator> </> );
Added foundation changes
Added foundation changes
e011fd79b4ae9b3eaa5471f3cce9e87799207e52
--- targets/US/package.json @@ -84,7 +84,7 @@ "@walmart/allspark-utils": "6.5.0", "@walmart/amp-mini-app": "1.1.89", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.27.4", + "@walmart/ask-sam-mini-app": "1.27.5", "@walmart/associate-listening-mini-app": "1.2.7", "@walmart/attendance-mini-app": "3.96.0", "@walmart/avp-feature-app": "0.10.7", @@ -355,4 +355,4 @@ ] } } -} \ No newline at end of file +} --- yarn.lock @@ -5893,9 +5893,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ask-sam-mini-app@npm:1.27.4": - version: 1.27.4 - resolution: "@walmart/ask-sam-mini-app@npm:1.27.4" +"@walmart/ask-sam-mini-app@npm:1.27.5": + version: 1.27.5 + resolution: "@walmart/ask-sam-mini-app@npm:1.27.5" dependencies: apisauce: "npm:^1.1.2" numeral: "npm:^2.0.6" @@ -5941,7 +5941,7 @@ __metadata: react-native-wm-voice-text: ">=0.3" reselect: ">=4" victory-native: ">=36.5" - checksum: 10c0/ad6baa639ddbd8b2fe02260f5f45b62854fbe0f0fb654322eee288a6e15cd4ccc9a25d03363a994738159b02ce608e7652664d7048773aeeac090e71019e364a + checksum: 10c0/06d23e045e5513f802a79d1e43fb1c807ef5091ddddab4a82f14914f66387eadd40dfdb5193790cea4f42fa82bc2a19321f4eb5d008db4fbec5a201b60e85462 languageName: node linkType: hard @@ -6999,7 +6999,7 @@ __metadata: "@walmart/allspark-utils": "npm:6.5.0" "@walmart/amp-mini-app": "npm:1.1.89" "@walmart/ask-sam-chat-components": "npm:^0.2.7" - "@walmart/ask-sam-mini-app": "npm:1.27.4" + "@walmart/ask-sam-mini-app": "npm:1.27.5" "@walmart/associate-listening-mini-app": "npm:1.2.7" "@walmart/attendance-mini-app": "npm:3.96.0" "@walmart/avp-feature-app": "npm:0.10.7"
Bump the version
Bump the version
f9d9d094d6169c9416fbfdb4b4642bf05b128352
--- .looper.multibranch.yml @@ -4,7 +4,7 @@ inherit: "job:///metropolis/metroloop/metroloop-parent" ## Whenever you update the nodes, please update it at the two-place, below line & the global variable LOOPER_NODES ## -node: (osx||stable_osx) +node: stable_osx&&!!dualcore tools: android:
looper fix
looper fix
4b79bf6c1c250a974f409961d6406b7b6fa988ae
--- package-lock.json @@ -73,7 +73,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.0", - "@walmart/receipt-check-miniapp": "1.8.27", + "@walmart/receipt-check-miniapp": "1.8.29", "@walmart/redux-store": "3.1.3", "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/returns-mini-app": "0.6.0", @@ -5712,9 +5712,9 @@ } }, "node_modules/@walmart/receipt-check-miniapp": { - "version": "1.8.27", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.8.27.tgz", - "integrity": "sha512-ivD/+HE/4LSsh1YUT6SmmUhK0gRkr0MKtwEPG4IgjcROA3knwNA3meFhBft+e7ETZqopcAojYagF0x95zFs7Ng==", + "version": "1.8.29", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.8.29.tgz", + "integrity": "sha512-O39j7IhEonP7veCK7Ze7zcoglyf0VV1uW1B9jzl56H+B1yy4nSShbC4QkZ6QakK28fwHkij7xkijrsOwmrL8OA==", "dependencies": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", @@ -25024,9 +25024,9 @@ "integrity": "sha512-VkGT8BSZOsxR4FJjxeu6ursO3qzAVZea6jEwT6KJsXgBJ9MIHhkBo78guM6kEbqqQl3SlGS/+5tbOxKdWrvStQ==" }, "@walmart/receipt-check-miniapp": { - "version": "1.8.27", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.8.27.tgz", - "integrity": "sha512-ivD/+HE/4LSsh1YUT6SmmUhK0gRkr0MKtwEPG4IgjcROA3knwNA3meFhBft+e7ETZqopcAojYagF0x95zFs7Ng==", + "version": "1.8.29", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.8.29.tgz", + "integrity": "sha512-O39j7IhEonP7veCK7Ze7zcoglyf0VV1uW1B9jzl56H+B1yy4nSShbC4QkZ6QakK28fwHkij7xkijrsOwmrL8OA==", "requires": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", --- package.json @@ -115,7 +115,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.0", - "@walmart/receipt-check-miniapp": "1.8.27", + "@walmart/receipt-check-miniapp": "1.8.29", "@walmart/redux-store": "3.1.3", "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/returns-mini-app": "0.6.0",
bump version for hotfix
bump version for hotfix
275139b4b7c949426620ed0b47dbc5de2cf58be4
--- packages/allspark-foundation/src/FeatureRunner/components/FeatureSection.tsx @@ -11,7 +11,7 @@ import { import { AllsparkNavigationClient } from '../../Navigation'; import { AllsparkFeatureModule } from '../../Feature'; -import { useLocalStorageService } from '../../LocalStorage'; +import { LocalStorageService } from '../../LocalStorage'; const styles = StyleSheet.create({ card: { flex: 0, marginTop: 16 }, @@ -110,15 +110,23 @@ export const LocalStorageCard = (props: { style?: StyleProp<ViewStyle>; }) => { const { featureID, style } = props; - const localStorage = useLocalStorageService(featureID); const clearLocalStorage = () => { - localStorage.clear(); + const localStorage = LocalStorageService.getFeatureInstance(featureID); + localStorage?.clear(); + + if (__DEV__ && !!localStorage) { + console.log('=============='); + console.log(`Allspark: Local Storage Value (${featureID})`, 'Cleared'); + console.log('=============='); + } }; const logLocalStorage = async () => { - const keys = await localStorage.getAllKeys(); - const values = await localStorage.multiGet(keys); + const localStorage = LocalStorageService.getFeatureInstance(featureID); + const keys = localStorage ? await localStorage.getAllKeys() : []; + const values = localStorage ? await localStorage.multiGet(keys) : []; + if (__DEV__) { console.log('=============='); console.log(
fix: local storage feature runner section not working correctly
fix: local storage feature runner section not working correctly
f6c39f69e08c899208df7d80d2fb93bf77ac7252
--- package-lock.json @@ -3936,7 +3936,7 @@ }, "axios-cache-adapter": { "version": "2.7.3", - "resolved": "http://localhost:4873/axios-cache-adapter/-/axios-cache-adapter-2.7.3.tgz", + "resolved": "http://npme.walmart.com/axios-cache-adapter/-/axios-cache-adapter-2.7.3.tgz", "integrity": "sha512-A+ZKJ9lhpjthOEp4Z3QR/a9xC4du1ALaAsejgRGrH9ef6kSDxdFrhRpulqsh9khsEnwXxGfgpUuDp1YXMNMEiQ==", "requires": { "cache-control-esm": "1.0.0", @@ -4329,7 +4329,7 @@ }, "cache-control-esm": { "version": "1.0.0", - "resolved": "http://localhost:4873/cache-control-esm/-/cache-control-esm-1.0.0.tgz", + "resolved": "http://npme.walmart.com/cache-control-esm/-/cache-control-esm-1.0.0.tgz", "integrity": "sha512-Fa3UV4+eIk4EOih8FTV6EEsVKO0W5XWtNs6FC3InTfVz+EjurjPfDXY5wZDo/lxjDxg5RjNcurLyxEJBcEUx9g==" }, "caller-callsite": { @@ -4410,7 +4410,7 @@ }, "charenc": { "version": "0.0.2", - "resolved": "http://localhost:4873/charenc/-/charenc-0.0.2.tgz", + "resolved": "http://npme.walmart.com/charenc/-/charenc-0.0.2.tgz", "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=" }, "ci-info": { @@ -4774,7 +4774,7 @@ }, "crypt": { "version": "0.0.2", - "resolved": "http://localhost:4873/crypt/-/crypt-0.0.2.tgz", + "resolved": "http://npme.walmart.com/crypt/-/crypt-0.0.2.tgz", "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=" }, "crypto-js": { @@ -10785,7 +10785,7 @@ }, "md5": { "version": "2.3.0", - "resolved": "http://localhost:4873/md5/-/md5-2.3.0.tgz", + "resolved": "http://npme.walmart.com/md5/-/md5-2.3.0.tgz", "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", "requires": { "charenc": "0.0.2", @@ -12577,7 +12577,7 @@ }, "react-native-linear-gradient": { "version": "2.5.6", - "resolved": "http://localhost:4873/react-native-linear-gradient/-/react-native-linear-gradient-2.5.6.tgz", + "resolved": "http://npme.walmart.com/react-native-linear-gradient/-/react-native-linear-gradient-2.5.6.tgz", "integrity": "sha512-HDwEaXcQIuXXCV70O+bK1rizFong3wj+5Q/jSyifKFLg0VWF95xh8XQgfzXwtq0NggL9vNjPKXa016KuFu+VFg==" }, "react-native-material-menu": {
fixing package lock
fixing package lock
d92e1b694f4aae7cb78a3535b4363e5b3efa5623
--- src/containers/ChatInput/index.tsx @@ -211,8 +211,8 @@ export const ChatInput = (props: { { mediaType: 'photo', selectionLimit: 1, - maxHeight: 1024, - maxWidth: 1024, + maxHeight: 512, + maxWidth: 512, }, ).catch((e) => console.log('pick image error', e)); --- src/containers/ChatInput/index.tsx @@ -211,8 +211,8 @@ export const ChatInput = (props: { { mediaType: 'photo', selectionLimit: 1, - maxHeight: 1024, - maxWidth: 1024, + maxHeight: 512, + maxWidth: 512, }, ).catch((e) => console.log('pick image error', e));
adding restriction
adding restriction
482924cfbc719cab3b80953f2ef62f2e2836b8d8
--- package.json @@ -102,7 +102,7 @@ "@walmart/emergency-mini-app": "1.32.5", "@walmart/exception-mini-app": "1.8.15", "@walmart/expo-config-plugins": "^0.2.0", - "@walmart/facilities-management-miniapp": "0.18.28", + "@walmart/facilities-management-miniapp": "0.18.30", "@walmart/feedback-all-spark-miniapp": "0.9.75", "@walmart/financial-wellbeing-feature-app": "1.29.10", "@walmart/functional-components": "~6.3.28", --- yarn.lock @@ -7097,9 +7097,9 @@ __metadata: languageName: node linkType: hard -"@walmart/facilities-management-miniapp@npm:0.18.28": - version: 0.18.28 - resolution: "@walmart/facilities-management-miniapp@npm:0.18.28::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ffacilities-management-miniapp%2F-%2F%40walmart%2Ffacilities-management-miniapp-0.18.28.tgz" +"@walmart/facilities-management-miniapp@npm:0.18.30": + version: 0.18.30 + resolution: "@walmart/facilities-management-miniapp@npm:0.18.30::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ffacilities-management-miniapp%2F-%2F%40walmart%2Ffacilities-management-miniapp-0.18.30.tgz" peerDependencies: expo: ~52.0.46 react: "*" @@ -7108,7 +7108,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/0e96f1ebb3bfa29951e65246d586f951eb8f2e8d95cfd79e661830577ddc50998346f550f00c8428014de22fa429fe56ef125a5ba7fd55195a3e25c6d93f22be + checksum: 10c0/759b2af4319d2522c29bb7f5eae4938d8e27d32bd1f1e7456e735c305a25e69a6ba98eb94387639e098a4d4178485943c11bec105585d51feb1b7e32c3bc2651 languageName: node linkType: hard @@ -7610,7 +7610,7 @@ __metadata: "@walmart/emergency-mini-app": "npm:1.32.5" "@walmart/exception-mini-app": "npm:1.8.15" "@walmart/expo-config-plugins": "npm:^0.2.0" - "@walmart/facilities-management-miniapp": "npm:0.18.28" + "@walmart/facilities-management-miniapp": "npm:0.18.30" "@walmart/feedback-all-spark-miniapp": "npm:0.9.75" "@walmart/financial-wellbeing-feature-app": "npm:1.29.10" "@walmart/functional-components": "npm:~6.3.28"
feat(facility-management): ONER-5432 ADA bug fixes (#4366)
feat(facility-management): ONER-5432 ADA bug fixes (#4366) * feat(facility-management): ONER-5432 Updating the version to 0.18.28-alpha1 * feat(facility-management): ONER-5457 Updating the version to 0.18.30 --------- Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>