@dhis2/app-service-offline 3.10.0 → 3.10.1

package/build/cjs/lib/dhis2-connection-status/dhis2-connection-status.js

@@ -186,6 +186,16 @@ const Dhis2ConnectionStatusProvider = (_ref) => {
     };
   }, [pingAndHandleStatus, serverVersion]);
   (0, _react.useEffect)(() => {
+    if (!offlineInterface.subscribeToDhis2ConnectionStatus) {
+      var _smartIntervalRef$cur3;
+
+      // Missing this functionality from the offline interface --
+      // use a ping on startup to get the status
+      (_smartIntervalRef$cur3 = smartIntervalRef.current) === null || _smartIntervalRef$cur3 === void 0 ? void 0 : _smartIntervalRef$cur3.invokeCallbackImmediately();
+      console.warn('Please upgrade to @dhis2/cli-app-scripts@>10.3.8 for full connection status features');
+      return;
+    }
+
     const unsubscribe = offlineInterface.subscribeToDhis2ConnectionStatus({
       onUpdate
     });
@@ -194,18 +204,21 @@ const Dhis2ConnectionStatusProvider = (_ref) => {
     };
   }, [offlineInterface, onUpdate]); // Memoize this value to prevent unnecessary rerenders of context provider
 
-  const contextValue = (0, _react.useMemo)(() => ({
+  const contextValue = (0, _react.useMemo)(() => {
     // in the unlikely circumstance that offlineInterface.latestIsConnected
-    // is `null` when this initializes, fail safe by defaulting to
-    // `isConnected: false`
-    isConnected: Boolean(isConnected),
-    isDisconnected: !isConnected,
-    lastConnected: isConnected ? null : // Only evaluate if disconnected, since local storage
-    // is synchronous and disk-based.
-    // If lastConnected is not set in localStorage though, set it.
-    // (relevant on startup)
-    getLastConnected(appName) || updateLastConnected(appName)
-  }), [isConnected, appName]);
+    // is `null` or `undefined` when this initializes, fail safe by defaulting to
+    // `isConnected: true`. A ping or SW update should update the status shortly.
+    const validatedIsConnected = isConnected !== null && isConnected !== void 0 ? isConnected : true;
+    return {
+      isConnected: validatedIsConnected,
+      isDisconnected: !validatedIsConnected,
+      lastConnected: validatedIsConnected ? null : // Only evaluate if disconnected, since local storage
+      // is synchronous and disk-based.
+      // If lastConnected is not set in localStorage though, set it.
+      // (relevant on startup)
+      getLastConnected(appName) || updateLastConnected(appName)
+    };
+  }, [isConnected, appName]);
   return /*#__PURE__*/_react.default.createElement(Dhis2ConnectionStatusContext.Provider, {
     value: contextValue
   }, children);

package/build/cjs/lib/dhis2-connection-status/dhis2-connection-status.test.js

@@ -162,9 +162,9 @@ describe('initialization to the right values based on offline interface', () =>
     } = (0, _reactHooks.renderHook)(() => (0, _dhis2ConnectionStatus.useDhis2ConnectionStatus)(), {
       wrapper: customWrapper
     });
-    expect(result.current.isConnected).toBe(false);
-    expect(result.current.isDisconnected).toBe(true);
-    expect(result.current.lastConnected).toEqual(testCurrentDate);
+    expect(result.current.isConnected).toBe(true);
+    expect(result.current.isDisconnected).toBe(false);
+    expect(result.current.lastConnected).toBe(null);
   });
 });
 describe('interval behavior', () => {

package/build/es/lib/dhis2-connection-status/dhis2-connection-status.js

@@ -160,6 +160,16 @@ export const Dhis2ConnectionStatusProvider = (_ref) => {
     };
   }, [pingAndHandleStatus, serverVersion]);
   useEffect(() => {
+    if (!offlineInterface.subscribeToDhis2ConnectionStatus) {
+      var _smartIntervalRef$cur3;
+
+      // Missing this functionality from the offline interface --
+      // use a ping on startup to get the status
+      (_smartIntervalRef$cur3 = smartIntervalRef.current) === null || _smartIntervalRef$cur3 === void 0 ? void 0 : _smartIntervalRef$cur3.invokeCallbackImmediately();
+      console.warn('Please upgrade to @dhis2/cli-app-scripts@>10.3.8 for full connection status features');
+      return;
+    }
+
     const unsubscribe = offlineInterface.subscribeToDhis2ConnectionStatus({
       onUpdate
     });
@@ -168,18 +178,21 @@ export const Dhis2ConnectionStatusProvider = (_ref) => {
     };
   }, [offlineInterface, onUpdate]); // Memoize this value to prevent unnecessary rerenders of context provider
 
-  const contextValue = useMemo(() => ({
+  const contextValue = useMemo(() => {
     // in the unlikely circumstance that offlineInterface.latestIsConnected
-    // is `null` when this initializes, fail safe by defaulting to
-    // `isConnected: false`
-    isConnected: Boolean(isConnected),
-    isDisconnected: !isConnected,
-    lastConnected: isConnected ? null : // Only evaluate if disconnected, since local storage
-    // is synchronous and disk-based.
-    // If lastConnected is not set in localStorage though, set it.
-    // (relevant on startup)
-    getLastConnected(appName) || updateLastConnected(appName)
-  }), [isConnected, appName]);
+    // is `null` or `undefined` when this initializes, fail safe by defaulting to
+    // `isConnected: true`. A ping or SW update should update the status shortly.
+    const validatedIsConnected = isConnected !== null && isConnected !== void 0 ? isConnected : true;
+    return {
+      isConnected: validatedIsConnected,
+      isDisconnected: !validatedIsConnected,
+      lastConnected: validatedIsConnected ? null : // Only evaluate if disconnected, since local storage
+      // is synchronous and disk-based.
+      // If lastConnected is not set in localStorage though, set it.
+      // (relevant on startup)
+      getLastConnected(appName) || updateLastConnected(appName)
+    };
+  }, [isConnected, appName]);
   return /*#__PURE__*/React.createElement(Dhis2ConnectionStatusContext.Provider, {
     value: contextValue
   }, children);

package/build/es/lib/dhis2-connection-status/dhis2-connection-status.test.js

@@ -152,9 +152,9 @@ describe('initialization to the right values based on offline interface', () =>
     } = renderHook(() => useDhis2ConnectionStatus(), {
       wrapper: customWrapper
     });
-    expect(result.current.isConnected).toBe(false);
-    expect(result.current.isDisconnected).toBe(true);
-    expect(result.current.lastConnected).toEqual(testCurrentDate);
+    expect(result.current.isConnected).toBe(true);
+    expect(result.current.isDisconnected).toBe(false);
+    expect(result.current.lastConnected).toBe(null);
   });
 });
 describe('interval behavior', () => {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@dhis2/app-service-offline",
     "description": "A runtime service for online/offline detection and offline caching",
-    "version": "3.10.0",
+    "version": "3.10.1",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "types": "build/types/index.d.ts",
@@ -33,7 +33,7 @@
         "coverage": "yarn test --coverage"
     },
     "peerDependencies": {
-        "@dhis2/app-service-config": "3.10.0",
+        "@dhis2/app-service-config": "3.10.1",
         "prop-types": "^15.7.2",
         "react": "^16.8.6",
         "react-dom": "^16.8.6"