Paths

Table of Contentst

-
lib/
-
actions/
-
alert-actions.js
-
reducers/
1/4
alert-reducer.js
-
types/
1/4
alert-types.js
1/4
redux-types.js
-
native/push/
-
push/
-
push-handler.react.js
-
web/push-notif/
-
push-notif/
-
push-notifs-handler.js

web] refactor recordNotifPermissionAlertActionType to recordAlertActionType
ClosedPublic
Actions

Authored by ginsu on Apr 9 2024, 10:25 AM.

Details

Reviewers

atul
inka

Commits

rCOMMc1de79d8d1b9: [lib/native/web] refactor recordNotifPermissionAlertActionType to…

Summary

This diff refactors recordNotifPermissionAlertActionType and into a more generic recordAlertActionType. I also updated the payload for this action to include the alert type so that the alert info reducer knows which alert info state in the alert store should be updated

Please note this diff + subsequent diffs won't be landed until the migration diff which will be introduced here shortly

Linear task: https://linear.app/comm/issue/ENG-7625/introduce-recordconnectfarcasteralertactiontype

Depends on D11599

Test Plan

flow + confirmed that the existing notif permission alert mechanism still works as expected

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

ginsu created this revision.Apr 9 2024, 10:25 AM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptApr 9 2024, 10:25 AM

Harbormaster completed remote builds in B28100: Diff 38955.Apr 9 2024, 10:44 AM

ginsu requested review of this revision.Apr 9 2024, 10:44 AM

found a bug

actually jk, I confused myself there is no bug with this diff

ginsu added a child revision: D11601: [native/web] introduce migration to update notifPermissionAlertInfo to alertStore in redux.Apr 9 2024, 12:19 PM

atul accepted this revision.Apr 10 2024, 10:39 AM

atul added inline comments.

lib/reducers/alert-reducer.js
15	Is existing `state.alertInfos[action.payload.alertType].totalAlerts` expected to always be a `number`? Do we need to handle `null`/`undefined` case? Looks like `number` is required for `RecordAlertActionPayload`, but is it possible for an `RecordAlertActionPayload` to be missing for given `alertType`?
21	Feel free to keep newline if intentional

This revision is now accepted and ready to land.Apr 10 2024, 10:39 AM

ginsu added inline comments.Apr 10 2024, 12:32 PM

lib/reducers/alert-reducer.js
15	Spoke to @atul about this IRL but based on how `RecordAlertActionPayload` is typed, the dev must pass in a valid `alertType` into the payload. If they pass in something not valid flow will throw an error which should address @atul's concerns

ginsu attached a referenced file: F1511189: Screenshot 2024-04-10 at 3.28.26 PM.png. (Show Details)Apr 10 2024, 12:32 PM

rebase

Harbormaster completed remote builds in B28145: Diff 39013.Apr 10 2024, 1:13 PM

Closed by commit rCOMMc1de79d8d1b9: [lib/native/web] refactor recordNotifPermissionAlertActionType to… (authored by ginsu). · Explain WhyApr 10 2024, 1:32 PM

This revision was automatically updated to reflect the committed changes.

ginsu added a commit: rCOMMc1de79d8d1b9: [lib/native/web] refactor recordNotifPermissionAlertActionType to….

Revision Contents
Changeset List

Path

Size

lib/

actions/

alert-actions.js

4 lines

reducers/

alert-reducer.js

11 lines

types/

alert-types.js

5 lines

redux-types.js

6 lines

native/

push/

push-handler.react.js

18 lines

web/

push-notif/

push-notifs-handler.js

27 lines

Diff 38955

View Options

lib/actions/alert-actions.js

This file was added.

				#import "CommServicesAuthMetadataEmitter.h"

				#import <Foundation/Foundation.h>
				#import <React/RCTBridgeModule.h>
				#import <React/RCTEventEmitter.h>

				NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";

				@interface CommServicesAuthMetadataEmitterIOSWrapper
				marcinAuthorUnsubmitted Done Inline Actions It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose `CommServicesAuthMetadataIOSWrapper`. If we want to call `sendAuthMetadataToJS` from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API. marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
				bartekUnsubmitted Not Done Inline Actions It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
				: RCTEventEmitter <RCTBridgeModule>
				@property(nonatomic) BOOL hasListeners;

				+ (void)sendToJSAccessToken:(NSString *)accessToken
				withUserID:(NSString *)userID
				withDeviceID:(NSString *)deviceID;
				bartekUnsubmitted Not Done Inline Actions What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused because I understood `sendToJSAccessToken` as "send something to JS-based access token" 😅 bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
				varunUnsubmitted Not Done Inline Actions +1 varun: +1
				@end

				@implementation CommServicesAuthMetadataEmitterIOSWrapper

				RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);

				static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;

				- (instancetype)init {
				self = [super init];
				if (!self) {
				return self;
				}
				_hasListeners = NO;
				return self;
				}

				- (void)startObserving {
				@synchronized([self class]) {
				_hasListeners = YES;
				sharedInstance = self;
				}
				}

				- (void)stopObserving {
				@synchronized([self class]) {
				_hasListeners = NO;
				sharedInstance = nil;
				}
				}

				- (NSArray<NSString > )supportedEvents {
				return @[ commServicesAuthMetadata ];
				}

				- (NSDictionary *)constantsToExport {
				return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
				}

				+ (BOOL)requiresMainQueueSetup {
				return YES;
				}

				+ (void)sendToJSAccessToken:(NSString *)accessToken
				withUserID:(NSString *)userID
				withDeviceID:(NSString *)deviceID {
				@synchronized([self class]) {
				if (!sharedInstance) {
				return;
				}

				NSDictionary *eventBody = @{
				@"accessToken" : accessToken,
				@"userID" : userID,
				@"deviceID" : deviceID
				};

				[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
				}
				}

				@end

				namespace comm {

				void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
				rust::String accessToken,
				rust::String userID,
				rust::String deviceID) {
				NSString *accessTokenObjC =
				[NSString stringWithCString:std::string(accessToken).c_str()
				encoding:NSUTF8StringEncoding];
				NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
				encoding:NSUTF8StringEncoding];
				NSString *deviceIDObjC =
				[NSString stringWithCString:std::string(deviceID).c_str()
				encoding:NSUTF8StringEncoding];

				[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
				withUserID:userIDObjC
				withDeviceID:deviceIDObjC];
				}
				} // namespace comm

View Options

lib/reducers/alert-reducer.js

This file was added.

				#import "CommServicesAuthMetadataEmitter.h"

				#import <Foundation/Foundation.h>
				#import <React/RCTBridgeModule.h>
				#import <React/RCTEventEmitter.h>

				NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";

				@interface CommServicesAuthMetadataEmitterIOSWrapper
				marcinAuthorUnsubmitted Done Inline Actions It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose `CommServicesAuthMetadataIOSWrapper`. If we want to call `sendAuthMetadataToJS` from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API. marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
				bartekUnsubmitted Not Done Inline Actions It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
				: RCTEventEmitter <RCTBridgeModule>
				@property(nonatomic) BOOL hasListeners;

				+ (void)sendToJSAccessToken:(NSString *)accessToken
				withUserID:(NSString *)userID
				withDeviceID:(NSString *)deviceID;
				bartekUnsubmitted Not Done Inline Actions What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused because I understood `sendToJSAccessToken` as "send something to JS-based access token" 😅 bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
				varunUnsubmitted Not Done Inline Actions +1 varun: +1
				@end

				@implementation CommServicesAuthMetadataEmitterIOSWrapper

				RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);

				static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;

				- (instancetype)init {
				self = [super init];
				if (!self) {
				return self;
				}
				_hasListeners = NO;
				return self;
				}

				- (void)startObserving {
				@synchronized([self class]) {
				_hasListeners = YES;
				sharedInstance = self;
				}
				}

				- (void)stopObserving {
				@synchronized([self class]) {
				_hasListeners = NO;
				sharedInstance = nil;
				}
				}

				- (NSArray<NSString > )supportedEvents {
				return @[ commServicesAuthMetadata ];
				}

				- (NSDictionary *)constantsToExport {
				return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
				}

				+ (BOOL)requiresMainQueueSetup {
				return YES;
				}

				+ (void)sendToJSAccessToken:(NSString *)accessToken
				withUserID:(NSString *)userID
				withDeviceID:(NSString *)deviceID {
				@synchronized([self class]) {
				if (!sharedInstance) {
				return;
				}

				NSDictionary *eventBody = @{
				@"accessToken" : accessToken,
				@"userID" : userID,
				@"deviceID" : deviceID
				};

				[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
				}
				}

				@end

				namespace comm {

				void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
				rust::String accessToken,
				rust::String userID,
				rust::String deviceID) {
				NSString *accessTokenObjC =
				[NSString stringWithCString:std::string(accessToken).c_str()
				encoding:NSUTF8StringEncoding];
				NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
				encoding:NSUTF8StringEncoding];
				NSString *deviceIDObjC =
				[NSString stringWithCString:std::string(deviceID).c_str()
				encoding:NSUTF8StringEncoding];

				[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
				withUserID:userIDObjC
				withDeviceID:deviceIDObjC];
				}
				} // namespace comm

View Options

lib/types/alert-types.js

This file was added.

				#import "CommServicesAuthMetadataEmitter.h"

				#import <Foundation/Foundation.h>
				#import <React/RCTBridgeModule.h>
				#import <React/RCTEventEmitter.h>

				NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";

				@interface CommServicesAuthMetadataEmitterIOSWrapper
				marcinAuthorUnsubmitted Done Inline Actions It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose `CommServicesAuthMetadataIOSWrapper`. If we want to call `sendAuthMetadataToJS` from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API. marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
				bartekUnsubmitted Not Done Inline Actions It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
				: RCTEventEmitter <RCTBridgeModule>
				@property(nonatomic) BOOL hasListeners;

				+ (void)sendToJSAccessToken:(NSString *)accessToken
				withUserID:(NSString *)userID
				withDeviceID:(NSString *)deviceID;
				bartekUnsubmitted Not Done Inline Actions What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused because I understood `sendToJSAccessToken` as "send something to JS-based access token" 😅 bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
				varunUnsubmitted Not Done Inline Actions +1 varun: +1
				@end

				@implementation CommServicesAuthMetadataEmitterIOSWrapper

				RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);

				static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;

				- (instancetype)init {
				self = [super init];
				if (!self) {
				return self;
				}
				_hasListeners = NO;
				return self;
				}

				- (void)startObserving {
				@synchronized([self class]) {
				_hasListeners = YES;
				sharedInstance = self;
				}
				}

				- (void)stopObserving {
				@synchronized([self class]) {
				_hasListeners = NO;
				sharedInstance = nil;
				}
				}

				- (NSArray<NSString > )supportedEvents {
				return @[ commServicesAuthMetadata ];
				}

				- (NSDictionary *)constantsToExport {
				return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
				}

				+ (BOOL)requiresMainQueueSetup {
				return YES;
				}

				+ (void)sendToJSAccessToken:(NSString *)accessToken
				withUserID:(NSString *)userID
				withDeviceID:(NSString *)deviceID {
				@synchronized([self class]) {
				if (!sharedInstance) {
				return;
				}

				NSDictionary *eventBody = @{
				@"accessToken" : accessToken,
				@"userID" : userID,
				@"deviceID" : deviceID
				};

				[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
				}
				}

				@end

				namespace comm {

				void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
				rust::String accessToken,
				rust::String userID,
				rust::String deviceID) {
				NSString *accessTokenObjC =
				[NSString stringWithCString:std::string(accessToken).c_str()
				encoding:NSUTF8StringEncoding];
				NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
				encoding:NSUTF8StringEncoding];
				NSString *deviceIDObjC =
				[NSString stringWithCString:std::string(deviceID).c_str()
				encoding:NSUTF8StringEncoding];

				[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
				withUserID:userIDObjC
				withDeviceID:deviceIDObjC];
				}
				} // namespace comm

View Options

lib/types/redux-types.js

This file was added.

				#import "CommServicesAuthMetadataEmitter.h"

				#import <Foundation/Foundation.h>
				#import <React/RCTBridgeModule.h>
				#import <React/RCTEventEmitter.h>

				NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";

				@interface CommServicesAuthMetadataEmitterIOSWrapper
				marcinAuthorUnsubmitted Done Inline Actions It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose `CommServicesAuthMetadataIOSWrapper`. If we want to call `sendAuthMetadataToJS` from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API. marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
				bartekUnsubmitted Not Done Inline Actions It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
				: RCTEventEmitter <RCTBridgeModule>
				@property(nonatomic) BOOL hasListeners;

				+ (void)sendToJSAccessToken:(NSString *)accessToken
				withUserID:(NSString *)userID
				withDeviceID:(NSString *)deviceID;
				bartekUnsubmitted Not Done Inline Actions What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused because I understood `sendToJSAccessToken` as "send something to JS-based access token" 😅 bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
				varunUnsubmitted Not Done Inline Actions +1 varun: +1
				@end

				@implementation CommServicesAuthMetadataEmitterIOSWrapper

				RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);

				static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;

				- (instancetype)init {
				self = [super init];
				if (!self) {
				return self;
				}
				_hasListeners = NO;
				return self;
				}

				- (void)startObserving {
				@synchronized([self class]) {
				_hasListeners = YES;
				sharedInstance = self;
				}
				}

				- (void)stopObserving {
				@synchronized([self class]) {
				_hasListeners = NO;
				sharedInstance = nil;
				}
				}

				- (NSArray<NSString > )supportedEvents {
				return @[ commServicesAuthMetadata ];
				}

				- (NSDictionary *)constantsToExport {
				return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
				}

				+ (BOOL)requiresMainQueueSetup {
				return YES;
				}

				+ (void)sendToJSAccessToken:(NSString *)accessToken
				withUserID:(NSString *)userID
				withDeviceID:(NSString *)deviceID {
				@synchronized([self class]) {
				if (!sharedInstance) {
				return;
				}

				NSDictionary *eventBody = @{
				@"accessToken" : accessToken,
				@"userID" : userID,
				@"deviceID" : deviceID
				};

				[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
				}
				}

				@end

				namespace comm {

				void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
				rust::String accessToken,
				rust::String userID,
				rust::String deviceID) {
				NSString *accessTokenObjC =
				[NSString stringWithCString:std::string(accessToken).c_str()
				encoding:NSUTF8StringEncoding];
				NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
				encoding:NSUTF8StringEncoding];
				NSString *deviceIDObjC =
				[NSString stringWithCString:std::string(deviceID).c_str()
				encoding:NSUTF8StringEncoding];

				[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
				withUserID:userIDObjC
				withDeviceID:deviceIDObjC];
				}
				} // namespace comm

View Options

native/push/push-handler.react.js

View Options

web/push-notif/push-notifs-handler.js

[lib/native/web] refactor recordNotifPermissionAlertActionType to recordAlertActionTypeClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 38955

lib/actions/alert-actions.js

lib/reducers/alert-reducer.js

lib/types/alert-types.js

lib/types/redux-types.js

native/push/push-handler.react.js

web/push-notif/push-notifs-handler.js

[lib/native/web] refactor recordNotifPermissionAlertActionType to recordAlertActionType
ClosedPublic
Actions

Revision Contents
Changeset List