@convep_mobilogy/react-native-qms-plugin 1.8.3 → 1.9.0

package/src/QmsDashboardView.android.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { DeviceEventEmitter, NativeModules, View } from 'react-native';
 import type {
   QmsActiveAccountPayload,
@@ -27,9 +27,91 @@ const { QmsModule } = NativeModules as {
     setAccentColor?: (hexColor?: string) => void;
     setFontFamily?: (fontFamily?: string) => void;
     setPushToken?: (pushToken?: string) => void;
+    consumePendingLogout?: () => Promise<boolean>;
   };
 };
 
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  value != null && typeof value === 'object' && !Array.isArray(value);
+
+const parseRecord = (value: unknown): Record<string, unknown> | null => {
+  if (isRecord(value)) {
+    return value;
+  }
+  if (typeof value !== 'string') {
+    return null;
+  }
+  const trimmed = value.trim();
+  if (!trimmed.startsWith('{')) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(trimmed);
+    return isRecord(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+};
+
+const mergeRecord = (
+  target: Record<string, unknown>,
+  source: Record<string, unknown> | null
+) => {
+  if (!source) {
+    return;
+  }
+  Object.entries(source).forEach(([key, value]) => {
+    if (value != null && target[key] == null) {
+      target[key] = value;
+    }
+  });
+};
+
+const normalizeNotificationPayload = (
+  rawPayload?: Record<string, unknown> | null
+): Record<string, unknown> | null => {
+  if (!rawPayload || Object.keys(rawPayload).length === 0) {
+    return rawPayload ?? null;
+  }
+
+  const normalized: Record<string, unknown> = { ...rawPayload };
+  const nestedKeys = [
+    'Data',
+    'data',
+    'payload',
+    'notificationData',
+    'remoteMessage',
+    'message',
+  ];
+
+  nestedKeys.forEach((key) => {
+    const nested = parseRecord(rawPayload[key]);
+    mergeRecord(normalized, nested);
+    mergeRecord(normalized, parseRecord(nested?.Data));
+    mergeRecord(normalized, parseRecord(nested?.data));
+    mergeRecord(normalized, parseRecord(nested?.payload));
+    mergeRecord(normalized, parseRecord(nested?.notificationData));
+  });
+
+  const notification = parseRecord(rawPayload.notification);
+  if (notification) {
+    if (normalized.title == null && notification.title != null) {
+      normalized.title = notification.title;
+    }
+    if (normalized.body == null && notification.body != null) {
+      normalized.body = notification.body;
+    }
+    if (normalized.message == null && notification.body != null) {
+      normalized.message = notification.body;
+    }
+  }
+  if (normalized.message == null && normalized.body != null) {
+    normalized.message = normalized.body;
+  }
+
+  return normalized;
+};
+
 export const QmsDashboardView: React.FC<QmsDashboardViewProps> = ({
   style,
   onClose,
@@ -58,12 +140,82 @@ export const QmsDashboardView: React.FC<QmsDashboardViewProps> = ({
   owner_version,
   payload,
 }) => {
+  const onLogoutRef = useRef(onLogout);
+  const logoutDeliveredRef = useRef(false);
+  const [logoutGate, setLogoutGate] = useState<
+    'checking' | 'clear' | 'blocked'
+  >('checking');
+
+  useEffect(() => {
+    onLogoutRef.current = onLogout;
+  }, [onLogout]);
+
   useEffect(() => {
+    let mounted = true;
+
+    const deliverLogout = () => {
+      if (logoutDeliveredRef.current) return;
+      logoutDeliveredRef.current = true;
+      if (mounted) {
+        setLogoutGate('blocked');
+      }
+      onLogoutRef.current?.();
+    };
+
+    const consumePendingLogout = QmsModule?.consumePendingLogout;
+    const subscription = DeviceEventEmitter.addListener(
+      'QmsSdkOnLogout',
+      () => {
+        if (mounted) {
+          setLogoutGate('blocked');
+        }
+        if (consumePendingLogout) {
+          consumePendingLogout().catch(() => false).finally(deliverLogout);
+        } else {
+          deliverLogout();
+        }
+      }
+    );
+
+    // A final-account logout may recreate the React host, making the event sent
+    // to the previous ReactContext impossible to receive. Consume the persisted
+    // handoff only after this component and its callback are ready.
+    if (consumePendingLogout) {
+      consumePendingLogout()
+        .then((wasPending) => {
+          if (wasPending) {
+            deliverLogout();
+          } else if (mounted) {
+            setLogoutGate('clear');
+          }
+        })
+        .catch(() => {
+          if (mounted) {
+            setLogoutGate('clear');
+          }
+        });
+    } else {
+      setLogoutGate('clear');
+    }
+
+    return () => {
+      mounted = false;
+      subscription.remove();
+    };
+  }, []);
+
+  useEffect(() => {
+    if (logoutGate !== 'clear') {
+      return;
+    }
+
     const resolvedClientID = clientID ?? ClientID ?? '';
     const resolvedClientCode = clientCode ?? ClientCode ?? '';
     const resolvedToken = user_token ?? token ?? userToken ?? '';
     const resolvedOwnerVersion = ownerVersion ?? owner_version ?? '';
-    const hasPayload = payload != null && Object.keys(payload).length > 0;
+    const normalizedPayload = normalizeNotificationPayload(payload);
+    const hasPayload =
+      normalizedPayload != null && Object.keys(normalizedPayload).length > 0;
 
     if (autoShow && QmsModule?.showQms) {
       if (QmsModule?.setOwnerVersion) {
@@ -93,7 +245,7 @@ export const QmsDashboardView: React.FC<QmsDashboardViewProps> = ({
           resolvedClientID,
           resolvedClientCode,
           isOrigin,
-          payload
+          normalizedPayload
         );
       } else {
         QmsModule.showQms(
@@ -123,6 +275,7 @@ export const QmsDashboardView: React.FC<QmsDashboardViewProps> = ({
     ownerVersion,
     owner_version,
     payload,
+    logoutGate,
   ]);
 
   useEffect(() => {
@@ -165,14 +318,6 @@ export const QmsDashboardView: React.FC<QmsDashboardViewProps> = ({
     return () => subscription.remove();
   }, [onClose]);
 
-  useEffect(() => {
-    if (!onLogout) return;
-    const subscription = DeviceEventEmitter.addListener('QmsSdkOnLogout', () =>
-      onLogout()
-    );
-    return () => subscription.remove();
-  }, [onLogout]);
-
   useEffect(() => {
     if (!onActiveAccountChange) return;
     const subscription = DeviceEventEmitter.addListener(

package/src/QmsPlugin.ts

@@ -6,8 +6,184 @@ export type InAppNotificationPayload = {
   data?: Record<string, unknown>;
 };
 
+type DirectLaunchPayload = {
+  userToken?: string;
+  token?: string;
+  user_token?: string;
+  userId?: string | number;
+  USER_ID?: string | number;
+  user_id?: string | number;
+  createdBy?: string | number;
+  created_by?: string | number;
+  created_by_id?: string | number;
+  userName?: string;
+  USER_NAME?: string;
+  user_name?: string;
+  createdByName?: string;
+  created_by_name?: string;
+  userEmail?: string;
+  USER_EMAIL?: string;
+  user_email?: string;
+  email?: string;
+  userAvatar?: string;
+  USER_AVATAR?: string;
+  user_avatar?: string;
+  avatar?: string;
+  profilePicture?: string;
+  profile_picture?: string;
+  icPassport?: string;
+  IC_PASSPORT?: string;
+  ic_passport?: string;
+  clientID?: string;
+  ClientID?: string;
+  clientCode?: string;
+  ClientCode?: string;
+  isOrigin?: boolean;
+  themePrimaryColor?: string;
+  primaryColor?: string;
+  THEME_PRIMARY_COLOR?: string;
+  PRIMARY_COLOR?: string;
+  themeHeaderBackgroundColor?: string;
+  headerBackgroundColor?: string;
+  themeHeaderColor?: string;
+  headerColor?: string;
+  THEME_HEADER_BACKGROUND_COLOR?: string;
+  HEADER_BACKGROUND_COLOR?: string;
+  THEME_HEADER_COLOR?: string;
+  HEADER_COLOR?: string;
+  themeHeaderTextColor?: string;
+  headerTextColor?: string;
+  THEME_HEADER_TEXT_COLOR?: string;
+  HEADER_TEXT_COLOR?: string;
+  themeHeaderIconColor?: string;
+  headerIconColor?: string;
+  THEME_HEADER_ICON_COLOR?: string;
+  HEADER_ICON_COLOR?: string;
+  themeAccentColor?: string;
+  accentColor?: string;
+  THEME_ACCENT_COLOR?: string;
+  ACCENT_COLOR?: string;
+};
+
+type SelectedUnitPayload = {
+  drawingPlanId?: string | number;
+  DRAWING_PLAN_ID?: string | number;
+  drawing_plan_id?: string | number;
+  plan_id?: string | number;
+  unitId?: string | number;
+  unit_id?: string | number;
+  unitName?: string;
+  UNIT_NAME?: string;
+  unit_name?: string;
+  projectId?: string | number;
+  PROJECT_ID?: string | number;
+  project_id?: string | number;
+  projectName?: string;
+  PROJECT_NAME?: string;
+  project_name?: string;
+};
+
+export type OpenAddIssuePayload = DirectLaunchPayload &
+  SelectedUnitPayload & {
+    issueLimitStatus?: string;
+    ISSUE_LIMIT_STATUS?: string;
+    issueLimitWarningText?: string;
+    ISSUE_LIMIT_WARNING_TEXT?: string;
+    issueLimitErrorText?: string;
+    ISSUE_LIMIT_ERROR_TEXT?: string;
+  };
+
+export type OpenThirdPartyLinkPayload = DirectLaunchPayload &
+  SelectedUnitPayload & {
+    lotId?: string | number;
+    LOT_ID?: string | number;
+    lot_id?: string | number;
+    unitLotId?: string | number;
+    unit_lot_id?: string | number;
+    userId?: string | number;
+    USER_ID?: string | number;
+    user_id?: string | number;
+    createdBy?: string | number;
+    created_by?: string | number;
+  };
+
+export type OpenPropertyInfoPayload = DirectLaunchPayload & SelectedUnitPayload;
+export type OpenAccessItemPayload = DirectLaunchPayload & SelectedUnitPayload;
+export type OpenProjectUpdatePayload = DirectLaunchPayload &
+  SelectedUnitPayload;
+export type OpenInboxPayload = DirectLaunchPayload & SelectedUnitPayload;
+export type OpenIssueListPayload = DirectLaunchPayload & SelectedUnitPayload;
+export type OpenDraftIssuesPayload = DirectLaunchPayload & SelectedUnitPayload;
+export type GetDraftIssueCountPayload = DirectLaunchPayload &
+  SelectedUnitPayload;
+export type OpenPoaSignOffPayload = DirectLaunchPayload & SelectedUnitPayload;
+export type OpenMakeAppointmentPayload = DirectLaunchPayload &
+  SelectedUnitPayload & {
+    preferredAppointmentType?: string;
+    PREFERRED_APPOINTMENT_TYPE?: string;
+    preferred_appointment_type?: string;
+  };
+export type OpenAppointmentListPayload = DirectLaunchPayload &
+  SelectedUnitPayload & {
+    handoverStatus?: string;
+    handover_status?: string;
+    readyToHandover?: string | boolean | number;
+    ready_to_handover?: string | boolean | number;
+    clearanceLetter?: string | boolean | number;
+    clearance_letter?: string | boolean | number;
+    clearanceLetterIssuanceMessage?: string;
+    clearance_letter_issuance_message?: string;
+    ownerHandover?: string | boolean | number;
+    owner_handover?: string | boolean | number;
+    ownerAppointmentAlert?: string;
+    owner_appointment_alert?: string;
+    ownerJointInspection?: string | boolean | number;
+    owner_joint_inspection?: string | boolean | number;
+  };
+
+type DirectNativeMethod = (
+  userToken?: string,
+  clientID?: string,
+  clientCode?: string,
+  isOrigin?: boolean,
+  options?: Record<string, unknown> | null
+) => Promise<boolean>;
+
+type DirectNativeCountMethod = (
+  userToken?: string,
+  clientID?: string,
+  clientCode?: string,
+  isOrigin?: boolean,
+  options?: Record<string, unknown> | null
+) => Promise<number>;
+
+type DirectMethodName =
+  | 'openAddIssue'
+  | 'openThirdPartyLink'
+  | 'openPropertyInfo'
+  | 'openAccessItem'
+  | 'openProjectUpdate'
+  | 'openInbox'
+  | 'openIssueList'
+  | 'openDraftIssues'
+  | 'openPoaSignOff'
+  | 'openMakeAppointment'
+  | 'openAppointmentList';
+
 const { QmsModule } = NativeModules as {
   QmsModule?: {
+    openAddIssue?: DirectNativeMethod;
+    openThirdPartyLink?: DirectNativeMethod;
+    openPropertyInfo?: DirectNativeMethod;
+    openAccessItem?: DirectNativeMethod;
+    openProjectUpdate?: DirectNativeMethod;
+    openInbox?: DirectNativeMethod;
+    openIssueList?: DirectNativeMethod;
+    openDraftIssues?: DirectNativeMethod;
+    getDraftIssueCount?: DirectNativeCountMethod;
+    openPoaSignOff?: DirectNativeMethod;
+    openMakeAppointment?: DirectNativeMethod;
+    openAppointmentList?: DirectNativeMethod;
     emitInAppNotification?: (title?: string, body?: string) => void;
     emitInAppNotificationWithPayload?: (
       title?: string,
@@ -17,7 +193,142 @@ const { QmsModule } = NativeModules as {
   };
 };
 
+function resolveCredentials(payload: DirectLaunchPayload) {
+  return {
+    token: payload.userToken ?? payload.token ?? payload.user_token ?? '',
+    clientID: payload.clientID ?? payload.ClientID ?? '',
+    clientCode: payload.clientCode ?? payload.ClientCode ?? '',
+    isOrigin: payload.isOrigin ?? false,
+  };
+}
+
+function callDirectMethod<T extends DirectLaunchPayload>(
+  methodName: DirectMethodName,
+  unavailableMessage: string,
+  payload: T
+): Promise<boolean> {
+  const method = QmsModule?.[methodName];
+  if (!method) {
+    return Promise.reject(new Error(unavailableMessage));
+  }
+
+  const credentials = resolveCredentials(payload);
+  return method(
+    credentials.token,
+    credentials.clientID,
+    credentials.clientCode,
+    credentials.isOrigin,
+    payload as Record<string, unknown>
+  );
+}
+
 export const QmsPlugin = {
+  openAddIssue(payload: OpenAddIssuePayload): Promise<boolean> {
+    return callDirectMethod(
+      'openAddIssue',
+      'QMS openAddIssue is not available.',
+      payload
+    );
+  },
+
+  openThirdPartyLink(payload: OpenThirdPartyLinkPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openThirdPartyLink',
+      'QMS openThirdPartyLink is not available.',
+      payload
+    );
+  },
+
+  openPropertyInfo(payload: OpenPropertyInfoPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openPropertyInfo',
+      'QMS openPropertyInfo is not available.',
+      payload
+    );
+  },
+
+  openAccessItem(payload: OpenAccessItemPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openAccessItem',
+      'QMS openAccessItem is not available.',
+      payload
+    );
+  },
+
+  openProjectUpdate(payload: OpenProjectUpdatePayload): Promise<boolean> {
+    return callDirectMethod(
+      'openProjectUpdate',
+      'QMS openProjectUpdate is not available.',
+      payload
+    );
+  },
+
+  openInbox(payload: OpenInboxPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openInbox',
+      'QMS openInbox is not available.',
+      payload
+    );
+  },
+
+  openIssueList(payload: OpenIssueListPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openIssueList',
+      'QMS openIssueList is not available.',
+      payload
+    );
+  },
+
+  openDraftIssues(payload: OpenDraftIssuesPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openDraftIssues',
+      'QMS openDraftIssues is not available.',
+      payload
+    );
+  },
+
+  getDraftIssueCount(payload: GetDraftIssueCountPayload): Promise<number> {
+    const method = QmsModule?.getDraftIssueCount;
+    if (!method) {
+      return Promise.reject(
+        new Error('QMS getDraftIssueCount is not available.')
+      );
+    }
+
+    const credentials = resolveCredentials(payload);
+    return method(
+      credentials.token,
+      credentials.clientID,
+      credentials.clientCode,
+      credentials.isOrigin,
+      payload as Record<string, unknown>
+    ).then((count: number) => Number(count) || 0);
+  },
+
+  openPoaSignOff(payload: OpenPoaSignOffPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openPoaSignOff',
+      'QMS openPoaSignOff is not available.',
+      payload
+    );
+  },
+
+  openMakeAppointment(payload: OpenMakeAppointmentPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openMakeAppointment',
+      'QMS openMakeAppointment is not available.',
+      payload
+    );
+  },
+
+  openAppointmentList(payload: OpenAppointmentListPayload): Promise<boolean> {
+    return callDirectMethod(
+      'openAppointmentList',
+      'QMS openAppointmentList is not available.',
+      payload
+    );
+  },
+
   emitInAppNotification(payload: InAppNotificationPayload): void {
     if (QmsModule?.emitInAppNotificationWithPayload) {
       QmsModule.emitInAppNotificationWithPayload(
@@ -27,6 +338,7 @@ export const QmsPlugin = {
       );
       return;
     }
+
     QmsModule?.emitInAppNotification?.(
       payload.title ?? 'Notification',
       payload.body ?? ''

package/src/index.tsx

@@ -4,4 +4,16 @@ export type {
   QmsDashboardViewProps,
 } from './QmsDashboardView.types';
 export { QmsPlugin } from './QmsPlugin';
-export type { InAppNotificationPayload } from './QmsPlugin';
+export type {
+  InAppNotificationPayload,
+  OpenAccessItemPayload,
+  OpenAddIssuePayload,
+  OpenAppointmentListPayload,
+  OpenInboxPayload,
+  OpenIssueListPayload,
+  OpenMakeAppointmentPayload,
+  OpenPoaSignOffPayload,
+  OpenProjectUpdatePayload,
+  OpenPropertyInfoPayload,
+  OpenThirdPartyLinkPayload,
+} from './QmsPlugin';

package/ios/QmsPluginFramework.xcframework/Info.plist

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>BinaryPath</key>
-			<string>QmsPluginFramework.framework/QmsPluginFramework</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>QmsPluginFramework.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>QmsPluginFramework.framework/QmsPluginFramework</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>QmsPluginFramework.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>

package/ios/QmsPluginFramework.xcframework/ios-arm64/QmsPluginFramework.framework/Headers/QmsPlugin.h

@@ -1,43 +0,0 @@
-//QmsPlugin.h
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface QmsPluginUI : NSObject
-
-+ (UIViewController *)makeViewController;
-
-/// Fetches project list data and presents DashboardViewController fully configured
-/// for the given FCM deep-link payload. The payload must contain at minimum
-/// `project_id` and `plan_id`. Auth/base-URL must already be configured in APIConfig
-/// (i.e. the SDK has already been initialised by the user opening the app).
-///
-/// @param payload  The FCM notification data dictionary.
-/// @param presenter The view controller from which the dashboard will be presented modally.
-+ (void)presentDashboardFromPayload:(NSDictionary *)payload
-                 fromViewController:(UIViewController *)presenter;
-
-/// Configures APIConfig with the project/plan context from the payload, then
-/// presents AppointmentDetailsViewController modally. The payload must contain
-/// `project_id`, `plan_id`, and `appointment_id` (or `id` as a fallback).
-/// Auth/base-URL must already be configured in APIConfig.
-///
-/// @param payload  The FCM notification data dictionary.
-/// @param presenter The view controller from which the appointment screen will be presented.
-+ (void)presentAppointmentFromPayload:(NSDictionary *)payload
-                   fromViewController:(UIViewController *)presenter;
-
-/// Fetches the issue list, finds the matching issue by `issue_id` from the payload,
-/// and presents IssueDetailViewController fully configured. The payload must contain
-/// at minimum `project_id`, `plan_id`, and `issue_id`. Auth/base-URL must already
-/// be configured in APIConfig.
-///
-/// @param payload  The FCM notification data dictionary.
-/// @param presenter The view controller from which the issue screen will be presented.
-+ (void)presentIssueFromPayload:(NSDictionary *)payload
-             fromViewController:(UIViewController *)presenter;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/QmsPluginFramework.xcframework/ios-arm64/QmsPluginFramework.framework/Headers/QmsPluginFramework.h

@@ -1,17 +0,0 @@
-//
-//  QmsPluginFramework.h
-//  QmsPluginFramework
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-//! Project version number for QmsPluginFramework.
-FOUNDATION_EXPORT double QmsPluginFrameworkVersionNumber;
-
-//! Project version string for QmsPluginFramework.
-FOUNDATION_EXPORT const unsigned char QmsPluginFrameworkVersionString[];
-
-// Public headers
-#import <QmsPluginFramework/QmsPlugin.h>
-

package/ios/QmsPluginFramework.xcframework/ios-arm64/QmsPluginFramework.framework/Modules/module.modulemap

@@ -1,6 +0,0 @@
-framework module QmsPluginFramework {
-  umbrella header "QmsPluginFramework.h"
-  export *
-
-  module * { export * }
-}