Add FXIOS-9627-[Native Error Page] Initial changes for manager support #22613
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Redux | ||
| import Common | ||
|
|
||
| final class NativeErrorPageAction: Action { | ||
| let networkError: NSError? | ||
| let nativePageErrorModel: ErrorPageModel? | ||
| init( | ||
| networkError: NSError? = nil, | ||
| nativePageErrorModel: ErrorPageModel? = nil, | ||
| windowUUID: WindowUUID, | ||
| actionType: any ActionType | ||
| ) { | ||
| self.networkError = networkError | ||
| self.nativePageErrorModel = nativePageErrorModel | ||
| super.init(windowUUID: windowUUID, actionType: actionType) | ||
| } | ||
| } | ||
|
|
||
| enum NativeErrorPageActionType: ActionType { | ||
| case receivedError | ||
| } | ||
|
|
||
| enum NativeErrorPageMiddlewareActionType: ActionType { | ||
| case initialize | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Common | ||
| import Foundation | ||
| import WebKit | ||
| import GCDWebServers | ||
| import Shared | ||
| import Storage | ||
|
|
||
| class NativeErrorPageHelper { | ||
| enum NetworkErrorType { | ||
| case noInternetConnection | ||
| } | ||
|
|
||
| var error: NSError | ||
|
|
||
| var errorDescriptionItem: String { | ||
| return error.localizedDescription | ||
| } | ||
|
|
||
| init(error: NSError) { | ||
| self.error = error | ||
| } | ||
|
|
||
| func parseErrorDetails() -> ErrorPageModel { | ||
| var title = "" | ||
| var description = "" | ||
| switch error.code { | ||
| case Int(CFNetworkErrors.cfurlErrorNotConnectedToInternet.rawValue): | ||
| title = .NativeErrorPage.NoInternetConnection.TitleLabel | ||
| description = .NativeErrorPage.NoInternetConnection.Description | ||
| default: | ||
| break | ||
| } | ||
|
|
||
| let model = ErrorPageModel(errorTitle: title, errorDescription: description) | ||
| return model | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,32 @@ | ||||||||||||||||||||||||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||||||||||||||||||||||||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||||||||||||||||||||||||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| import Foundation | ||||||||||||||||||||||||
| import Redux | ||||||||||||||||||||||||
| import Shared | ||||||||||||||||||||||||
| import Common | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| final class NativeErrorPageMiddleware { | ||||||||||||||||||||||||
| lazy var nativeErrorPageProvider: Middleware<AppState> = { state, action in | ||||||||||||||||||||||||
| let windowUUID = action.windowUUID | ||||||||||||||||||||||||
| print(action.actionType) | ||||||||||||||||||||||||
|
There was a problem hiding this comment. no need for |
||||||||||||||||||||||||
| switch action.actionType { | ||||||||||||||||||||||||
|
There was a problem hiding this comment. spppaaaaaaccccceeeee :P |
||||||||||||||||||||||||
| case NativeErrorPageActionType.receivedError: | ||||||||||||||||||||||||
| guard let action = action as? NativeErrorPageAction, let error = action.networkError else {return} | ||||||||||||||||||||||||
| self.initializeNativeErrorPage(windowUUID: windowUUID, error: error) | ||||||||||||||||||||||||
| break | ||||||||||||||||||||||||
| default: | ||||||||||||||||||||||||
| break | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| private func initializeNativeErrorPage(windowUUID: WindowUUID, error: NSError) { | ||||||||||||||||||||||||
| let model = NativeErrorPageHelper(error: error).parseErrorDetails() | ||||||||||||||||||||||||
| let newAction = NativeErrorPageAction(nativePageErrorModel: model, | ||||||||||||||||||||||||
| windowUUID: windowUUID, | ||||||||||||||||||||||||
| actionType: NativeErrorPageMiddlewareActionType.initialize | ||||||||||||||||||||||||
| ) | ||||||||||||||||||||||||
| store.dispatch(newAction) | ||||||||||||||||||||||||
|
Comment on lines
+26
to
+30
There was a problem hiding this comment.
Suggested change
nit: alternative to consider that doesn't require assignment. |
||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
| } | ||||||||||||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,8 +4,7 @@ | |
|
|
||
| import Foundation | ||
|
|
||
| struct ErrorPageModel: Equatable { | ||
| let errorTitle: String | ||
| let errorDescription: String | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Redux | ||
| import Shared | ||
| import Common | ||
|
|
||
| struct NativeErrorPageState: ScreenState, Equatable { | ||
| var windowUUID: WindowUUID | ||
| var title: String? | ||
| var description: String? | ||
|
|
||
| init(appState: AppState, uuid: WindowUUID) { | ||
| guard let nativeErrorPageState = store.state.screenState( | ||
| NativeErrorPageState.self, | ||
| for: .nativeErrorPage, | ||
| window: uuid | ||
| ) else { | ||
| self.init(windowUUID: uuid) | ||
| return | ||
| } | ||
|
|
||
| self.init( | ||
| windowUUID: nativeErrorPageState.windowUUID, | ||
| title: nativeErrorPageState.title, | ||
| description: nativeErrorPageState.description | ||
| ) | ||
| } | ||
|
|
||
| init( | ||
| windowUUID: WindowUUID, | ||
| title: String? = nil, | ||
| description: String? = nil | ||
| ) { | ||
| self.windowUUID = windowUUID | ||
| self.title = title | ||
| self.description = description | ||
| } | ||
|
|
||
| static let reducer: Reducer<Self> = { state, action in | ||
| print(action.actionType) | ||
|
There was a problem hiding this comment. we shouldn't have these statements in production |
||
| guard action.windowUUID == .unavailable || action.windowUUID == state.windowUUID else { return NativeErrorPageState( | ||
|
There was a problem hiding this comment. nit: return can be on a separate line here |
||
| windowUUID: state.windowUUID, | ||
| title: state.title, | ||
| description: state.description | ||
| )} | ||
| switch action.actionType { | ||
|
There was a problem hiding this comment. nit: leave some space so it's easier to read. Vertical space is free, we may as well take advantage! |
||
| case NativeErrorPageMiddlewareActionType.initialize: | ||
| guard let action = action as? NativeErrorPageAction, let model = action.nativePageErrorModel else { | ||
|
There was a problem hiding this comment. nit: spread the multiple let conditions over multiple lines for easy reading |
||
| return NativeErrorPageState( | ||
| windowUUID: state.windowUUID, | ||
| title: state.title, | ||
| description: state.description | ||
| ) | ||
| } | ||
| return NativeErrorPageState( | ||
| windowUUID: state.windowUUID, | ||
| title: model.errorTitle, | ||
| description: model.errorDescription | ||
| ) | ||
| default: | ||
| return NativeErrorPageState( | ||
| windowUUID: state.windowUUID, | ||
| title: state.title, | ||
| description: state.description | ||
| ) | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Space for readibility