The Testharness scenario was created successfully. The raw JSON output below contains information on the created scenario.
+{{.}}
These scenarios were introduced in ADR 0076 and addressed further in ADR 0083. These scenarios can be used to create Moves in the MilMove system when working locally or with Ephemeral deployments. Click any of the buttons below to create a Move data scenario.
+diff --git a/src/utils/retryPageLoading.js b/src/utils/retryPageLoading.js new file mode 100644 index 00000000000..dd04b2feac2 --- /dev/null +++ b/src/utils/retryPageLoading.js @@ -0,0 +1,18 @@ +const MilmoveHasBeenForceRefreshed = 'milmove-has-been-force-refreshed'; + +export const retryPageLoading = (error) => { + // if we see a chunk load error, try to reload the window to get + // the latest version of the code + if (!!error && error.name === 'ChunkLoadError' && !!window) { + const pageHasAlreadyBeenForceRefreshed = window.localStorage.getItem(MilmoveHasBeenForceRefreshed) === 'true'; + + if (!pageHasAlreadyBeenForceRefreshed) { + window.localStorage.setItem(MilmoveHasBeenForceRefreshed, 'true'); + return window.location.reload(); + } + window.localStorage.setItem(MilmoveHasBeenForceRefreshed, 'false'); + } + return false; +}; + +export default retryPageLoading; diff --git a/src/utils/retryPageLoading.test.js b/src/utils/retryPageLoading.test.js new file mode 100644 index 00000000000..68a95f403cd --- /dev/null +++ b/src/utils/retryPageLoading.test.js @@ -0,0 +1,51 @@ +import { retryPageLoading } from './retryPageLoading'; + +describe('retryPageLoading', () => { + let windowSpy; + let windowObj; + + const setUpWindow = (localStorageItem) => { + windowObj = { + localStorage: { + getItem: jest.fn().mockImplementation(() => localStorageItem), + setItem: jest.fn(), + }, + location: { + reload: jest.fn(), + }, + }; + windowSpy.mockImplementation(() => windowObj); + }; + + beforeEach(() => { + windowSpy = jest.spyOn(global, 'window', 'get'); + }); + + afterEach(() => { + windowSpy.mockRestore(); + }); + + it('does not reload on non chunk errors', () => { + setUpWindow(null); + retryPageLoading({ name: 'SomethingError' }); + expect(windowObj.localStorage.getItem).not.toBeCalled(); + expect(windowObj.localStorage.setItem).not.toBeCalled(); + expect(windowObj.location.reload).not.toBeCalled(); + }); + + it('reloads on first chunk error', () => { + setUpWindow('false'); + retryPageLoading({ name: 'ChunkLoadError' }); + expect(windowObj.localStorage.getItem).toBeCalled(); + expect(windowObj.localStorage.setItem).toBeCalledWith(expect.any(String), 'true'); + expect(windowObj.location.reload).toBeCalled(); + }); + + it('does not reload on 2nd chunk error', () => { + setUpWindow('true'); + retryPageLoading({ name: 'ChunkLoadError' }); + expect(windowObj.localStorage.getItem).toBeCalled(); + expect(windowObj.localStorage.setItem).toBeCalledWith(expect.any(String), 'false'); + expect(windowObj.location.reload).not.toBeCalled(); + }); +}); diff --git a/swagger-def/definitions/prime/MTOServiceItemDestSIT.yaml b/swagger-def/definitions/prime/MTOServiceItemDestSIT.yaml index 61acdfd3150..388e9a5bb7f 100644 --- a/swagger-def/definitions/prime/MTOServiceItemDestSIT.yaml +++ b/swagger-def/definitions/prime/MTOServiceItemDestSIT.yaml @@ -60,6 +60,16 @@ allOf: x-omitempty: false sitAddressUpdates: $ref: 'SitAddressUpdates.yaml' + sitRequestedDelivery: + format: date + type: string + description: Date when the customer has requested delivery out of SIT. + x-nullable: true + sitCustomerContacted: + format: date + type: string + description: Date when the customer contacted the prime for a delivery out of SIT. + x-nullable: true required: - reServiceCode - sitEntryDate diff --git a/swagger-def/prime.yaml b/swagger-def/prime.yaml index ce09268b5f7..95fcb934b58 100644 --- a/swagger-def/prime.yaml +++ b/swagger-def/prime.yaml @@ -36,7 +36,6 @@ tags: approved service item. sitAddressUpdates with a distance less than or equal to 50 miles will be automatically approved while a distance greater than 50 miles will typically require office user approval. - x-tagGroups: - name: Endpoints tags: @@ -1489,7 +1488,7 @@ definitions: type: array MoveTaskOrder: $ref: 'definitions/prime/MoveTaskOrder.yaml' - MTOServiceItemBasic: # spectral oas2-unused-definition is OK here due to polymorphism + MTOServiceItemBasic: # spectral oas2-unused-definition is OK here due to polymorphism $ref: 'definitions/prime/MTOServiceItemBasic.yaml' MTOServiceItemDestSIT: # spectral oas2-unused-definition is OK here due to polymorphism $ref: 'definitions/prime/MTOServiceItemDestSIT.yaml' @@ -1672,6 +1671,16 @@ definitions: type: string description: Second available date that Prime can deliver SIT service item. x-nullable: true + sitRequestedDelivery: + format: date + type: string + description: Date when the customer has requested delivery out of SIT. + x-nullable: true + sitCustomerContacted: + format: date + type: string + description: Date when the customer contacted the prime for a delivery out of SIT. + x-nullable: true UpdateMTOShipment: properties: scheduledPickupDate: diff --git a/swagger/prime.yaml b/swagger/prime.yaml index 70208006aed..fd8c78b4b9f 100644 --- a/swagger/prime.yaml +++ b/swagger/prime.yaml @@ -1892,6 +1892,18 @@ definitions: x-omitempty: false sitAddressUpdates: $ref: '#/definitions/SitAddressUpdates' + sitRequestedDelivery: + format: date + type: string + description: Date when the customer has requested delivery out of SIT. + x-nullable: true + sitCustomerContacted: + format: date + type: string + description: >- + Date when the customer contacted the prime for a delivery out of + SIT. + x-nullable: true required: - reServiceCode - sitEntryDate @@ -2226,6 +2238,18 @@ definitions: type: string description: Second available date that Prime can deliver SIT service item. x-nullable: true + sitRequestedDelivery: + format: date + type: string + description: Date when the customer has requested delivery out of SIT. + x-nullable: true + sitCustomerContacted: + format: date + type: string + description: >- + Date when the customer contacted the prime for a delivery out of + SIT. + x-nullable: true UpdateMTOShipment: properties: scheduledPickupDate: diff --git a/swagger/prime_v2.yaml b/swagger/prime_v2.yaml index edece313a53..cf3762510ad 100644 --- a/swagger/prime_v2.yaml +++ b/swagger/prime_v2.yaml @@ -155,6 +155,18 @@ definitions: x-omitempty: false sitAddressUpdates: $ref: '#/definitions/SitAddressUpdates' + sitRequestedDelivery: + format: date + type: string + description: Date when the customer has requested delivery out of SIT. + x-nullable: true + sitCustomerContacted: + format: date + type: string + description: >- + Date when the customer contacted the prime for a delivery out of + SIT. + x-nullable: true required: - reServiceCode - sitEntryDate