commit_hash stringlengths 40 40 | input stringlengths 13 7.99k | output stringlengths 5 155 | full_message stringlengths 6 8.96k |
|---|---|---|---|
47a53c90b5af5bd4b3d419f6cf05857b432545cc | --- ios/AllSpark.xcodeproj/project.pbxproj
@@ -728,7 +728,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements;
- CODE_SIGN_IDENTITY = "iPhone Distribution";
+ CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = F7HDEWM8SU;
@@ -745,7 +745,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.walmart.stores.allspark.beta;
PRODUCT_NAME = "Me@Walmart Beta";
- PROVISIONING_PROFILE_SPECIFIER = "Allspark (MeAtWM Beta) InHouse Profile";
+ PROVISIONING_PROFILE_SPECIFIER = "Allspark (MeAtWM Beta) Dev";
SWIFT_OBJC_BRIDGING_HEADER = "AllSpark-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@@ -761,7 +761,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements;
- CODE_SIGN_IDENTITY = "iPhone Distribution";
+ CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = F7HDEWM8SU;
@@ -777,7 +777,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.walmart.stores.allspark.beta;
PRODUCT_NAME = "Me@Walmart Beta";
- PROVISIONING_PROFILE_SPECIFIER = "Allspark (MeAtWM Beta) InHouse Profile";
+ PROVISIONING_PROFILE_SPECIFIER = "Allspark (MeAtWM Beta) Dev";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
| reverting profile | reverting profile
|
ac1d68574adcde3a8f2fc4e2d76507315fc93b76 | --- ios/AllSpark.xcodeproj/project.pbxproj
@@ -416,7 +416,7 @@
"${PODS_ROOT}/../../node_modules/react-native-wm-voice-text/ios/state-change_confirm-down.wav",
"${PODS_ROOT}/../../node_modules/react-native-wm-voice-text/ios/state-change_confirm-up.wav",
"${PODS_ROOT}/../../node_modules/@walmart/topstock-mini-app/ios/VizPick.xcdatamodeld",
- "${PODS_CONFIGURATION_BUILD_DIR}/vizpick-mini-app/ShellAssets.bundle",
+ "${PODS_CONFIGURATION_BUILD_DIR}/topstock-mini-app/ShellAssets.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
--- ios/Podfile.lock
@@ -1454,12 +1454,12 @@ PODS:
- FirebaseMessaging (<= 10.1.0)
- StructuredLogAssistantIOS (= 0.0.7)
- TOCropViewController (2.6.1)
+ - topstock-mini-app (1.2.0):
+ - React
- VisionCamera (2.15.2):
- React
- React-callinvoker
- React-Core
- - vizpick-mini-app (1.0.13):
- - React
- walmart-react-native-sumo-sdk (2.5.1):
- React
- SumoSDK (= 2.5.0)
@@ -1605,8 +1605,8 @@ DEPENDENCIES:
- RNSoundPlayer (from `../node_modules/react-native-sound-player`)
- RNSVG (from `../node_modules/react-native-svg`)
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
+ - "topstock-mini-app (from `../node_modules/@walmart/topstock-mini-app`)"
- VisionCamera (from `../node_modules/react-native-vision-camera`)
- - "vizpick-mini-app (from `../node_modules/@walmart/topstock-mini-app`)"
- "walmart-react-native-sumo-sdk (from `../node_modules/@walmart/react-native-sumo-sdk`)"
- wifi-store-locator (from `../node_modules/wifi-store-locator`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
@@ -1870,10 +1870,10 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-svg"
RNVectorIcons:
:path: "../node_modules/react-native-vector-icons"
+ topstock-mini-app:
+ :path: "../node_modules/@walmart/topstock-mini-app"
VisionCamera:
:path: "../node_modules/react-native-vision-camera"
- vizpick-mini-app:
- :path: "../node_modules/@walmart/topstock-mini-app"
walmart-react-native-sumo-sdk:
:path: "../node_modules/@walmart/react-native-sumo-sdk"
wifi-store-locator:
@@ -2035,8 +2035,8 @@ SPEC CHECKSUMS:
StructuredLogAssistantIOS: d48c327b3b67366d954435891dc1e748a6aeb9c1
SumoSDK: e79d830e9a4b14e6d32c07719e7562b30f1b535f
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
+ topstock-mini-app: 4ff590f0b34c62a468366618e13f0f7f63c0d533
VisionCamera: 4cfd685b1e671fea4aa0400905ab397f0e972210
- vizpick-mini-app: b298f0498d76ce8a77c8664f09080019c40b38ae
walmart-react-native-sumo-sdk: 0c9a5bd5f514bce7eed9f4a31b5d7b76ad6749a8
wifi-store-locator: d3fb3a630fe7d5e64cca7a8f564dcf5b14a594e2
Yoga: dc109b79db907f0f589fc423e991b09ec42d2295
--- package-lock.json
@@ -87,7 +87,7 @@
"@walmart/taskit-mini-app": "2.40.8",
"@walmart/texting-mini-app": "2.0.29",
"@walmart/time-clock-mini-app": "2.111.3",
- "@walmart/topstock-mini-app": "1.0.13",
+ "@walmart/topstock-mini-app": "1.2.0",
"@walmart/ui-components": "1.15.1",
"@walmart/welcomeme-mini-app": "0.82.1",
"@walmart/wfm-ui": "0.2.26",
@@ -9259,9 +9259,9 @@
"license": "GPL-3.0-or-later"
},
"node_modules/@walmart/topstock-mini-app": {
- "version": "1.0.13",
- "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-1.0.13.tgz",
- "integrity": "sha512-mcRjsh1xyOU1wpCr80KV7jCPl/GfyKCp6lbYMRykQ814MgPVIH448kKxa/OwVVU32MIVRy3jf8rumOcwNFI/eQ==",
+ "version": "1.2.0",
+ "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-1.2.0.tgz",
+ "integrity": "sha512-EKfUNgzwRy6c/h+Fon6NRsLQz5dWVR8UdatFuUnt09U0dr1KLLft3hEaWX9OfXb5xUvNLabqbHc9tJx6Km4xyA==",
"dependencies": {
"javascript-time-ago": "^2.5.7"
},
@@ -33876,9 +33876,9 @@
"version": "1.0.4"
},
"@walmart/topstock-mini-app": {
- "version": "1.0.13",
- "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-1.0.13.tgz",
- "integrity": "sha512-mcRjsh1xyOU1wpCr80KV7jCPl/GfyKCp6lbYMRykQ814MgPVIH448kKxa/OwVVU32MIVRy3jf8rumOcwNFI/eQ==",
+ "version": "1.2.0",
+ "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-1.2.0.tgz",
+ "integrity": "sha512-EKfUNgzwRy6c/h+Fon6NRsLQz5dWVR8UdatFuUnt09U0dr1KLLft3hEaWX9OfXb5xUvNLabqbHc9tJx6Km4xyA==",
"requires": {
"javascript-time-ago": "^2.5.7"
}
--- package.json
@@ -128,7 +128,7 @@
"@walmart/taskit-mini-app": "2.40.8",
"@walmart/texting-mini-app": "2.0.29",
"@walmart/time-clock-mini-app": "2.111.3",
- "@walmart/topstock-mini-app": "1.0.13",
+ "@walmart/topstock-mini-app": "1.2.0",
"@walmart/ui-components": "1.15.1",
"@walmart/welcomeme-mini-app": "0.82.1",
"@walmart/wfm-ui": "0.2.26",
| fix(version): merge develop branch | fix(version): merge develop branch
|
8368dc968cddc29ad85c68c40424d0f23bae610a | --- __tests__/startup/AssociateStartupTest.ts
@@ -2,10 +2,8 @@ import {call, put, take} from 'redux-saga/effects';
import {ConfigSagas} from '@walmart/allspark-foundation/Config';
import {AllsparkNotificationClient} from '@walmart/allspark-foundation/Notification';
-import {
- ActiveAllsparkContainer,
- ContainerActionTypes,
-} from '@walmart/allspark-foundation/Container';
+import {AllsparkWorkClient} from '@walmart/allspark-foundation/Work';
+import {ContainerActionTypes} from '@walmart/allspark-foundation/Container';
import {NAVIGATE_HOME} from '@walmart/me-at-walmart-common';
import {associateStartupFlow} from '../../src/startup/AssociateStartup';
@@ -33,7 +31,9 @@ test('associateStartupFlow', () => {
expect(iterator.next().value).toEqual(call(handleTermsOfUse));
expect(iterator.next().value).toEqual(call(handlePermissions));
expect(iterator.next().value).toEqual(
- call(ActiveAllsparkContainer.runFlow, 'settings'),
+ call(AllsparkWorkClient.runFlow, 'side_key.settings', {
+ actionId: 'none',
+ }),
);
expect(iterator.next().value).toEqual(call(checkPreviousImpersonation));
expect(iterator.next().value).toEqual(call(handlePinCode));
@@ -61,7 +61,10 @@ test('associateStartupFlow', () => {
take(WhatsNewTypes.CHECK_WHATS_NEW_COMPLETE),
);
expect(iterator.next().value).toEqual(
- ActiveAllsparkContainer.runFlow('startup'),
+ call(AllsparkWorkClient.runFlow, 'calling.startup', {actionId: 'none'}),
+ );
+ expect(iterator.next().value).toEqual(
+ call(AllsparkWorkClient.runFlow, 'feedback.startup', {actionId: 'none'}),
);
expect(iterator.next().value).toEqual(call(handleAppReviewPrompt));
});
@@ -72,7 +75,9 @@ test('associateStartupFlow when handleDeepLink is false', () => {
expect(iterator.next().value).toEqual(call(handleTermsOfUse));
expect(iterator.next().value).toEqual(call(handlePermissions));
expect(iterator.next().value).toEqual(
- call(ActiveAllsparkContainer.runFlow, 'settings'),
+ call(AllsparkWorkClient.runFlow, 'side_key.settings', {
+ actionId: 'none',
+ }),
);
expect(iterator.next().value).toEqual(call(checkPreviousImpersonation));
expect(iterator.next().value).toEqual(call(handlePinCode));
--- src/features/calling.ts
@@ -6,6 +6,7 @@ import {
FeatureConfig,
} from '@walmart/allspark-foundation/Config';
import {RootComponentContainer} from '@walmart/me-at-walmart-common';
+import {WorkflowExecutor} from '@walmart/allspark-foundation/Work';
export function* handleCallingOnboarding() {
const {
@@ -24,12 +25,16 @@ export function* handleCallingOnboarding() {
}
}
+type CallingWorkflows = {
+ 'calling.startup': WorkflowExecutor;
+}
+
// Temporary Calling Feature
// TODO: Calling, once moved to the foundation should export a similar module
export const CallingFeature = new AllsparkFeatureModule('calling', {
name: 'Calling',
flows: {
- startup: handleCallingOnboarding,
+ 'calling.startup': handleCallingOnboarding,
},
listeners: {
feature: {
@@ -66,3 +71,9 @@ export const CallingFeature = new AllsparkFeatureModule('calling', {
},
},
});
+
+declare global {
+ namespace Allspark {
+ interface Workflows extends CallingWorkflows {}
+ }
+}
--- src/features/feedback.ts
@@ -101,7 +101,7 @@ export function* surveySagas() {
export const FeedbackFeature = new AllsparkFeatureModule('feedback', {
name: 'Feedback',
flows: {
- startup: handleSurveyPrompt,
+ 'feedback.startup': handleSurveyPrompt,
},
redux: {
saga: surveySagas,
--- src/sideKey/index.ts
@@ -15,7 +15,7 @@ export default SideKeyFeature.createModule({
saga: sideKeySagas,
},
flows: {
- settings: handleSideButtonSetting,
+ 'side_key.settings': handleSideButtonSetting,
},
listeners: {
feature: {
--- src/startup/AssociateStartup.ts
@@ -2,10 +2,8 @@ import {call, take, put} from 'redux-saga/effects';
import {ConfigSagas} from '@walmart/allspark-foundation/Config';
import {AllsparkNotificationClient} from '@walmart/allspark-foundation/Notification';
-import {
- ActiveAllsparkContainer,
- ContainerActionTypes,
-} from '@walmart/allspark-foundation/Container';
+import {ContainerActionTypes} from '@walmart/allspark-foundation/Container';
+import {AllsparkWorkClient} from '@walmart/allspark-foundation/Work';
import {NAVIGATE_HOME} from '@walmart/me-at-walmart-common';
@@ -38,8 +36,8 @@ export function* associateStartupFlow() {
// Permissions
yield call(handlePermissions);
- // Run all feature setting flows that have been added to the active container
- yield call(ActiveAllsparkContainer.runFlow, 'settings');
+ // Run all feature specific setting flows
+ yield call(AllsparkWorkClient.runFlow, 'side_key.settings', {actionId: 'none'});
// Impersonation Check
yield call(checkPreviousImpersonation);
@@ -74,8 +72,9 @@ export function* associateStartupFlow() {
yield put(WhastNewActionCreators.checkWhatsNew());
yield take(WhatsNewTypes.CHECK_WHATS_NEW_COMPLETE);
- // Run all feature startup flows that have been added to the active container
- yield ActiveAllsparkContainer.runFlow('startup');
+ // Run all feature specific startup flows
+ yield call(AllsparkWorkClient.runFlow, 'calling.startup', {actionId: 'none'});
+ yield call(AllsparkWorkClient.runFlow, 'feedback.startup', {actionId: 'none'});
// User will be on home at this point, but we'll wait until they navigates away and back to the home screen.
// This is to avoid conflict of prompts at startup
| fix(startup): feature flows not being called from work client (#4263) | fix(startup): feature flows not being called from work client (#4263)
|
f43335bb3556e3129c37c95b9d33ad6f0f8e9858 | --- packages/allspark-foundation/Hooks/useUserPreferences.js
@@ -8,19 +8,20 @@ const mockData_1 = require("../Components/Hub/Container/mockData");
const User_1 = require("../User");
const Site_1 = require("../Site");
const sorter = (data) => {
- const sorted = [];
- for (let i = 0; i < data.length; i++) {
- if (data[i].teamLabel === 'Total store') {
- sorted.push(data[i]);
- }
- if (data[i].teamLabel === 'My teams') {
- sorted.push(data[i]);
- }
- }
- return [
- ...sorted,
- ...data.sort((a, b) => a.teamLabel.localeCompare(b.teamLabel)),
- ];
+ const TOTAL_STORE = 'Total store';
+ const MY_TEAMS = 'My teams';
+ const customSort = (a, b) => {
+ if (a.teamLabel === TOTAL_STORE)
+ return -1;
+ if (b.teamLabel === TOTAL_STORE)
+ return 1;
+ if (a.teamLabel === MY_TEAMS)
+ return -1;
+ if (b.teamLabel === MY_TEAMS)
+ return 1;
+ return a.teamLabel.localeCompare(b.teamLabel);
+ };
+ return [...data].sort(customSort);
};
const useUserPreferences = (data) => {
const storeId = (0, react_redux_1.useSelector)(Site_1.SiteSelectors.getWorkingSite).data?.siteId;
| chore(ui): added sorter function for teamdata | chore(ui): added sorter function for teamdata
|
022695fe6914dfb1d4ae235fa88480daca26be65 | --- 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.9):
+ - react-native-wm-vizpick-shell (1.1.2-rc.10):
- 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: b8ac31392ef523d9aa036e869f875a74b36c4c0c
+ react-native-wm-vizpick-shell: ba027ae8c56b27af19450df755a9d73a5b9caf16
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-136dd04",
+ "@walmart/topstock-mini-app": "1.0.2",
"@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.9",
+ "react-native-wm-vizpick-shell": "1.1.2-rc.10",
"react-native-wm-voice-text": "1.0.1",
"react-redux": "^8.0.4",
"realm": "11.2.0",
@@ -6101,9 +6101,9 @@
"license": "GPL-3.0-or-later"
},
"node_modules/@walmart/topstock-mini-app": {
- "version": "0.0.2-feat-136dd04",
- "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-0.0.2-feat-136dd04.tgz",
- "integrity": "sha512-B00zJs+RYXdQGd52brTY/8PJOwzoqmip+WX6ebc02xnaPWc6jXnZRvuy/64mmbfuSZvnIlLiVGkS1NFS+611Jg==",
+ "version": "1.0.2",
+ "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-1.0.2.tgz",
+ "integrity": "sha512-YPjtWOtPcaJ1hQrGTtaQDnTgeEthG1COr6Pmf56U+yiRMNbZ+UACaa6cc0rlZH1Z8IXUs808663hX8y7bVlRyA==",
"dependencies": {
"javascript-time-ago": "^2.5.7"
},
@@ -18359,9 +18359,9 @@
}
},
"node_modules/react-native-wm-vizpick-shell": {
- "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==",
+ "version": "1.1.2-rc.10",
+ "resolved": "https://npme.walmart.com/react-native-wm-vizpick-shell/-/react-native-wm-vizpick-shell-1.1.2-rc.10.tgz",
+ "integrity": "sha512-8Df2k+TtSOxRgnYVE0FjQU84GK1ILKrFlRvqUKCd2u5JpGsj5aPLVBojggNFypZa6p47Czf6uRnZHgMgVF5fIQ==",
"license": "UNLICENSED"
},
"node_modules/react-native-wm-voice-text": {
@@ -25408,9 +25408,9 @@
"version": "1.0.4"
},
"@walmart/topstock-mini-app": {
- "version": "0.0.2-feat-136dd04",
- "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-0.0.2-feat-136dd04.tgz",
- "integrity": "sha512-B00zJs+RYXdQGd52brTY/8PJOwzoqmip+WX6ebc02xnaPWc6jXnZRvuy/64mmbfuSZvnIlLiVGkS1NFS+611Jg==",
+ "version": "1.0.2",
+ "resolved": "https://npme.walmart.com/@walmart/topstock-mini-app/-/topstock-mini-app-1.0.2.tgz",
+ "integrity": "sha512-YPjtWOtPcaJ1hQrGTtaQDnTgeEthG1COr6Pmf56U+yiRMNbZ+UACaa6cc0rlZH1Z8IXUs808663hX8y7bVlRyA==",
"requires": {
"javascript-time-ago": "^2.5.7"
}
@@ -33224,9 +33224,9 @@
"version": "0.4.0"
},
"react-native-wm-vizpick-shell": {
- "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=="
+ "version": "1.1.2-rc.10",
+ "resolved": "https://npme.walmart.com/react-native-wm-vizpick-shell/-/react-native-wm-vizpick-shell-1.1.2-rc.10.tgz",
+ "integrity": "sha512-8Df2k+TtSOxRgnYVE0FjQU84GK1ILKrFlRvqUKCd2u5JpGsj5aPLVBojggNFypZa6p47Czf6uRnZHgMgVF5fIQ=="
},
"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-136dd04",
+ "@walmart/topstock-mini-app": "1.0.2",
"@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.9",
+ "react-native-wm-vizpick-shell": "1.1.2-rc.10",
"react-native-wm-voice-text": "1.0.1",
"react-redux": "^8.0.4",
"realm": "11.2.0",
| build(update): update topstock & shell version | build(update): update topstock & shell version
|
436217ef90525503004abffcf82799e70e641a43 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.15.0-alpha.8",
+ "version": "1.15.0-alpha.9",
"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.10",
+ "@walmart/roster-mini-app": "2.12.0-alpha.11",
"@walmart/ui-components": "1.15.1",
"@walmart/wmconnect-mini-app": "2.7.0",
"babel-jest": "^29.2.1",
--- yarn.lock
@@ -5925,8 +5925,8 @@ __metadata:
linkType: hard
"@walmart/allspark-foundation-hub@npm:latest":
- version: 1.0.0-beta.2
- resolution: "@walmart/allspark-foundation-hub@npm:1.0.0-beta.2"
+ version: 1.0.0-beta.3
+ resolution: "@walmart/allspark-foundation-hub@npm:1.0.0-beta.3"
dependencies:
"@apollo/client": "npm:^3.8.6"
"@graphql-codegen/cli": "npm:^5.0.0"
@@ -6022,7 +6022,7 @@ __metadata:
allspark-generate-graphql: cli/generate.js
allspark-link: cli/link.js
allspark-setup: cli/setup.js
- checksum: 10c0/8d9ffb33860a5a9326f6786c5fbb81cedf56b43db900fac8b75dd79ddff0dde35e73ed4e673ad48c6946a099ee0d86e34069ccf0da7999d2b75e833f9c74baca
+ checksum: 10c0/ce26bdbb3539f7c34e127a371cafe1c64c3c396b2e15cabcf8c1b8fe99366fcf940638141ceb26c6840c4bbded76e2b1e7cec6a84de466f7a9c7a1022daf9f81
languageName: node
linkType: hard
@@ -6428,7 +6428,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.10"
+ "@walmart/roster-mini-app": "npm:2.12.0-alpha.11"
"@walmart/ui-components": "npm:1.15.1"
"@walmart/wmconnect-mini-app": "npm:2.7.0"
babel-jest: "npm:^29.2.1"
@@ -6610,9 +6610,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/roster-mini-app@npm:2.12.0-alpha.10":
- version: 2.12.0-alpha.10
- resolution: "@walmart/roster-mini-app@npm:2.12.0-alpha.10"
+"@walmart/roster-mini-app@npm:2.12.0-alpha.11":
+ version: 2.12.0-alpha.11
+ resolution: "@walmart/roster-mini-app@npm:2.12.0-alpha.11"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.21.0
"@react-native-community/netinfo": ^11.0.1
@@ -6654,7 +6654,7 @@ __metadata:
redux: ^4.2.1
redux-saga: ^1.2.3
wifi-store-locator: 1.4.1
- checksum: 10c0/b51bd58acdbc0b9eeac0579514c85128245bb2407700d46e3efe4c4b4ac5a4f40dfd247d3780bded967195251afde551c86e5772e3b40e69d45b97fb9bf227ca
+ checksum: 10c0/f23ec2fb154da34f28aba8abf02b5cb6dfa018216b9c51f9a27ca2da1673c8965dd321241fbbf83da98b75f8f765c9a76a02cb8f006ea9fb0d074aa11fc3acb2
languageName: node
linkType: hard
@@ -14687,11 +14687,11 @@ __metadata:
linkType: hard
"moment-timezone@npm:~0.5.43":
- version: 0.5.45
- resolution: "moment-timezone@npm:0.5.45"
+ version: 0.5.46
+ resolution: "moment-timezone@npm:0.5.46"
dependencies:
moment: "npm:^2.29.4"
- checksum: 10c0/7497f23c4b8c875dbf07c03f9a1253f79edaeedc29d5732e36bfd3c5577e25aed1924fbd84cbb713ce1920dbe822be0e21bd487851a7d13907226f289a5e568b
+ checksum: 10c0/003fd278d1aa3e63afff340a318735db80157b7a343e3f807cac10e026def214f0e71b52d582b89a11ee0a19f5d9f0da2752b7959d855429f2b715d4859d3722
languageName: node
linkType: hard
@@ -17251,13 +17251,13 @@ __metadata:
linkType: hard
"regjsparser@npm:^0.11.0":
- version: 0.11.0
- resolution: "regjsparser@npm:0.11.0"
+ version: 0.11.1
+ resolution: "regjsparser@npm:0.11.1"
dependencies:
jsesc: "npm:~3.0.2"
bin:
regjsparser: bin/parser
- checksum: 10c0/155143a8f2c95e3170df4fff10ddf3f16a351b5d2b8cbb257e9f4a50abb9a980a28af0936b5bf850fee767537ffa8eb77c6b211fe8be19834dbe584dfd950c62
+ checksum: 10c0/be4b40981a596b31eacd84ee12cfa474f1d33a6c05f7e995e8ec9d5ad8f1c3fbf7a5b690a05c443e1f312a1c0b16d4ea0b3384596a61d4fda97aa322879bb3cd
languageName: node
linkType: hard
| Update roster widget on my Team mini app | Update roster widget on my Team mini app
|
6d34b420080b25d6688f90704b8064ab899d901c | --- targets/US/package.json
@@ -148,7 +148,7 @@
"@walmart/store-feature-orders": "1.26.12",
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch",
"@walmart/time-clock-mini-app": "2.400.0",
- "@walmart/topstock-mini-app": "1.16.21-299-f82ab41",
+ "@walmart/topstock-mini-app": "1.16.22",
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch",
"@walmart/welcomeme-mini-app": "0.95.1",
"@walmart/wfm-ui": "1.6.0",
--- yarn.lock
@@ -6874,7 +6874,7 @@ __metadata:
"@walmart/store-feature-orders": "npm:1.26.12"
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch"
"@walmart/time-clock-mini-app": "npm:2.400.0"
- "@walmart/topstock-mini-app": "npm:1.16.21-299-f82ab41"
+ "@walmart/topstock-mini-app": "npm:1.16.22"
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch"
"@walmart/welcomeme-mini-app": "npm:0.95.1"
"@walmart/wfm-ui": "npm:1.6.0"
@@ -7860,9 +7860,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/topstock-mini-app@npm:1.16.21-299-f82ab41":
- version: 1.16.21-299-f82ab41
- resolution: "@walmart/topstock-mini-app@npm:1.16.21-299-f82ab41"
+"@walmart/topstock-mini-app@npm:1.16.22":
+ version: 1.16.22
+ resolution: "@walmart/topstock-mini-app@npm:1.16.22"
peerDependencies:
"@react-native-firebase/app": ^15.1.1
"@react-native-firebase/crashlytics": ^15.1.1
@@ -7879,7 +7879,7 @@ __metadata:
react-native-haptic-feedback: ^1.13.0
react-native-vector-icons: ">=6.6.0"
react-redux: ">=7.2.0"
- checksum: 10c0/684d68f8a972758c5fc94e0290cf6ad3ea772395679676b1f34ac196cd89f6d249d124087549c4ffc3aab7420b481bd153408321f8b9a9afdfaa41f1d06e1d8f
+ checksum: 10c0/98052bbaed113a1acfeb6a7ec58885c582891bad3014c0dcf7e9563e3b6bb6d062079462c0a24042fd3ac9a31bda750170bcbbe1810d215585c480cfcd8a71e4
languageName: node
linkType: hard
| fix(): updated topstock version | fix(): updated topstock version
|
49f0cbd907c6b70927d103209a1088df31fda323 | --- .yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch
@@ -1,13 +1,13 @@
-diff --git a/lib/module/TransitionConfigs/CardStyleInterpolators.js b/lib/module/TransitionConfigs/CardStyleInterpolators.js
-index fe959806339399f0ef4a3c89144a0d0c579d6c68..26ab594bc1e0ec8e6b924b199ee364a94afcd912 100644
---- a/lib/module/TransitionConfigs/CardStyleInterpolators.js
-+++ b/lib/module/TransitionConfigs/CardStyleInterpolators.js
-@@ -301,7 +301,7 @@ export function forFadeFromRightAndroid({
- }), inverted);
- const translateUnfocused = next ? multiply(next.progress.interpolate({
- inputRange: [0, 1],
-- outputRange: [0, -96],
-+ outputRange: [0, 0],
- extrapolate: 'clamp'
- }), inverted) : 0;
- const opacity = conditional(closing, current.progress.interpolate({
+diff --git a/lib/module/views/Stack/Card.js b/lib/module/views/Stack/Card.js
+index b680e64a31f75c230ce0332adf3593147308445d..3a8810224a0f0ef60c58bf295b3f708bbf42e518 100644
+--- a/lib/module/views/Stack/Card.js
++++ b/lib/module/views/Stack/Card.js
+@@ -15,7 +15,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+ const GESTURE_VELOCITY_IMPACT = 0.3;
+ const TRUE = 1;
+ const FALSE = 0;
+-const useNativeDriver = Platform.OS !== 'web';
++const useNativeDriver = Platform.OS !== 'web' && Platform.OS !== 'android';
+ const hasOpacityStyle = style => {
+ if (style) {
+ const flattenedStyle = StyleSheet.flatten(style);
--- src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx
@@ -206,10 +206,10 @@ export const MainStackNav = () => {
initialRouteName="tabs"
screenOptions={{
headerShown: true,
- ...TransitionPresets.SlideFromRightIOS,
+ ...(Platform.OS === 'ios' && TransitionPresets.SlideFromRightIOS),
header: (props) => <Header {...props} />,
headerBackAccessibilityLabel: t('headerBackLabel'),
- detachPreviousScreen: false,
+ detachPreviousScreen: false
}}
>
{/* Render the correct tabs depending on mode */}
@@ -345,17 +345,6 @@ export const MainStackNav = () => {
{AskSamFeature.buildAllScreens({
Navigator: MainStack,
- ...(Platform.OS === 'android' && {
- // Apply transparentModal presentation on Android only to fix flickering issue
- routeConfig: {
- options: {
- presentation: 'transparentModal',
- animation: false,
- headerShown: false,
- ...TransitionPresets.ModalSlideFromBottomIOS,
- }
- } as any
- })
})}
{ModFlexFeature.buildAllScreens({
--- src/navigation/index.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import {StyleSheet} from 'react-native';
+import {Platform, StyleSheet} from 'react-native';
import {useSelector} from 'react-redux';
import {TransitionPresets, createStackNavigator} from '@react-navigation/stack';
import {FeatureModule} from '@walmart/allspark-foundation/Feature';
@@ -46,8 +46,8 @@ export const CoreNavigation = () => {
<RootStack.Navigator
initialRouteName='Core.Login'
screenOptions={{
- ...TransitionPresets.SlideFromRightIOS,
headerShown: false,
+ ...(Platform.OS === 'ios' && TransitionPresets.SlideFromRightIOS),
}}>
{isAppAccessible ? (
<>
--- yarn.lock
@@ -6023,7 +6023,7 @@ __metadata:
"@react-navigation/stack@patch:@react-navigation/stack@npm%3A7.6.7#~/.yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch":
version: 7.6.7
- resolution: "@react-navigation/stack@patch:@react-navigation/stack@npm%3A7.6.7%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540react-navigation%252Fstack%252F-%252Fstack-7.6.7.tgz#~/.yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch::version=7.6.7&hash=b63133"
+ resolution: "@react-navigation/stack@patch:@react-navigation/stack@npm%3A7.6.7%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540react-navigation%252Fstack%252F-%252Fstack-7.6.7.tgz#~/.yarn/patches/@react-navigation-stack-npm-7.6.7-99a55dcbcc.patch::version=7.6.7&hash=9aeee1"
dependencies:
"@react-navigation/elements": "npm:^2.8.3"
color: "npm:^4.2.3"
@@ -6035,7 +6035,7 @@ __metadata:
react-native-gesture-handler: ">= 2.0.0"
react-native-safe-area-context: ">= 4.0.0"
react-native-screens: ">= 4.0.0"
- checksum: 10c0/3c782cb76c11d74af5f6bd2f9e79ed006189591822c7d8269a329e5171548925265ca0d0600ddcdb5d30123796cca59ee9f47e9f996e490a5326f23417166636
+ checksum: 10c0/abaf0c51e4bc7faa5ae1f149604a8b8723c58a45499ff5afb34f235900f74319f2baedac34923ba4fbbafe14ef9e7f718090b5e5b3976a1f64cdd7a7991c19cc
languageName: node
linkType: hard
| fix(navigation): disable native driver for animation (#5250) | fix(navigation): disable native driver for animation (#5250)
Co-authored-by: Shubhang Shah <s0s0zug@homeoffice.wal-mart.com>
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> |
4704336d52bf92a35816c2a2f3e965b8f74a3bd2 | --- __tests__/__mocks__/@walmart/allspark-foundation-hub/HubFeature.js
@@ -0,0 +1,5 @@
+import MockHubWidget from './MockHubWidget';
+
+module.exports = {
+ HubWidget: jest.fn().mockImplementation(MockHubWidget),
+};
--- __tests__/__mocks__/@walmart/allspark-foundation-hub/MockHubWidget.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import {View} from 'react-native';
+
+const MockHubWidget = () => {
+ return <View testID='mock-hub-widget' />;
+};
+
+export default MockHubWidget;
--- __tests__/managerExperience/components/RosterWidget.test.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import * as hooks from '../../../src/hooks';
+import {renderWithProviders} from '../../harness';
+import {RosterWidget} from '../../../src/managerExperience/components/RosterWidget';
+import {TeamHubWidgetProps} from '@walmart/me-at-walmart-common';
+import {GetDailyRosterQueryResult} from '../../../src/queries/getDailyRoster';
+import {mockGetDailyRosterQuery} from '../../harness/athenaQueries/getDailyRoster';
+import {mockGetTeamsByStoreQuery} from '../../harness/athenaQueries/getTeamsByStore';
+import {GetTeamByIdQueryResult} from '../../../src/queries/getTeamById';
+import {finishPendingRequests} from '../../harness/utils';
+
+const props: TeamHubWidgetProps = {
+ selectedTeamIds: ['1'],
+ refresh: 'refresh',
+ widgetStyle: {},
+};
+
+jest.mock('../../../src/hooks');
+
+jest.useFakeTimers();
+
+// TODO: add more test cases
+describe('RosterWidget', () => {
+ beforeEach(() => {
+ jest.spyOn(hooks, 'useDailyRoster').mockReturnValue(
+ // @ts-ignore
+ {
+ ...mockGetDailyRosterQuery.result,
+ loading: false,
+ error: undefined,
+ refetch: jest.fn(() => Promise.resolve({data: {}})),
+ } as GetDailyRosterQueryResult,
+ );
+
+ jest
+ .spyOn(hooks, 'useGetTeamsByStore')
+ // @ts-ignore
+ .mockReturnValue({
+ ...mockGetTeamsByStoreQuery.result,
+ loading: false,
+ refetch: jest.fn(() => Promise.resolve({data: {}})),
+ } as GetTeamByIdQueryResult);
+ });
+ it('renders correctly with given props', async () => {
+ const {toJSON} = renderWithProviders(<RosterWidget {...props} />);
+ await finishPendingRequests();
+ expect(toJSON()).toMatchSnapshot();
+ });
+});
--- __tests__/managerExperience/components/__snapshots__/RosterWidget.test.tsx.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`RosterWidget renders correctly with given props 1`] = `
+<View
+ testID="mock-hub-widget"
+/>
+`;
| test: add minimal test coverage for roster widget | test: add minimal test coverage for roster widget
|
287b230a0e2aa1d89e5c5d489497e292c28dc6e0 | --- packages/allspark-graphql-client/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.0.5](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-graphql-client@0.0.4...@walmart/allspark-graphql-client@0.0.5) (2023-01-11)
+
+**Note:** Version bump only for package @walmart/allspark-graphql-client
+
+
+
+
+
## [0.0.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-graphql-client@0.0.3...@walmart/allspark-graphql-client@0.0.4) (2023-01-11)
**Note:** Version bump only for package @walmart/allspark-graphql-client
--- packages/allspark-graphql-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-graphql-client",
- "version": "0.0.4",
+ "version": "0.0.5",
"description": "> TODO: description",
"license": "ISC",
"main": "lib/index.js",
--- packages/allspark-redux-store/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.0.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-redux-store@1.0.3...@walmart/allspark-redux-store@1.0.4) (2023-01-11)
+
+**Note:** Version bump only for package @walmart/allspark-redux-store
+
+
+
+
+
## [1.0.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-redux-store@1.0.2...@walmart/allspark-redux-store@1.0.3) (2023-01-11)
**Note:** Version bump only for package @walmart/allspark-redux-store
--- packages/allspark-redux-store/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-redux-store",
- "version": "1.0.3",
+ "version": "1.0.4",
"description": "Common redux store for allspark platform",
"author": "rlane1 <russell.lane@walmart.com>",
"homepage": "",
| chore(version): updating package version | chore(version): updating package version
- @walmart/allspark-graphql-client@0.0.5
- @walmart/allspark-redux-store@1.0.4
|
38a9f5927b21c0178e82c504fa8c92f1ad148b34 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/wmconnect-mini-app",
- "version": "2.40.0",
+ "version": "2.41.0",
"main": "dist/index.js",
"files": [
"dist",
| fix: SMDV-8203 upgrade version to 2.41.0 | fix: SMDV-8203 upgrade version to 2.41.0
|
db91fb90e529c235b848dbf54be10f40adb525e0 | --- packages/allspark-foundation/src/Feature/AllsparkFeatureManager.ts
@@ -1,5 +1,6 @@
import { EventManager } from '@walmart/allspark-utils';
import { AllsparkFeatureModule } from './AllsparkFeatureModule';
+import { ConnectCapabilities } from './types';
/**
* Manages a collection of AllsparkFeatureModule instances, allowing for adding, retrieving, and connecting features.
@@ -118,10 +119,33 @@ export class FeatureModuleManager {
* Connects all features in the manager in the order of their dependencies.
* Sets the `connected` property to `true` when complete.
*/
- public connect() {
+ public connectAll() {
this._connectByDependencyOrder(this.getFeatures());
this.connected = true;
}
+
+ /**
+ * Connects features in the manager based on a given feature id or capability.
+ * If feature id is provided, every capability will be connected on that feature.
+ * If capability is provided, that capability will be connected on every feature.
+ * If both are provided, then only that capability for that feature will be connected.
+ */
+ public connect(config: {
+ featureId?: string;
+ capability?: ConnectCapabilities;
+ }) {
+ if (config.featureId) {
+ const feature = this.getFeature(config.featureId);
+ if (feature) {
+ feature.connect(config.capability);
+ }
+ } else if (config.capability) {
+ const features = this.getFeatures();
+ features.forEach((feature) => {
+ feature.connect(config.capability);
+ });
+ }
+ }
}
/**
--- packages/allspark-foundation/src/FeatureRunner/navigation.tsx
@@ -70,7 +70,7 @@ export const createFeatureRunnerNavigation = <F extends AllsparkFeatureModule>(
}
if (!AllsparkFeatureManager.connected) {
- AllsparkFeatureManager.connect();
+ AllsparkFeatureManager.connectAll();
}
};
| refactor: update feature module manager connect to handle specific features and capabilities | refactor: update feature module manager connect to handle specific features and capabilities
|
853cf4b5d4298d1a4f13392f26beeb4b3e00a7e1 | --- packages/components-library/components/BottomNav/BottomNav.tsx
@@ -33,14 +33,14 @@ export type NavItem = {
label: string;
/** Icon component to render for the navigation item.
* Do not pass `color` and `size` props, it will be handled internally.
- * Example: `Icon: CalendarIcon`
+ * Example: `icon: CalendarIcon`
*
* if you need to modify the icon props, pass in an arrow function that returns the icon component.
* This allows for custom props to be passed to the icon component.
* @example
* (props) => <Icon your-prop="value" {...props} />
*/
- Icon: React.ComponentType<
+ icon: React.ComponentType<
{ color?: string; size?: any } & Record<string, any>
>;
/** Callback function executed when the item is pressed. */
@@ -98,16 +98,16 @@ const getItemAccessibility = (item: NavItem, activeKey: string) => ({
* @example
* // Basic usage with controlled active state
* const navItems = [
- * { key: 'home', label: 'Home', iconName: 'home', onPress: () => setActive('home') },
- * { key: 'profile', label: 'Profile', iconName: 'user', onPress: () => setActive('profile') },
+ * { key: 'home', label: 'Home', icon: HomeIcon, onPress: () => setActive('home') },
+ * { key: 'profile', label: 'Profile', icon: UserIcon, onPress: () => setActive('profile') },
* ];
* <BottomNav items={navItems} activeItem={activeTab} />
*
* @example
* // With disabled item and custom styles
* const navItems = [
- * { key: 'search', label: 'Search', iconName: 'search', onPress: handleSearch },
- * { key: 'cart', label: 'Cart', iconName: 'shopping-cart', onPress: handleCart, disabled: true },
+ * { key: 'search', label: 'Search', icon: SearchIcon, onPress: handleSearch },
+ * { key: 'cart', label: 'Cart', icon: ShoppingCartIcon, onPress: handleCart, disabled: true },
* ];
* <BottomNav
* items={navItems}
@@ -121,7 +121,7 @@ const getItemAccessibility = (item: NavItem, activeKey: string) => ({
* {
* key: 'featured',
* label: 'Featured',
- * iconName: 'star',
+ * icon: StarIcon,
* onPress: handleFeatured,
* UNSAFE_Style: { paddingVertical: 8 }
* },
@@ -144,6 +144,7 @@ export const BottomNav: React.FC<BottomNavProps> = ({
{items.map((item) => {
const iconColor = getIconColor(item, activeItem);
const accessibilityProps = getItemAccessibility(item, activeItem);
+ const IconComponent = item.icon;
return (
<TouchableOpacity
@@ -154,7 +155,7 @@ export const BottomNav: React.FC<BottomNavProps> = ({
testID={`${TEST_ID}-${item.key}`}
{...accessibilityProps}
>
- <item.Icon color={iconColor} size={SIZE_PRESETS.iconSize} />
+ <IconComponent color={iconColor} size={SIZE_PRESETS.iconSize} />
<Body
UNSAFE_style={[styles.label, { color: iconColor }]}
weight={item.key === activeItem ? '700' : '400'}
--- packages/components-library/components/BottomNav/bottomNav.stories.tsx
@@ -8,21 +8,21 @@ const navItems: NavItem[] = [
{
key: 'forYou',
label: 'For you',
- Icon: Icons.HomeIcon,
+ icon: Icons.HomeIcon,
onPress: () => console.log('For you pressed'),
accessibilityLabel: 'View For You screen',
},
{
key: 'todayPlan',
label: 'Today plan',
- Icon: Icons.CalendarIcon,
+ icon: Icons.CalendarIcon,
onPress: () => console.log('Today`s plan pressed'),
accessibilityLabel: 'View Today`s Plan screen',
},
{
key: 'yourTeam',
label: 'Your team',
- Icon: Icons.AssociateIcon,
+ icon: Icons.AssociateIcon,
onPress: () => console.log('Your team pressed'),
accessibilityLabel: 'View My Team screen',
},
--- packages/components-library/components/BottomNav/bottomNav.test.tsx
@@ -21,19 +21,19 @@ const mockNavItems: NavItem[] = [
{
key: 'home',
label: 'Home',
- Icon: HomeIcon,
+ icon: HomeIcon,
onPress: jest.fn(),
},
{
key: 'profile',
label: 'Profile',
- Icon: HomeIcon,
+ icon: HomeIcon,
onPress: jest.fn(),
},
{
key: 'settings',
label: 'Settings',
- Icon: (props) => <HomeIcon {...props} />,
+ icon: (props) => <HomeIcon {...props} />,
onPress: jest.fn(),
},
];
@@ -207,7 +207,7 @@ describe('BottomNav Component', () => {
{
key: 'dashboard',
label: 'Dashboard',
- Icon: HomeIcon,
+ icon: HomeIcon,
onPress: jest.fn(),
accessibilityLabel: 'View Dashboard',
UNSAFE_Style: { paddingHorizontal: 12 },
@@ -215,14 +215,14 @@ describe('BottomNav Component', () => {
{
key: 'analytics',
label: 'Analytics',
- Icon: HomeIcon,
+ icon: HomeIcon,
onPress: jest.fn(),
disabled: true,
},
{
key: 'notifications',
label: 'Notifications',
- Icon: HomeIcon,
+ icon: HomeIcon,
onPress: jest.fn(),
},
];
@@ -258,7 +258,7 @@ describe('BottomNav Helper Functions', () => {
{
key: 'home',
label: 'Home',
- Icon: ({ color, ...props }) => (
+ icon: ({ color, ...props }) => (
<TestableIcon {...props} color={color} testID='icon-home' />
),
onPress: jest.fn(),
@@ -266,7 +266,7 @@ describe('BottomNav Helper Functions', () => {
{
key: 'profile',
label: 'Profile',
- Icon: ({ color, ...props }) => (
+ icon: ({ color, ...props }) => (
<TestableIcon {...props} color={color} testID='icon-profile' />
),
onPress: jest.fn(),
@@ -274,7 +274,7 @@ describe('BottomNav Helper Functions', () => {
{
key: 'settings',
label: 'Settings',
- Icon: ({ color, ...props }) => (
+ icon: ({ color, ...props }) => (
<TestableIcon {...props} color={color} testID='icon-settings' />
),
onPress: jest.fn(),
@@ -314,7 +314,7 @@ describe('BottomNav Helper Functions', () => {
{
key: 'home',
label: 'Home',
- Icon: ({ color, ...props }) => (
+ icon: ({ color, ...props }) => (
<TestableIcon {...props} color={color} testID='icon-home' />
),
onPress: jest.fn(),
@@ -323,7 +323,7 @@ describe('BottomNav Helper Functions', () => {
{
key: 'profile',
label: 'Profile',
- Icon: ({ color, ...props }) => (
+ icon: ({ color, ...props }) => (
<TestableIcon {...props} color={color} testID='icon-profile' />
),
onPress: jest.fn(),
@@ -368,7 +368,7 @@ describe('BottomNav Edge Cases', () => {
{
key: 'veryLongLabel',
label: 'This is a very long navigation label that might wrap',
- Icon: HomeIcon,
+ icon: HomeIcon,
onPress: jest.fn(),
},
...mockNavItems.slice(1),
@@ -387,7 +387,7 @@ describe('BottomNav Edge Cases', () => {
{
key: 'special-key_123',
label: 'Special & Label',
- Icon: HomeIcon,
+ icon: HomeIcon,
onPress: jest.fn(),
},
...mockNavItems.slice(1),
| refactor(BottomNav): rename icon prop for consistency across components | refactor(BottomNav): rename icon prop for consistency across components
|
ca80f496df3eca05f2d38f7757db0864f7e3709e | --- package-lock.json
@@ -3062,9 +3062,9 @@
}
},
"@walmart/ask-sam-mini-app": {
- "version": "0.29.5",
- "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.29.5.tgz",
- "integrity": "sha512-MOgZvgc3pJuHabHW6nhgLPheomCoko6wy+TaKKdE5UkgFg96Vw8GnSp81V4JgL7p2vN3KMeqLb58xYTnWJulxw==",
+ "version": "0.29.8",
+ "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.29.8.tgz",
+ "integrity": "sha512-fAiAhggNeILQW1fddZVEDUDaG8cjKkxc39xznUQ0EGeNPbQX/ZVqsU1XjgHmGrzsmajxur+uTViIFNwdrw4AZw==",
"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.29.5",
+ "@walmart/ask-sam-mini-app": "0.29.8",
"@walmart/config-components": "^1.0.26",
"@walmart/counts-component-miniapp": "0.0.11",
"@walmart/exception-mini-app": "0.16.0",
| Ask sam version bump | Ask sam version bump
|
515cd3e2f4173a8e40f01c01aae4463d2728b319 | --- core/src/core/translations.ts
@@ -141,6 +141,7 @@ export const enUS = {
notifications_1: '{{label}}, 1 notification',
notifications_null: '{{label}}',
notifications_plural: '{{label}}, {{count}} notifications',
+ request_details: 'Request Details',
settings: {
'3rd_party_notices': '3rd Party Notices',
data_saver: 'Data saver',
@@ -162,6 +163,7 @@ export const enUS = {
signInFailed: 'Sign in failed',
taskit: 'Notes',
terms_of_use: 'Terms of Use',
+ time_off_requests: 'Time Off Requests',
},
pinAccess: {
attemptsMessage: 'You have {{count}} more attempt',
@@ -384,6 +386,7 @@ export const esMX = {
notifications_1: '{{label}}, 1 notificacione',
notifications_null: '{{label}}',
notifications_plural: '{{label}}, {{count}} notificaciones',
+ request_details: 'Detalles de la solicitud',
settings: {
'3rd_party_notices': 'Avisos de terceros',
data_saver: 'Ahorro de datos',
@@ -405,6 +408,7 @@ export const esMX = {
signInFailed: 'Error al iniciar sesión',
taskit: 'Notas',
terms_of_use: 'Condiciones de uso',
+ time_off_requests: 'Solicitar tiempo libre',
},
pinAccess: {
attemptsMessage: 'Tienes {{count}} intento más',
--- core/src/features/attendance.ts
@@ -1,6 +1,6 @@
import {AllsparkFeature} from '@walmart/allspark-foundation';
+import {TeamHubContainer} from '@walmart/allspark-foundation-hub';
import {InboxContainer} from '@walmart/me-at-walmart-common';
-
// --- NOTICE --- //
// Temporary Attendance Feature
// TODO: Attendance, once moved to the foundation, should export a similar module.
@@ -13,8 +13,12 @@ export default AttendanceFeature.createModule({
listeners: {
feature: {
onConnect: () => {
- const {TorInboxWidget} = require('@walmart/attendance-mini-app');
+ const {
+ ManagedTorWidget,
+ TorInboxWidget,
+ } = require('@walmart/attendance-mini-app');
InboxContainer.add('torWidget', TorInboxWidget);
+ TeamHubContainer.add('Attendance.mgrTorReview', ManagedTorWidget);
const {
addLanguageResources,
} = require('@walmart/attendance-mini-app/dist/localization');
@@ -36,5 +40,21 @@ export default AttendanceFeature.createModule({
headerShown: true,
},
},
+ managedTorListScreen: {
+ getComponent: () =>
+ require('@walmart/attendance-mini-app').ManagedTorListScreen,
+ options: {
+ headerShown: true,
+ title: 'Time Off Requests',
+ },
+ },
+ managedTorDetailsScreen: {
+ getComponent: () =>
+ require('@walmart/attendance-mini-app').ManagedTorDetailsScreen,
+ options: {
+ headerShown: true,
+ title: 'Request Details',
+ },
+ },
},
});
--- core/src/navigation/USHallway/AssociateHallwayNav/Tabs/HomeStackNav.tsx
@@ -52,9 +52,17 @@ export const HomeStackNav = (_: MainTabsScreenProps<'home'>) => {
Navigator: HomeStack as any,
})}
- {AttendanceFeature.buildScreens(['Attendance', 'torInbox'], {
- Navigator: HomeStack as any,
- })}
+ {AttendanceFeature.buildScreens(
+ [
+ 'Attendance',
+ 'torInbox',
+ 'managedTorListScreen',
+ 'managedTorDetailsScreen',
+ ],
+ {
+ Navigator: HomeStack as any,
+ },
+ )}
{ScheduleModule.buildAllScreens({
Navigator: HomeStack as any,
--- core/src/navigation/USHallway/AssociateHallwayNav/Tabs/MyTeamStackNav.tsx
@@ -4,6 +4,10 @@ import {createStackNavigator} from '@react-navigation/stack';
import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation';
import {renderDrawerButton} from '@walmart/allspark-foundation/Navigation';
import {Header} from '@walmart/ui-components';
+import {
+ ManagedTorDetailsScreen,
+ ManagedTorListScreen,
+} from '@walmart/attendance-mini-app';
import {TextingMiniApp} from '@walmart/myteam-mini-app';
import {MyTeamHooks} from '@walmart/wmconnect-mini-app';
@@ -48,6 +52,20 @@ export const MyTeamStackNav = (props: MainTabsScreenProps<'myTeam'>) => {
headerLeft: renderDrawerButton,
}}
/>
+ <MyTeamStack.Screen
+ name='managedTorListScreen'
+ component={ManagedTorListScreen}
+ options={{
+ title: t('navigation.time_off_requests'),
+ }}
+ />
+ <MyTeamStack.Screen
+ name='managedTorDetailsScreen'
+ component={ManagedTorDetailsScreen}
+ options={{
+ title: t('navigation.request_details'),
+ }}
+ />
</MyTeamStack.Navigator>
);
};
--- core/src/navigation/USHallway/AssociateHallwayNav/types.ts
@@ -171,6 +171,8 @@ export type HomeStackMap = {
scheduleScreen: undefined;
torInbox: undefined;
roster: undefined;
+ managedTorListScreen: undefined;
+ managedTorDetailsScreen: undefined;
};
// The type of screen props for a home stack screen, passed to the screen component as props
@@ -197,6 +199,8 @@ export type MyTeamStackMap = {
roster: undefined;
Attendance: undefined;
scheduleScreen: undefined;
+ managedTorListScreen: undefined;
+ managedTorDetailsScreen: undefined;
};
// The type of screen props for a my team stack screen, passed to the screen component as props
| Add reuqest list and request details page routes. | Add reuqest list and request details page routes.
|
127ad67e958d2ba22e30f90db2013e0c341b3e5d | --- package-lock.json
@@ -79,7 +79,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.6.1",
- "@walmart/receipt-check-miniapp": "1.17.3",
+ "@walmart/receipt-check-miniapp": "1.18.4",
"@walmart/redux-store": "3.7.0",
"@walmart/returns-mini-app": "3.13.0",
"@walmart/schedule-mini-app": "0.63.0",
@@ -9195,6 +9195,31 @@
"wifi-store-locator": "^1.0.0-alpha2"
}
},
+ "node_modules/@walmart/manager-approvals-miniapp": {
+ "version": "0.2.4",
+ "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.2.4.tgz",
+ "integrity": "sha512-IjgpoS1xzZAm8jtEI5fpTqpwRHQXC8FORd2OpRD5vCpJ2QIKVUzhH3iCEhyjZSOWQ5rmc9miUxt5HGtLABYhTg==",
+ "hasInstallScript": true,
+ "peerDependencies": {
+ "@react-navigation/native": "^6.0.0",
+ "@react-navigation/stack": "^6.1.0",
+ "@walmart/core-services-allspark": "~1.10.11",
+ "@walmart/core-utils": "~1.3.0",
+ "@walmart/gtp-shared-components": "2.0.2",
+ "@walmart/react-native-logger": "1.31.0-rc.1",
+ "@walmart/react-native-shared-navigation": "1.0.2",
+ "i18next": "^22.0.1",
+ "jwt-decode": "^3.1.2",
+ "react": "^18.2.0",
+ "react-i18next": "^12.0.0",
+ "react-native": "0.70.5",
+ "react-native-app-auth": "^6.4.3",
+ "react-native-device-info": "^10.3.0",
+ "react-native-wm-telemetry": "0.3.0",
+ "react-redux": "^8.0.4",
+ "reselect": "^4.1.0"
+ }
+ },
"node_modules/@walmart/me-at-homeoffice-ui-components": {
"version": "1.2.140",
"resolved": "https://npme.walmart.com/@walmart/me-at-homeoffice-ui-components/-/me-at-homeoffice-ui-components-1.2.140.tgz",
@@ -9215,6 +9240,15 @@
"react-native-webview": "^11.23.1"
}
},
+ "node_modules/@walmart/me-at-walmart-athena-queries": {
+ "version": "1.7.3",
+ "resolved": "https://npme.walmart.com/@walmart/me-at-walmart-athena-queries/-/me-at-walmart-athena-queries-1.7.3.tgz",
+ "integrity": "sha512-3ioO6FPcVDOxb609WaxlpeaOn4ojiV/htuzzTPKM5ygQb0R58LwdpypVj0oAx7OVHiKidERYWN/952+YGXlqtg==",
+ "license": "ISC",
+ "dependencies": {
+ "@walmart/allspark-graphql-client": "^1.4.12"
+ }
+ },
"node_modules/@walmart/metrics-mini-app": {
"version": "0.17.9",
"resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.17.9.tgz",
@@ -9530,9 +9564,9 @@
}
},
"node_modules/@walmart/receipt-check-miniapp": {
- "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==",
+ "version": "1.18.4",
+ "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.18.4.tgz",
+ "integrity": "sha512-oWCJrF3hj3BPOat8d+xjnvQLoGdBlnrO92VjKOnxd2Wp2rR6yp73n2QHxzK3t3A+WeEiN/gT1P9ElVFgktLS0Q==",
"hasInstallScript": true,
"dependencies": {
"@walmart/tcnumber": "^2.3.3",
@@ -33346,7 +33380,9 @@
}
},
"@walmart/manager-approvals-miniapp": {
- "version": "0.2.4"
+ "version": "0.2.4",
+ "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.2.4.tgz",
+ "integrity": "sha512-IjgpoS1xzZAm8jtEI5fpTqpwRHQXC8FORd2OpRD5vCpJ2QIKVUzhH3iCEhyjZSOWQ5rmc9miUxt5HGtLABYhTg=="
},
"@walmart/me-at-homeoffice-ui-components": {
"version": "1.2.140",
@@ -33463,9 +33499,9 @@
"integrity": "sha512-jGJ2GDvDka1L8scmqvU2puNj93TFRgpr61ef4XyFO+FPUIPhs4CUtxDAChg4XIHMjLcNkQOwpc2mtz4A01wJfg=="
},
"@walmart/receipt-check-miniapp": {
- "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==",
+ "version": "1.18.4",
+ "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.18.4.tgz",
+ "integrity": "sha512-oWCJrF3hj3BPOat8d+xjnvQLoGdBlnrO92VjKOnxd2Wp2rR6yp73n2QHxzK3t3A+WeEiN/gT1P9ElVFgktLS0Q==",
"requires": {
"@walmart/tcnumber": "^2.3.3",
"@xstate/react": "^3.0.1",
--- package.json
@@ -120,7 +120,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.6.1",
- "@walmart/receipt-check-miniapp": "1.17.3",
+ "@walmart/receipt-check-miniapp": "1.18.4",
"@walmart/redux-store": "3.7.0",
"@walmart/returns-mini-app": "3.13.0",
"@walmart/schedule-mini-app": "0.63.0",
| upgrade version | upgrade version
|
cd80e4119584ba698fb4f5e4d7269d05a5c2317a | --- package.json
@@ -41,7 +41,7 @@
"@walmart/config-components": "^1.0.4",
"@walmart/functional-components": "^1.0.21",
"@walmart/gtp-shared-components": "^0.2.1",
- "@walmart/push-to-talk-mini-app": "0.0.10",
+ "@walmart/push-to-talk-mini-app": "0.0.11",
"@walmart/react-native-logger": "^1.14.0",
"@walmart/react-native-shared-navigation": "^0.2.0",
"@walmart/redux-store": "^1.0.4",
| Update package.json | Update package.json |
59b37ff9b4f9e60eaa3d9fec62b8b9b38e752bb0 | --- src/components/RosterFiltersAndInfo/RosterFiltersAndInfo.tsx
@@ -63,7 +63,6 @@ export const RosterFiltersAndInfo = ({
{isScheduleVisible && (
<Link
onPress={viewWeeklySchedule}
- disabled={!associateWINs.length}
UNSAFE_style={styles.weeklyScheduleLink}
testID='viewWeeklyScheduleButton'>
{t('rosterScreen.weeklySchedule')}
| Update weekly schedule disable check | Update weekly schedule disable check
|
6f9017f0d5de95b8e48be5834a57b0d8d3b83205 | --- packages/allspark-foundation/src/Translation/index.tsx
@@ -1,4 +1,4 @@
export type { TranslationFeatureClient } from './client';
export { AllsparkTranslationClient } from './client';
-export type { TranslationClientOptions } from './types';
+export type { TranslationClientOptions, LocaleConfig } from './types';
export * from './hooks';
| fix: export locale config type | fix: export locale config type
|
4701bf1de8876887b414b0735c6b090957e141d1 | --- packages/allspark-foundation-hub/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-foundation-hub",
- "version": "1.2.22",
+ "version": "1.2.23",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
--- packages/allspark-foundation-hub/src/Store/Modules/TeamSelection/Component/TeamSelectionList.tsx
@@ -213,6 +213,12 @@ export const TeamSelectionList = ({
accessibilityRole='header'
accessibilityLabel={section.title!}
>
+ <Body
+ UNSAFE_style={styles.myArea}
+ testID='teamSelection-myArea'
+ >
+ {t('teamSelection.myArea')}
+ </Body>
<Body
UNSAFE_style={[styles.areaHeader, { marginTop: 0 }]}
weight='bold'
--- packages/allspark-foundation-hub/src/Store/translation.ts
@@ -36,8 +36,8 @@ export const enUS = {
teamSelection: {
teams: 'Teams',
selectAll: 'Select all teams',
- myArea: 'My Area',
- primaryTeam: 'Primary Team',
+ myArea: 'My area',
+ primaryTeam: 'Primary team',
cancel: 'Cancel',
saveTeams: 'Save teams',
teamSelected: 'team selected',
| Update the foundation hub version | Update the foundation hub version
|
5ca3fb08e52bf36bf6e223cd58067dd288f254fc | --- __tests__/__mocks__/@react-native-community/netinfo.js
@@ -3,16 +3,6 @@ module.exports = {
default: {
addEventListener: jest.fn(),
},
- NetInfoStateType: {
- wifi: 'wifi',
- unknown: 'unknown',
- cellular: 'cellular',
- },
- NetInfoCellularGeneration: {
- '2g': '2g',
- '3g': '3g',
- '4g': '4g',
- },
useNetInfo: jest.fn(() => ({
isConnected: true,
})),
--- __tests__/__mocks__/@walmart/ui-components-learning.js
@@ -0,0 +1,24 @@
+const Header = () => 'Header';
+Header.Provider = 'Header.Provider';
+const DrawerButton = () => 'DrawerButton';
+DrawerButton.Provider = 'DrawerButton.Provider';
+
+module.exports = {
+ Header,
+ DrawerButton,
+ ActivityMonitor: 'ActivityMonitor',
+ BottomTabs: 'BottomTabs',
+ BottomTabsConfig: {},
+ Dialog: 'Dialog',
+ GlobalNavigation: 'GlobalNavigation',
+ CreatePinError: 'CreatePinError',
+ LockScreen: 'LockScreen',
+ Modal: 'Modal',
+ ClockOutOverlay: 'ClockOutOverlay',
+ IndicatorBar: 'IndicatorBar',
+ ConnectivityBanner: 'ConnectivityBanner',
+ FontIcon: 'FontIcon',
+ BackButton: 'BackButton',
+ hardwareBackButton: jest.fn(),
+ AccessibilityFocusWrapper: 'AccessibilityFocusWrapper',
+};
--- __tests__/__mocks__/react-native-background-timer.js
@@ -1 +0,0 @@
-jest.mock('react-native-background-timer', () => {});
--- jest.config.js
@@ -21,15 +21,15 @@ module.exports = {
},
},
transformIgnorePatterns: [
- '<rootDir>/node_modules/(?!(react-native|@walmart/core-utils|@walmart/allspark-utils|@walmart/allspark-http-client|@walmart/core-services|@walmart/core-services-allspark|@walmart/gtp-shared-components|@react-native-community/picker|@walmart/redux-store|@react-native-firebase|axios|react-native-gesture-handler|@react-native|@living-design|@react-native-community/datetimepicker|@testing-library|jest-diff|jest-matcher-utils||@walmart/learning-mini-app|@walmart/gtp-shared-icons|react-native-drop-shadow|@walmart/allspark-graphql-client|@lifeomic/axios-fetch|@react-navigation|@walmart/ui-components-learning|react-native-calendars|react-native-swipe-gestures|react-native-reanimated)/)',
+ '<rootDir>/node_modules/(?!(react-native|@walmart/core-utils|@walmart/allspark-utils|@walmart/allspark-http-client|@walmart/core-services|@walmart/core-services-allspark|@walmart/gtp-shared-components|@react-native-community/picker|@walmart/redux-store|@react-native-firebase|axios|react-native-gesture-handler|@react-native|@living-design|@react-native-community/datetimepicker|@testing-library|jest-diff|jest-matcher-utils|@walmart/learning-mini-app|@walmart/gtp-shared-icons|@walmart/allspark-graphql-client|@lifeomic/axios-fetch|@react-navigation/elements)/)',
],
moduleNameMapper: {
'@walmart/react-native-logger/(.*)':
'<rootDir>/__tests__/__mocks__/@walmart/react-native-logger.js',
- '@walmart/me-at-homeoffice-ui-components/(.*)':
- '<rootDir>/__tests__/__mocks__/@walmart/me-at-homeoffice-ui-components.js',
'@walmart/ui-components/(.*)':
'<rootDir>/__tests__/__mocks__/@walmart/ui-components.js',
+ '@walmart/ui-components-learning/(.*)':
+ '<rootDir>/__tests__/__mocks__/@walmart/ui-components-learning.js',
'@walmart/redux-store/(.*)':
'<rootDir>/__tests__/__mocks__/@walmart/redux-store.js',
'@react-navigation/drawer/(.*)':
| chore: :wrench: Removed not needed mock files | chore: :wrench: Removed not needed mock files
|
7e61adf01d2a76fce7311f8d4762d9fc550c3f39 | --- __tests__/Hooks/useUpsertStoreAssociatePreference.test.ts
@@ -80,7 +80,7 @@ describe('useUpsertStoreAssociatePreference', () => {
// Setup mock Apollo client
mockApolloClient = {
- refetchQueries: jest.fn(),
+ refetchQueries: jest.fn().mockReturnValue(Promise.resolve()),
cache: {
evict: jest.fn(),
gc: jest.fn(),
@@ -118,6 +118,11 @@ describe('useUpsertStoreAssociatePreference', () => {
];
return values[callCount++];
});
+
+ // Mock the useGetStoreAssociateTeamPreference hook
+ (useGetStoreAssociateTeamPreference as jest.Mock).mockReturnValue({
+ client: mockApolloClient,
+ });
// Mock the mutation hook
mockUseUpsertStoreAssociatePreferenceMutation.mockReturnValue([
@@ -237,9 +242,11 @@ describe('useUpsertStoreAssociatePreference', () => {
mockMutationFunction.mock.calls[0][0].onCompleted;
onCompletedCallback();
- expect(mockApolloClient.refetchQueries).toHaveBeenCalledWith({
- include: [expect.any(Object)], // GetStoreAssociateTeamPreferenceDocument
- });
+ expect(mockApolloClient.refetchQueries).toHaveBeenCalled();
+ const refetchOptions = mockApolloClient.refetchQueries.mock.calls[0][0];
+ expect(refetchOptions).toBeDefined();
+ expect(refetchOptions.include).toBeDefined();
+ expect(refetchOptions.include.length).toBe(1);
expect(mockApolloClient.cache.evict).toHaveBeenCalledWith({
id: 'ROOT_QUERY',
--- __tests__/__mocks__/@apollo/client.js
@@ -0,0 +1,10 @@
+export const ApolloProvider = ({ children }) => children;
+export const useQuery = jest.fn();
+export const useLazyQuery = jest.fn();
+export const useMutation = jest.fn();
+export const gql = jest.fn();
+export const InMemoryCache = jest.fn();
+export const ApolloClient = jest.fn(() => ({
+ query: jest.fn(),
+ mutate: jest.fn(),
+}));
--- __tests__/common/queries/getStoreAssociateTeamPreference.test.ts
@@ -0,0 +1,195 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import * as ApolloReactHooks from '@apollo/client';
+import { skipToken } from '@apollo/client';
+import {
+ useGetStoreAssociateTeamPreferenceQuery,
+ useGetStoreAssociateTeamPreferenceLazyQuery,
+ useGetStoreAssociateTeamPreferenceSuspenseQuery,
+} from '../../../src/common/queries/getStoreAssociateTeamPreference';
+
+// Mock the Apollo Client hooks
+jest.mock('@apollo/client', () => ({
+ ...jest.requireActual('@apollo/client'),
+ useQuery: jest.fn(),
+ useLazyQuery: jest.fn(),
+ useSuspenseQuery: jest.fn(),
+ SkipToken: Symbol.for('skip-token'),
+}));
+
+// Mock response data
+const mockSuccessResponse = {
+ associatePreferences: {
+ __typename: 'AssociatePreferences',
+ meAtWalmartPreferences: {
+ __typename: 'MeAtWalmartPreferences',
+ managerExperiencePreferences: {
+ __typename: 'ManagerExperiencePreferences',
+ myTeams: [
+ {
+ __typename: 'Team',
+ teamId: 'team-1',
+ teamName: 'Morning Shift',
+ site: '1234',
+ },
+ ],
+ },
+ },
+ },
+};
+
+describe('getStoreAssociateTeamPreference', () => {
+ const mockUseQuery = ApolloReactHooks.useQuery as jest.Mock;
+ const mockUseLazyQuery = ApolloReactHooks.useLazyQuery as jest.Mock;
+ const mockUseSuspenseQuery = ApolloReactHooks.useSuspenseQuery as jest.Mock;
+
+ const queryVariables = { site: 1234, win: 'WIN12345' };
+ const queryOptions = { variables: queryVariables };
+ const defaultOptions = {};
+
+ beforeEach(() => {
+ // Reset mocks before each test
+ mockUseQuery.mockReset();
+ mockUseLazyQuery.mockReset();
+ mockUseSuspenseQuery.mockReset();
+ });
+
+ describe('useGetStoreAssociateTeamPreferenceQuery', () => {
+ it('should return the expected data on success', () => {
+ // Mock successful response
+ mockUseQuery.mockReturnValue({
+ data: mockSuccessResponse,
+ loading: false,
+ error: null,
+ });
+
+ const { result } = renderHook(() =>
+ useGetStoreAssociateTeamPreferenceQuery(queryOptions)
+ );
+
+ expect(result.current).toEqual({
+ data: mockSuccessResponse,
+ loading: false,
+ error: null,
+ });
+
+ expect(mockUseQuery).toHaveBeenCalledWith(
+ expect.anything(),
+ expect.objectContaining(queryOptions)
+ );
+ });
+
+ it('should handle loading state', () => {
+ // Mock loading state
+ mockUseQuery.mockReturnValue({
+ data: undefined,
+ loading: true,
+ error: null,
+ });
+
+ const { result } = renderHook(() =>
+ useGetStoreAssociateTeamPreferenceQuery(queryOptions)
+ );
+
+ expect(result.current).toEqual({
+ data: undefined,
+ loading: true,
+ error: null,
+ });
+ });
+
+ it('should handle error state', () => {
+ // Mock error state
+ const error = new Error('Network error');
+ mockUseQuery.mockReturnValue({
+ data: undefined,
+ loading: false,
+ error,
+ });
+
+ const { result } = renderHook(() =>
+ useGetStoreAssociateTeamPreferenceQuery(queryOptions)
+ );
+
+ expect(result.current).toEqual({
+ data: undefined,
+ loading: false,
+ error,
+ });
+ });
+ });
+
+ describe('useGetStoreAssociateTeamPreferenceLazyQuery', () => {
+ it('should return execute function and query result', async () => {
+ const executeMock = jest.fn();
+ const queryResult = {
+ data: mockSuccessResponse,
+ loading: false,
+ error: null,
+ };
+
+ mockUseLazyQuery.mockReturnValue([executeMock, queryResult]);
+
+ const { result } = renderHook(() =>
+ useGetStoreAssociateTeamPreferenceLazyQuery()
+ );
+
+ const [execute, resultData] = result.current;
+
+ expect(execute).toBe(executeMock);
+ expect(resultData).toBe(queryResult);
+ expect(mockUseLazyQuery).toHaveBeenCalled();
+
+ // Test execute function
+ await act(async () => {
+ await execute(queryOptions);
+ });
+
+ expect(executeMock).toHaveBeenCalledWith(queryOptions);
+ });
+ });
+
+ describe('useGetStoreAssociateTeamPreferenceSuspenseQuery', () => {
+ it('should handle query options', () => {
+ const mockSuspenseResult = { data: mockSuccessResponse };
+
+ // Mock the implementation to handle the options case
+ mockUseSuspenseQuery.mockImplementation((document, options) => {
+ if (options && 'variables' in options) {
+ return mockSuspenseResult;
+ }
+ return { data: null };
+ });
+
+ const { result } = renderHook(
+ () => useGetStoreAssociateTeamPreferenceSuspenseQuery(queryOptions)
+ );
+
+ expect(result.current).toBe(mockSuspenseResult);
+ expect(mockUseSuspenseQuery).toHaveBeenCalledWith(
+ expect.anything(),
+ expect.objectContaining(queryOptions)
+ );
+ });
+
+ // Skip token test is more complex due to how Apollo Client handles it internally
+ // We'll test the main functionality with query options which covers most of the code
+ it('should handle skip token', () => {
+ // Mock the implementation to return a specific result when skipToken is used
+ const mockSkippedResult = { data: 'skipped' };
+
+ mockUseSuspenseQuery.mockImplementation((document, options) => {
+ // Return our mock result when options is skipToken
+ if (options === skipToken) {
+ return mockSkippedResult;
+ }
+ return { data: null };
+ });
+
+ // Call the hook with skipToken
+ const result = useGetStoreAssociateTeamPreferenceSuspenseQuery(skipToken);
+
+ // Verify the hook returns our mock result when skipToken is used
+ expect(result).toBe(mockSkippedResult);
+ });
+ });
+});
| feat(ui): add coverage for getStoreAssociateTeamPreference #SMDV-8075 | feat(ui): add coverage for getStoreAssociateTeamPreference #SMDV-8075
|
9d0d95f2c549c12d78740993289d86e9a207463f | --- package-lock.json
@@ -64,7 +64,7 @@
"@walmart/learning-mini-app": "17.0.4",
"@walmart/manager-approvals-miniapp": "0.2.4",
"@walmart/metrics-mini-app": "0.17.9",
- "@walmart/mod-flex-mini-app": "1.13.7",
+ "@walmart/mod-flex-mini-app": "1.14.5",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.0.14",
"@walmart/onewalmart-miniapp": "1.0.16",
@@ -9287,9 +9287,9 @@
}
},
"node_modules/@walmart/mod-flex-mini-app": {
- "version": "1.14.4",
- "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.14.4.tgz",
- "integrity": "sha512-jFYfCEYHnhG39MVtBn9ee+K6mcn+0bPGJf8P+3fr3YwO08inH2n7ww9+KoXGP0kTuujtpUNeLi3g126DrKmAjQ==",
+ "version": "1.14.5",
+ "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.14.5.tgz",
+ "integrity": "sha512-XHjKjaLQnD898xhM8LCSsAxPI1DeN7T5H/YpVs98pxA7Mi0R0FSh91dxk1T07fJSGYTRnlZayvYVj7dVYgUM/g==",
"hasInstallScript": true,
"peerDependencies": {
"@react-native-async-storage/async-storage": "^1.19.0",
@@ -33412,9 +33412,9 @@
}
},
"@walmart/mod-flex-mini-app": {
- "version": "1.14.4",
- "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.14.4.tgz",
- "integrity": "sha512-jFYfCEYHnhG39MVtBn9ee+K6mcn+0bPGJf8P+3fr3YwO08inH2n7ww9+KoXGP0kTuujtpUNeLi3g126DrKmAjQ=="
+ "version": "1.14.5",
+ "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.14.5.tgz",
+ "integrity": "sha512-XHjKjaLQnD898xhM8LCSsAxPI1DeN7T5H/YpVs98pxA7Mi0R0FSh91dxk1T07fJSGYTRnlZayvYVj7dVYgUM/g=="
},
"@walmart/moment-walmart": {
"version": "1.0.4"
--- package.json
@@ -105,7 +105,7 @@
"@walmart/learning-mini-app": "17.0.4",
"@walmart/manager-approvals-miniapp": "0.2.4",
"@walmart/metrics-mini-app": "0.17.9",
- "@walmart/mod-flex-mini-app": "1.14.4",
+ "@walmart/mod-flex-mini-app": "1.14.5",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.0.14",
"@walmart/onewalmart-miniapp": "1.0.16",
| Update to version v1.14.5 | Update to version v1.14.5
|
4f9b9aa84dac0ef3c31a4150d2ce7a7c38a16f49 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.43.0",
+ "version": "1.44.0",
"main": "dist/index.js",
"files": [
"dist"
| Update roster version and count changes | Update roster version and count changes
|
82fd59d1e2ae959ccf762bf53e580af98aea5d76 | --- package-lock.json
@@ -32866,7 +32866,7 @@
},
"packages/allspark": {
"name": "@walmart/allspark",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"dependencies": {
"commander": "11.0.0",
"inquirer": "^9.2.10",
@@ -32875,10 +32875,10 @@
},
"packages/allspark-authentication": {
"name": "@walmart/allspark-authentication",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"dependencies": {
- "@walmart/allspark-utils": "^5.0.0-beta.36",
+ "@walmart/allspark-utils": "^5.0.0-beta.37",
"lodash": "~4.17.21",
"moment-timezone": "~0.5.43",
"ts-retry-promise": "~0.7.1"
@@ -32897,7 +32897,7 @@
},
"packages/allspark-foundation": {
"name": "@walmart/allspark-foundation",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"dependencies": {
"@apollo/client": "^3.8.6",
"@graphql-codegen/cli": "^5.0.0",
@@ -32907,7 +32907,7 @@
"@graphql-codegen/typescript-react-apollo": "^4.1.0",
"@reduxjs/toolkit": "^1.9.7",
"@types/node-fetch": "^2.6.9",
- "@walmart/allspark-utils": "^5.0.0-beta.36",
+ "@walmart/allspark-utils": "^5.0.0-beta.37",
"axios": "~1.6.0",
"axios-cache-interceptor": "^1.3.2",
"crypto-js": "~4.2.0",
@@ -34359,7 +34359,7 @@
},
"packages/allspark-graphql-client": {
"name": "@walmart/allspark-graphql-client",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
@@ -34367,7 +34367,7 @@
},
"packages/allspark-http-client": {
"name": "@walmart/allspark-http-client",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
@@ -34375,7 +34375,7 @@
},
"packages/allspark-utils": {
"name": "@walmart/allspark-utils",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"dependencies": {
"crypto-js": "~4.2.0",
@@ -34722,7 +34722,7 @@
},
"packages/core-services": {
"name": "@walmart/core-services",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"peerDependencies": {
"@walmart/allspark-foundation": "*",
@@ -34731,7 +34731,7 @@
},
"packages/core-services-allspark": {
"name": "@walmart/core-services-allspark",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"peerDependencies": {
"@walmart/allspark-foundation": "*",
@@ -34741,7 +34741,7 @@
},
"packages/core-utils": {
"name": "@walmart/core-utils",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"peerDependencies": {
"@walmart/allspark-utils": "*"
@@ -34749,7 +34749,7 @@
},
"packages/core-widget-registry": {
"name": "@walmart/core-widget-registry",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"peerDependencies": {
"@walmart/me-at-walmart-common": "*"
@@ -34757,14 +34757,14 @@
},
"packages/functional-components": {
"name": "@walmart/functional-components",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
}
},
"packages/me-at-walmart-athena-queries": {
"name": "@walmart/me-at-walmart-athena-queries",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"peerDependencies": {
"@walmart/me-at-walmart-common": "*"
@@ -34772,7 +34772,7 @@
},
"packages/me-at-walmart-common": {
"name": "@walmart/me-at-walmart-common",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"peerDependencies": {
"@reduxjs/toolkit": "*",
"@walmart/allspark-foundation": "*",
@@ -34781,13 +34781,13 @@
},
"packages/me-at-walmart-container": {
"name": "@walmart/me-at-walmart-container",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"license": "ISC",
"dependencies": {
- "@walmart/allspark-authentication": "^5.0.0-beta.36",
- "@walmart/allspark-foundation": "^5.0.0-beta.36",
- "@walmart/allspark-utils": "^5.0.0-beta.36",
- "@walmart/me-at-walmart-common": "^5.0.0-beta.36",
+ "@walmart/allspark-authentication": "^5.0.0-beta.37",
+ "@walmart/allspark-foundation": "^5.0.0-beta.37",
+ "@walmart/allspark-utils": "^5.0.0-beta.37",
+ "@walmart/me-at-walmart-common": "^5.0.0-beta.37",
"jwt-decode": "^3.1.2",
"nanoid": "4.0.2",
"redux-flipper": "^2.0.2",
@@ -34862,39 +34862,39 @@
},
"packages/react-native-env": {
"name": "@walmart/react-native-env",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
}
},
"packages/react-native-shared-navigation": {
"name": "@walmart/react-native-shared-navigation",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
}
},
"packages/react-native-wm-network": {
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
}
},
"packages/react-native-wm-notification": {
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
}
},
"packages/react-native-wm-telemetry": {
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
}
},
"packages/redux-store": {
"name": "@walmart/redux-store",
- "version": "5.0.0-beta.36",
+ "version": "5.0.0-beta.37",
"peerDependencies": {
"@walmart/allspark-foundation": "*"
}
| chore: update package lock | chore: update package lock
|
409b727124deda9d21ed136dc834d2971ebaf727 | --- __tests__/config/foundationConfig.test.ts
@@ -6,6 +6,9 @@ import rosterScreens from '../../src/screens';
import rosterTranslations from '../../src/translations';
import {rosterModals} from '../../src/modals';
+beforeEach(() => {
+ jest.resetAllMocks();
+});
jest.mock('@walmart/me-at-walmart-common', () => ({
ScreenTags: jest.fn().mockReturnValue({
RootStack: 'RootStack',
| Update __tests__/config/foundationConfig.test.ts | Update __tests__/config/foundationConfig.test.ts
Co-authored-by: AI Code Assistant <AI-Code-Assistant@email.wal-mart.com> |
2c2a5669936cc8652388ce0c3f177a04e2b6362e | --- packages/allspark-http-client/src/react/providers.tsx
@@ -1,6 +1,7 @@
import React, {
forwardRef,
PropsWithChildren,
+ useEffect,
useImperativeHandle,
} from 'react';
import { defaultHttpClient } from '../defaultClient';
@@ -10,20 +11,36 @@ import { HttpClientConfig } from '../types';
import { HttpClientContext } from './context';
import { useHttpClientClone } from './hooks';
+/**
+ * @description Sets up the HttpClient context. Optional proxy prop to
+ * override or extend instance methods.
+ */
export const HttpClientProvider = (
props: PropsWithChildren<{
- value?: HttpClient;
+ proxy?: Partial<HttpClient>;
}>
) => {
- const { value, children } = props;
+ const { proxy, children } = props;
+
+ useEffect(() => {
+ if (proxy) {
+ defaultHttpClient.proxy(proxy);
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
return (
- <HttpClientContext.Provider value={value || defaultHttpClient}>
+ <HttpClientContext.Provider value={defaultHttpClient}>
{children}
</HttpClientContext.Provider>
);
};
+/**
+ * @description Creates a clone of the nearest HttpClient context and sets up
+ * another context for it. All children of this will have access to this clone
+ * when using the hooks rather than the parent instance.
+ */
export const HttpClientCloneProvider = forwardRef<
HttpClient,
{ id: string; config: HttpClientConfig }
@@ -35,6 +52,8 @@ export const HttpClientCloneProvider = forwardRef<
useImperativeHandle(ref, () => clonedClient);
return (
- <HttpClientProvider value={clonedClient}>{children}</HttpClientProvider>
+ <HttpClientContext.Provider value={clonedClient}>
+ {children}
+ </HttpClientContext.Provider>
);
});
| refactor: update http client context to accept proxy | refactor: update http client context to accept proxy
|
113fd311bdb6f5755628c6d4c13644a544e2dba9 | --- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/AllsparkHubContainer.tsx
@@ -3,7 +3,6 @@ import {
AllsparkComponentContainers,
ComponentContainer,
} from '@walmart/allspark-foundation/Components';
-import { widgetCCMData } from './mockData';
import { useDispatch } from 'react-redux';
import { validateWidgets } from './utils';
import { ValidatedTeamWidgetMapping } from './types';
@@ -45,7 +44,7 @@ export const managerExperienceFeature = new AllsparkFeatureModule(FEATURE_ID, {
export class AllsparkHubContainer {
private AllsparkWidgetContainer = {} as ComponentContainer;
private containerName = '';
- private widgetCCMConfigs = {} || widgetCCMData.teamWidgetMapping;
+ private widgetCCMConfigs = {};
private validWidgets: ValidatedTeamWidgetMapping = {};
constructor() {
managerExperienceFeature.connect();
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/Screens/HubDashboard.tsx
@@ -25,6 +25,7 @@ import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigatio
import BottomSheet from '../../../BottomSheet/BottomSheet';
import HubOnboardingImage from '../../../BottomSheet/HubOnboardingImage/OnboardingImage';
import { createDefaultWidgetPlaceholder } from '../utils';
+import { isNil } from 'lodash';
export const HubDashboard = ({ name, widgets }: HubDashboardProps) => {
const [teamId, setTeamId] = useState('total');
@@ -72,7 +73,21 @@ export const HubDashboard = ({ name, widgets }: HubDashboardProps) => {
const userTeamSelectionComplete = useSelector(
ManagerExperienceSelectors.getUserTeamSelectionComplete
);
+ const userTeamOnboardingError = useSelector(
+ ManagerExperienceSelectors.getUserOnboardingError
+ );
+ const userTeamSelectionError = useSelector(
+ ManagerExperienceSelectors.getUserTeamSelectionError
+ );
+ const isUserAlreadyOnboarded = useSelector(
+ ManagerExperienceSelectors.getUserIsAlreadyOnboarded
+ );
+
const [userOnboarded, setUserOnboarded] = useState(false);
+ const [
+ userOnboardingOrTeamSelectionError,
+ setUserOnboardingOrTeamSelectionError,
+ ] = useState(false);
const bottomSheetRef = useRef<{ open: () => void; close: () => void }>(null);
@@ -158,11 +173,18 @@ export const HubDashboard = ({ name, widgets }: HubDashboardProps) => {
{ useNativeDriver: false }
);
- /** Refresh the screen once the team selection is added/updated */
+ /** Refresh the screen once the team selection is added/updated
+ * Display the bottom sheet when the user is completed onboarding
+ */
useEffect(() => {
- if (userOnboardingComplete) {
+ if (userOnboardingComplete && !isUserAlreadyOnboarded) {
setUserOnboarded(userOnboardingComplete);
}
+ if (userTeamOnboardingError || userTeamSelectionError) {
+ const showErrorBottomSheet =
+ !isNil(userTeamOnboardingError) || !isNil(userTeamSelectionError);
+ setUserOnboardingOrTeamSelectionError(showErrorBottomSheet);
+ }
if (userOnboardingComplete || userTeamSelectionComplete) {
onRefresh();
}
@@ -180,9 +202,7 @@ export const HubDashboard = ({ name, widgets }: HubDashboardProps) => {
: createDefaultWidgetPlaceholder(teamId, widgets);
setAllowedWidgetsList(allowedWidgets);
}, [teamId, widgets]);
- const isMutationError = useSelector(
- ManagerExperienceSelectors.getUserOnboardingError
- );
+ const isMutationError = userTeamOnboardingError || userTeamSelectionError;
const renderContent = useCallback(() => {
return (
<HubOnboardingImage
@@ -267,17 +287,19 @@ export const HubDashboard = ({ name, widgets }: HubDashboardProps) => {
}}
/>
</ScrollView>
- <BottomSheet
- ref={bottomSheetRef}
- isVisible={userOnboarded}
- content={renderContent()}
- onPrimaryButtonPress={closeBottomSheet}
- primaryButtonText={
- isMutationError
- ? t('errorBottomsheet.buttonText')
- : t('bottomSheet.buttonText')
- }
- />
+ {(userOnboarded || userOnboardingOrTeamSelectionError) && (
+ <BottomSheet
+ ref={bottomSheetRef}
+ isVisible={userOnboarded || userOnboardingOrTeamSelectionError}
+ content={renderContent()}
+ onPrimaryButtonPress={closeBottomSheet}
+ primaryButtonText={
+ isMutationError
+ ? t('errorBottomsheet.buttonText')
+ : t('bottomSheet.buttonText')
+ }
+ />
+ )}
</>
);
};
| feat(ui): Update navigation changes | feat(ui): Update navigation changes
|
58e11fe3c0df61f9ab6c99257f6ff20f262a8a8b | --- package-lock.json
@@ -3606,19 +3606,37 @@
}
},
"@walmart/time-clock-mini-app": {
- "version": "0.4.3",
- "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.4.3.tgz",
- "integrity": "sha1-T6M3BmnOshMaH43pOIotUzfnUsY=",
+ "version": "0.4.7",
+ "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.4.7.tgz",
+ "integrity": "sha512-DNirBUEwPnr+lj8jnzbclIkPqHEmiD2caKB8ATHXmylrwGjRVoeGARZclIC9ekjRZDk9OiNXM5hs/hog/6W7Mw==",
"requires": {
"@react-native-community/datetimepicker": "3.0.9",
"@react-native-picker/picker": "^1.16.1",
- "@walmart/gta-react-native-calendars": "0.0.13",
+ "@walmart/gta-react-native-calendars": "0.0.15",
"moment-timezone": "0.5.33",
"react-native-geolocation-service": "5.2.0",
+ "react-native-hyperlink": "0.0.19",
+ "react-native-reanimated": "^1.10.2",
"react-native-sound-player": "0.10.9",
"wfm-allspark-data-library": "^0.0.19"
},
"dependencies": {
+ "@walmart/gta-react-native-calendars": {
+ "version": "0.0.15",
+ "resolved": "https://npme.walmart.com/@walmart/gta-react-native-calendars/-/gta-react-native-calendars-0.0.15.tgz",
+ "integrity": "sha512-Axq/7HBaDuW02U8DHrcSVC2XR3jQO4yRNZHfLKBZ4/BTJZ7Hx7XJIHpBJIIKfsVIFVni5+yFpRbFGmj7xY342A==",
+ "requires": {
+ "@walmart/moment-walmart": "1.0.4",
+ "hoist-non-react-statics": "^3.3.1",
+ "immutable": "^4.0.0-rc.12",
+ "lodash": "^4.17.15",
+ "memoize-one": "^5.2.1",
+ "moment": "^2.24.0",
+ "prop-types": "^15.5.10",
+ "react-native-swipe-gestures": "^1.0.5",
+ "xdate": "^0.8.0"
+ }
+ },
"react-native-geolocation-service": {
"version": "5.2.0",
"resolved": "https://npme.walmart.com/react-native-geolocation-service/-/react-native-geolocation-service-5.2.0.tgz",
--- package.json
@@ -99,7 +99,7 @@
"@walmart/shelfavailability-mini-app": "0.3.78",
"@walmart/ui-components": "1.1.56",
"@walmart/welcomeme-mini-app": "0.28.1",
- "@walmart/time-clock-mini-app": "0.4.3",
+ "@walmart/time-clock-mini-app": "0.4.7",
"@walmart/wfm-ui": "^0.1.50",
"axios-cache-adapter": "2.7.3",
"crypto-js": "^3.3.0",
| Bump time clock mini app version | Bump time clock mini app version
|
c0ba6958c244b0af9b405639d6cd02a65e20307b | --- .looper-native-common.yml
@@ -4,7 +4,6 @@ envs:
global:
variables:
RCT_NO_LAUNCH_PACKAGER: true
- PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
KEYCHAIN_PW: "%{credentials.secret('ios-sign-keychain-pw')}"
XCODE_CONFIG: 'Release'
PROVISIONING_PROFILE: ./BuildSupport/Allspark_MeAtWM_Beta_InHouse_Profile.mobileprovision
@@ -15,7 +14,7 @@ envs:
XC_TARGET: 'AllSpark'
TARGET_XCODE: "11.5"
GITHUB_TOKEN: ENC[CGMhL3M/PKGSd9JmVpyMSAxGD/ZNRzJbf6v6/VuJBIWoj226WrPkQe5i7DIFJjTR]
- NO_PROXY: "*.walmart.com, chromium.googlesource.com, apps.betacrash.com"
+ NO_PROXY: "*.walmart.com, chromium.googlesource.com"
#BetaCrash
BETACRASH_TOKEN: ENC[iHTVp1f+Zsd1SDXzxbQNqv82W/567khXD0AuBEt5dfrbR1EdM15ThlelIUrJkH6V]
| updated looper file | updated looper file
|
8f92f69166f93b85ab29af956d7f4a2a7aac0972 | --- package-lock.json
@@ -89,7 +89,7 @@
"@walmart/time-clock-mini-app": "2.111.3",
"@walmart/topstock-mini-app": "1.0.13",
"@walmart/ui-components": "1.15.1",
- "@walmart/welcomeme-mini-app": "0.83.0",
+ "@walmart/welcomeme-mini-app": "0.83.0-736-d783686",
"@walmart/wfm-ui": "0.2.26",
"axios": "~1.2.6",
"axios-cache-adapter": "2.7.3",
@@ -9324,9 +9324,9 @@
}
},
"node_modules/@walmart/welcomeme-mini-app": {
- "version": "0.83.0",
- "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.83.0.tgz",
- "integrity": "sha512-6qzqakgQ9F8eWwnvPlFEiwSKj6CVbGXB6VinPnm66+KsRR2JEtfJzj/ClHU6VE12HbJUiN749KV2aYPnveSCAA==",
+ "version": "0.83.0-736-d783686",
+ "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.83.0-736-d783686.tgz",
+ "integrity": "sha512-Gzx9hcRL5xBSzsNZjhmUeFen62Cw1T1JNtB6ge4DVQaksBwS4DUkuIASMa4MK7/GWzFUYgFyqBSLW/L4dEbeKA==",
"hasInstallScript": true,
"dependencies": {
"apisauce": "^1.1.2"
@@ -33908,9 +33908,9 @@
}
},
"@walmart/welcomeme-mini-app": {
- "version": "0.83.0",
- "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.83.0.tgz",
- "integrity": "sha512-6qzqakgQ9F8eWwnvPlFEiwSKj6CVbGXB6VinPnm66+KsRR2JEtfJzj/ClHU6VE12HbJUiN749KV2aYPnveSCAA==",
+ "version": "0.83.0-736-d783686",
+ "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.83.0-736-d783686.tgz",
+ "integrity": "sha512-Gzx9hcRL5xBSzsNZjhmUeFen62Cw1T1JNtB6ge4DVQaksBwS4DUkuIASMa4MK7/GWzFUYgFyqBSLW/L4dEbeKA==",
"requires": {
"apisauce": "^1.1.2"
}
--- package.json
@@ -130,7 +130,7 @@
"@walmart/time-clock-mini-app": "2.111.3",
"@walmart/topstock-mini-app": "1.0.13",
"@walmart/ui-components": "1.15.1",
- "@walmart/welcomeme-mini-app": "0.83.0",
+ "@walmart/welcomeme-mini-app": "0.83.0-736-d783686",
"@walmart/wfm-ui": "0.2.26",
"axios": "~1.2.6",
"axios-cache-adapter": "2.7.3",
| chore: welcomeme version bump | chore: welcomeme version bump
|
0485fb6d298935fd7aa4134d7fb4e637bd15288f | --- src/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {Component} from 'react';
import {StatusBar} from 'react-native';
import {SafeAreaProvider} from 'react-native-safe-area-context';
import {NavigationContainer} from '@react-navigation/native';
@@ -20,7 +20,7 @@ import {TranslationRef} from './translations';
import {UpdateVersionModal} from './updates/UpdateVersionModal';
import {AuthRef} from './core/Auth';
-import {CoreLoggerProvider} from './core/Logger';
+import {CoreLoggerProvider, Logger} from './core/Logger';
import {TelemetryRef} from './core/Telemetry';
import {NavigationTheme} from './core/AllsparkTheme';
import {LocalStorageRef} from './core/LocalStorage';
@@ -50,26 +50,45 @@ const AllsparkNav = () => {
);
};
-export const BaseApp = () => (
- <SafeAreaProvider>
- <LivingDesignProvider>
- <AllsparkCoreServices recipe={AllsparkRecipe}>
- <TelemetryConsumer ref={TelemetryRef} />
- <TranslationConsumer ref={TranslationRef} />
- <LocalStorageConsumer ref={LocalStorageRef} />
- <AuthConsumer ref={AuthRef} />
- <CoreLoggerProvider>
- <PushToTalkProvider>
- <AllsparkNav />
- </PushToTalkProvider>
- </CoreLoggerProvider>
- </AllsparkCoreServices>
- </LivingDesignProvider>
- </SafeAreaProvider>
-);
+export class BaseApp extends Component {
+ codePushStatusDidChange(codePushStatus: codePush.SyncStatus) {
+ if(codePushStatus === codePush.SyncStatus.DOWNLOADING_PACKAGE) {
+ Logger.info("Codepush: Downloading update")
+ } else if(codePushStatus === codePush.SyncStatus.UPDATE_INSTALLED) {
+ codePush.getUpdateMetadata(codePush.UpdateState.PENDING).then(update => {
+ if(update !== null) {
+ Logger.info("Codepush: Update installed", {
+ updateLabel: update.label
+ })
+ } else {
+ Logger.info("Codepush: Update installed")
+ }
+ })
+ } else if(codePushStatus === codePush.SyncStatus.UNKNOWN_ERROR) {
+ Logger.error("Codepush: update error");
+ }
+ }
+ render () {
+ return <SafeAreaProvider>
+ <LivingDesignProvider>
+ <AllsparkCoreServices recipe={AllsparkRecipe}>
+ <TelemetryConsumer ref={TelemetryRef} />
+ <TranslationConsumer ref={TranslationRef} />
+ <LocalStorageConsumer ref={LocalStorageRef} />
+ <AuthConsumer ref={AuthRef} />
+ <CoreLoggerProvider>
+ <PushToTalkProvider>
+ <AllsparkNav />
+ </PushToTalkProvider>
+ </CoreLoggerProvider>
+ </AllsparkCoreServices>
+ </LivingDesignProvider>
+ </SafeAreaProvider>
+ }
+}
let codePushOptions = {
checkFrequency: codePush.CheckFrequency.ON_APP_START,
installMode: codePush.InstallMode.ON_NEXT_RESTART,
};
-export const App = codePush(codePushOptions)(BaseApp);
+export const App = codePush(codePushOptions)(BaseApp);
\ No newline at end of file
| CP adding logs | CP adding logs
|
3e47e69d3331b7c53bc94f62b16eeabd1d9fbf96 | --- package.json
@@ -1,7 +1,7 @@
{
"name": "@walmart/wmconnect-mini-app",
"version": "2.29.0",
- "main": "index.js",
+ "main": "dist/index.js",
"files": [
"dist/"
],
| feat: SMDV-9999 update package | feat: SMDV-9999 update package
|
7d557b8db0cae55ab3a20f895a8332a72dfbdc3d | --- targets/US/android/app/build.gradle
@@ -55,6 +55,7 @@ react {
/* Hermes Commands */
// The hermes compiler command to run. By default it is 'hermesc'
// hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
+ hermesCommand = "$rootDir/../../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
//
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]
| Updating hermesCommand for US target | Updating hermesCommand for US target
|
78b2bde595e0dcd63ee06155826933ae5bde223b | --- src/screens/RosterDetailScreen/StoreRosterDetailScreen/StoreRosterDetailScreen.tsx
@@ -430,7 +430,7 @@ export const StoreRosterDetailScreen = ({route}: RosterDetailScreenProps) => {
/>
);
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, []);
+ }, [teamState]);
useEffect(() => {
const associatesFiltered = filterAssociatesByStatusAndSearchInput(
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen/SupplyChainRosterDetailScreen.tsx
@@ -333,7 +333,7 @@ export const SupplyChainRosterDetailScreen = ({
/>
);
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, []);
+ }, [teamState]);
const searchInputElement = useCallback(() => {
return (
| fix(ui): update floating message btn | fix(ui): update floating message btn
|
b75311d6493a2af63849b7d9ce541b9609dfaf44 | --- packages/allspark-navigation/package.json
@@ -26,7 +26,7 @@
"clean": "rm -rf lib/ || true"
},
"dependencies": {
- "@walmart/allspark-utils": "^1.3.2",
+ "@walmart/allspark-utils": "^1.4.0",
"@walmart/gtp-shared-components": "^2.0.0",
"redux-saga": "^1.2.2"
},
| chore: version fix | chore: version fix
|
9ab98a89c8953bff80c36a02b829986f2d601904 | --- src/components/RosterFiltersAndInfo/RosterFiltersAndInfo.tsx
@@ -14,7 +14,6 @@ import {useSelector} from 'react-redux';
import {SiteSelectors} from '@walmart/allspark-foundation/Site';
import {UserSelectors} from '@walmart/allspark-foundation/User';
import {UserDomain} from '@walmart/me-at-walmart-common';
-import {MY_TEAMS_TEAM_LABEL} from '@walmart/allspark-foundation-hub';
export const RosterFiltersAndInfo = ({
totalScheduleCount,
@@ -40,6 +39,10 @@ export const RosterFiltersAndInfo = ({
const isSalariedOrLead =
isTeamLead || isSalaried || isPeopleLead || isHomeOffice;
+ const isScheduleVisible = siteIsDC
+ ? isSalariedOrLead
+ : isWeeklyScheduleVisible;
+
const associateWINs = useMemo(
() =>
associates
@@ -63,17 +66,15 @@ export const RosterFiltersAndInfo = ({
numberOfAssociates={totalScheduleCount}
/>
</View>
- {isWeeklyScheduleVisible &&
- (!siteIsDC || (siteIsDC && isSalariedOrLead)) &&
- MY_TEAMS_TEAM_LABEL.includes(teamName as string) && (
- <Link
- onPress={viewWeeklySchedule}
- disabled={!associateWINs.length}
- UNSAFE_style={styles.weeklyScheduleLink}
- testID='viewWeeklyScheduleButton'>
- {t('rosterScreen.weeklySchedule')}
- </Link>
- )}
+ {isScheduleVisible && (
+ <Link
+ onPress={viewWeeklySchedule}
+ disabled={!associateWINs.length}
+ UNSAFE_style={styles.weeklyScheduleLink}
+ testID='viewWeeklyScheduleButton'>
+ {t('rosterScreen.weeklySchedule')}
+ </Link>
+ )}
</View>
{filterChips.length > 0 && showFilterChips && (
<View testID='filterChipGroupContainer'>
| fix: weekly Schedule link logic | fix: weekly Schedule link logic
|
3b9d3ae0fc343866591bfa490cb50234b1310b26 | --- android/app/build.gradle
@@ -272,23 +272,23 @@ android {
}
}
-apply plugin: 'com.walmart.amp.androidsigning'
+apply plugin: 'com.walmart.ssmp.signing'
android {
buildTypes {
release {
tasks.whenTaskAdded { task ->
- if(task.name.matches(/^assemble.*Release$/)) {
- task.finalizedBy 'signReleaseApkTask'
+ if (task.name.matches(/^assemble.*Release$/)) {
+ task.finalizedBy 'signReleaseAPK'
}
}
}
debug {
tasks.whenTaskAdded { task ->
- if(task.name.matches(/^assemble.*Debug/) || task.name.matches(/^package.*Debug$/))
- task.finalizedBy 'signDebugApkTask'
- if(task.name.matches(/^assemble.*DebugAndroidTest/) || task.name.matches(/^package.*DebugAndroidTest$/))
- task.finalizedBy 'signTestApkTask'
+ if (task.name.matches(/^assemble.*Debug/) || task.name.matches(/^package.*Debug$/))
+ task.finalizedBy 'signDebugAPK'
+ if (task.name.matches(/^assemble.*DebugAndroidTest/) || task.name.matches(/^package.*DebugAndroidTest$/))
+ task.finalizedBy 'signTestAPK'
}
}
}
--- android/app/src/main/AndroidManifest.xml
@@ -14,6 +14,14 @@
<uses-permission android:name="com.walmart.ssae.sms.sumo.azureclient.android.services.RECEIVE_AZURE_PUSH" />
<!-- SUMO -->
+ <queries>
+ <intent>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <data android:scheme="https" />
+ </intent>
+ </queries>
+
<application
android:name="com.walmart.stores.allspark.beta.MainApplication"
android:label="@string/app_name"
--- android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
buildToolsVersion = "29.0.2"
minSdkVersion = 23
compileSdkVersion = 29
- targetSdkVersion = 29
+ targetSdkVersion = 30
googlePlayServicesVersion = "17.0.0"
}
repositories {
@@ -16,10 +16,10 @@ buildscript {
}
}
dependencies {
- classpath("com.android.tools.build:gradle:3.4.2")
+ classpath("com.android.tools.build:gradle:4.0.1")
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.0.0'
- classpath 'com.walmart.amp:android-signing:1.0.0'
+ classpath 'com.walmart.ssmp:android-signing:1.0.9'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
--- package.json
@@ -1,6 +1,6 @@
{
"name": "allspark-main",
- "version": "1.1.0",
+ "version": "1.1.0-alpha",
"private": true,
"scripts": {
"firebase:dev": "cp ./ios/GoogleService-Info-Dev.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-dev.json ./android/app/google-services.json",
@@ -118,7 +118,7 @@
"react-native-screens": "^2.10.1",
"react-native-sha256": "^1.3.6",
"react-native-splash-screen": "^3.2.0",
- "react-native-ssmp-sso-allspark": "1.1.0",
+ "react-native-ssmp-sso-allspark": "1.1.0-alpha-beta-gamma",
"react-native-sumo-sdk": "^2.7.4-rc.9",
"react-native-svg": "^12.1.0",
"react-native-tab-view": "^2.15.2",
@@ -129,7 +129,7 @@
"react-native-video": "^5.1.0-alpha8",
"react-native-view-shot": "^3.1.2",
"react-native-webview": "^10.7.0",
- "react-native-wm-barcode": "2.9.0",
+ "react-native-wm-barcode": "2.25.0",
"react-native-wm-config": "^0.1.1",
"react-native-wm-network": "^0.1.0",
"react-native-wm-notification": "^1.0.0",
| sos fix | sos fix
|
721aa4d9569975ac061a408dce34eb603fe14a8f | --- package-lock.json
@@ -41,7 +41,7 @@
"@walmart/core-services": "~1.4.15",
"@walmart/core-services-allspark": "~1.10.18",
"@walmart/core-utils": "~1.3.0",
- "@walmart/core-widget-registry": "~0.7.2",
+ "@walmart/core-widget-registry": "~0.9.5",
"@walmart/counts-component-miniapp": "0.1.2",
"@walmart/emergency-mini-app": "1.19.0",
"@walmart/exception-mini-app": "1.0.16",
@@ -74,7 +74,7 @@
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.5.1",
"@walmart/receipt-check-miniapp": "1.9.10",
- "@walmart/redux-store": "3.1.3",
+ "@walmart/redux-store": "3.1.4",
"@walmart/returns-mini-app": "0.12.0",
"@walmart/schedule-mini-app": "0.33.0",
"@walmart/settings-mini-app": "1.12.0",
@@ -4870,9 +4870,9 @@
}
},
"node_modules/@walmart/core-widget-registry": {
- "version": "0.7.2",
- "resolved": "https://npme.walmart.com/@walmart/core-widget-registry/-/core-widget-registry-0.7.2.tgz",
- "integrity": "sha512-qCDWQF6Uvg9ftBqG4BHItlS1Fh6B0kzBDa3d9/ObmcAaeiGhWM1H3WkOaNeI+h8j7SoSAHiHeyGVbw+OCpH2sQ==",
+ "version": "0.9.5",
+ "resolved": "https://npme.walmart.com/@walmart/core-widget-registry/-/core-widget-registry-0.9.5.tgz",
+ "integrity": "sha512-jFLlvput4Eb/Asu5t3IkChNcmWwmS6oLlreBEROX9BEBUpYTJF3cEkz4G1AMtr0RnmPODctyA2BtHT/t02VumQ==",
"license": "ISC",
"peerDependencies": {
"@walmart/core-utils": "^1.1.2",
@@ -5762,9 +5762,9 @@
}
},
"node_modules/@walmart/redux-store": {
- "version": "3.1.3",
- "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-3.1.3.tgz",
- "integrity": "sha512-PxvdYstWLtFzoB/Z/1sf+Ra98jWZ47uO8+MQB/pw89YCgbfZL0yhJpdTvpQ/8H/4kddbVJNjNLDVftJNOWCGfQ==",
+ "version": "3.1.4",
+ "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-3.1.4.tgz",
+ "integrity": "sha512-nU/iS9ccQ8LhzczWRVFe4acjcWvN4QZuvGRMScnjMjozehIit+8LItz3LTGMO6HaOUq/lWxNTnUyu/VWmVBhLw==",
"license": "MIT",
"dependencies": {
"namecase": "^1.1.2",
@@ -24991,9 +24991,9 @@
}
},
"@walmart/core-widget-registry": {
- "version": "0.7.2",
- "resolved": "https://npme.walmart.com/@walmart/core-widget-registry/-/core-widget-registry-0.7.2.tgz",
- "integrity": "sha512-qCDWQF6Uvg9ftBqG4BHItlS1Fh6B0kzBDa3d9/ObmcAaeiGhWM1H3WkOaNeI+h8j7SoSAHiHeyGVbw+OCpH2sQ=="
+ "version": "0.9.5",
+ "resolved": "https://npme.walmart.com/@walmart/core-widget-registry/-/core-widget-registry-0.9.5.tgz",
+ "integrity": "sha512-jFLlvput4Eb/Asu5t3IkChNcmWwmS6oLlreBEROX9BEBUpYTJF3cEkz4G1AMtr0RnmPODctyA2BtHT/t02VumQ=="
},
"@walmart/counts-component-miniapp": {
"version": "0.1.2",
@@ -25005,7 +25005,7 @@
"resolved": "https://npme.walmart.com/@walmart/emergency-mini-app/-/emergency-mini-app-1.19.0.tgz",
"integrity": "sha512-ITOT8qbEI4m/5iJ4y1xBG5CR6Z9AG3T9XsmyBbeQXpViU8vGrJcQ49jeAeweVbRSn0bNFZ6c3l6Go2btAvA8wg==",
"requires": {
- "@walmart/core-widget-registry": "~0.7.2"
+ "@walmart/core-widget-registry": "~0.9.5"
}
},
"@walmart/exception-mini-app": {
@@ -25252,9 +25252,9 @@
}
},
"@walmart/redux-store": {
- "version": "3.1.3",
- "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-3.1.3.tgz",
- "integrity": "sha512-PxvdYstWLtFzoB/Z/1sf+Ra98jWZ47uO8+MQB/pw89YCgbfZL0yhJpdTvpQ/8H/4kddbVJNjNLDVftJNOWCGfQ==",
+ "version": "3.1.4",
+ "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-3.1.4.tgz",
+ "integrity": "sha512-nU/iS9ccQ8LhzczWRVFe4acjcWvN4QZuvGRMScnjMjozehIit+8LItz3LTGMO6HaOUq/lWxNTnUyu/VWmVBhLw==",
"requires": {
"namecase": "^1.1.2",
"reduxsauce": "^1.2.1"
| version bump for redux-store & widget registry with package lock | version bump for redux-store & widget registry with package lock
|
ff4acba5510428eb7f36492d035f7b4279cea326 | --- package-lock.json
@@ -95,7 +95,7 @@
"@walmart/time-clock-mini-app": "2.301.0",
"@walmart/topstock-mini-app": "1.4.8",
"@walmart/ui-components": "1.15.6",
- "@walmart/welcomeme-mini-app": "0.85.0",
+ "@walmart/welcomeme-mini-app": "0.86.0",
"@walmart/wfm-ui": "0.2.26",
"axios": "~1.2.6",
"axios-cache-adapter": "2.7.3",
@@ -10067,13 +10067,10 @@
}
},
"node_modules/@walmart/welcomeme-mini-app": {
- "version": "0.85.0",
- "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.85.0.tgz",
- "integrity": "sha512-JSUltBgjn4DcKeytI6OlGgpt9e4dWv0q7Y9h2j+z5bptRvVC2HonUVPWo4SOHxGB9hqXt6q/Px2gNgfbAMDTZQ==",
+ "version": "0.86.0",
+ "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.86.0.tgz",
+ "integrity": "sha512-U08nL/9ZXyliotY3eXqMEpjTtGTzqU39hAr7not7Ko52ussUg4V1rbFDpUUZ9L9B8cboLC22R6e5CL/SvH9QPw==",
"hasInstallScript": true,
- "dependencies": {
- "apisauce": "^1.1.2"
- },
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
"@react-navigation/stack": "^6.1.0",
@@ -33736,12 +33733,9 @@
}
},
"@walmart/welcomeme-mini-app": {
- "version": "0.85.0",
- "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.85.0.tgz",
- "integrity": "sha512-JSUltBgjn4DcKeytI6OlGgpt9e4dWv0q7Y9h2j+z5bptRvVC2HonUVPWo4SOHxGB9hqXt6q/Px2gNgfbAMDTZQ==",
- "requires": {
- "apisauce": "^1.1.2"
- }
+ "version": "0.86.0",
+ "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.86.0.tgz",
+ "integrity": "sha512-U08nL/9ZXyliotY3eXqMEpjTtGTzqU39hAr7not7Ko52ussUg4V1rbFDpUUZ9L9B8cboLC22R6e5CL/SvH9QPw=="
},
"@walmart/wfm-ui": {
"version": "0.2.26",
@@ -45343,4 +45337,4 @@
}
}
}
-}
\ No newline at end of file
+}
--- package.json
@@ -136,7 +136,7 @@
"@walmart/time-clock-mini-app": "2.301.0",
"@walmart/topstock-mini-app": "1.4.8",
"@walmart/ui-components": "1.15.6",
- "@walmart/welcomeme-mini-app": "0.85.0",
+ "@walmart/welcomeme-mini-app": "0.86.0",
"@walmart/wfm-ui": "0.2.26",
"axios": "~1.2.6",
"axios-cache-adapter": "2.7.3",
@@ -335,4 +335,4 @@
"pre-push": "run-p solidarity coverage"
}
}
-}
\ No newline at end of file
+}
| chore: welcome me mini app version bump | chore: welcome me mini app version bump
|
597d8fe09e4a7a0b1a688dd242a990bd90a6de15 | --- app.config.US.ts
@@ -220,6 +220,7 @@ const CONFIG: ExpoConfig = {
"Allow $(PRODUCT_NAME) to use your Camera for scanning barcodes",
},
],
+ ["./plugins/withAbiFilters", ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]],
// "./plugins/withActiveArchFix",
"./plugins/withAppAuth",
"./plugins/withBoringSSLFix",
@@ -250,7 +251,7 @@ const CONFIG: ExpoConfig = {
// ["./plugins/withProductFlavors", ["dev", "teflon", "beta", "prod"]],
// [
// "./plugins/withReactNativeArchitectures",
- // ["armeabi-v7a", "arm64-v8a", "armeabi", "x86", "x86_64"],
+ // ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"],
// ],
"./plugins/withRealm",
"./plugins/withSsmpAndroidSigning",
--- plugins/withAbiFilters.ts
@@ -0,0 +1,24 @@
+import { ConfigPlugin, withAppBuildGradle } from "@expo/config-plugins";
+import { mergeContents } from "@expo/config-plugins/build/utils/generateCode";
+
+type Props = string[];
+
+const withAbiFilters: ConfigPlugin<Props> = (config, props) => {
+ const newSrc = `ndk {
+ abiFilters ${props.map((item) => `"${item}"`).join(",")}"
+ }`;
+ return withAppBuildGradle(config, (config) => {
+ config.modResults.contents = mergeContents({
+ tag: "abi-filters",
+ src: config.modResults.contents,
+ newSrc: newSrc,
+ anchor: /defaultConfig {/,
+ offset: 1,
+ comment: "//",
+ }).contents;
+
+ return config;
+ });
+};
+
+export default withAbiFilters;
| chore: add abi filters plugin for looper testing | chore: add abi filters plugin for looper testing
|
d914518ecf1691d82e325a7bdf865d4e4b9ec152 | --- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx
@@ -442,6 +442,7 @@ export const SupplyChainRosterDetailScreen = ({
shiftSelected,
teamState,
rosterData?.getDailyRoster,
+ dataLoading
]);
useEffect(() => {
| fix: fix associate List on Team Selected | fix: fix associate List on Team Selected |
57341510927f8f4ecf2d0568b25049903286e341 | --- ios/Podfile.lock
@@ -935,7 +935,7 @@ SPEC CHECKSUMS:
FirebaseRemoteConfig: 2d6e2cfdb49af79535c8af8a80a4a5009038ec2b
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
- glog: 5337263514dd6f09803962437687240c5dc39aa4
+ glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
GoogleAppMeasurement: 4c19f031220c72464d460c9daa1fb5d1acce958e
GoogleDataTransport: 5fffe35792f8b96ec8d6775f5eccd83c998d5a3b
GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
@@ -947,7 +947,7 @@ SPEC CHECKSUMS:
Permission-Notifications: 4325073de6e418cfbbdd8d296822c419d8ddc7ef
PromisesObjC: 99b6f43f9e1044bd87a95a60beff28c2c44ddb72
PTT: ad0e445a1953114d2f5dd57b13de6fe1ed070fc5
- RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9
+ RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
RCTRequired: 0aa6c1c27e1d65920df35ceea5341a5fe76bdb79
RCTTypeSafety: d76a59d00632891e11ed7522dba3fd1a995e573a
React: ab8c09da2e7704f4b3ebad4baa6cfdfcc852dcb5
@@ -1036,4 +1036,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 7efc314454ab8f495d11a401c27762edcf1c5e4f
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
--- package-lock.json
@@ -4821,9 +4821,9 @@
"integrity": "sha512-uIUj9pncr+UHyTCegApYq91eQCcTGeLu1ejINUZAij0N8IHtnZwPgudV2gLTpdi8a7uxuW1SGQARGV96XC8/+w=="
},
"@walmart/push-to-talk-mini-app": {
- "version": "1.7.10",
- "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-1.7.10.tgz",
- "integrity": "sha512-g8KCsUKp19PqTKanL9fSlF8jsuK29TGOKPLbivXhS0G3Or1OUx7ElktCEYWt0cpVzQQ7QUavRHTLcGlbNt1niA=="
+ "version": "1.7.12",
+ "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-1.7.12.tgz",
+ "integrity": "sha512-bzE3OP+mf6YRq0jyVBoKvDv/bbPuT6u4d7k4Hwe053Korp2HzGqieSmg29OD4C5IiERNZH1YGrnTugFukFHZ+A=="
},
"@walmart/react-native-collapsible": {
"version": "1.5.3",
--- package.json
@@ -94,7 +94,7 @@
"@walmart/payrollsolution_miniapp": "^0.122.5",
"@walmart/price-changes-mini-app": "1.2.3",
"@walmart/profile-feature-app": "0.0.34",
- "@walmart/push-to-talk-mini-app": "1.7.10",
+ "@walmart/push-to-talk-mini-app": "1.7.12",
"@walmart/react-native-env": "^0.2.0",
"@walmart/react-native-logger": "^1.29.0",
"@walmart/react-native-shared-navigation": "1.0.2",
| updating ptt version | updating ptt version
|
c9021cbabf64c5b257b99468926b6743f845553f | --- packages/me-at-walmart-container/__tests__/http/interceptors/headerSize.test.ts
@@ -7,7 +7,7 @@ import {
HEADER_SIZE_BUFFER,
} from '../../../src/http/interceptors/headerSize';
const {
- MeAtWalmartEnvironment, AllsparkEnvironment
+ MeAtWalmartEnvironment
} = require('@walmart/allspark-foundation/Environment');
const {getHeaderSizeLimit} = require('../../../src/http/utils');
import {HttpLogger} from '../../../src/http/logger';
| code cleanup | code cleanup
|
a2ffa137d1479f422785d08e0cdea3669610f672 | --- packages/allspark-foundation/__mocks__/axios-cache-interceptor.js
@@ -0,0 +1,4 @@
+module.exports = {
+ buildStorage: jest.fn(),
+ setupCache: jest.fn(),
+}
\ No newline at end of file
--- packages/allspark-foundation/__tests__/Auth/sagas.test.tsx
@@ -8,7 +8,7 @@ beforeEach(() => {
});
describe('waitForSignIn and waitForToken tests', () => {
- it('waitForSignIn - should wait for SIGN_IN_SUCCESS or SIGN_IN_ERROR if signing in or data is null and no error', () => {
+ it('waitForSignIn - should wait for SIGN_IN_SUCCESS', () => {
const iterator = waitForSignIn();
expect(iterator.next().value).toEqual(select(AuthSelectors.getSigningIn));
expect(iterator.next(true).value).toEqual(select(AuthSelectors.getData));
@@ -26,7 +26,7 @@ describe('waitForSignIn and waitForToken tests', () => {
expect(iterator.next().done).toBe(true);
});
- it('waitForSignIn - should return data immediately if not signing in, data is available, and no error', () => {
+ it('waitForSignIn - should return data immediately if not signin', () => {
const iterator = waitForSignIn();
expect(iterator.next().value).toEqual(select(AuthSelectors.getSigningIn));
expect(iterator.next(false).value).toEqual(select(AuthSelectors.getData));
@@ -36,8 +36,20 @@ describe('waitForSignIn and waitForToken tests', () => {
);
expect(iterator.next().done).toBe(false);
});
+ it('waitForSignIn -SIGN_IN_SUCCESS when data is null and error is false', () => {
+ const iterator = waitForSignIn();
+ expect(iterator.next().value).toEqual(select(AuthSelectors.getSigningIn));
+ expect(iterator.next(false).value).toEqual(select(AuthSelectors.getData));
+ expect(iterator.next(null).value).toEqual(select(AuthSelectors.getSignInError));
+ const expectedTakeEffect = take([
+ AuthActionTypes.SIGN_IN_SUCCESS,
+ AuthActionTypes.SIGN_IN_ERROR,
+ ]);
+ expect(iterator.next(false).value).toEqual(expectedTakeEffect);
+ expect(iterator.next().value).toEqual(select(AuthSelectors.getData));
+ });
- it('waitForToken - should wait for FETCH_TOKEN_SUCCESS or FETCH_TOKEN_ERROR if fetching token or data is undefined and no error', () => {
+ it('waitForToken - should wait for FETCH_TOKEN_SUCCESS or FETCH_TOKEN_ERROR', () => {
const iterator = waitForToken();
expect(iterator.next().value).toEqual(
select(AuthSelectors.getFetchingToken)
@@ -59,7 +71,7 @@ describe('waitForSignIn and waitForToken tests', () => {
expect(iterator.next().done).toBe(true);
});
- it('waitForToken - should return token immediately if not fetching, token is available, and no error', () => {
+ it('waitForToken - should return token immediately if not fetching', () => {
const mockToken = 'abc123';
const iterator = waitForToken();
expect(iterator.next().value).toEqual(
@@ -72,4 +84,4 @@ describe('waitForSignIn and waitForToken tests', () => {
select(AuthSelectors.getFetchTokenError)
);
});
-});
+});
\ No newline at end of file
--- packages/allspark-foundation/__tests__/HTTP/cache.test.ts
@@ -1,15 +1,54 @@
import { getStorageForClient } from '../../src/HTTP/cache';
+import { buildStorage } from 'axios-cache-interceptor';
+import { AllsparkLocalStorage } from '../../src//LocalStorage';
-describe('HTTP/cache.ts', () => {
+jest.mock('../../src/LocalStorage', () => ({
+ AllsparkLocalStorage: {
+ getContainerInstance: jest.fn(),
+ getFeatureInstance: jest.fn(),
+ },
+}));
+
+describe('getStorageForClient', () => {
+ const mockContainerInstance = {
+ get: jest.fn(),
+ set: jest.fn(),
+ remove: jest.fn(),
+ };
beforeEach(() => {
jest.clearAllMocks();
});
-
- test('returns default storage when id is "default"', () => {
- const storage = getStorageForClient('default');
-
- expect(storage).toBeDefined();
- expect(storage.set).toBeDefined();
- expect(storage.remove).toBeDefined();
+ it('test buildStorage with default storage', async () => {
+ AllsparkLocalStorage.getContainerInstance.mockReturnValue(mockContainerInstance);
+ AllsparkLocalStorage.getFeatureInstance.mockReturnValue(null);
+ const mockBuildStorage = buildStorage as jest.Mock;
+ getStorageForClient('default');
+ const storageConfig = mockBuildStorage.mock.calls[0][0];
+ const findResult = await storageConfig.find('key1');
+ expect(mockContainerInstance.get).toHaveBeenCalledWith('key1');
+ expect(findResult).toBeUndefined();
+ await storageConfig.set('key2', 'value2');
+ expect(mockContainerInstance.set).toHaveBeenCalledWith('key2', JSON.stringify('value2'));
+ await storageConfig.remove('key3');
+ expect(mockContainerInstance.remove).toHaveBeenCalledWith('key3');
+ });
+ it('buildStorage with configuration for feature storage', async () => {
+ const mockFeatureInstance = {
+ get: jest.fn(),
+ set: jest.fn(),
+ remove: jest.fn(),
+ };
+ AllsparkLocalStorage.getContainerInstance.mockReturnValue(mockContainerInstance);
+ AllsparkLocalStorage.getFeatureInstance.mockReturnValue(mockFeatureInstance);
+ const mockBuildStorage = buildStorage as jest.Mock;
+ getStorageForClient('feature');
+ const storageConfig = mockBuildStorage.mock.calls[0][0];
+ const findResult = await storageConfig.find('key1');
+ expect(mockFeatureInstance.get).toHaveBeenCalledWith('key1');
+ expect(findResult).toBeUndefined();
+ await storageConfig.set('key2', 'value2');
+ expect(mockFeatureInstance.set).toHaveBeenCalledWith('key2', JSON.stringify('value2'));
+ await storageConfig.remove('key3');
+ expect(mockFeatureInstance.remove).toHaveBeenCalledWith('key3');
});
-});
+});
\ No newline at end of file
| added more unit tests | added more unit tests
|
c8edf08b5a35a036b8ef3a6fceb5a826739a2b3c | --- package-lock.json
@@ -54,7 +54,7 @@
"@walmart/gtp-shared-components": "2.0.2",
"@walmart/impersonation-mini-app": "1.10.0",
"@walmart/ims-print-services-ui": "1.2.0",
- "@walmart/inbox-mini-app": "0.81.6",
+ "@walmart/inbox-mini-app": "0.81.7",
"@walmart/iteminfo-mini-app": "5.3.2",
"@walmart/manager-approvals-miniapp": "0.1.2",
"@walmart/me-field-mini-app": "1.1.36",
@@ -5351,9 +5351,9 @@
}
},
"node_modules/@walmart/inbox-mini-app": {
- "version": "0.81.6",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.81.6.tgz",
- "integrity": "sha512-FDPD3nHHozoJj4i8KN2be+3B5PEO0gIOCuRHFoaji3Joukzg1GX7Q07FVwW5zLywWpiLxt6jNfGZMHhW2sqmTg==",
+ "version": "0.81.7",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.81.7.tgz",
+ "integrity": "sha512-9iofcdf44yN3RbQdHk8VwwNdVJ2zr2DnS1epoh7xDWZnxwHY6kIMTNSNPzbSXvTqcCE+en2MT/GgYPFEsLm5Kw==",
"dependencies": {
"@walmart/walmart-fiscal-week": "^0.3.6"
},
@@ -25292,9 +25292,9 @@
"integrity": "sha512-ruI1vqy+0peD+BHi32DvhPSV8lmeoG/iLOeFYGekj40YwIKexXFepkYDiMTOr9tk5rzDg8d+FjRyzVAfKClhOw=="
},
"@walmart/inbox-mini-app": {
- "version": "0.81.6",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.81.6.tgz",
- "integrity": "sha512-FDPD3nHHozoJj4i8KN2be+3B5PEO0gIOCuRHFoaji3Joukzg1GX7Q07FVwW5zLywWpiLxt6jNfGZMHhW2sqmTg==",
+ "version": "0.81.7",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.81.7.tgz",
+ "integrity": "sha512-9iofcdf44yN3RbQdHk8VwwNdVJ2zr2DnS1epoh7xDWZnxwHY6kIMTNSNPzbSXvTqcCE+en2MT/GgYPFEsLm5Kw==",
"requires": {
"@walmart/walmart-fiscal-week": "^0.3.6"
}
--- package.json
@@ -96,7 +96,7 @@
"@walmart/gtp-shared-components": "2.0.2",
"@walmart/impersonation-mini-app": "1.10.0",
"@walmart/ims-print-services-ui": "1.2.0",
- "@walmart/inbox-mini-app": "0.81.6",
+ "@walmart/inbox-mini-app": "0.81.7",
"@walmart/iteminfo-mini-app": "5.3.2",
"@walmart/manager-approvals-miniapp": "0.1.2",
"@walmart/me-field-mini-app": "1.1.36",
| version bump inbox | version bump inbox
|
8f69e87325712e728c1d26ab1f3c84ff8bcd9a07 | --- core/__tests__/core/syncDeviceLanguageTest.ts
@@ -37,8 +37,8 @@ test('onLanguageChange', async () => {
describe('syncDeviceLanguage', () => {
beforeEach(jest.clearAllMocks);
- AllsparkTranslationClient.getSupportedLanguages.mockReturnValue(['en-US', 'es-MX']);
it('does not change language if device language matches current language', async () => {
+ AllsparkTranslationClient.getSupportedLanguages.mockReturnValue(['en-US', 'es-MX']);
AllsparkTranslationClient.language = 'en-US';
(AllsparkLocalStorage.get as jest.Mock).mockResolvedValue('en-US');
await syncDeviceLanguage();
@@ -52,4 +52,11 @@ describe('syncDeviceLanguage', () => {
await syncDeviceLanguage();
expect(ChangeLanguageSpy).toHaveBeenCalledWith('es-MX');
});
+ it('get device langauage when getPersistedLanguage return null', async () => {
+ (AllsparkLocalStorage.get as jest.Mock).mockRejectedValue(new Error('Mocked error: unable to retrieve language key'));
+ (AllsparkTranslationClient.getDeviceLanguage as jest.Mock).mockResolvedValue('en-US')
+ AllsparkTranslationClient.language = 'es-MX'
+ await syncDeviceLanguage();
+ expect(AllsparkTranslationClient.changeLanguage).toBeCalledWith('en-US');
+ });
});
| sync device language tests | sync device language tests
|
64c8a4fd4dde60b3e870f7dac6d47e52669abf55 | --- __tests__/core/__snapshots__/RootContainerTest.tsx.snap
@@ -21,12 +21,17 @@ exports[`RootContainer renders and fires startup event 1`] = `
"getState": [MockFunction] {
"calls": Array [
Array [],
+ Array [],
],
"results": Array [
Object {
"type": "return",
"value": Object {},
},
+ Object {
+ "type": "return",
+ "value": Object {},
+ },
],
},
}
--- __tests__/core/versionsInitTest.ts
@@ -1,13 +1,14 @@
-import {initAppVersions} from '../../src/core/versionsInit';
-import {versionsActions, VersionSection} from '@walmart/redux-store';
-
import DeviceInfo from 'react-native-device-info';
+import {versionsActions, VersionSection} from '@walmart/redux-store';
+import i18next from 'i18next';
+import {initAppVersions, setupAppVersions} from '../../src/core/versionsInit';
describe('versionsInit', () => {
beforeEach(() => {
jest.clearAllMocks();
(DeviceInfo.getVersion as jest.Mock).mockResolvedValue('1.0.0');
});
+
const versions: VersionSection[] = [
{
title: 'version sample',
@@ -23,12 +24,12 @@ describe('versionsInit', () => {
];
it('initialized app versions in redux store from package.json', async () => {
- await initAppVersions();
+ await setupAppVersions();
expect(versionsActions.versionsFetchSuccess).toBeCalledTimes(1);
});
it('versionsFetchSuccess actions should return list of versions', async () => {
- await initAppVersions();
+ await setupAppVersions();
expect(versionsActions.versionsFetchSuccess(versions)).toBe(versions);
});
@@ -36,7 +37,12 @@ describe('versionsInit', () => {
versionsActions.versionsFetchSuccess.mockImplementation(() => {
throw new Error();
});
- await initAppVersions();
+ await setupAppVersions();
expect(versionsActions.versionsFetchError).toBeCalled();
});
+
+ it('setups up translation listener', () => {
+ initAppVersions();
+ expect(i18next.on).toHaveBeenCalledWith('initialized', setupAppVersions);
+ });
});
--- src/core/RootContainer.tsx
@@ -50,7 +50,6 @@ export const onImport = async () => {
initAppConfig();
initUpdateCheck();
initNavConfig();
- await initTranslations();
initAppVersions();
initPermissions();
initBiometrics();
@@ -60,6 +59,7 @@ export const onImport = async () => {
initSsoFeedback();
initAppState();
initCellularDataSaverSaga();
+ initTranslations();
};
onImport();
--- src/core/versionsInit.ts
@@ -27,7 +27,7 @@ const miniApps = [
'@walmart/metrics-mini-app',
];
-export async function initAppVersions() {
+export async function setupAppVersions() {
versionsActions.versionsFetchProgress();
const packageDependencies: packageType = packageJson.dependencies;
try {
@@ -51,6 +51,10 @@ export async function initAppVersions() {
];
versionsActions.versionsFetchSuccess(appVersionResponse);
} catch (err) {
- versionsActions.versionsFetchError(err);
+ versionsActions.versionsFetchError(err as Error);
}
}
+
+export const initAppVersions = () => {
+ i18next.on('initialized', setupAppVersions);
+};
| Removing await from onImport chain. Init sagas not added in time. | Removing await from onImport chain. Init sagas not added in time.
|
057560e0dc8df4ca885752bfa39e7a638a8eb289 | --- package.json
@@ -20,6 +20,7 @@
"lint:fix": "yarn workspaces foreach --all -p run lint:fix",
"prepare": "husky",
"test": "npm run build && jest --no-watchman",
+ "generate:iconTypes": "node ./scripts/generateIconTypes.js",
"components:prebuild": "yarn workspace components-library-storybook run prebuild",
"components:start": "yarn workspace components-library-storybook run start",
"components:android": "yarn workspace components-library-storybook run android",
--- packages/components-library/components/Icon/types.ts
@@ -0,0 +1,51 @@
+export const ICON_NAMES = [
+ 'arrow-up-left',
+ 'aruco-marker',
+ 'better-u',
+ 'birthday-cake',
+ 'bug',
+ 'bulb',
+ 'career',
+ 'cellular-data-saver-off',
+ 'cellular-data-saver-on',
+ 'chat',
+ 'clock-in',
+ 'clock-out',
+ 'clock-out-v2',
+ 'current-location',
+ 'direction',
+ 'email-fill',
+ 'flash-fill',
+ 'inbox',
+ 'inbox-fill',
+ 'link',
+ 'location-plus',
+ 'map-fill',
+ 'meal',
+ 'money',
+ 'money-circle-fill',
+ 'my-assistant',
+ 'my-team',
+ 'my-team-fill',
+ 'nav-home',
+ 'nav-home-fill',
+ 'nav-note',
+ 'nav-note-fill',
+ 'nav-profile',
+ 'nav-profile-fill',
+ 'pallet',
+ 'party',
+ 'payment-calendar-money',
+ 'rest-break',
+ 'rotate-360',
+ 'sandwich',
+ 'shuffle',
+ 'store-fill',
+ 'store-location',
+ 'store-map',
+ 'team',
+ 'thermometer',
+ 'tote-handle',
+] as const;
+
+export type IconName = (typeof ICON_NAMES)[number];
--- scripts/generateIconTypes.js
@@ -0,0 +1,151 @@
+#!/usr/bin/env node
+
+/**
+ * @fileoverview Script to generate TypeScript type definitions for icon names.
+ * Reads icon data from a JSON file and generates corresponding TypeScript types.
+ *
+ * @author Generated by icon build process
+ * @version 1.0.0
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+// Default paths for input and output files
+const DEFAULT_INPUT = path.resolve(
+ process.cwd(),
+ 'packages/components-library/assets/icons/selection.json'
+);
+const DEFAULT_OUTPUT = path.resolve(
+ process.cwd(),
+ 'packages/components-library/components/Icon/types.ts'
+);
+
+/**
+ * Extracts icon names from the selection JSON data.
+ * Filters out invalid entries and returns a sorted array of unique icon names.
+ *
+ * @param {object} selection - The selection object containing icons array
+ * @param {Array} selection.icons - Array of icon objects with properties
+ * @returns {string[]} Sorted array of unique icon names
+ *
+ * @example
+ * const selection = {
+ * icons: [
+ * { properties: { name: 'home' } },
+ * { properties: { name: 'user' } }
+ * ]
+ * };
+ * const names = extractIconNames(selection); // ['home', 'user']
+ */
+function extractIconNames(selection) {
+ // Extract name property from each icon, filtering out undefined/null values
+ const names = selection.icons
+ .map((icon) => icon.properties && icon.properties.name)
+ .filter((name) => typeof name === 'string' && name.length > 0);
+
+ // Remove duplicates and sort alphabetically
+ return Array.from(new Set(names)).sort();
+}
+
+/**
+ * Generates TypeScript type definition content from icon names.
+ * Creates a const array and corresponding union type for type safety.
+ *
+ * @param {string[]} iconNames - Array of icon names to include in types
+ * @returns {string} TypeScript code content as a string
+ *
+ * @example
+ * const names = ['home', 'user'];
+ * const content = generateTypesContent(names);
+ * // Returns: export const ICON_NAMES = ['home', 'user'] as const; ...
+ */
+function generateTypesContent(iconNames) {
+ // Create formatted array entries with proper indentation
+ const namesArray = iconNames.map((name) => ` '${name}'`).join(',\n');
+
+ // Generate the complete TypeScript type definition
+ return `export const ICON_NAMES = [
+${namesArray},
+] as const;
+
+export type IconName = (typeof ICON_NAMES)[number];
+`;
+}
+
+/**
+ * Main function that orchestrates the icon type generation process.
+ * Handles command line arguments, file I/O, error handling, and the complete workflow.
+ *
+ * Command line usage:
+ * - node generateIconTypes.js [inputPath] [outputPath]
+ * - If no arguments provided, uses default paths
+ *
+ * Process:
+ * 1. Parse command line arguments
+ * 2. Read and validate input JSON file
+ * 3. Extract icon names from JSON data
+ * 4. Generate TypeScript type definitions
+ * 5. Write output to file
+ *
+ * @throws {Error} When input file doesn't exist, contains invalid JSON, or output directory doesn't exist
+ */
+function main() {
+ try {
+ // Parse command line arguments
+ const args = process.argv.slice(2);
+ const inputPath = args[0]
+ ? path.resolve(process.cwd(), args[0])
+ : DEFAULT_INPUT;
+ const outputPath = args[1]
+ ? path.resolve(process.cwd(), args[1])
+ : DEFAULT_OUTPUT;
+
+ console.log(`Reading icons from ${inputPath}`);
+
+ // Validate input file exists
+ if (!fs.existsSync(inputPath)) {
+ console.error(`Input file not found: ${inputPath}`);
+ process.exit(1);
+ }
+
+ // Read and parse JSON content
+ const content = fs.readFileSync(inputPath, 'utf-8');
+ let data;
+ try {
+ data = JSON.parse(content);
+ } catch (e) {
+ console.error(`Invalid JSON in input file: ${e.message}`);
+ process.exit(1);
+ }
+
+ // Validate JSON structure
+ if (!data.icons || !Array.isArray(data.icons)) {
+ console.error(`Invalid format: "icons" array missing in ${inputPath}`);
+ process.exit(1);
+ }
+
+ // Extract icon names and generate types
+ const iconNames = extractIconNames(data);
+ console.log(`Found ${iconNames.length} icons`);
+
+ const typesContent = generateTypesContent(iconNames);
+
+ // Validate output directory exists
+ const outDir = path.dirname(outputPath);
+ if (!fs.existsSync(outDir)) {
+ console.error(`Output directory does not exist: ${outDir}`);
+ process.exit(1);
+ }
+
+ // Write generated types to output file
+ fs.writeFileSync(outputPath, typesContent, 'utf-8');
+ console.log(`Generated types at ${outputPath}`);
+ } catch (err) {
+ console.error(`Error: ${err.message || err}`);
+ process.exit(1);
+ }
+}
+
+// Execute the main function when script is run directly
+main();
| feat(icons): add script to generate TypeScript types for iconmoon json file | feat(icons): add script to generate TypeScript types for iconmoon json file
|
bbaaae7c723da0ce21624a20055e1b72b358fba4 | --- src/navigation/AssociateHallwayNav/Banners.tsx
@@ -18,6 +18,7 @@ import {
} from '@walmart/core-widget-registry';
import {ChangeStoreBanner} from '../../changeStore/ChangeStoreBanner';
import {getDataSaverOn} from '../../settings';
+import {createSelector} from 'reselect';
export const ImpersonationBanner = (props: NavigationBannerProps) => {
const {route} = props;
@@ -34,11 +35,17 @@ export const ImpersonationBanner = (props: NavigationBannerProps) => {
) : null;
};
+const getIsInternetReachable = createSelector(
+ [NetworkGlobalSelectors.getNetworkState],
+ (state) => state.isInternetReachable,
+);
+
export const ConnectivityBanner = (_: NavigationBannerProps) => {
- const isConnected = useSelector(NetworkGlobalSelectors.getIsConnected);
+ const isInternetReachable = useSelector(getIsInternetReachable);
const connectionType = useSelector(NetworkGlobalSelectors.getType);
const dataSaverOn = useSelector(getDataSaverOn);
- const showBanner = !isConnected || (connectionType !== 'wifi' && dataSaverOn);
+ const showBanner =
+ !isInternetReachable || (connectionType !== 'wifi' && dataSaverOn);
return showBanner ? <ConnectivityBannerBase /> : null;
};
| fix connectivity banner logic | fix connectivity banner logic
|
b39eebd468472def7f1b2c865943d1471be8282f | --- package-lock.json
@@ -99,7 +99,7 @@
"react": "^18.2.0",
"react-hook-form": "^7.38.0",
"react-i18next": "^12.0.0",
- "react-native": "0.70.4",
+ "react-native": "0.70.5",
"react-native-app-auth": "^6.4.3",
"react-native-background-timer": "^2.4.1",
"react-native-barcode-builder": "^2.0.0",
@@ -20162,9 +20162,9 @@
"license": "MIT"
},
"node_modules/react-native": {
- "version": "0.70.4",
- "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.4.tgz",
- "integrity": "sha512-1e4jWotS20AJ/4lGVkZQs2wE0PvCpIRmPQEQ1FyH7wdyuewFFIxbUHqy6vAj1JWVFfAzbDakOQofrIkkHWLqNA==",
+ "version": "0.70.5",
+ "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.5.tgz",
+ "integrity": "sha512-5NZM80LC3L+TIgQX/09yiyy48S73wMgpIgN5cCv3XTMR394+KpDI3rBZGH4aIgWWuwijz31YYVF5504+9n2Zfw==",
"license": "MIT",
"dependencies": {
"@jest/create-cache-key-function": "^29.0.3",
@@ -39229,9 +39229,9 @@
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
"react-native": {
- "version": "0.70.4",
- "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.4.tgz",
- "integrity": "sha512-1e4jWotS20AJ/4lGVkZQs2wE0PvCpIRmPQEQ1FyH7wdyuewFFIxbUHqy6vAj1JWVFfAzbDakOQofrIkkHWLqNA==",
+ "version": "0.70.5",
+ "resolved": "https://npme.walmart.com/react-native/-/react-native-0.70.5.tgz",
+ "integrity": "sha512-5NZM80LC3L+TIgQX/09yiyy48S73wMgpIgN5cCv3XTMR394+KpDI3rBZGH4aIgWWuwijz31YYVF5504+9n2Zfw==",
"requires": {
"@jest/create-cache-key-function": "^29.0.3",
"@react-native-community/cli": "9.2.1",
--- package.json
@@ -141,7 +141,7 @@
"react": "^18.2.0",
"react-hook-form": "^7.38.0",
"react-i18next": "^12.0.0",
- "react-native": "0.70.4",
+ "react-native": "0.70.5",
"react-native-app-auth": "^6.4.3",
"react-native-background-timer": "^2.4.1",
"react-native-barcode-builder": "^2.0.0",
| feat: upgrade to react native 70.5 | feat: upgrade to react native 70.5
|
c3b9bfcb648069df0b2970684950f607ff079b5f | --- .husky/pre-commit
@@ -50,8 +50,8 @@ echo "🧪 Running tests on changed files..."
# Get list of staged source files
STAGED_SRC_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E '^src/.*\.(js|jsx|ts|tsx)$' | tr '\n' ' ')
-# Get list of staged test files
-STAGED_TEST_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E '__tests__/.*\.(test|spec)\.(js|jsx|ts|tsx)$' | tr '\n' ' ')
+# Get list of staged test files (exclude snapshots)
+STAGED_TEST_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E '__tests__/.*\.(test|spec)\.(js|jsx|ts|tsx)$' | grep -v '__snapshots__' | tr '\n' ' ')
if [ -n "$STAGED_SRC_FILES" ] || [ -n "$STAGED_TEST_FILES" ]; then
echo "Changed source files: $STAGED_SRC_FILES"
@@ -83,14 +83,14 @@ if [ -n "$STAGED_SRC_FILES" ] || [ -n "$STAGED_TEST_FILES" ]; then
if [ -n "$ALL_TEST_FILES" ]; then
echo "Running tests: $ALL_TEST_FILES"
# Run specific test files with coverage for changed source files
- yarn jest $ALL_TEST_FILES --collectCoverageFrom="$STAGED_SRC_FILES" --coverage --coverageReporters=text
+ yarn jest $ALL_TEST_FILES --collectCoverageFrom="$STAGED_SRC_FILES" --coverage --coverageReporters=text --passWithNoTests
else
echo "No test files found for changed source files. Running all tests to ensure nothing is broken..."
# If no specific tests found, run all tests but only collect coverage for changed files
if [ -n "$STAGED_SRC_FILES" ]; then
- yarn jest --collectCoverageFrom="$STAGED_SRC_FILES" --coverage --coverageReporters=text
+ yarn jest --collectCoverageFrom="$STAGED_SRC_FILES" --coverage --coverageReporters=text --passWithNoTests
else
- yarn jest
+ yarn jest --passWithNoTests
fi
fi
| fix(pre-commit): exclude snapshot files from test runner and add passWithNoTests flag | fix(pre-commit): exclude snapshot files from test runner and add passWithNoTests flag
- Fixed pre-commit hook to exclude __snapshots__ files from test detection
- Added --passWithNoTests flag to Jest commands to prevent failures when no tests are found
- This resolves issues where snapshot files were being treated as executable tests
|
d0098fa63d0bbc77db9eddb1e72bb87504664278 | --- package.json
@@ -149,7 +149,7 @@
"@walmart/returns-mini-app": "4.17.8",
"@walmart/rfid-scan-mini-app": "2.13.2",
"@walmart/rn-mobile-sdk-pairing": "2.1.8",
- "@walmart/rn-receiving-mini-app": "2.5.18",
+ "@walmart/rn-receiving-mini-app": "2.5.21",
"@walmart/roster-mini-app": "3.5.0",
"@walmart/schedule-mini-app": "2.6.1",
"@walmart/shelfavailability-mini-app": "1.5.47",
--- yarn.lock
@@ -7723,9 +7723,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/atlas-rn-ui-components@npm:1.3.19":
- version: 1.3.19
- resolution: "@walmart/atlas-rn-ui-components@npm:1.3.19::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fatlas-rn-ui-components%2F-%2F%40walmart%2Fatlas-rn-ui-components-1.3.19.tgz"
+"@walmart/atlas-rn-ui-components@npm:1.3.22":
+ version: 1.3.22
+ resolution: "@walmart/atlas-rn-ui-components@npm:1.3.22"
peerDependencies:
"@walmart/gtp-shared-components": ">=2.2.3-rc.1"
i18next: ">=23.12.2"
@@ -7736,7 +7736,7 @@ __metadata:
bin:
installFonts: ./scripts/installFonts
runCodemods: ./scripts/runCodemods
- checksum: 10c0/9b8661b8d5bd185927f00771407154d6d51f626246af717a478a50a43f0185ea00b4b1191cb5b5f0bbe456e1d9eb3ae4c4a600404410071602ac0fb233d6c870
+ checksum: 10c0/d27e47a6aede71c66b1daedea837fc2e5e77cfaf54f0e1e4777071b6262b6581e14b5a9933a20d830a46b3b7e300d94307cc0f45ee4cb34d0c9500c3bcb4aa95
languageName: node
linkType: hard
@@ -8692,7 +8692,7 @@ __metadata:
"@walmart/returns-mini-app": "npm:4.17.8"
"@walmart/rfid-scan-mini-app": "npm:2.13.2"
"@walmart/rn-mobile-sdk-pairing": "npm:2.1.8"
- "@walmart/rn-receiving-mini-app": "npm:2.5.18"
+ "@walmart/rn-receiving-mini-app": "npm:2.5.21"
"@walmart/roster-mini-app": "npm:3.5.0"
"@walmart/schedule-mini-app": "npm:2.6.1"
"@walmart/shelfavailability-mini-app": "npm:1.5.47"
@@ -9335,11 +9335,11 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/rn-receiving-mini-app@npm:2.5.18":
- version: 2.5.18
- resolution: "@walmart/rn-receiving-mini-app@npm:2.5.18::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Frn-receiving-mini-app%2F-%2F%40walmart%2Frn-receiving-mini-app-2.5.18.tgz"
+"@walmart/rn-receiving-mini-app@npm:2.5.21":
+ version: 2.5.21
+ resolution: "@walmart/rn-receiving-mini-app@npm:2.5.21"
dependencies:
- "@walmart/atlas-rn-ui-components": "npm:1.3.19"
+ "@walmart/atlas-rn-ui-components": "npm:1.3.22"
"@walmart/loadquality-mini-app": "npm:2.0.30"
peerDependencies:
"@react-native-clipboard/clipboard": ">=1.14.0"
@@ -9366,7 +9366,7 @@ __metadata:
react-native-svg: ">=14.1.0"
react-native-svg-transformer: ">=1.3.0"
react-native-vision-camera: "*"
- checksum: 10c0/aa53a6b01871e27530c9bf7c2d17de24f2f81873329d26dbae3a12e3e2758b99c54dcefa60346e61231d8866ea13b5d62ad2388d5cd3bcc2b984e194519dda60
+ checksum: 10c0/1b02d2eca08204b202bb50c0e8e66f68a73b93bbef8095bde8d1a2025d04b29388f63a18c0e66190791231ca4dd7892be716117dbd7c7fe9c2df4d2508a81045
languageName: node
linkType: hard
| feat(receiving): Drop 33 version bump (#4669) | feat(receiving): Drop 33 version bump (#4669)
* chore: bump receiving @ 2.5.21
* chore: bump receiving version 2.5.21
---------
Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
Co-authored-by: Justin Shuck - j0s03ko <Justin.Shuck@walmart.com> |
9be0fa5ed5c91f37e027422996b8715254c5448c | --- src/components/TeamList.tsx
@@ -86,6 +86,31 @@ const styles = StyleSheet.create({
},
buttonsStyle: {flexDirection: 'row', alignItems: 'center'},
pushToTalkBtn: {marginRight: 8},
+ workgroupMyTeamOrAreaHeader: {
+ fontFamily: 'Bogle-Regular',
+ fontSize: 12,
+ color: colors.gray['140'],
+ },
+ workgroupHeader: {
+ fontFamily: 'Bogle-Regular',
+ fontWeight: '700',
+ fontSize: 16,
+ },
+ workgroupMyTeamHeaderContainer: {
+ marginLeft: 48,
+ marginVertical: 0,
+ paddingVertical: 0,
+ },
+ workgroupHeaderContainer: {
+ marginLeft: 16,
+ paddingBottom: 0,
+ },
+ workgroupCardContainer: {
+ borderBottomColor: colors.gray[5],
+ borderBottomWidth: 16,
+ padding: 0,
+ margin: 0,
+ },
});
//TODO: Store iconMap in CCM?
@@ -316,15 +341,27 @@ export const TeamChatCard = (props: {
if (isNil(teams) || teams.length === 0) {
return null;
}
- const workgroupName = teams[0].workgroup;
const renderTeamItems = teams.map((teamItemInfo) => {
return <TeamItem teamId={teamItemInfo.teamId!} canMessage={false} />;
});
+ const workgroupName = teams[0].workgroup;
+
return (
- <>
- <Text>{workgroupName}</Text>
- {renderTeamItems}
- </>
+ <CardContent UNSAFE_style={styles.workgroupCardContainer}>
+ <>
+ {
+ <ListItem>
+ {workgroupKey === primaryWorkGroup && (
+ <Text style={styles.workgroupMyTeamOrAreaHeader}>
+ My area
+ </Text>
+ )}
+ <Text style={styles.workgroupHeader}>{workgroupName}</Text>
+ </ListItem>
+ }
+ {renderTeamItems}
+ </>
+ </CardContent>
);
});
};
@@ -356,7 +393,9 @@ export const TeamChatCard = (props: {
<>
{primaryTeam.length > 0 ? (
<>
- <Text>My Team</Text>
+ <ListItem UNSAFE_style={styles.workgroupMyTeamHeaderContainer}>
+ <Text style={styles.workgroupMyTeamOrAreaHeader}>My Team</Text>
+ </ListItem>
<TeamItem
teamId={primaryTeam}
canMessage={true}
@@ -366,15 +405,18 @@ export const TeamChatCard = (props: {
) : (
<StoreTeamItem style={styles.firstItem} />
)}
-
- {expanded && (
- <>
- {primaryTeam.length > 0 && <StoreTeamItem />}
- {renderWorkgroups()}
- </>
- )}
</>
</CardContent>
+ {expanded && (
+ <>
+ {primaryTeam.length > 0 && (
+ <CardContent>
+ <StoreTeamItem />
+ </CardContent>
+ )}
+ {renderWorkgroups()}
+ </>
+ )}
<Button
UNSAFE_style={styles.toggleButton}
--- src/components/TeamList.tsx
@@ -86,6 +86,31 @@ const styles = StyleSheet.create({
},
buttonsStyle: {flexDirection: 'row', alignItems: 'center'},
pushToTalkBtn: {marginRight: 8},
+ workgroupMyTeamOrAreaHeader: {
+ fontFamily: 'Bogle-Regular',
+ fontSize: 12,
+ color: colors.gray['140'],
+ },
+ workgroupHeader: {
+ fontFamily: 'Bogle-Regular',
+ fontWeight: '700',
+ fontSize: 16,
+ },
+ workgroupMyTeamHeaderContainer: {
+ marginLeft: 48,
+ marginVertical: 0,
+ paddingVertical: 0,
+ },
+ workgroupHeaderContainer: {
+ marginLeft: 16,
+ paddingBottom: 0,
+ },
+ workgroupCardContainer: {
+ borderBottomColor: colors.gray[5],
+ borderBottomWidth: 16,
+ padding: 0,
+ margin: 0,
+ },
});
//TODO: Store iconMap in CCM?
@@ -316,15 +341,27 @@ export const TeamChatCard = (props: {
if (isNil(teams) || teams.length === 0) {
return null;
}
- const workgroupName = teams[0].workgroup;
const renderTeamItems = teams.map((teamItemInfo) => {
return <TeamItem teamId={teamItemInfo.teamId!} canMessage={false} />;
});
+ const workgroupName = teams[0].workgroup;
+
return (
- <>
- <Text>{workgroupName}</Text>
- {renderTeamItems}
- </>
+ <CardContent UNSAFE_style={styles.workgroupCardContainer}>
+ <>
+ {
+ <ListItem>
+ {workgroupKey === primaryWorkGroup && (
+ <Text style={styles.workgroupMyTeamOrAreaHeader}>
+ My area
+ </Text>
+ )}
+ <Text style={styles.workgroupHeader}>{workgroupName}</Text>
+ </ListItem>
+ }
+ {renderTeamItems}
+ </>
+ </CardContent>
);
});
};
@@ -356,7 +393,9 @@ export const TeamChatCard = (props: {
<>
{primaryTeam.length > 0 ? (
<>
- <Text>My Team</Text>
+ <ListItem UNSAFE_style={styles.workgroupMyTeamHeaderContainer}>
+ <Text style={styles.workgroupMyTeamOrAreaHeader}>My Team</Text>
+ </ListItem>
<TeamItem
teamId={primaryTeam}
canMessage={true}
@@ -366,15 +405,18 @@ export const TeamChatCard = (props: {
) : (
<StoreTeamItem style={styles.firstItem} />
)}
-
- {expanded && (
- <>
- {primaryTeam.length > 0 && <StoreTeamItem />}
- {renderWorkgroups()}
- </>
- )}
</>
</CardContent>
+ {expanded && (
+ <>
+ {primaryTeam.length > 0 && (
+ <CardContent>
+ <StoreTeamItem />
+ </CardContent>
+ )}
+ {renderWorkgroups()}
+ </>
+ )}
<Button
UNSAFE_style={styles.toggleButton}
| partial completion of styles | partial completion of styles
|
9ab872eb6c8ed8dd8d46a6a6b6f289e18d7cf33d | --- android/app/build.gradle
@@ -134,7 +134,7 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 139
+ versionCode 140
versionName "1.0.14"
}
splits {
--- ios/AllSpark/Info.plist
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>139</string>
+ <string>140</string>
<key>FirebaseAutomaticScreenReportingEnabled</key>
<false />
<key>LSApplicationQueriesSchemes</key>
| Incrementing build number | Incrementing build number
|
92722ff6824d6a279e9f3dd7c7272a65a2048625 | --- packages/allspark-foundation-hub/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-foundation-hub",
- "version": "1.0.1-beta.17",
+ "version": "1.0.1-beta.18",
"description": "",
"main": "Core/index.js",
"types": "Core/index.d.ts",
--- packages/allspark-foundation-hub/src/HubFeature/Store/Common/constant.ts
@@ -11,10 +11,5 @@ export const TOTAL_STORE_TEAM_LABEL = 'Total store';
export const MY_TEAMS_TEAM_ID = 'myTeams';
export const MY_TEAMS_TEAM_LABEL = 'My teams';
export const PLATFORM_NAME = 'manager-experience';
-
-export declare enum UserDomain {
- dc = 'distribution center',
- candidate = 'candidate',
- homeoffice = 'homeoffice',
- store = 'store/club',
-}
+export const HOME_OFFICE_DOMAIN = 'homeoffice';
+export const SUPPLY_CHAIN_DOMAIN = 'distribution center';
--- packages/allspark-foundation-hub/src/HubFeature/Store/Hub/TeamSwitcher/index.tsx
@@ -37,7 +37,7 @@ import {
TOTAL_STORE_TEAM_ID,
TOTAL_STORE_TEAM_LABEL,
FEATURE_ID,
- UserDomain,
+ HOME_OFFICE_DOMAIN,
} from '../../Common/constant';
import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry';
import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context';
@@ -74,7 +74,7 @@ export const TeamSwitcher = ({
);
const userDomain: string | undefined = useSelector(UserSelectors.getDomain);
const isHomeOffice: boolean =
- userDomain?.toLowerCase() === UserDomain.homeoffice;
+ userDomain?.toLowerCase() === HOME_OFFICE_DOMAIN;
const userTeams: Team[] | undefined = useSelector(UserSelectors.getTeams);
const styles = useMemo(() => TeamSwitcherStyles(), []);
const TeamImage = useAllsparkImage();
@@ -131,7 +131,7 @@ export const TeamSwitcher = ({
let evaluatedTeamList: TeamSwitcherTypes[];
let evaluatedSelectTeam: TeamSwitcherTypes;
- if (isOffSite && empType === EMP_TYPE_SALARIED) {
+ if (isOffSite && empType === EMP_TYPE_SALARIED && !isHomeOffice) {
evaluatedTeamList = [totalStore, management, ...allTeamsOfStore];
evaluatedSelectTeam = management;
} else if ((isOffSite && empType === EMP_TYPE_HOURLY) || isHomeOffice) {
| Update the user domain for team switcher | Update the user domain for team switcher
|
a5468ad80f94090d1994dd020b94ffd942803f27 | --- package.json
@@ -1,7 +1,7 @@
{
- "name": "@walmart/wmconnect-mini-app",
+ "name": "@walmart/wmconnect-minri-app",
"version": "2.36.2",
- "main": "dist/index.js",
+ "main": "main.js",
"files": [
"dist",
"main.js"
| fix(ui): update packages | fix(ui): update packages
|
56039e4bef130909d9ce685dd348ee9fb632ee4f | --- graphql.yml
@@ -36,6 +36,11 @@ applications:
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql'
tags:
- 'v1'
+ - name: 'getSupplyChainTeamPreference'
+ hash: '61253c3d4d8ab6db774a903969c2f63de9113f44c1947d52c3630dd38ce30839'
+ queryTemplate: 'packages/me-at-walmart-athena-queries/src/getSupplyChainTeamPreferenceQuery.graphql'
+ tags:
+ - 'v1'
- name: 'getTeamByIdHome'
hash: '6b4b876250309d85dd51831ace4595bd1764b3d41ef7fd65c08df03b4c4982e0'
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getTeamByIdHome.graphql'
@@ -73,11 +78,11 @@ applications:
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociateById.graphql'
tags:
- 'v1'
- # - name: "getAssociatePreferences"
- # hash: "38e0530d669fff42cb1dc8e5814369c40c33f6d6a77ed734e039948a0c06e8f4"
- # queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociatePreference.graphql"
- # tags:
- # - "v1"
+ - name: 'getAssociatePreferences'
+ hash: '38e0530d669fff42cb1dc8e5814369c40c33f6d6a77ed734e039948a0c06e8f4'
+ queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociatePreference.graphql'
+ tags:
+ - 'v1'
- name: 'getDailyRosterHome'
hash: '3c492831585580bae535c3386ec48e90c2d1895450016f050653bd51ddf86c21'
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getDailyRosterHome.graphql'
@@ -88,28 +93,28 @@ applications:
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql'
tags:
- 'v1'
+ - name: 'getSupplyChainTeamPreference'
+ hash: '61253c3d4d8ab6db774a903969c2f63de9113f44c1947d52c3630dd38ce30839'
+ queryTemplate: 'packages/me-at-walmart-athena-queries/src/getSupplyChainTeamPreferenceQuery.graphql'
+ tags:
+ - 'v1'
- name: 'getTeamByIdHome'
hash: '6b4b876250309d85dd51831ace4595bd1764b3d41ef7fd65c08df03b4c4982e0'
queryTemplate: 'packages/me-at-walmart-athena-queries/src/getTeamByIdHome.graphql'
tags:
- 'v1'
- # - name: "GetTeamsByStore"
- # hash: "e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44"
- # queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql"
- # tags:
- # - "v1"
+ - name: 'GetTeamsByStore'
+ hash: 'e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44'
+ queryTemplate: 'packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql'
+ tags:
+ - 'v1'
- name: 'upsertAssociatePreference'
hash: '972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036'
queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql'
tags:
- 'v1'
- # - name: "upsertManagerExperiencePreference"
- # hash: "bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca"
- # queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql"
- # tags:
- # - "v1"
- - name: 'upsertSupplyChainAssociatePreference'
- hash: '39c45936c3b4d0020c6192b629c29860a30a5f2f70c5297c9e34dcffbaa0c7b0'
- queryTemplate: 'packages/me-at-walmart-athena-queries/src/upsertSupplyChainAssociatePreference.graphql'
+ - name: 'upsertManagerExperiencePreference'
+ hash: 'bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca'
+ queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql'
tags:
- 'v1'
--- packages/me-at-walmart-athena-queries/src/schema.graphql
@@ -2835,6 +2835,11 @@ type CourseProgress {
"""
status(userId: String!): [LearningStatus!]
+ """
+ Fetches details from third party learning content providers. For example Coursera, Harvard etc
+ """
+ status(userId: String!): [LearningStatus!]
+
"""
Fetches details from third party learning content providers. For example Coursera, Harvard etc
"""
@@ -2879,6 +2884,11 @@ enum CourseTypeFilter {
MICRO_LEARNING
}
+enum CourseTypeFilter {
+ COMPLIANCE
+ MICRO_LEARNING
+}
+
input CreateSection1UrlInput {
DOB: String!
dateHired: String!
@@ -7498,6 +7508,12 @@ input MySupplyChainTeamsInput {
supplyChainTeamPreference: [ManagerExperienceTeamInput!]
}
+input MySupplyChainTeamsInput {
+ businessUnitNumber: Int!
+ shiftCodePreference: [String]!
+ supplyChainTeamPreference: [ManagerExperienceTeamInput!]
+}
+
input MyTeamsInput {
businessUnitNumber: Int!
teamPreferenceForBusinessUnit: [ManagerExperienceTeamInput!]
@@ -9873,6 +9889,32 @@ type SchedulingGraphDaily {
startOfWeek: Date
}
+type SchedulingMetric {
+ """Polaris job IDs for Workgroup, Team, Role, etc."""
+ jobIds: [Int]
+
+ """Polaris location ID for Teams"""
+ locationId: Int
+
+ """The Walmart start of week"""
+ startOfWeek: Date
+ totalAggregateData: TotalAggregateData
+ weeklyTeamAggregateData: [WeeklyTeamAggregateData]
+}
+
+type SchedulingGraphDaily {
+ graphData: [DailyGraphData]
+
+ """Polaris job IDs for Team"""
+ jobIds: [Int]
+
+ """Polaris location ID for Teams"""
+ locationId: Int
+
+ """The Walmart start of week"""
+ startOfWeek: Date
+}
+
type SchedulingMetric {
"""Polaris job IDs for Workgroup, Team, Role, etc."""
jobIds: [Int]
| Adding getSupplyChainTeamPreference query | Adding getSupplyChainTeamPreference query
|
cefedac50c6ae12c64f31335d5b9d91dbfec51a4 | --- __tests__/startup/AuthFlowTest.ts
@@ -1,23 +1,14 @@
import {createMockTask} from '@redux-saga/testing-utils';
-import {call, cancel, fork, select, take, takeLatest} from 'redux-saga/effects';
+import {call, cancel, fork, take} from 'redux-saga/effects';
import {navigate} from '@walmart/react-native-shared-navigation';
-import {AuthTypes, UserSelectors} from '@walmart/redux-store';
+import {AuthTypes} from '@walmart/redux-store';
import WmConfig from 'react-native-wm-config';
-import {Auth} from '../../src/core/Auth';
import {
isSilentSignInError,
authFlow,
- authSagas,
waitForAuth,
- handleCandidateSignOut,
} from '../../src/startup/AuthFlow';
-jest.mock('../../src/core/Auth', () => ({
- Auth: {
- signOut: jest.fn(),
- },
-}));
-
describe('isSilentSignInError', () => {
it('returns true for silent error', () => {
const error = new Error('Oh boy...Get user failed. Thats not good!');
@@ -122,32 +113,3 @@ describe('waitForAuth', () => {
expect(iterator.next().done).toEqual(true);
});
});
-
-describe('handleCandidateSignOut', () => {
- it('handles pre hire user', () => {
- const iterator = handleCandidateSignOut();
- expect(iterator.next().value).toEqual(
- select(UserSelectors.getUserIsPreHire),
- );
- expect(iterator.next(true).value).toEqual(call(Auth.signOut));
- expect(iterator.next().done).toEqual(true);
- });
-
- it('handles associate user', () => {
- const iterator = handleCandidateSignOut();
- expect(iterator.next().value).toEqual(
- select(UserSelectors.getUserIsPreHire),
- );
- expect(iterator.next(false).done).toEqual(true);
- });
-});
-
-describe('authSagas', () => {
- it('calls expected actions', () => {
- const iterator = authSagas();
- expect(iterator.next().value).toEqual(
- takeLatest(AuthTypes.SIGN_OUT_REQUEST, handleCandidateSignOut),
- );
- expect(iterator.next().done).toEqual(true);
- });
-});
--- __tests__/startup/RootStartupTest.ts
@@ -12,7 +12,6 @@ import {initUpdateCheck} from '../../src/updates';
import {initAppState} from '../../src/appState';
import {termsOfUseSagas} from '../../src/termsOfUse';
import {permissionSagas} from '../../src/permissions';
-import {authSagas} from '../../src/startup/AuthFlow';
import {StartupActionCreators} from '../../src/startup/StartupRedux';
// eslint-disable-next-line react-hooks/rules-of-hooks
@@ -54,9 +53,6 @@ jest.mock('../../src/termsOfUse', () => ({
jest.mock('../../src/permissions', () => ({
permissionSagas: jest.fn(),
}));
-jest.mock('../../src/startup/AuthFlow', () => ({
- authSagas: jest.fn(),
-}));
describe('useRootStartup', () => {
it('calls expect init actions, handles cleanup on unmount', () => {
@@ -73,7 +69,6 @@ describe('useRootStartup', () => {
expect(initAppState).toHaveBeenCalled();
expect(addSagas).toHaveBeenCalledWith(termsOfUseSagas);
expect(addSagas).toHaveBeenCalledWith(permissionSagas);
- expect(addSagas).toHaveBeenCalledWith(authSagas);
hook.unmount();
expect(mockCleanupEnv).toHaveBeenCalled();
@@ -81,6 +76,6 @@ describe('useRootStartup', () => {
expect(mockCleanupBiometrics).toHaveBeenCalled();
expect(mockCleanupUpdate).toHaveBeenCalled();
expect(mockCleanupAppState).toHaveBeenCalled();
- expect(mockTask.cancel).toHaveBeenCalledTimes(3);
+ expect(mockTask.cancel).toHaveBeenCalledTimes(2);
});
});
--- __tests__/startup/StartupFlowTest.ts
@@ -1,4 +1,8 @@
-import {UserSelectors} from '@walmart/redux-store';
+import {
+ AuthActionCreators,
+ AuthTypes,
+ UserSelectors,
+} from '@walmart/redux-store';
import {createMockTask} from '@redux-saga/testing-utils';
import {call, put, select, spawn, take} from 'redux-saga/effects';
import {
@@ -22,6 +26,13 @@ import {
WhatsNewTypes,
} from '../../src/whatsNew/WhatsNewRedux';
import {checkAvailableSurveys} from '../../src/survey/SurveySaga';
+import {Auth} from '../../src/core/Auth';
+
+jest.mock('../../src/core/Auth', () => ({
+ Auth: {
+ signOut: jest.fn(),
+ },
+}));
jest.mock('../../src/redux/SharedSagas', () => ({
resetTo: jest.fn(),
@@ -55,6 +66,11 @@ describe('candidateStartupFlow', () => {
expect(iterator.next().value).toEqual(call(handleTermsOfUse));
expect(iterator.next().value).toEqual(call(handlePermissions));
expect(iterator.next().value).toEqual(call(resetTo, 'main'));
+ expect(iterator.next().value).toEqual(take(AuthTypes.SIGN_OUT_REQUEST));
+ expect(iterator.next(AuthActionCreators.signOutRequest()).value).toEqual(
+ call(Auth.signOut),
+ );
+ expect(iterator.next().done).toEqual(true);
});
});
--- src/startup/AuthFlow.ts
@@ -1,16 +1,9 @@
import {Task} from 'redux-saga';
-import {call, cancel, fork, select, take, takeLatest} from 'redux-saga/effects';
-import {
- AuthTypes,
- SignInError,
- SignInSuccess,
- UserSelectors,
-} from '@walmart/redux-store';
+import {call, cancel, fork, take} from 'redux-saga/effects';
+import {AuthTypes, SignInError, SignInSuccess} from '@walmart/redux-store';
import {navigate} from '@walmart/react-native-shared-navigation';
-import {createRestartableSaga} from '@walmart/core-utils';
import {FirebaseRemoteConfigTypes} from '@react-native-firebase/remote-config';
import WmConfig from 'react-native-wm-config';
-import {Auth} from '../core/Auth';
/**
* get user failed, authorization canceled - iOS
@@ -64,17 +57,3 @@ export function* waitForAuth() {
yield take(AuthTypes.SIGN_IN_SUCCESS);
yield cancel(authTask);
}
-
-export function* handleCandidateSignOut(): any {
- const isPreHire = yield select(UserSelectors.getUserIsPreHire);
-
- if (isPreHire) {
- yield call(Auth.signOut);
- }
-}
-
-export function* authSagas() {
- yield createRestartableSaga(
- takeLatest(AuthTypes.SIGN_OUT_REQUEST, handleCandidateSignOut),
- );
-}
--- src/startup/RootStartup.ts
@@ -12,7 +12,6 @@ import {initUpdateCheck} from '../updates';
import {initAppState} from '../appState';
import {initWmConfig} from './wmConfigInit';
import {StartupActionCreators} from './StartupRedux';
-import {authSagas} from './AuthFlow';
import {initAppFlow} from './index';
export const useRootStartup = () => {
@@ -30,7 +29,6 @@ export const useRootStartup = () => {
const cleanupAppState = initAppState();
const termsTask = addSagas(termsOfUseSagas);
const permissionTask = addSagas(permissionSagas);
- const authTask = addSagas(authSagas);
return () => {
cleanupEnv();
@@ -40,7 +38,6 @@ export const useRootStartup = () => {
cleanupBiometrics();
cleanupUpdateCheck();
cleanupAppState();
- authTask.cancel();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
--- src/startup/StartupFlow.ts
@@ -1,6 +1,6 @@
import {Task} from 'redux-saga';
import {select, call, take, put, spawn} from 'redux-saga/effects';
-import {UserSelectors} from '@walmart/redux-store';
+import {AuthTypes, UserSelectors} from '@walmart/redux-store';
import {
UpdateCheckActionCreators,
@@ -14,6 +14,7 @@ import {handlePinCode} from '../PinAccess/PinCodeSagas';
import {WhastNewActionCreators, WhatsNewTypes} from '../whatsNew/WhatsNewRedux';
import {checkAvailableSurveys} from '../survey/SurveySaga';
import {handleSiteIdPrompt} from './UserFlow';
+import {Auth} from '../core/Auth';
export function* candidateStartupFlow() {
// Terms of Use
@@ -24,6 +25,12 @@ export function* candidateStartupFlow() {
// Navigate to Main
yield call(resetTo, 'main');
+
+ // Candidate mode will dispatch a request when ready to sign out
+ yield take(AuthTypes.SIGN_OUT_REQUEST);
+
+ // On request, we'll handle sign out for them
+ yield call(Auth.signOut);
}
export function* associateStartupFlow() {
| refactor candidate logout handling | refactor candidate logout handling
|
19cfa1c0dc54604784038ea539f624d6714b5097 | --- __tests__/services/configTest.ts
@@ -81,20 +81,4 @@ describe('getGraphQLConfig', () => {
expect(getGraphQLConfig(envConfig)).toEqual(expectedConfig);
});
-
- it('should return the correct config when miniAppPackage.version is not defined', () => {
- jest.replaceProperty(miniAppPackage, 'version', undefined);
- const envConfig = {env: 'dev'};
-
- const expectedConfig = {
- headers: {
- 'wm_consumer.id': '1bfc1d19-903b-438b-be7e-b0733aade46b',
- 'x-o-platform': 'roster-miniapp',
- 'x-o-platform-version': '2.x.x',
- },
- };
-
- expect(getGraphQLConfig(envConfig)).toEqual(expectedConfig);
- jest.restoreAllMocks();
- });
});
--- __tests__/utils/associateList.test.ts
@@ -158,13 +158,6 @@ describe('AssociateList Tests', () => {
expect(result).toBe(1);
});
- it('should sort by first name if preferred first name is not available', () => {
- const associateA = {firstName: 'B'};
- const associateB = {firstName: 'A'};
- const result = sortByAssociateName(associateA, associateB);
- expect(result).toBe(1);
- });
-
it('should sort by first name if preferred first name of associateB is not available', () => {
const associateA = {preferredFirstName: 'A', firstName: 'B'};
const associateB = {firstName: 'A'};
@@ -172,13 +165,6 @@ describe('AssociateList Tests', () => {
expect(result).toBe(1);
});
- it('should return NO_SORT if both names are equal', () => {
- const associateA = {preferredFirstName: 'A', firstName: 'A'};
- const associateB = {preferredFirstName: 'A', firstName: 'A'};
- const result = sortByAssociateName(associateA, associateB);
- expect(result).toBe(NO_SORT);
- });
-
it('should sort by first name if associateA has no preferred first name', () => {
const associateA = {firstName: 'B'};
const associateB = {preferredFirstName: 'A', firstName: 'A'};
| feat: removed duplicate tests | feat: removed duplicate tests
|
a19fd18db108d902a5cd35025ec2693bd8eca8aa | --- package-lock.json
@@ -5644,9 +5644,9 @@
}
},
"@walmart/time-clock-mini-app": {
- "version": "0.22.2",
- "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.22.2.tgz",
- "integrity": "sha512-d0GlA9ImjIvRFdBtx6xRYp0Ujtj+ZbEL/2SVy4KhvHizpEnN+CkoMnNwCCQrlYFuyUwqihad44BjQcSe+GS11Q==",
+ "version": "0.22.3",
+ "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.22.3.tgz",
+ "integrity": "sha512-ZuKb79UcIhIx4P/j/cDGbwPWMqI5AfnDyav482geX9FkhSJHNS4iQdOewLnAQphW/Yy/MgfXm8gg3a1WM+qJ/Q==",
"requires": {
"@react-native-community/datetimepicker": "3.0.9",
"@react-native-picker/picker": "2.4.2",
--- package.json
@@ -121,7 +121,7 @@
"@walmart/settings-mini-app": "1.10.0",
"@walmart/shelfavailability-mini-app": "1.3.1",
"@walmart/taskit-mini-app": "0.34.5-beta.9",
- "@walmart/time-clock-mini-app": "0.22.2",
+ "@walmart/time-clock-mini-app": "0.22.3",
"@walmart/ui-components": "1.5.0",
"@walmart/welcomeme-mini-app": "0.71.0",
"@walmart/wfm-ui": "0.2.24",
| Bump time clock mini app to 0.22.3 | Bump time clock mini app to 0.22.3
|
0eccdf26259e01fe298627bfc4f8b93980f48169 | --- packages/allspark-cli/package.json
@@ -35,7 +35,7 @@
},
"dependencies": {
"@azure/storage-blob": "^12.26.0",
- "@clack/prompts": "^0.7.0",
+ "@clack/prompts": "^0.8.2",
"@graphql-codegen/cli": "^5.0.0",
"@graphql-codegen/near-operation-file-preset": "^2.5.0",
"@graphql-codegen/typescript": "^4.0.1",
--- yarn.lock
@@ -1904,23 +1904,23 @@ __metadata:
languageName: node
linkType: hard
-"@clack/core@npm:0.5.0":
- version: 0.5.0
- resolution: "@clack/core@npm:0.5.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40clack%2Fcore%2F-%2Fcore-0.5.0.tgz"
+"@clack/core@npm:0.3.5":
+ version: 0.3.5
+ resolution: "@clack/core@npm:0.3.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40clack%2Fcore%2F-%2Fcore-0.3.5.tgz"
dependencies:
picocolors: "npm:^1.0.0"
sisteransi: "npm:^1.0.5"
- checksum: 10c0/ef55dce4b0a4802171b71fe595865a6452c7cf823d162df7fa9afe2ea5a594b9d97e0b8e2880c2a805f2ce1d2f782cb1637d9f8d2ab8b99010af3a20816fae5a
+ checksum: 10c0/b1037226b38696bd95e09beef789ff4e23abb282505ac233c0316c2410c8afb68cf91b67812c883f05ffa6943d6f0593f1ebc17beb94f4a42c13e4657f598c0b
languageName: node
linkType: hard
-"@clack/core@npm:^0.3.3":
- version: 0.3.5
- resolution: "@clack/core@npm:0.3.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40clack%2Fcore%2F-%2Fcore-0.3.5.tgz"
+"@clack/core@npm:0.5.0":
+ version: 0.5.0
+ resolution: "@clack/core@npm:0.5.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40clack%2Fcore%2F-%2Fcore-0.5.0.tgz"
dependencies:
picocolors: "npm:^1.0.0"
sisteransi: "npm:^1.0.5"
- checksum: 10c0/b1037226b38696bd95e09beef789ff4e23abb282505ac233c0316c2410c8afb68cf91b67812c883f05ffa6943d6f0593f1ebc17beb94f4a42c13e4657f598c0b
+ checksum: 10c0/ef55dce4b0a4802171b71fe595865a6452c7cf823d162df7fa9afe2ea5a594b9d97e0b8e2880c2a805f2ce1d2f782cb1637d9f8d2ab8b99010af3a20816fae5a
languageName: node
linkType: hard
@@ -1935,15 +1935,14 @@ __metadata:
languageName: node
linkType: hard
-"@clack/prompts@npm:^0.7.0":
- version: 0.7.0
- resolution: "@clack/prompts@npm:0.7.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40clack%2Fprompts%2F-%2Fprompts-0.7.0.tgz"
+"@clack/prompts@npm:^0.8.2":
+ version: 0.8.2
+ resolution: "@clack/prompts@npm:0.8.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40clack%2Fprompts%2F-%2Fprompts-0.8.2.tgz"
dependencies:
- "@clack/core": "npm:^0.3.3"
- is-unicode-supported: "npm:*"
+ "@clack/core": "npm:0.3.5"
picocolors: "npm:^1.0.0"
sisteransi: "npm:^1.0.5"
- checksum: 10c0/fecb3b34308c5cb75807211b28d50caa4b0c5d150d16e733e59bfba3187ac856f050ed44baeca90eb99e047671096ff54402dd2790e9c0e77845a75b04003e2e
+ checksum: 10c0/7ac6e7e0fba1c958847e6e3ef9415d9c2184fb424b31691aaef64fd06042d243e859c157b941ca1c9f73e9cb649413fab487a602b981e300acfbec4a111d7562
languageName: node
linkType: hard
@@ -7948,7 +7947,7 @@ __metadata:
resolution: "@walmart/allspark-cli@workspace:packages/allspark-cli"
dependencies:
"@azure/storage-blob": "npm:^12.26.0"
- "@clack/prompts": "npm:^0.7.0"
+ "@clack/prompts": "npm:^0.8.2"
"@graphql-codegen/cli": "npm:^5.0.0"
"@graphql-codegen/near-operation-file-preset": "npm:^2.5.0"
"@graphql-codegen/typescript": "npm:^4.0.1"
@@ -14936,13 +14935,6 @@ __metadata:
languageName: node
linkType: hard
-"is-unicode-supported@npm:*":
- version: 2.1.0
- resolution: "is-unicode-supported@npm:2.1.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fis-unicode-supported%2F-%2Fis-unicode-supported-2.1.0.tgz"
- checksum: 10c0/a0f53e9a7c1fdbcf2d2ef6e40d4736fdffff1c9f8944c75e15425118ff3610172c87bf7bc6c34d3903b04be59790bb2212ddbe21ee65b5a97030fc50370545a5
- languageName: node
- linkType: hard
-
"is-unicode-supported@npm:^0.1.0":
version: 0.1.0
resolution: "is-unicode-supported@npm:0.1.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fis-unicode-supported%2F-%2Fis-unicode-supported-0.1.0.tgz"
| feat(cli): update package.json (#440) | feat(cli): update package.json (#440)
* feat(cli): update package.json
* feat(cli): update package.json |
8be79f56d7d3e00f50989b6a516a215a4b05212b | --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/ShiftFilter/ShiftFilter.tsx
@@ -25,7 +25,7 @@ export const ShiftFilter = ({
return (
<TouchableOpacity
style={styles.container}
- testID='shift-filter'
+ testID={`shift-filter-${shiftId}`}
onPress={handleSelect}
>
<View style={styles.shiftFilterOuterContainer}>
@@ -45,6 +45,7 @@ export const ShiftFilter = ({
shiftId: shiftId,
});
}}
+ testID='teamImage-shiftFilter'
/>
<View
accessible={true}
| Adding test Id's | Adding test Id's
|
295b39975cf6921c9a3e57f9c2a56e1e7dab18a3 | --- __tests__/core/wmConfigInitTest.ts
@@ -19,6 +19,11 @@ jest.mock('react-native-wm-config', () => ({
}));
describe('wmConfigInit', () => {
+ const user = {
+ data: {
+ siteId: '100',
+ },
+ };
const mockGetStore = getStore as jest.Mock;
const mockGetState = jest.fn(() => ({}));
const mockDispatch = jest.fn();
@@ -34,6 +39,7 @@ describe('wmConfigInit', () => {
});
it('initializes app config', async () => {
+ mockGetState.mockReturnValueOnce({user});
mockSetConfig.mockResolvedValueOnce({});
mockFetchAndActivate.mockResolvedValueOnce({});
@@ -52,7 +58,7 @@ describe('wmConfigInit', () => {
});
it('skips adding reducer & initializes wm config', async () => {
- mockGetState.mockReturnValueOnce({wmConfig: INITIAL_STATE});
+ mockGetState.mockReturnValueOnce({wmConfig: INITIAL_STATE, user});
mockSetConfig.mockResolvedValueOnce({});
mockFetchAndActivate.mockResolvedValueOnce({});
@@ -66,8 +72,25 @@ describe('wmConfigInit', () => {
);
});
+ it('skips initializing due to missing siteId', async () => {
+ const userSiteNotFound = {
+ data: {
+ siteId: 'NOT_FOUND',
+ },
+ };
+ mockGetState.mockReturnValueOnce({
+ wmConfig: INITIAL_STATE,
+ user: userSiteNotFound,
+ });
+
+ await initWmConfig();
+ expect(mockGetStore).toBeCalledTimes(1);
+ expect(mockGetState).toBeCalledTimes(1);
+ });
+
it('fails to fetch config due to throttling', async () => {
const mockError = new Error('error');
+ mockGetState.mockReturnValueOnce({user});
mockSetConfig.mockResolvedValueOnce({});
mockFetchAndActivate.mockRejectedValueOnce(mockError);
@@ -86,6 +109,7 @@ describe('wmConfigInit', () => {
});
it('fails to set config', async () => {
+ mockGetState.mockReturnValueOnce({user});
const mockError = new Error('error');
mockSetConfig.mockRejectedValueOnce(mockError);
--- src/core/wmConfigInit.ts
@@ -11,8 +11,12 @@ export const initWmConfig = async () => {
if (!state[wmConfigSliceName]) {
reducerManager.addReducer(wmConfigSliceName, wmConfigReducer);
}
- const config: RCTypes.ConfigSettings = {};
+ if (state.user.data && state.user.data.siteId === 'NOT_FOUND') {
+ return;
+ }
+
+ const config: RCTypes.ConfigSettings = {};
return wmConfig
.setConfigSettings(config)
.catch((error) => {
| add siteId check (#151) | add siteId check (#151)
|
cd9cb9f8cd75ec641eed021b065030cc6c010a18 | --- package-lock.json
@@ -69,7 +69,7 @@
"@walmart/react-native-encrypted-storage": "1.1.3",
"@walmart/react-native-env": "0.2.0",
"@walmart/react-native-logger": "1.33.0",
- "@walmart/react-native-scanner-3.0": "0.1.32",
+ "@walmart/react-native-scanner-3.0": "0.2.1",
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.5.1",
@@ -5805,9 +5805,9 @@
}
},
"node_modules/@walmart/react-native-scanner-3.0": {
- "version": "0.1.32",
- "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz",
- "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==",
+ "version": "0.2.1",
+ "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.1.tgz",
+ "integrity": "sha512-1b8IJIj2yRxWbIR/bGGAjgDEJjxAo/LEDvcgQ/kkniO7ZCVBy9i8MQqJP5rgwPQorY0e78Rqiu29i+Dtdi5Myg==",
"license": "ISC",
"peerDependencies": {
"react-native": ">=0.47.1"
@@ -25386,9 +25386,9 @@
"version": "1.33.0"
},
"@walmart/react-native-scanner-3.0": {
- "version": "0.1.32",
- "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz",
- "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q=="
+ "version": "0.2.1",
+ "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.1.tgz",
+ "integrity": "sha512-1b8IJIj2yRxWbIR/bGGAjgDEJjxAo/LEDvcgQ/kkniO7ZCVBy9i8MQqJP5rgwPQorY0e78Rqiu29i+Dtdi5Myg=="
},
"@walmart/react-native-shared-navigation": {
"version": "1.0.2",
--- package.json
@@ -111,7 +111,7 @@
"@walmart/react-native-encrypted-storage": "1.1.3",
"@walmart/react-native-env": "0.2.0",
"@walmart/react-native-logger": "1.33.0",
- "@walmart/react-native-scanner-3.0": "0.1.32",
+ "@walmart/react-native-scanner-3.0": "0.2.1",
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.5.1",
| chore: updating scanner | chore: updating scanner
|
423ab2363703a6fd10c9ba75cf3466ae751918d4 | --- targets/US/ios/AllSpark/Info.plist
@@ -19,7 +19,7 @@
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<!-- @customization - default: <string>$(MARKETING_VERSION)</string> -->
- <string>1.27.0</string>
+ <string>1.29.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
| GDVCVR-17557 info.list file changes for builds | GDVCVR-17557 info.list file changes for builds
|
f877a47fda09cd349e817b20abd121895a8d771c | --- index.js
@@ -10,5 +10,8 @@ import 'moment/locale/es-mx';
import {AppRegistry} from 'react-native';
import {App} from './src';
import {name as appName} from './app.json';
+import {registerAskSamWidgets} from '@walmart/metrics-mini-app';
AppRegistry.registerComponent(appName, () => App);
+registerAskSamWidgets();
+// registerHomeWidgets();
--- package-lock.json
@@ -35,7 +35,7 @@
"@walmart/allspark-neon-core": "0.1.31",
"@walmart/amp-mini-app": "1.1.30",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.3.62",
+ "@walmart/ask-sam-mini-app": "1.3.71",
"@walmart/attendance-mini-app": "0.86.0",
"@walmart/config-components": "4.1.0-rc.4",
"@walmart/core-services": "~2.0.19",
@@ -4796,9 +4796,9 @@
}
},
"node_modules/@walmart/ask-sam-mini-app": {
- "version": "1.3.62",
- "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.62.tgz",
- "integrity": "sha512-fZOGAbpXyYUbraln7ElVbJPCCWi2g6+9o8PfmfVPubE0TxYTI6eBqP5IBWR0aZPR1umSbR88EJBm9CLO1Sdtuw==",
+ "version": "1.3.71",
+ "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.71.tgz",
+ "integrity": "sha512-VBc4w4HOVjNoPOiJ/W12Wkm6QxGxf9bhOjhRs9udvXYYfJrPl6lRjH+CYujMf1lUPYvz5DEkQI5rtCGQUWnWcg==",
"license": "NONE",
"dependencies": {
"apisauce": "^1.1.2",
@@ -25108,9 +25108,9 @@
}
},
"@walmart/ask-sam-mini-app": {
- "version": "1.3.62",
- "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.62.tgz",
- "integrity": "sha512-fZOGAbpXyYUbraln7ElVbJPCCWi2g6+9o8PfmfVPubE0TxYTI6eBqP5IBWR0aZPR1umSbR88EJBm9CLO1Sdtuw==",
+ "version": "1.3.71",
+ "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.71.tgz",
+ "integrity": "sha512-VBc4w4HOVjNoPOiJ/W12Wkm6QxGxf9bhOjhRs9udvXYYfJrPl6lRjH+CYujMf1lUPYvz5DEkQI5rtCGQUWnWcg==",
"requires": {
"apisauce": "^1.1.2",
"axios-cache-adapter": "^2.7.3",
--- package.json
@@ -77,7 +77,7 @@
"@walmart/allspark-neon-core": "0.1.31",
"@walmart/amp-mini-app": "1.1.30",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.3.62",
+ "@walmart/ask-sam-mini-app": "1.3.71",
"@walmart/attendance-mini-app": "0.86.0",
"@walmart/config-components": "4.1.0-rc.4",
"@walmart/core-services": "~2.0.19",
| asksam version bump | asksam version bump
|
3a43ee9db0d3dacda1afa66121988357bf4f0344 | --- graphql.yml
@@ -155,24 +155,24 @@ applications:
# queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql"
# tags:
# - "v1"
- - name: "allspark-core-intl"
- applicationKey: "ALLSPARK_APP_INTL"
- description: "Core application for Me@Walmart International"
- environments:
- - name: "stg"
- persistedQueries:
- - name: "businessUnitByCountryAndNumber"
- hash: "dc5adc0197a2bfd29b0ecc4ec5a255f44f8e0700a8a6916a834ec745574ab54d"
- queryTemplate: "packages/me-at-walmart-athena-queries/src/businessUnitByCountryAndNumber.graphql"
- tags:
- - "v1"
- - name: "getAssociateById"
- hash: "0a06f624828f31fa5f8a13615385e1c3c4424732132e432655f4a45962a7fa22"
- queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociateById.graphql"
- tags:
- - "v1"
- - name: "getLoggedInUser"
- hash: "0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd"
- queryTemplate: "packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql"
- tags:
- - "v1"
+ - name: "allspark-core-intl"
+ applicationKey: "ALLSPARK_APP_INTL"
+ description: "Core application for Me@Walmart International"
+ environments:
+ - name: "stg"
+ persistedQueries:
+ - name: "businessUnitByCountryAndNumber"
+ hash: "dc5adc0197a2bfd29b0ecc4ec5a255f44f8e0700a8a6916a834ec745574ab54d"
+ queryTemplate: "packages/me-at-walmart-athena-queries/src/businessUnitByCountryAndNumber.graphql"
+ tags:
+ - "v1"
+ - name: "getAssociateById"
+ hash: "0a06f624828f31fa5f8a13615385e1c3c4424732132e432655f4a45962a7fa22"
+ queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociateById.graphql"
+ tags:
+ - "v1"
+ - name: "getLoggedInUser"
+ hash: "0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd"
+ queryTemplate: "packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql"
+ tags:
+ - "v1"
| fix: spacing | fix: spacing
|
c73359becabd12df7fc4708c549b651d44eb0f1e | --- package-lock.json
@@ -3032,9 +3032,9 @@
}
},
"@walmart/ask-sam-mini-app": {
- "version": "0.28.0",
- "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.28.0.tgz",
- "integrity": "sha512-3wcqmEIL/0n4cpiJnyiZnkFtqFFGATqU4Ta49WM1HtumFPWsc7tK+6Vkws10btt4DmEnGwQs+6aTcyD3KoV45g==",
+ "version": "0.17.2",
+ "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.17.2.tgz",
+ "integrity": "sha512-2Gf7qTzO9qnHeJk8FQUNnRrQKLpgXaJT7DypOjwJl/dBP5ueGHdFvuo5BXYHQPU4/iEovlG0iBeLdZXNCJVGxg==",
"requires": {
"apisauce": "^1.1.2",
"lodash": "^4.17.19",
--- package.json
@@ -66,7 +66,7 @@
"@walmart/allspark-health-survey-mini-app": "0.0.35",
"@walmart/allspark-home-mini-app": "0.4.0",
"@walmart/allspark-me-mini-app": "0.1.0",
- "@walmart/ask-sam-mini-app": "0.28.0",
+ "@walmart/ask-sam-mini-app": "0.17.2",
"@walmart/config-components": "1.0.21",
"@walmart/feedback-all-spark-miniapp": "0.0.49",
"@walmart/functional-components": "1.0.27",
| Correcting ask sam version | Correcting ask sam version
|
5b91db1901de6aed05fb0e4c803fd6b3a1edbf16 | --- packages/allspark-utils/__tests__/placeholderProxyTest.ts
@@ -0,0 +1,21 @@
+import {PlaceholderProxy} from '../src/placeholderProxy';
+
+describe("Placeholder proxy tests", () => {
+ it("works as described", () => {
+ // const placeholder = PlaceholderProxy((error) => 'error');
+ // expect(placeholder.isConnected).toBe(false);
+ // try {
+ // const val = placeholder.notAvailable;
+ // } catch(e) {
+ // expect(e).toBe('error');
+ // }
+ // placeholder.Connect({
+ // one: 1,
+ // two: '2'
+ // });
+ // expect(placeholder.isConnected).toBe(true);
+ // expect(placeholder.one).toBe(1);
+ // expect(placeholder.two).toBe('2');
+
+ })
+})
\ No newline at end of file
--- packages/allspark-utils/__tests__/queueTest.ts
@@ -0,0 +1,82 @@
+import {DynamicQueue, Queue, QueueManager} from '../src/queue';
+
+describe("Queue tests", () => {
+ const verifyItem = (item, length) => {
+ switch(length) {
+ case 3: return item === 1;
+ case 2: return item === 2;
+ case 1: return item === 3;
+ case 0: return item === 4;
+ default: return false;
+ }
+ }
+ it("creates and flushes a queue as described", () => {
+ const q = new Queue({initial: [1,2,3]});
+ expect(q.length).toBe(3);
+ q.enqueue(4);
+ expect(q.length).toBe(4);
+
+ q.forEach((item, index) => expect(item).toBe(index + 1));
+
+ q.flush((item) => expect(verifyItem(item, q.length)).toBe(true));
+ expect(q.length).toBe(0);
+ });
+
+ it("works as described with a lifo queue", () => {
+ const q = new Queue({initial: [], strategy: 'lifo'});
+ q.enqueue(4);
+ q.enqueue(3);
+ q.enqueue(2);
+ q.enqueue(1);
+ expect(q.length).toBe(4);
+ q.flush(item => expect(verifyItem(item, q.length)).toBe(true));
+ });
+
+ it("works normally without a config present", () => {
+ const q = new Queue();
+ q.enqueue(1);
+ expect(q.length).toBe(1);
+ q.flush(item => expect(item).toBe(1));
+ })
+});
+
+
+describe("Queue manager tests", () => {
+ it("works as described", () => {
+ const qm = new QueueManager(
+ ['stringq', 'numberq']
+ );
+ qm.enqueue('stringq', 'a');
+ qm.enqueue('numberq', 1);
+
+ qm.flush('stringq', (item) => expect(item).toBe('a'));
+ qm.flushAll((q, item) => {
+ expect(q).toBe("numberq");
+ expect(item).toBe(1);
+ });
+ qm.enqueue('numberq', 1);
+ qm.enqueue('numberq', 2);
+ expect(qm.getLength('numberq')).toBe(2);
+ qm.forEach('numberq', (num, i) => {
+ if(i === 0) expect(num).toBe(1);
+ if(i === 1) expect(num).toBe(2);
+ });
+ })
+});
+
+describe("dynamic queue", () => {
+ it("works as described", () => {
+ const dq = new DynamicQueue();
+ dq.enqueue('numq', 1);
+ dq.flush('numq', (item) => {
+ expect(item).toBe(1);
+ });
+ dq.enqueue('numq', 2);
+ dq.flush('numq', (item) => {
+ expect(item).toBe(2);
+ });
+ const mockcb = jest.fn();
+ dq.flush('doesntexist', mockcb);
+ expect(mockcb).not.toHaveBeenCalled();
+ })
+})
\ No newline at end of file
--- packages/allspark-utils/src/queue.ts
@@ -64,10 +64,10 @@ export class Queue<T extends any> {
/**
* A generic class for managing multiple queues of different types.
* @example
- * const queueManager = new QueueManager({
- * stringQueue: new Queue<string>(),
- * numberQueue: new Queue<number>(),
- * });
+ * const queueManager = new QueueManager([
+ * 'stringQueue',
+ * 'numberQueue'
+ * ]);
* queueManager.enqueue('stringQueue', 'a');
* queueManager.enqueue('numberQueue', 1);
*
| fix: queue tests | fix: queue tests
|
4c189a2a16f37ba22cf8dd0395f4386ed04d8eba | --- package-lock.json
@@ -80,7 +80,7 @@
"@walmart/schedule-mini-app": "0.37.0",
"@walmart/settings-mini-app": "1.18.1",
"@walmart/shelfavailability-mini-app": "1.5.16",
- "@walmart/taskit-mini-app": "2.40.6",
+ "@walmart/taskit-mini-app": "2.40.7",
"@walmart/time-clock-mini-app": "2.98.0",
"@walmart/topstock-mini-app": "1.0.6",
"@walmart/ui-components": "1.15.0",
@@ -5994,9 +5994,9 @@
}
},
"node_modules/@walmart/taskit-mini-app": {
- "version": "2.40.6",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.6.tgz",
- "integrity": "sha512-hC1OhbCpJYe5BNvAd4/BSWIaE8ViiRvLGcWdJU4bvOmY4EKka0gDMZlGvdXOr9T+gdIoA2g1znhmboUpTpcYBA==",
+ "version": "2.40.7",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.7.tgz",
+ "integrity": "sha512-oeYaLYOBl7vLMsbTvT/brk3/ktwNRPESL8lDZXQTfAr7OqnyyhO+JrB3qpgjfX5CquNdjw9i27MgyjeFR7P+UQ==",
"peerDependencies": {
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@types/lodash": ">=4.14.176",
@@ -25384,9 +25384,9 @@
"version": "1.5.16"
},
"@walmart/taskit-mini-app": {
- "version": "2.40.6",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.6.tgz",
- "integrity": "sha512-hC1OhbCpJYe5BNvAd4/BSWIaE8ViiRvLGcWdJU4bvOmY4EKka0gDMZlGvdXOr9T+gdIoA2g1znhmboUpTpcYBA=="
+ "version": "2.40.7",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.7.tgz",
+ "integrity": "sha512-oeYaLYOBl7vLMsbTvT/brk3/ktwNRPESL8lDZXQTfAr7OqnyyhO+JrB3qpgjfX5CquNdjw9i27MgyjeFR7P+UQ=="
},
"@walmart/tcnumber": {
"version": "2.3.3",
--- package.json
@@ -122,7 +122,7 @@
"@walmart/schedule-mini-app": "0.37.0",
"@walmart/settings-mini-app": "1.18.1",
"@walmart/shelfavailability-mini-app": "1.5.16",
- "@walmart/taskit-mini-app": "2.40.6",
+ "@walmart/taskit-mini-app": "2.40.7",
"@walmart/time-clock-mini-app": "2.98.0",
"@walmart/topstock-mini-app": "1.0.6",
"@walmart/ui-components": "1.15.0",
| chore: taskit version bump | chore: taskit version bump
|
3861bb624b2e4d2a38c0009b5139eae447ff8192 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "3.12.0",
+ "version": "3.12.1",
"main": "dist/index.js",
"files": [
"dist",
@@ -90,9 +90,9 @@
"@walmart/react-native-logger": "1.35.0",
"@walmart/react-native-scanner-3.0": "0.10.4",
"@walmart/react-native-sumo-sdk": "2.8.0",
- "@walmart/roster-mini-app": "3.14.0",
+ "@walmart/roster-mini-app": "3.15.1",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "3.8.0",
+ "@walmart/wmconnect-mini-app": "3.8.1",
"babel-jest": "^29.6.3",
"chance": "^1.1.11",
"crypto-js": "~4.2.0",
--- yarn.lock
@@ -7606,9 +7606,9 @@ __metadata:
"@walmart/react-native-logger": "npm:1.35.0"
"@walmart/react-native-scanner-3.0": "npm:0.10.4"
"@walmart/react-native-sumo-sdk": "npm:2.8.0"
- "@walmart/roster-mini-app": "npm:3.14.0"
+ "@walmart/roster-mini-app": "npm:3.15.1"
"@walmart/ui-components": "npm:1.15.1"
- "@walmart/wmconnect-mini-app": "npm:3.8.0"
+ "@walmart/wmconnect-mini-app": "npm:3.8.1"
babel-jest: "npm:^29.6.3"
chance: "npm:^1.1.11"
crypto-js: "npm:~4.2.0"
@@ -7714,9 +7714,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/roster-mini-app@npm:3.14.0":
- version: 3.14.0
- resolution: "@walmart/roster-mini-app@npm:3.14.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.14.0.tgz"
+"@walmart/roster-mini-app@npm:3.15.1":
+ version: 3.15.1
+ resolution: "@walmart/roster-mini-app@npm:3.15.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.15.1.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=7.12.0"
"@walmart/gtp-shared-components-3": "*"
@@ -7728,7 +7728,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/960d1c1833e1eb029e4ed7d3d8fe1dcd0e198dfb03f0ba684599b7d457db85cc0993f87380a57db028241335b91f6edb55fa697c63ecd8d7105d65f2388166ef
+ checksum: 10c0/2147ccd380f3b2d620855824212e04618be4895e02aa485350b999b2bd66d64a3f1009bff7cf525c20040a33a82f75507ebc18c93d2342f7ae1a6199224299d5
languageName: node
linkType: hard
@@ -7752,9 +7752,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:3.8.0":
- version: 3.8.0
- resolution: "@walmart/wmconnect-mini-app@npm:3.8.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.8.0.tgz"
+"@walmart/wmconnect-mini-app@npm:3.8.1":
+ version: 3.8.1
+ resolution: "@walmart/wmconnect-mini-app@npm:3.8.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.8.1.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=7.12.0"
expo: ~53.0.20
@@ -7765,7 +7765,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/0248399c5505154292b79e49f46e8324f9c75b86649aa6359e15e2a5305d5d9fc2a995e60d63c88788bcd794ad912d6bafe10f9f90a767f49208d730ec7c2392
+ checksum: 10c0/39c4c1b1bacf22c50d5d23067d41d22497d0b31dd60b6c32eac97b36f9b653dbf228b32f6f7174dc27c72a46f1456616382b5fa706e3a2f19abb0328cca71d2c
languageName: node
linkType: hard
| feat(ui): update wmconnect, roster and myteam verion | feat(ui): update wmconnect, roster and myteam verion
|
bdb1fef145f46426c10a82572ed5f938c6bdf676 | --- package-lock.json
@@ -4475,9 +4475,9 @@
}
},
"@walmart/taskit-mini-app": {
- "version": "0.199.0-rc.0",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.199.0-rc.0.tgz",
- "integrity": "sha512-NE2lQSZuN7dnvvOZPom+vnpwuo6tfdhMWUSt8bCIc2uL0IIdH/JoTSGv64eUoYVsTASMh0U8qdxKY+/HmPAyUw=="
+ "version": "0.200.0-rc.1",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.200.0-rc.1.tgz",
+ "integrity": "sha512-PfwZer1i7CZTWWGr8P4SSIyGvfJmW50NVGr7u2kybeI9Fy/2oHMSwBepW8XMh+sNsHGCiyiUsVcMWqT8nNNM7Q=="
},
"@walmart/time-clock-mini-app": {
"version": "0.4.27",
--- 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.199.0-rc.0",
+ "@walmart/taskit-mini-app": "^0.200.0-rc.1",
"@walmart/time-clock-mini-app": "0.4.27",
"@walmart/ui-components": "1.3.0-rc.11",
"@walmart/welcomeme-mini-app": "0.44.0",
| upgrading taskit version | upgrading taskit version
|
5c8ad6725f024525e74b83d97c3d35746c5559b5 | --- targets/US/package.json
@@ -116,7 +116,7 @@
"@walmart/me-at-walmart-common": "workspace:^",
"@walmart/me-at-walmart-container": "workspace:^",
"@walmart/me-at-walmart-core": "workspace:^",
- "@walmart/metrics-mini-app": "1.27.0",
+ "@walmart/metrics-mini-app": "1.27.3",
"@walmart/mod-flex-mini-app": "1.22.0",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.1.22",
--- yarn.lock
@@ -7318,7 +7318,7 @@ __metadata:
"@walmart/me-at-walmart-common": "workspace:^"
"@walmart/me-at-walmart-container": "workspace:^"
"@walmart/me-at-walmart-core": "workspace:^"
- "@walmart/metrics-mini-app": "npm:1.27.0"
+ "@walmart/metrics-mini-app": "npm:1.27.3"
"@walmart/mod-flex-mini-app": "npm:1.22.0"
"@walmart/moment-walmart": "npm:1.0.4"
"@walmart/money-auth-shared-components": "npm:0.1.22"
@@ -7551,19 +7551,19 @@ __metadata:
languageName: unknown
linkType: soft
-"@walmart/metrics-common@npm:^1.1.0":
+"@walmart/metrics-common@npm:1.1.0":
version: 1.1.0
resolution: "@walmart/metrics-common@npm:1.1.0"
checksum: 10c0/57310424e90b657072376a8faecd0a81065e83b03a0f42a5cc9fdb6df8ec473a18e780cc5a3af329f3f58eddd3ccdc61f37c21b9ebd142180d1576e56659c6c7
languageName: node
linkType: hard
-"@walmart/metrics-mini-app@npm:1.27.0":
- version: 1.27.0
- resolution: "@walmart/metrics-mini-app@npm:1.27.0"
+"@walmart/metrics-mini-app@npm:1.27.3":
+ version: 1.27.3
+ resolution: "@walmart/metrics-mini-app@npm:1.27.3"
dependencies:
- "@walmart/metrics-common": "npm:^1.1.0"
- "@walmart/metrics-store": "npm:^1.1.0"
+ "@walmart/metrics-common": "npm:1.1.0"
+ "@walmart/metrics-store": "npm:1.1.3"
peerDependencies:
"@react-native/gradle-plugin": ">=0.73.4"
"@react-navigation/native": ">=6.0.0"
@@ -7584,17 +7584,17 @@ __metadata:
react-native: 0.73.7
react-redux: ">=8.0.4"
reduxsauce: ">=1.2.0"
- checksum: 10c0/5909154c94b76dbf6f38dd0fbdc276147b406ac51d842f88838f6886bb532626516acd1be0a9463787e351b9a14966bcf69e5a0cb1da151d1873a88e67fff468
+ checksum: 10c0/2af8460b72806206a8d3ce9d9f36d2617afa3013941e2ea23e401f8bbcac8ee4aa68ceddaea3e9bd32f8e8739dc42850fe0ed008931faf62ec8c342ade74f0f1
languageName: node
linkType: hard
-"@walmart/metrics-store@npm:^1.1.0":
- version: 1.1.0
- resolution: "@walmart/metrics-store@npm:1.1.0"
+"@walmart/metrics-store@npm:1.1.3":
+ version: 1.1.3
+ resolution: "@walmart/metrics-store@npm:1.1.3"
dependencies:
- "@walmart/metrics-common": "npm:^1.1.0"
+ "@walmart/metrics-common": "npm:1.1.0"
base-64: "npm:^1.0.0"
- checksum: 10c0/de10270f465162c5bfa05acb98138bfc800c8159228e72c1b2e8ff4c8e353cd6a38154dc2b67fac66fc8bf4ee09353a586be87efe8ec2bc8e121eda6981de895
+ checksum: 10c0/8e4dc6d01df7d92e8b6046da0d5b49f18eb126dc5f8008f29310c05c08fe6fe61758b43cf9e2b780fc9c528920b7df99658ab4952c0ff41fbe99662ba69533d5
languageName: node
linkType: hard
| chore: metrics version bump to remove ^ from metrics pkgs versions | chore: metrics version bump to remove ^ from metrics pkgs versions
|
a1bcf6bdb69b550e2c6f4329331b6cc083ca7c08 | --- package-lock.json
@@ -3088,9 +3088,9 @@
"integrity": "sha512-LveEdSxJy0V8cEmS3xS22gsVYtqS+T/e9hrZxkxCgVV5O12UFv8dSrfDkIuQ/WMzuijIf5yTlLOxRPjf0dDRdg=="
},
"@walmart/inbox-mini-app": {
- "version": "0.0.53",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.53.tgz",
- "integrity": "sha512-DMF6WDw5prVizx/Dqcjx4oOj7wihkChz3juibyeW75n3Ph7v6fSjSlw0D5gl2ENEBBV6oOWEkkLuNYaGuJjuxA=="
+ "version": "0.0.54",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.0.54.tgz",
+ "integrity": "sha512-Ed2INrMFsJDZr4DuJpf3oiXXdrQPwZB1iQx9o3FbrxPaNhLbKao6qSsNjpAFoz/nyQ4VfkcfT+Kwmh28ITZ+AA=="
},
"@walmart/moment-walmart": {
"version": "1.0.4",
--- package.json
@@ -56,7 +56,7 @@
"@walmart/functional-components": "1.0.24",
"@walmart/gtp-shared-components": "^0.2.2",
"@walmart/impersonation-mini-app": "1.0.12",
- "@walmart/inbox-mini-app": "0.0.53",
+ "@walmart/inbox-mini-app": "0.0.54",
"@walmart/moment-walmart": "1.0.4",
"@walmart/push-to-talk-mini-app": "0.3.3",
"@walmart/react-native-env": "^0.1.0",
| bump inbox-mini-app (#375) | bump inbox-mini-app (#375)
Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com> |
60f188067b50c273a8494b671995c6b303559ddb | --- package.json
@@ -94,7 +94,7 @@
"@walmart/react-native-shared-navigation": "6.1.4",
"@walmart/react-native-sumo-sdk": "2.7.4",
"@walmart/redux-store": "6.3.29",
- "@walmart/roster-mini-app": "2.36.0",
+ "@walmart/roster-mini-app": "2.37.0",
"@walmart/ui-components": "1.15.1",
"@walmart/wmconnect-mini-app": "2.35.1",
"babel-jest": "^29.6.3",
--- yarn.lock
@@ -6591,7 +6591,7 @@ __metadata:
"@walmart/react-native-shared-navigation": "npm:6.1.4"
"@walmart/react-native-sumo-sdk": "npm:2.7.4"
"@walmart/redux-store": "npm:6.3.29"
- "@walmart/roster-mini-app": "npm:2.36.0"
+ "@walmart/roster-mini-app": "npm:2.37.0"
"@walmart/ui-components": "npm:1.15.1"
"@walmart/wmconnect-mini-app": "npm:2.35.1"
babel-jest: "npm:^29.6.3"
@@ -6717,9 +6717,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/roster-mini-app@npm:2.36.0":
- version: 2.36.0
- resolution: "@walmart/roster-mini-app@npm:2.36.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2Froster-mini-app-2.36.0.tgz"
+"@walmart/roster-mini-app@npm:2.37.0":
+ version: 2.37.0
+ resolution: "@walmart/roster-mini-app@npm:2.37.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2Froster-mini-app-2.37.0.tgz"
peerDependencies:
"@react-native-async-storage/async-storage": ^1.21.0
"@react-native-community/netinfo": ^11.0.1
@@ -6761,7 +6761,7 @@ __metadata:
redux: ^4.2.1
redux-saga: ^1.2.3
wifi-store-locator: 1.4.1
- checksum: 10c0/071ef4b3d4d1c054a08d0fe9c76f34c8c517dbe37bb02f9fafbf707144d7db0e593aece4886c4c5562bd16270b55fe2a15444fe08bf5ae4a4521b7613b58aaa4
+ checksum: 10c0/9406d67c1d65467be94a74f2f0e462e8c440c5e1d233bbf1d1953769949abbf6da2bcf5bc4c178089c0988723729346c16407028dd55a19e4d0ad74a4f91b9c0
languageName: node
linkType: hard
| updating roster version | updating roster version
|
667570a2d3bd917c38a6ed0667426360199a5969 | --- package-lock.json
@@ -81,7 +81,7 @@
"@walmart/shelfavailability-mini-app": "1.5.13",
"@walmart/taskit-mini-app": "2.28.14",
"@walmart/time-clock-mini-app": "2.85.0",
- "@walmart/ui-components": "1.10.1",
+ "@walmart/ui-components": "1.11.1",
"@walmart/welcomeme-mini-app": "0.76.0",
"@walmart/wfm-ui": "0.2.26",
"axios": "~1.2.6",
@@ -6158,9 +6158,9 @@
"license": "GPL-3.0-or-later"
},
"node_modules/@walmart/ui-components": {
- "version": "1.10.1",
- "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.10.1.tgz",
- "integrity": "sha512-Y2ExddytTHFxdh8d0rEtbswld4Mu0WyKD6whiAz8AX5lWkeeMZJIY5ni76ol6G58YyZVUGpn6BhbVngM2h8w2A==",
+ "version": "1.11.1",
+ "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.11.1.tgz",
+ "integrity": "sha512-7TmHsnA4RuPz2sQNceLa5HoQliVWCXn2LBsZDv1jSwfbpRNexTRBxvVUPcMxcPD8eddEFVBPEKJyDsJKDt/b3A==",
"license": "ISC",
"dependencies": {
"react-hook-form": "^7.33.1",
@@ -25519,9 +25519,9 @@
"version": "1.0.4"
},
"@walmart/ui-components": {
- "version": "1.10.1",
- "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.10.1.tgz",
- "integrity": "sha512-Y2ExddytTHFxdh8d0rEtbswld4Mu0WyKD6whiAz8AX5lWkeeMZJIY5ni76ol6G58YyZVUGpn6BhbVngM2h8w2A==",
+ "version": "1.11.1",
+ "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.11.1.tgz",
+ "integrity": "sha512-7TmHsnA4RuPz2sQNceLa5HoQliVWCXn2LBsZDv1jSwfbpRNexTRBxvVUPcMxcPD8eddEFVBPEKJyDsJKDt/b3A==",
"requires": {
"react-hook-form": "^7.33.1",
"react-native-calendars": "^1.1291.0",
--- package.json
@@ -123,7 +123,7 @@
"@walmart/shelfavailability-mini-app": "1.5.13",
"@walmart/taskit-mini-app": "2.28.14",
"@walmart/time-clock-mini-app": "2.85.0",
- "@walmart/ui-components": "1.10.1",
+ "@walmart/ui-components": "1.11.1",
"@walmart/welcomeme-mini-app": "0.76.0",
"@walmart/wfm-ui": "0.2.26",
"axios": "~1.2.6",
| again incrementing the ui-components version which got reverted by mistake | again incrementing the ui-components version which got reverted by mistake
|
12d6b99f8ad9617cad743a9bc34a93d2bfe206cc | --- core/__tests__/navigation/USHallway/AssociateHallwayNav/Tabs/__snapshots__/MeStackNavTest.tsx.snap
@@ -3,6 +3,7 @@
exports[`MeStackNav headerLeft of initial screen match snapshot 1`] = `
[
<IconButton
+ accessibilityLabel="drawerButton.accessiblityLabel"
color="white"
disabled={false}
onPress={[Function]}
--- core/__tests__/navigation/USHallway/AssociateHallwayNav/Tabs/__snapshots__/MyTeamStackNavTest.tsx.snap
@@ -26,6 +26,7 @@ exports[`MyTeamStackNav matches snapshot - attendanceminiapp false 1`] = `
exports[`MyTeamStackNav matches snapshot - attendanceminiapp false 2`] = `
[
<IconButton
+ accessibilityLabel="drawerButton.accessiblityLabel"
color="white"
disabled={false}
onPress={[Function]}
@@ -77,6 +78,7 @@ exports[`MyTeamStackNav matches snapshot 1`] = `
exports[`MyTeamStackNav matches snapshot 2`] = `
[
<IconButton
+ accessibilityLabel="drawerButton.accessiblityLabel"
color="white"
disabled={false}
onPress={[Function]}
| updating tests | updating tests
|
f44caf2fe7c517b34fa2e832542748163b9d2701 | --- android/app/src/main/java/com/walmart/stores/allspark/beta/MainActivity.kt
@@ -26,7 +26,7 @@ class MainActivity: ReactActivity() {
* Handles showing the splash screen on creation of MainActivity
*/
override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
+ super.onCreate(null)
SplashScreen.show(this);
}
--- android/app/src/main/java/com/walmart/stores/allspark/beta/MainApplication.kt
@@ -47,7 +47,7 @@ class MainApplication : PlatformCoreApplication(), ReactApplication {
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
override fun onCreate() {
- super.onCreate(null)
+ super.onCreate()
SoLoader.init(this, false)
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// If you opted-in for the New Architecture, we load the native entry point for this app.
| add null for bundleinstance on MainActivity and remove MainApplication | add null for bundleinstance on MainActivity and remove MainApplication
|
2b93c346efa65764aac5710ac903b2141dd88c6d | --- packages/allspark-foundation/__tests__/Navigation/__snapshots__/DrawerButton.test.tsx.snap
@@ -1,30 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Navigation/components/DrawerButton should render DrawerButton snapshot 1`] = `
-[
- <IconButton
- UNSAFE_style={{}}
- color="white"
- disabled={false}
- onPress={[Function]}
- size="medium"
- testID="navigationMenu"
- >
- <MenuIcon
- UNSAFE_style={{}}
- />
- </IconButton>,
- <View
- style={
- [
- {
- "position": "absolute",
- "right": 0,
- "top": 10,
- },
- {},
- ]
- }
- />,
-]
-`;
| code cleanup | code cleanup
|
5e12b3cf219c44e6c1a222b12e4e2d0cc417356a | --- package-lock.json
@@ -1857,9 +1857,9 @@
}
},
"@walmart/allspark-me-mini-app": {
- "version": "0.0.9",
- "resolved": "https://npme.walmart.com/@walmart/allspark-me-mini-app/-/allspark-me-mini-app-0.0.9.tgz",
- "integrity": "sha512-R2m8IwV9MVeHJwutTZyc4TKXeDJMaPnG5I6lQ/fDPyS9CtpTfUdFJt+YPYstIVlShnMZD4p/h5fEdfJE3LLcog==",
+ "version": "0.0.10",
+ "resolved": "https://npme.walmart.com/@walmart/allspark-me-mini-app/-/allspark-me-mini-app-0.0.10.tgz",
+ "integrity": "sha512-nYu6ROMMeXnX2fU309Y1EA+sOPbuUUpq7yAtyXHnUCee9BfNDB7wvVY5Mrq4X2SRk9AXLrELK/wf4Sr3QwsnWA==",
"requires": {
"reselect": "^4.0.0"
}
@@ -1978,9 +1978,9 @@
"integrity": "sha512-LbHoqiU3zTvPrZ0rK7X1UICXTdJnK4iK0ZetSxF/zC+Kp8EKrAe3nkZhPnRqtJ6Q6Ql4xcN/EJYvc9JLQ9bB3g=="
},
"@walmart/time-clock-mini-app": {
- "version": "0.0.14",
- "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.0.14.tgz",
- "integrity": "sha512-YDn+zdD9biJMgEEjZRt9517eLRpqlzoa9lJmGTk5iPNIdAsaBAE7B/pKAEddu4FXE90EEOiRZRNYzY7dIZpyPg==",
+ "version": "0.0.16",
+ "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.0.16.tgz",
+ "integrity": "sha512-Smawpi0PHFASKxutNy+rHshw2KY0Gym2gTHsJOgiyaXE81ovLaqJ5k2oxJJxvrddseTJqXvY33Rw1QRv7vElqQ==",
"requires": {
"@react-native-community/datetimepicker": "^3.0.3",
"moment-timezone": "^0.5.31"
--- package.json
@@ -40,7 +40,7 @@
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@types/lodash": "^4.14.159",
"@walmart/allspark-home-mini-app": "0.1.2",
- "@walmart/allspark-me-mini-app": "0.0.9",
+ "@walmart/allspark-me-mini-app": "0.0.10",
"@walmart/ask-sam-mini-app": "^0.6.20",
"@walmart/config-components": "^1.0.4",
"@walmart/feedback-all-spark-miniapp": "0.0.24",
@@ -54,7 +54,7 @@
"@walmart/redux-store": "^1.0.7",
"@walmart/schedule-mini-app": "0.2.21",
"@walmart/settings-mini-app": "1.1.5",
- "@walmart/time-clock-mini-app": "0.0.14",
+ "@walmart/time-clock-mini-app": "0.0.16",
"@walmart/ui-components": "^1.0.75",
"i18next": "^19.7.0",
"intl": "^1.2.5",
| Feature flagged time clock and time off requests (#143) | Feature flagged time clock and time off requests (#143)
|
766232399d275e899ffff804f453bb26be282617 | --- src/components/TeamList.tsx
@@ -65,6 +65,13 @@ const styles = StyleSheet.create({
paddingVertical: 2,
color: colors.gray['150'],
},
+ viewTeamStyleTextDisabled: {
+ textDecorationLine: 'underline',
+ fontFamily: 'Bogle-Regular',
+ paddingVertical: 8,
+ right: 16,
+ color: colors.gray['150'],
+ },
});
//TODO: Store iconMap in CCM?
@@ -146,22 +153,18 @@ const TeamItem = (props: {
/>
}
trailing={
- isMessageButtonEnabled ? (
- canMessage ? (
- <Button
- variant='secondary'
- onPress={onMessage}
- size='small'
- disabled={!userIsInRoster}>
- <Text>{t('rosterScreen.teamListItem.messageBtn')}</Text>
- </Button>
- ) : (
- <Button variant='tertiary' onPress={onViewTeam} size='small'>
- <Text>{t('rosterScreen.teamListItem.viewTeam')}</Text>
- </Button>
- )
+ canMessage && isMessageButtonEnabled ? (
+ <Button
+ variant='secondary'
+ onPress={onMessage}
+ size='small'
+ disabled={!userIsInRoster}>
+ <Text>{t('rosterScreen.teamListItem.messageBtn')}</Text>
+ </Button>
) : (
- <></>
+ <Button variant='tertiary' onPress={onViewTeam} size='small'>
+ <Text>{t('rosterScreen.teamListItem.viewTeam')}</Text>
+ </Button>
)
}>
<Body weight='400' size='small'>
@@ -169,7 +172,7 @@ const TeamItem = (props: {
count: clockedInCount,
})}
</Body>
- {canMessage && (
+ {canMessage && isMessageButtonEnabled && (
<Body weight='400' size='small'>
<TouchableOpacity onPress={onViewTeam}>
<Text style={styles.viewTeamStyle}>
@@ -264,7 +267,13 @@ export const TeamChatCard = (props: {
<Text>{t('rosterScreen.storeChatCard.messageBtn')}</Text>
</Button>
) : (
- <></>
+ <Body weight='400' size='small'>
+ <TouchableOpacity onPress={onViewTeam}>
+ <Text style={styles.viewTeamStyleTextDisabled}>
+ {t('rosterScreen.teamListItem.viewTeam')}
+ </Text>
+ </TouchableOpacity>
+ </Body>
)
}>
<Body weight='400' size='small'>
@@ -272,13 +281,15 @@ export const TeamChatCard = (props: {
onlineCount: onlineCount,
})}
</Body>
- <Body weight='400' size='small'>
- <TouchableOpacity onPress={onViewTeam}>
- <Text style={styles.viewTeamStyle}>
- {t('rosterScreen.teamListItem.viewTeam')}
- </Text>
- </TouchableOpacity>
- </Body>
+ {isMessageButtonEnabled && (
+ <Body weight='400' size='small'>
+ <TouchableOpacity onPress={onViewTeam}>
+ <Text style={styles.viewTeamStyle}>
+ {t('rosterScreen.teamListItem.viewTeam')}
+ </Text>
+ </TouchableOpacity>
+ </Body>
+ )}
</ListItem>
{teams.map((team) => (
--- src/components/TeamList.tsx
@@ -65,6 +65,13 @@ const styles = StyleSheet.create({
paddingVertical: 2,
color: colors.gray['150'],
},
+ viewTeamStyleTextDisabled: {
+ textDecorationLine: 'underline',
+ fontFamily: 'Bogle-Regular',
+ paddingVertical: 8,
+ right: 16,
+ color: colors.gray['150'],
+ },
});
//TODO: Store iconMap in CCM?
@@ -146,22 +153,18 @@ const TeamItem = (props: {
/>
}
trailing={
- isMessageButtonEnabled ? (
- canMessage ? (
- <Button
- variant='secondary'
- onPress={onMessage}
- size='small'
- disabled={!userIsInRoster}>
- <Text>{t('rosterScreen.teamListItem.messageBtn')}</Text>
- </Button>
- ) : (
- <Button variant='tertiary' onPress={onViewTeam} size='small'>
- <Text>{t('rosterScreen.teamListItem.viewTeam')}</Text>
- </Button>
- )
+ canMessage && isMessageButtonEnabled ? (
+ <Button
+ variant='secondary'
+ onPress={onMessage}
+ size='small'
+ disabled={!userIsInRoster}>
+ <Text>{t('rosterScreen.teamListItem.messageBtn')}</Text>
+ </Button>
) : (
- <></>
+ <Button variant='tertiary' onPress={onViewTeam} size='small'>
+ <Text>{t('rosterScreen.teamListItem.viewTeam')}</Text>
+ </Button>
)
}>
<Body weight='400' size='small'>
@@ -169,7 +172,7 @@ const TeamItem = (props: {
count: clockedInCount,
})}
</Body>
- {canMessage && (
+ {canMessage && isMessageButtonEnabled && (
<Body weight='400' size='small'>
<TouchableOpacity onPress={onViewTeam}>
<Text style={styles.viewTeamStyle}>
@@ -264,7 +267,13 @@ export const TeamChatCard = (props: {
<Text>{t('rosterScreen.storeChatCard.messageBtn')}</Text>
</Button>
) : (
- <></>
+ <Body weight='400' size='small'>
+ <TouchableOpacity onPress={onViewTeam}>
+ <Text style={styles.viewTeamStyleTextDisabled}>
+ {t('rosterScreen.teamListItem.viewTeam')}
+ </Text>
+ </TouchableOpacity>
+ </Body>
)
}>
<Body weight='400' size='small'>
@@ -272,13 +281,15 @@ export const TeamChatCard = (props: {
onlineCount: onlineCount,
})}
</Body>
- <Body weight='400' size='small'>
- <TouchableOpacity onPress={onViewTeam}>
- <Text style={styles.viewTeamStyle}>
- {t('rosterScreen.teamListItem.viewTeam')}
- </Text>
- </TouchableOpacity>
- </Body>
+ {isMessageButtonEnabled && (
+ <Body weight='400' size='small'>
+ <TouchableOpacity onPress={onViewTeam}>
+ <Text style={styles.viewTeamStyle}>
+ {t('rosterScreen.teamListItem.viewTeam')}
+ </Text>
+ </TouchableOpacity>
+ </Body>
+ )}
</ListItem>
{teams.map((team) => (
| update view team for primary team and whole store | update view team for primary team and whole store
|
082c041431548a8c30d279e21b81de97782a7be5 | --- packages/allspark-foundation/__tests__/Feature/AllsparkFeature.test.tsx
@@ -2,35 +2,18 @@ import React from 'react';
import { Text } from 'react-native';
import { AllsparkFeature } from '../../src/Feature/AllsparkFeature';
import { HttpModule } from '../../src/HTTP';
+import { LoggerModule } from '../../src/Logger';
import { GeolocationService } from '../../src/Geolocation';
import { LocalStorageManagerConfig } from '../../src/LocalStorage';
import { LoggerManager } from '../../src/Logger/LoggerManager';
-jest
- .mock('../../src/Logger', () => ({
- LoggerService: {
- createFeatureInstance: jest.fn(),
- getContainerInstance: jest.fn(),
- },
- }))
+jest
.mock('../../src/Geolocation', () => ({
GeolocationService: {
createFeatureInstance: jest.fn(),
},
}))
- .mock('../../src/Logger', () => {
- const initVal = jest.requireActual('../../src/Logger');
- return {
- ...initVal,
- LoggerModule: {
- factory: {
- createLoggerManager: jest.fn(),
- },
- },
- };
- });
-const { LoggerModule } = require('../../src/Logger');
let feature: AllsparkFeature<'testFeature'>;
describe('AllsparkFeature', () => {
@@ -165,14 +148,9 @@ describe('AllsparkFeature', () => {
it('should create a logger with the given config', () => {
const testConfig = { level: 'debug', format: 'json' };
- LoggerModule.factory.createLoggerManager.mockImplementation(
- () => new LoggerManager(feature.id, {} as any)
- );
+ const spy = jest.spyOn(LoggerModule.factory, 'createLoggerManager');
const result = feature.createLogger(testConfig);
- expect(LoggerModule.factory.createLoggerManager).toHaveBeenCalledWith(
- feature.id,
- testConfig
- );
+ expect(spy).toHaveBeenCalledWith(feature.id, testConfig);
expect(result).toBeInstanceOf(LoggerManager);
});
| feat(test): update AllsparkFeature test | feat(test): update AllsparkFeature test
|
7abb2efe52e41ce0897b30b9d3d8ce8968730334 | --- core/src/auth/AuthenticatorView.tsx
@@ -128,7 +128,7 @@ export const AuthenticatorView = (
isLoading={associateLoading}
disabled={loading}
testID='retryButton'
- accessibilityLabel={translate('signInButtonText')}>
+ accessibilityLabel={translate('signInAccessibilityLabel')}>
{translate('signInButtonText')}
</Button>
</View>
@@ -152,7 +152,7 @@ export const AuthenticatorView = (
label={translate('candidateLabel')}
title={translate('candidateTitle')}
action={translate('candidateAction')}
- accessibilityActionLabel='Candidate Sign In'
+ accessibilityActionLabel={translate('candidateAccessibilityLabel')}
/>
<SectionCard
@@ -163,6 +163,7 @@ export const AuthenticatorView = (
label={translate('guestLabel')}
title={translate('guestTitle')}
action={translate('guestAction')}
+ accessibilityActionLabel={translate('guestAccessibilityLabel')}
/>
</ScrollView>
);
--- core/src/auth/translations.ts
@@ -1,16 +1,19 @@
export const enUS = {
associateTitle: 'Hello Associates!',
candidateAction: 'Sign in',
+ candidateAccessibilityLabel: 'Candidate Sign In',
candidateLabel: 'Candidates',
candidateTitle: 'Accepted an offer? Get ready to start!',
errorRegisteredText:
'Thanks for reporting the issue. If this problem persists, check if you are using the latest version of Me@Walmart.',
gotIt: 'Got It',
guestAction: 'Explore',
+ guestAccessibilityLabel: 'Explore as Guest',
guestButtonSubtitle: 'Explore jobs and learn about Walmart',
guestButtonTitle: 'Welcome Guests!',
guestLabel: 'Guests',
guestTitle: 'Explore jobs and learn about Walmart',
+ signInAccessibilityLabel: 'Associate Sign in',
signInButtonText: 'Sign in',
signInFailed: 'Sign in failed',
callForSupport: 'Call for support',
@@ -101,16 +104,19 @@ export const enUS = {
export const esMX = {
associateTitle: 'Hola Asociados!',
candidateAction: 'Iniciar sesión',
+ candidateAccessibilityLabel: 'Candidate Sign In',
candidateLabel: 'Candidatos',
candidateTitle: '¿Aceptaste una oferta? ¡Prepárate para empezar!',
errorRegisteredText:
'Gracias por reportar el problema. Si el problema persiste, verifica que estés usando la versión más reciente de Me@Walmart.',
gotIt: 'Entendido',
guestAction: 'Explorar',
+ guestAccessibilityLabel: 'Explore as Guest',
guestButtonSubtitle: 'Explora trabajos y conoce más sobre Walmart',
guestButtonTitle: '¡Bienvenidos, visitantes!',
guestLabel: 'Invitados',
guestTitle: 'Explora trabajos y aprende sobre Walmart',
+ signInAccessibilityLabel: 'Associate Sign in',
signInButtonText: 'Iniciar Sesión',
signInFailed: 'Error al iniciar sesión',
callForSupport: 'Llamar para soporte',
| fix: updating AuthenticatorView labels | fix: updating AuthenticatorView labels
|
c73d3d06ee3b6d000f1354a0fd3bfe3f7ca25b32 | --- docs/CHANGELOG.md
@@ -1,3 +1,30 @@
+# [3.2.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.1.1...v3.2.0) (2025-07-01)
+
+
+### Bug Fixes
+
+* **ui:** fix lint issues ([8c99237](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8c992371258168963cf78bf18b0905da57552e97))
+* **ui:** update lint errors ([de5209a](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/de5209a49552c32e8199c9132e525b3a52ebdda2))
+* **ui:** update lint errors ([9bad268](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/9bad2685ad7d95612c272c63b97f8ba2b49e3889))
+* **ui:** update lint errors ([9cc66ae](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/9cc66ae5ba14509b78386999bf216074c721049f))
+* **ui:** update lint errors ([5802783](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/580278309ac7938e5261432670da3a268cbd1589))
+* **ui:** update lint fix ([8c066ce](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8c066ce26eac7146f969af96eb2cc2c52fcf803a))
+* **ui:** update lint fix ([74dadcf](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/74dadcff22b7d15bd68aa793881ffbaa37bb55e5))
+* **ui:** update lint fix ([491833c](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/491833c0aafe5ec1b180fbfe8be54a1b0140bae5))
+* **ui:** update roster supply chainchanges ([409ecdf](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/409ecdf1edc11dc6e2b63648ac89976ea7cc8ae4))
+* **ui:** update supply chain query hook fix ([a582bfc](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/a582bfc0f51a171aa919d9a6d7189872bfd67728))
+* **ui:** update wmconnect version ([db5c02e](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/db5c02e9af20879a24ecf2efacbdd0660c23b109))
+
+
+### Features
+
+* **ui:** fixed tests ([7a120ed](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/7a120ed37b140d6cfc5c6fe8e646116bd60c60a3))
+* **ui:** shifts logic update ([69228c6](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/69228c6e88701be6d5d4642382c6b6efb917368f))
+* **ui:** shifts logic update 2 ([d33204f](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/d33204fd4f5d1ad1bd197df95555c0a923508f4b))
+* **ui:** updated err ([8ba1d78](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8ba1d7883754f8ae2b55e9cd4fddb727c0b08845))
+* **ui:** updated query functions ([126ab6a](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/126ab6aed93fe8948c5e7a23f3e38890505dd5b5))
+* **ui:** updated query functions ([cf8c96e](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/cf8c96eaaaa0aaba428a2b30faecfe2844bcb360))
+
## [3.1.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.1.0...v3.1.1) (2025-07-01)
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "3.1.1",
+ "version": "3.2.0",
"main": "dist/index.js",
"files": [
"dist",
| chore(release): 3.2.0 [skip ci] | chore(release): 3.2.0 [skip ci]
# [3.2.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.1.1...v3.2.0) (2025-07-01)
### Bug Fixes
* **ui:** fix lint issues ([8c99237](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8c992371258168963cf78bf18b0905da57552e97))
* **ui:** update lint errors ([de5209a](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/de5209a49552c32e8199c9132e525b3a52ebdda2))
* **ui:** update lint errors ([9bad268](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/9bad2685ad7d95612c272c63b97f8ba2b49e3889))
* **ui:** update lint errors ([9cc66ae](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/9cc66ae5ba14509b78386999bf216074c721049f))
* **ui:** update lint errors ([5802783](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/580278309ac7938e5261432670da3a268cbd1589))
* **ui:** update lint fix ([8c066ce](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8c066ce26eac7146f969af96eb2cc2c52fcf803a))
* **ui:** update lint fix ([74dadcf](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/74dadcff22b7d15bd68aa793881ffbaa37bb55e5))
* **ui:** update lint fix ([491833c](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/491833c0aafe5ec1b180fbfe8be54a1b0140bae5))
* **ui:** update roster supply chainchanges ([409ecdf](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/409ecdf1edc11dc6e2b63648ac89976ea7cc8ae4))
* **ui:** update supply chain query hook fix ([a582bfc](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/a582bfc0f51a171aa919d9a6d7189872bfd67728))
* **ui:** update wmconnect version ([db5c02e](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/db5c02e9af20879a24ecf2efacbdd0660c23b109))
### Features
* **ui:** fixed tests ([7a120ed](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/7a120ed37b140d6cfc5c6fe8e646116bd60c60a3))
* **ui:** shifts logic update ([69228c6](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/69228c6e88701be6d5d4642382c6b6efb917368f))
* **ui:** shifts logic update 2 ([d33204f](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/d33204fd4f5d1ad1bd197df95555c0a923508f4b))
* **ui:** updated err ([8ba1d78](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8ba1d7883754f8ae2b55e9cd4fddb727c0b08845))
* **ui:** updated query functions ([126ab6a](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/126ab6aed93fe8948c5e7a23f3e38890505dd5b5))
* **ui:** updated query functions ([cf8c96e](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/cf8c96eaaaa0aaba428a2b30faecfe2844bcb360))
|
feb027d79a4392656596a016eeb03acc6d50534f | --- packages/expo-config-plugins/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.
+## [0.5.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/expo-config-plugins@0.5.2...@walmart/expo-config-plugins@0.5.3) (2025-08-25)
+
+**Note:** Version bump only for package @walmart/expo-config-plugins
+
## [0.5.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/expo-config-plugins@0.5.1...@walmart/expo-config-plugins@0.5.2) (2025-08-22)
### Bug Fixes
--- packages/expo-config-plugins/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/expo-config-plugins",
- "version": "0.5.2",
+ "version": "0.5.3",
"description": "Expo config plugins for me@apps",
"main": "lib/index.js",
"types": "lib/index.d.ts",
| chore(version): updating package version | chore(version): updating package version
- @walmart/expo-config-plugins@0.5.3
|
ca4eafd1b3e795c114b3e856111022bcd864d1ef | --- src/utils/user.ts
@@ -29,6 +29,6 @@ export const associateIsClockedIn = (associate?: Associate) =>
export const associateIsOnMeal = (associate?: Associate) =>
!associateIsClockedIn(associate) && associate?.punch?.lastPunchType === '5';
-// @todo - add correct logic
+// @todo - add correct logic, ptt has said this is correct but...doubt
export const associateIsOnPPTO = (associate?: Associate) =>
- associate?.punch?.lastPunchType === 'ppto';
+ associate?.punch?.clockStatus === '4';
--- src/utils/user.ts
@@ -29,6 +29,6 @@ export const associateIsClockedIn = (associate?: Associate) =>
export const associateIsOnMeal = (associate?: Associate) =>
!associateIsClockedIn(associate) && associate?.punch?.lastPunchType === '5';
-// @todo - add correct logic
+// @todo - add correct logic, ptt has said this is correct but...doubt
export const associateIsOnPPTO = (associate?: Associate) =>
- associate?.punch?.lastPunchType === 'ppto';
+ associate?.punch?.clockStatus === '4';
| chore: add temp logic for ppto | chore: add temp logic for ppto
|
c177a6c4acca2e44f58249d37bd2879b0eebf234 | --- package-lock.json
@@ -78,7 +78,7 @@
"@walmart/me-at-walmart-common": "6.0.16",
"@walmart/me-at-walmart-container": "6.0.16",
"@walmart/metrics-mini-app": "0.20.8",
- "@walmart/mod-flex-mini-app": "1.16.4",
+ "@walmart/mod-flex-mini-app": "1.17.5",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.1.4",
"@walmart/myteam-mini-app": "1.1.6",
@@ -11955,9 +11955,9 @@
}
},
"node_modules/@walmart/mod-flex-mini-app": {
- "version": "1.16.4",
- "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.16.4.tgz",
- "integrity": "sha512-Fps+HHnGazowX93Lanp3macRrVXe50wX7YZeVnjCpqtRoQHxrDZzcrsMC3XuAYy27fjogJJR47+CpCxIcX59Qw==",
+ "version": "1.17.5",
+ "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.17.5.tgz",
+ "integrity": "sha512-ujmhVrqjTLcvQO1zSjgTY/N4MgtWCaLsOGNarSsuLe0zDsVzMgp4JZQOU4OFh8O5vbXHe6DfUrsvipN8XTvEEA==",
"hasInstallScript": true,
"peerDependencies": {
"@apollo/client": "^3.7.3",
--- package.json
@@ -119,7 +119,7 @@
"@walmart/me-at-walmart-common": "6.0.16",
"@walmart/me-at-walmart-container": "6.0.16",
"@walmart/metrics-mini-app": "0.20.8",
- "@walmart/mod-flex-mini-app": "1.16.4",
+ "@walmart/mod-flex-mini-app": "1.17.5",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.1.4",
"@walmart/myteam-mini-app": "1.1.6",
@@ -383,7 +383,7 @@
"@walmart/me-at-walmart-athena-queries": "6.0.16",
"@walmart/me-at-walmart-common": "6.0.16",
"@walmart/metrics-mini-app": "0.20.8",
- "@walmart/mod-flex-mini-app": "1.16.4",
+ "@walmart/mod-flex-mini-app": "1.17.5",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "0.1.4",
"@walmart/native-rfid-scanner": "3.7.3",
| modflex drop 21 | modflex drop 21
|
92efd21a2869e429795562bf345c986e112b6520 | --- package-lock.json
@@ -70,7 +70,7 @@
"@walmart/gtp-shared-components": "2.1.10",
"@walmart/impersonation-mini-app": "1.20.8",
"@walmart/ims-print-services-ui": "2.10.3",
- "@walmart/inbox-mini-app": "0.92.9",
+ "@walmart/inbox-mini-app": "0.92.9-549-78a92c4",
"@walmart/iteminfo-mini-app": "7.10.5",
"@walmart/learning-mini-app": "20.0.3",
"@walmart/manager-approvals-miniapp": "0.2.4",
@@ -95,8 +95,8 @@
"@walmart/react-native-shared-navigation": "6.0.7",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.6.4",
- "@walmart/receipt-check-miniapp": "1.19.4",
"@walmart/react-native-webex-sdk": "0.1.8",
+ "@walmart/receipt-check-miniapp": "1.19.4",
"@walmart/redux-store": "6.0.7",
"@walmart/returns-mini-app": "4.6.0",
"@walmart/rfid-scan-mini-app": "2.2.8",
@@ -11665,16 +11665,16 @@
}
},
"node_modules/@walmart/inbox-mini-app": {
- "version": "0.92.9",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.92.9.tgz",
- "integrity": "sha512-A+z8a9sRIbuUERyxBtLeMVzQZKJ5rBhInljHJKnGXpio2TbLZvbYhNq6r8mqBJcXvG/gHoogEF2V+UMdhL7nYA==",
+ "version": "0.92.9-549-78a92c4",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.92.9-549-78a92c4.tgz",
+ "integrity": "sha512-4gYWc3E+EZM4pVsSYNe/GbuN7c6DIwpu5avLHK65zt1xxV1y36YVRWTAwwa9hqp8TVwdkccQ6EWNdZD6Q04jcQ==",
"dependencies": {
"@walmart/moment-walmart": "^1.0.4",
- "@walmart/walmart-fiscal-week": "^0.3.6"
+ "@walmart/walmart-fiscal-week": "^0.3.6",
+ "react-native-device-info": "^10.3.0"
},
"peerDependencies": {
"@walmart/allspark-utils": "^1.6.4",
- "@walmart/attendance-mini-app": "^0.46.0",
"@walmart/feedback-all-spark-miniapp": ">=0.1.5",
"@walmart/schedule-mini-app": "^0.2.66",
"crypto-js": ">=3.3.0",
--- package.json
@@ -111,7 +111,7 @@
"@walmart/gtp-shared-components": "2.1.10",
"@walmart/impersonation-mini-app": "1.20.8",
"@walmart/ims-print-services-ui": "2.10.3",
- "@walmart/inbox-mini-app": "0.92.9",
+ "@walmart/inbox-mini-app": "0.92.9-549-78a92c4",
"@walmart/iteminfo-mini-app": "7.10.5",
"@walmart/learning-mini-app": "20.0.3",
"@walmart/manager-approvals-miniapp": "0.2.4",
@@ -136,8 +136,8 @@
"@walmart/react-native-shared-navigation": "6.0.7",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.6.4",
- "@walmart/receipt-check-miniapp": "1.19.4",
"@walmart/react-native-webex-sdk": "0.1.8",
+ "@walmart/receipt-check-miniapp": "1.19.4",
"@walmart/redux-store": "6.0.7",
"@walmart/returns-mini-app": "4.6.0",
"@walmart/rfid-scan-mini-app": "2.2.8",
@@ -376,7 +376,7 @@
"@walmart/gtp-shared-components": "2.1.10",
"@walmart/impersonation-mini-app": "1.20.8",
"@walmart/ims-print-services-ui": "2.10.3",
- "@walmart/inbox-mini-app": "0.92.9",
+ "@walmart/inbox-mini-app": "0.92.9-549-78a92c4",
"@walmart/iteminfo-mini-app": "7.10.5",
"@walmart/learning-mini-app": "20.0.3",
"@walmart/manager-approvals-miniapp": "0.2.4",
--- src/navigation/AssociateHallwayNav/SideMenuContent.tsx
@@ -13,7 +13,7 @@ import {Dialog} from '@walmart/ui-components';
import {colors} from '@walmart/gtp-shared-components';
import {MyTeamHooks} from '@walmart/wmconnect-mini-app';
import {ClockAppSelectors} from '@walmart/time-clock-mini-app';
-import {getInboxBadgeCount} from '@walmart/inbox-mini-app';
+// import {getInboxBadgeCount} from '@walmart/inbox-mini-app';
import {getTaskBadge} from '@walmart/taskit-mini-app';
import {UserSelectors} from '@walmart/allspark-foundation/User';
import {ClockSelectors} from '@walmart/allspark-foundation/Clock';
@@ -50,7 +50,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = (
const [translate, i18n] = useAllsparkTranslation();
- const badgesCount = useSelector(getInboxBadgeCount);
+ const badgesCount = true;
const unreadMessageCount = MyTeamHooks.useMessagesUnreadCount();
const user = useSelector(UserSelectors.getData);
const clockedIn = useSelector(ClockSelectors.getIsClockedIn);
--- src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx
@@ -9,7 +9,7 @@ import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation';
import {UserSelectors} from '@walmart/allspark-foundation/User';
import AttendanceMiniApp, {TorInboxScreen} from '@walmart/attendance-mini-app';
import {Spinner} from '@walmart/gtp-shared-components';
-import {useBadgesCount, InboxScreen} from '@walmart/inbox-mini-app';
+import {InboxScreen} from '@walmart/inbox-mini-app';
import {metricsNavigationScreens} from '@walmart/metrics-mini-app';
import {ScheduleMiniApp} from '@walmart/schedule-mini-app';
import {DrawerButton, FontIcon, Header} from '@walmart/ui-components';
@@ -31,7 +31,7 @@ export const InboxHeaderRight = (props: HeaderButtonProps) => {
const pressOpacity = props?.pressOpacity || 0.2;
const navigtion = useNavigation<MainTabsNavigationProp>();
- const [badgesCount] = useBadgesCount();
+ // const [badgesCount] = useBadgesCount();
const enabled = useSelector(getInboxHeaderEnabled);
const onPress = () => {
@@ -46,7 +46,7 @@ export const InboxHeaderRight = (props: HeaderButtonProps) => {
activeOpacity={pressOpacity}
accessibilityLabel='View Inbox'>
<FontIcon size={24} name='inbox' color={tintColor} />
- {!!badgesCount && <View style={styles.headerBadge} />}
+ {!!true && <View style={styles.headerBadge} />}
</TouchableOpacity>
) : null;
};
--- src/navigation/AssociateHallwayNav/Tabs/index.tsx
@@ -30,7 +30,7 @@ export const MainTabsNav = (_: MainStackScreenProps<'tabs'>) => {
const config = useSelector(getBottomNavConfigMap);
const {askSam, copilot, home, inbox, me, myTeam, taskit} = config;
- const inboxBadge = useSelector(getInboxBadgeCount);
+ const inboxBadge = true; //useSelector(getInboxBadgeCount);
const taskitBadge = getTaskTabBarBadge();
const copilotBadge = useWorkBadgeCount();
| Platform Drop21 changes | Platform Drop21 changes
|
f8e5e64986cd0266cd39619ea60238fc4c8d95cd | --- package.json
@@ -86,7 +86,7 @@
"@walmart/core-utils": "~1.3.0",
"@walmart/core-widget-registry": "~0.7.2",
"@walmart/counts-component-miniapp": "0.0.42",
- "@walmart/emergency-mini-app": "1.10.0",
+ "@walmart/emergency-mini-app": "1.10.0-bannerEtc.1",
"@walmart/exception-mini-app": "1.0.3",
"@walmart/facilities-management-miniapp": "0.4.2",
"@walmart/feedback-all-spark-miniapp": "0.9.7",
| add banner related cases | add banner related cases
|
2700f48adf54327acfa55069f8c140f7005ef8af | --- __tests__/index.test.tsx
@@ -6,18 +6,18 @@ const {initialize, RosterMiniApp} = require('../src/index');
describe('initialize', () => {
it('should initialize Firebase App Check with debug token', async () => {
- const debugToken = 'test_debug_token';
- await initialize(debugToken);
+ const testValue = 'test_debug';
+ await initialize(testValue);
expect(appCheck.newReactNativeFirebaseAppCheckProvider).toHaveBeenCalled();
expect(mockConfigure).toHaveBeenCalledWith({
android: {
provider: expect.any(String),
- debugToken: debugToken,
+ debugToken: testValue,
},
apple: {
provider: expect.any(String),
- debugToken: debugToken,
+ debugToken: testValue,
},
});
@@ -33,18 +33,18 @@ describe('initialize', () => {
it('should initialize Firebase App Check with __DEV__ false and with debug token', async () => {
global.window.__DEV__ = false;
- const debugToken = 'test_debug_token';
- await initialize(debugToken);
+ const testValue = 'test_debug';
+ await initialize(testValue);
expect(appCheck.newReactNativeFirebaseAppCheckProvider).toHaveBeenCalled();
expect(mockConfigure).toHaveBeenCalledWith({
android: {
provider: expect.any(String),
- debugToken: debugToken,
+ debugToken: testValue,
},
apple: {
provider: expect.any(String),
- debugToken: debugToken,
+ debugToken: testValue,
},
});
| Update test for debug token | Update test for debug token
|
3d913b2170504f1492b572b223a175506fdd699e | --- .looper.multibranch.yml
@@ -607,11 +607,11 @@ flows:
- var(END_TIME):
date +%s
- var(TIME_ELAPSED):
- $START_TIME-$END_TIME
+ $(($START_TIME-$END_TIME))
- var(MINUTES):
- ($TIME_ELAPSED%3600)/60
+ $((($TIME_ELAPSED%3600)/60))
- var(SECONDS):
- (($TIME_ELAPSED%3600)/60)%60
+ $(((($TIME_ELAPSED%3600)/60)%60))
- slack.postMessage:
message: $MESSAGE_TITLE
channelId: ${slackChannel}
| Update .looper.multibranch.yml | Update .looper.multibranch.yml
|
07032a1bf8a7e0bc7d489603a76a7b4cc7ed62f4 | --- packages/allspark-foundation-hub/src/Store/Modules/Hub/HubDashboard.tsx
@@ -202,6 +202,7 @@ export const HubDashboard = ({
if (scrollView) {
scrollView.scrollTo({ y: 0, animated: false });
}
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [allowedWidgetsList])
);
| Fixing lint errors | Fixing lint errors
|
72cfe2b0fe9457065564acfffd9d862a71299ec0 | --- packages/celebration-mini-app-graphql/CHANGELOG.md
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [1.4.0](https://gecgithub01.walmart.com/smdv/celebration-mini-app/compare/@walmart/celebration-mini-app-graphql@1.3.0...@walmart/celebration-mini-app-graphql@1.4.0) (2025-09-01)
+
+### Features
+
+- **ui:** update associate exp hub layout config ([87e7b71](https://gecgithub01.walmart.com/smdv/celebration-mini-app/commit/87e7b712b799c1abfe006bbfe12306ec0fb8fefb))
+
# [1.3.0](https://gecgithub01.walmart.com/smdv/celebration-mini-app/compare/@walmart/celebration-mini-app-graphql@1.2.1...@walmart/celebration-mini-app-graphql@1.3.0) (2025-09-01)
### Features
--- packages/celebration-mini-app-graphql/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/celebration-mini-app-graphql",
- "version": "1.3.0",
+ "version": "1.4.0",
"packageManager": "yarn@4.6.0",
"engines": {
"node": ">=18"
--- packages/celebration-mini-app/CHANGELOG.md
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [1.5.0](https://gecgithub01.walmart.com/smdv/celebration-mini-app/compare/@walmart/celebration-mini-app@1.4.0...@walmart/celebration-mini-app@1.5.0) (2025-09-01)
+
+### Features
+
+- **ui:** update associate exp hub layout config ([87e7b71](https://gecgithub01.walmart.com/smdv/celebration-mini-app/commit/87e7b712b799c1abfe006bbfe12306ec0fb8fefb))
+
# [1.4.0](https://gecgithub01.walmart.com/smdv/celebration-mini-app/compare/@walmart/celebration-mini-app@1.3.0...@walmart/celebration-mini-app@1.4.0) (2025-09-01)
### Features
--- packages/celebration-mini-app/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/celebration-mini-app",
- "version": "1.4.0",
+ "version": "1.5.0",
"packageManager": "yarn@4.6.0",
"engines": {
"node": ">=18"
| chore(version): updating package version | chore(version): updating package version
- @walmart/celebration-mini-app@1.5.0
- @walmart/celebration-mini-app-graphql@1.4.0
|
6f8466f280986d23fedcd4bce644a386070b7dfc | --- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx
@@ -484,7 +484,7 @@ export class AllsparkFeatureModule<
this._connectedMap.screens = true;
Object.keys(screens).forEach((id) => {
- AllsparkNavigationClient.addScreen(id, screens[id]);
+ AllsparkNavigationClient.addScreen(id, screens[id], this.id);
});
}
}
--- packages/allspark-foundation/src/Navigation/client.tsx
@@ -65,6 +65,8 @@ export class NavigationClient<
private _ref = createRef<NavigationContainerRef<S>>();
+ private _screenToFeatureMapping = new Map<string, string>();
+
// @todo- confirm linking is working this way. relying on idea of updating this shared
// reference later and by the time its used by react navigation...values will be defined.
private _linking: LinkingOptions<any> = {
@@ -257,10 +259,24 @@ export class NavigationClient<
};
}
+ /**
+ * Get the feature id for a given screen name.
+ */
+ public getFeatureIdForScreenName = (screenName: string) => {
+ return this._screenToFeatureMapping.get(screenName);
+ };
+
/**
* Add a screen to the navigation client.
*/
- public addScreen = (name: string, config: AllsparkScreenConfig<any, any>) => {
+ public addScreen = (
+ name: string,
+ config: AllsparkScreenConfig<any, any>,
+ featureId: string
+ ) => {
+ // Add screen to screen to feature mapping for identification of feature owner by screen name
+ this._screenToFeatureMapping.set(name, featureId);
+
// If linking config is defined, add screen to linking screen config
if (config.linking) {
this._linking.config!.screens[name] = config.linking;
| feat: add capability on navigation client to get feature id from screen name | feat: add capability on navigation client to get feature id from screen name
|
a4a7466a3a2d9dd5f32e30a878f527dd849412d3 | --- package-lock.json
@@ -5026,7 +5026,7 @@
}
},
"@walmart/OneWalmart-MiniApp": {
- "version": "1.0.12",
+ "version": "1.0.11",
"resolved": "https://npme.walmart.com/@walmart/OneWalmart-MiniApp/-/OneWalmart-MiniApp-1.0.11.tgz",
"integrity": "sha512-+4z1KqCaKdstCSQNd5SVWz/7gWU7IZHSgboWHf8WFJxGM7habDHtGV322q+4HwEdnNwBbp/F8+Jp2+bXFz0ijg==",
"requires": {
| ECT-1733 Reverting package-lock changes | ECT-1733 Reverting package-lock changes
|
ba353ee41ae28bde200dffb0f69ba2520438e32e | --- packages/allspark-foundation-hub/src/HubFeature/Store/Components/TeamListItem/TeamListItem.tsx
@@ -8,6 +8,7 @@ import {
Tag,
} from '@walmart/gtp-shared-components';
import { Images } from '../../Images/images';
+import { Images as supplyChainImages } from '../../../SupplyChain/Images/images';
import { TeamListItemProps } from './types';
import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context';
import { LoggerService } from '@walmart/allspark-foundation/Logger';
@@ -31,6 +32,7 @@ export const TeamListItem = ({
subText,
teamName,
teamId,
+ domain = 'store',
handlePress,
}: TeamListItemProps) => {
const styles = useMemo(
@@ -57,9 +59,9 @@ export const TeamListItem = ({
<TeamImage
resizeMode='cover'
source={{
- uri: Images[teamId ?? teamName]?.uri || Images['0000000'].uri,
+ uri: domain === 'store' ? Images[teamId ?? teamName]?.uri || Images['0000000'].uri : supplyChainImages[teamId ?? teamName]?.uri || supplyChainImages['0000000'].uri,
}}
- placeholder={Images[teamId ?? teamName]?.blurhash}
+ placeholder={domain === 'store' ? Images[teamId ?? teamName]?.blurhash : supplyChainImages[teamId ?? teamName]?.blurhash}
style={styles.teamImage}
onError={(error) => {
logger.error('ImageFailure', {
--- packages/allspark-foundation-hub/src/HubFeature/Store/Components/TeamListItem/types.ts
@@ -3,6 +3,7 @@ export interface TeamListItemProps {
iconType?: 'checkbox' | 'navArrow';
isLastListItem?: boolean;
isSelected?: boolean;
+ domain?: 'store' | 'supplyChain';
isPrimaryTeam?: boolean;
primaryTeamText?: string;
subText?: string;
| feat: Add supplyChain Images to TeamListItem | feat: Add supplyChain Images to TeamListItem
|
daf0be4cdcf9308174f91917e578b41f13fde610 | --- packages/allspark-foundation/__tests__/Site/selectors.test.tsx
@@ -1,4 +1,4 @@
-import { createAddressString, createCoordinates, divisionIsStore } from '../../src/Site/selectors';
+import { createAddressString, createCoordinates, divisionIsDC, divisionIsStore } from '../../src/Site/selectors';
describe('Address and Location Functions', () => {
let address = {
@@ -51,4 +51,17 @@ describe('Address and Location Functions', () => {
const STORE_DIVISION_CODE = 'STORE_CODE';
expect(divisionIsStore(STORE_DIVISION_CODE)).toBe(false);
});
+
+ it('should return false if divisionCode does not match one of DC_DIVISION_CODES', () =>{
+ expect(divisionIsDC('1')).toBe(false);
+ expect(divisionIsDC(undefined)).toBe(false);
+ })
+
+ // Tests for divisionIsDC
+ it('should return true if divisionCode matches one of DC_DIVISION_CODES', () => {
+ expect(divisionIsDC('7')).toBe(true);
+ expect(divisionIsDC('3')).toBe(true);
+ expect(divisionIsDC('13')).toBe(true);
+ expect(divisionIsDC('44')).toBe(true);
+ })
});
--- packages/allspark-foundation/src/Site/selectors.ts
@@ -166,9 +166,9 @@ export const createCoordinates = (location?: Location) => {
}
: undefined;
};
-const DC_DIVISION_CODE = '7';
-const divisionIsDC = (divisionCode?: string) =>
- divisionCode === DC_DIVISION_CODE;
+const DC_DIVISION_CODES = ['3', '7', '13', '44'];
+export const divisionIsDC = (divisionCode?: string) =>
+ divisionCode ? DC_DIVISION_CODES.includes(divisionCode as string) : false;
const STORE_DIVISION_CODE = '1';
export const divisionIsStore = (divisionCode?: string) =>
| feat: update isDC selector for new DC division scope. | feat: update isDC selector for new DC division scope.
|
fa6fd06ec8d816f44ddd65bdf5e59dbb02b4b1b6 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "2.12.0-alpha.16",
+ "version": "2.12.1-alpha.1",
"main": "dist/index.js",
"files": [
"dist"
--- src/hooks/teams.ts
@@ -9,6 +9,10 @@ import {useEnvironment} from '@walmart/allspark-foundation/Environment';
import {getGraphQLConfig} from '../services/config';
import {UserSelectors} from '@walmart/allspark-foundation/User';
import {SiteSelectors} from '@walmart/allspark-foundation/Site';
+import {
+ MY_TEAMS_TEAM_LABEL,
+ TOTAL_STORE_TEAM_LABEL,
+} from '@walmart/allspark-foundation-hub/HubFeature/constant';
export const useGetTeamById = (teamId: string) => {
const storeNbr: string | undefined = useSelector(
@@ -25,7 +29,12 @@ export const useGetTeamById = (teamId: string) => {
teamId,
countryCode: countryCode!,
},
- skip: !storeNbr || !countryCode || !teamId,
+ skip:
+ !storeNbr ||
+ !countryCode ||
+ !teamId ||
+ teamId === TOTAL_STORE_TEAM_LABEL ||
+ teamId === MY_TEAMS_TEAM_LABEL,
notifyOnNetworkStatusChange: true,
context: getGraphQLConfig(envConfig),
onError(error) {
--- src/managerExperience/components/RosterWidget/RosterWidget.tsx
@@ -99,9 +99,10 @@ export const RosterWidget = (props: TeamHubWidgetProps) => {
message: err.toString(),
});
});
+ configureRosterInfo();
setTimeout(() => {
setWidgetRefresh(false);
- }, 3000);
+ }, 1500);
}, [widgetRefresh]);
useEffect(() => {
configureRosterInfo();
--- src/managerExperience/screens/RosterDetailScreen/RosterDetailScreen.tsx
@@ -95,7 +95,7 @@ export const RosterDetailScreen = () => {
loading: teamLoading,
data: currentTeamData,
error: teamError,
- } = useGetTeamById(teamState.teamIds[0]);
+ } = useGetTeamById(teamState.teamLabel);
const {
loading: rosterLoading,
data: rosterData,
@@ -199,7 +199,7 @@ export const RosterDetailScreen = () => {
});
});
clearTimeout(lastUpdatedTimeout.current);
- lastUpdatedTimeout.current = setTimeout(stopRefreshing, 3500);
+ lastUpdatedTimeout.current = setTimeout(stopRefreshing, 1500);
}, [state.refreshing]);
useEffect(() => {
--- yarn.lock
@@ -5795,8 +5795,8 @@ __metadata:
linkType: hard
"@walmart/allspark-foundation-hub@npm:latest":
- version: 1.0.0-beta.9
- resolution: "@walmart/allspark-foundation-hub@npm:1.0.0-beta.9"
+ version: 1.0.1-beta.1
+ resolution: "@walmart/allspark-foundation-hub@npm:1.0.1-beta.1"
dependencies:
"@apollo/client": "npm:^3.8.6"
"@graphql-codegen/cli": "npm:^5.0.0"
@@ -5892,7 +5892,7 @@ __metadata:
allspark-generate-graphql: cli/generate.js
allspark-link: cli/link.js
allspark-setup: cli/setup.js
- checksum: 10c0/0a6ad56d7d3c28adfaf5930abbe3913e78cf2576550bcb7e0ff3e57a3db1468ddaf6d491de871f4c2adc5d8db967bd0c7a3f1efb949b158136b358ba84f37c55
+ checksum: 10c0/40ced1f7055876491d828ee7c984db25e2c5fe69069ead72cdb0e991ce811789e95da946afe64d567ad541043366d37fa3eb8c8a896fbf901f782539bbd9af72
languageName: node
linkType: hard
@@ -9071,9 +9071,9 @@ __metadata:
linkType: hard
"electron-to-chromium@npm:^1.5.28":
- version: 1.5.36
- resolution: "electron-to-chromium@npm:1.5.36"
- checksum: 10c0/cd8d0de7801107f2b2744b5b18641c969a49b0503996cc1a586bb79d893020d0c4e916ac1935603eea65104b4fc1096bc339e0151531dca9e0f0ce0c1882e2d8
+ version: 1.5.38
+ resolution: "electron-to-chromium@npm:1.5.38"
+ checksum: 10c0/f44715632fce33ac2444e5f0ac54684640b95bbfcdde47153e727645c33f5d18110d5af5348120a8345707c6c219d6109573b6acba56d819ca607010b75931ef
languageName: node
linkType: hard
| Update roster app version | Update roster app version
|
a8d7442bb1d4230f90930247560c7a123e25db53 | --- .looper.codepush.yml
@@ -40,6 +40,7 @@ flows:
- npm install -g appcenter-cli
- echo 'doing listing'
- appcenter apps list --token $APPCENTER_API_TOKEN_ANDROID
+ - appcenter codepush release-react -a AllSpark-Me-Walmart/AllSpark-Android -d Staging --description ‘This is from looper’ --token $APPCENTER_API_TOKEN_ANDROID
pr:
- npm install
| updated key2 | updated key2
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.