From 05c2475d8dd2c49fd5b7b16a65b2102b1dd2558e Mon Sep 17 00:00:00 2001 From: Reinaldo Neto Date: Fri, 2 Feb 2024 17:19:07 -0300 Subject: [PATCH] feat: push quota --- .../troubleshootingNotification.test.ts | 4 +- app/reducers/troubleshootingNotification.ts | 9 ++-- app/sagas/troubleshootingNotification.ts | 5 ++- app/views/PushTroubleshootView/index.tsx | 44 ++++++++++--------- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/app/reducers/troubleshootingNotification.test.ts b/app/reducers/troubleshootingNotification.test.ts index b34ed265a..83938d47d 100644 --- a/app/reducers/troubleshootingNotification.test.ts +++ b/app/reducers/troubleshootingNotification.test.ts @@ -19,7 +19,9 @@ describe('test troubleshootingNotification reducer', () => { deviceNotificationEnabled: true, highlightTroubleshooting: false, defaultPushGateway: true, - pushGatewayEnabled: true + pushGatewayEnabled: true, + consumptionPercentage: 0, + isCommunityEdition: false }; mockedStore.dispatch(setTroubleshootingNotification(payload)); const state = mockedStore.getState().troubleshootingNotification; diff --git a/app/reducers/troubleshootingNotification.ts b/app/reducers/troubleshootingNotification.ts index be7311060..9da7bbf73 100644 --- a/app/reducers/troubleshootingNotification.ts +++ b/app/reducers/troubleshootingNotification.ts @@ -6,16 +6,17 @@ export interface ITroubleshootingNotification { pushGatewayEnabled: boolean; defaultPushGateway: boolean; highlightTroubleshooting: boolean; + consumptionPercentage: number; + isCommunityEdition: boolean; } export const initialState: ITroubleshootingNotification = { deviceNotificationEnabled: false, pushGatewayEnabled: false, defaultPushGateway: false, - highlightTroubleshooting: false - // TODO: This will be used in the near future when the consumption percentage is implemented on the server. - // consumptionPercentage: 0, - // isCommunityEdition: false, + highlightTroubleshooting: false, + consumptionPercentage: 0, + isCommunityEdition: false }; export default (state = initialState, action: TActionTroubleshootingNotification): ITroubleshootingNotification => { diff --git a/app/sagas/troubleshootingNotification.ts b/app/sagas/troubleshootingNotification.ts index 634f11c74..30dbf7216 100644 --- a/app/sagas/troubleshootingNotification.ts +++ b/app/sagas/troubleshootingNotification.ts @@ -20,13 +20,14 @@ function* request() { let defaultPushGateway = false; let pushGatewayEnabled = false; try { - const { authorizationStatus } = yield* call(notifee.getNotificationSettings); + const { authorizationStatus } = yield * call(notifee.getNotificationSettings); deviceNotificationEnabled = authorizationStatus > 0; - const pushInfoResult = yield* call(pushInfo); + const pushInfoResult = yield * call(pushInfo); if (pushInfoResult.success) { pushGatewayEnabled = pushInfoResult.pushGatewayEnabled; defaultPushGateway = pushInfoResult.defaultPushGateway; } + // TODO: Need to request the information of push quota and if the server is a community edition } catch (e) { log(e); } finally { diff --git a/app/views/PushTroubleshootView/index.tsx b/app/views/PushTroubleshootView/index.tsx index 280d5f02c..091001620 100644 --- a/app/views/PushTroubleshootView/index.tsx +++ b/app/views/PushTroubleshootView/index.tsx @@ -15,8 +15,7 @@ import { compareServerVersion, isIOS, showErrorAlert } from '../../lib/methods/h import { requestTroubleshootingNotification } from '../../actions/troubleshootingNotification'; import { useAppSelector, usePermissions } from '../../lib/hooks'; import { Services } from '../../lib/services'; -// TODO: This will be used in the near future when the consumption percentage is implemented on the server. -// import ListPercentage from './components/ListPercentage'; +import ListPercentage from './components/ListPercentage'; interface IPushTroubleshootViewProps { navigation: StackNavigationProp; @@ -26,18 +25,23 @@ const PushTroubleshootView = ({ navigation }: IPushTroubleshootViewProps): JSX.E const { colors } = useTheme(); const dispatch = useDispatch(); - const { deviceNotificationEnabled, defaultPushGateway, pushGatewayEnabled, foreground, serverVersion } = useAppSelector( - state => ({ - deviceNotificationEnabled: state.troubleshootingNotification.deviceNotificationEnabled, - pushGatewayEnabled: state.troubleshootingNotification.pushGatewayEnabled, - defaultPushGateway: state.troubleshootingNotification.defaultPushGateway, - foreground: state.app.foreground, - serverVersion: state.server.version - // TODO: This will be used in the near future when the consumption percentage is implemented on the server. - // isCommunityEdition: state.troubleshootingNotification.isCommunityEdition, - // consumptionPercentage: state.troubleshootingNotification.consumptionPercentage, - }) - ); + const { + deviceNotificationEnabled, + defaultPushGateway, + pushGatewayEnabled, + consumptionPercentage, + isCommunityEdition, + foreground, + serverVersion + } = useAppSelector(state => ({ + deviceNotificationEnabled: state.troubleshootingNotification.deviceNotificationEnabled, + pushGatewayEnabled: state.troubleshootingNotification.pushGatewayEnabled, + defaultPushGateway: state.troubleshootingNotification.defaultPushGateway, + foreground: state.app.foreground, + serverVersion: state.server.version, + isCommunityEdition: state.troubleshootingNotification.isCommunityEdition, + consumptionPercentage: state.troubleshootingNotification.consumptionPercentage + })); const [testPushNotificationsPermission] = usePermissions(['test-push-notifications']); @@ -65,10 +69,9 @@ const PushTroubleshootView = ({ navigation }: IPushTroubleshootViewProps): JSX.E ); }; - // TODO: This will be used in the near future when the consumption percentage is implemented on the server. - // const alertWorkspaceConsumption = () => { - // Alert.alert(I18n.t('Push_consumption_alert_title'), I18n.t('Push_consumption_alert_description')); - // }; + const alertWorkspaceConsumption = () => { + Alert.alert(I18n.t('Push_consumption_alert_title'), I18n.t('Push_consumption_alert_description')); + }; const goToNotificationSettings = () => { if (isIOS) { @@ -84,7 +87,7 @@ const PushTroubleshootView = ({ navigation }: IPushTroubleshootViewProps): JSX.E const result = await Services.pushTest(); if (result.success) { message = I18n.t('Your_push_was_sent_to_s_devices', { s: result.tokensCount }); - } + } } catch (error: any) { message = I18n.isTranslated(error?.data?.errorType) ? I18n.t(error?.data?.errorType) : error?.data?.error; } finally { @@ -120,7 +123,6 @@ const PushTroubleshootView = ({ navigation }: IPushTroubleshootViewProps): JSX.E - {/* TODO: This will be used in the near future when the consumption percentage is implemented on the server. {isCommunityEdition ? ( @@ -133,7 +135,7 @@ const PushTroubleshootView = ({ navigation }: IPushTroubleshootViewProps): JSX.E - ) : null} */} + ) : null} {compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '6.6.0') ? (