Merge branch 'bugfix/CXTDT-546577' into 'develop'
Digital PCT265 defect CXTDT-546577 - Remove transcendsPageUpdates to prevent replace duplication. ### Summary Remove transcendsPageUpdates to prevent replace duplication. ### JIRA Ticket https://onejira.verizon.com/browse/CXTDT-546577 See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1099
This commit is contained in:
commit
7488ba3bcb
@ -771,6 +771,8 @@
|
|||||||
5822720A2B1FC55F00F75BAE /* RotorHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RotorHandler.swift; sourceTree = "<group>"; };
|
5822720A2B1FC55F00F75BAE /* RotorHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RotorHandler.swift; sourceTree = "<group>"; };
|
||||||
5846ABF52B4762A600FA6C76 /* PollingBehaviorModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollingBehaviorModel.swift; sourceTree = "<group>"; };
|
5846ABF52B4762A600FA6C76 /* PollingBehaviorModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollingBehaviorModel.swift; sourceTree = "<group>"; };
|
||||||
5870636E2ACF238E00CA18D5 /* ReadableDecodingErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReadableDecodingErrors.swift; sourceTree = "<group>"; };
|
5870636E2ACF238E00CA18D5 /* ReadableDecodingErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReadableDecodingErrors.swift; sourceTree = "<group>"; };
|
||||||
|
5878F0A42BD7E68800ADE23D /* mvmcoreui.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = mvmcoreui.xcconfig; sourceTree = "<group>"; };
|
||||||
|
5878F0A52BD7E6BE00ADE23D /* mvmcoreui_dev.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = mvmcoreui_dev.xcconfig; sourceTree = "<group>"; };
|
||||||
58A9DD7C2AC2103300F5E0B0 /* ReplaceableMoleculeBehaviorModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplaceableMoleculeBehaviorModel.swift; sourceTree = "<group>"; };
|
58A9DD7C2AC2103300F5E0B0 /* ReplaceableMoleculeBehaviorModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplaceableMoleculeBehaviorModel.swift; sourceTree = "<group>"; };
|
||||||
608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUILoggingHandler.swift; sourceTree = "<group>"; };
|
608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUILoggingHandler.swift; sourceTree = "<group>"; };
|
||||||
8D070BAF241B56530099AC56 /* ListRightVariableTotalDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariableTotalDataModel.swift; sourceTree = "<group>"; };
|
8D070BAF241B56530099AC56 /* ListRightVariableTotalDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariableTotalDataModel.swift; sourceTree = "<group>"; };
|
||||||
@ -2345,6 +2347,8 @@
|
|||||||
D29DF31421ECECA7003B2FB9 /* SupportingFiles */ = {
|
D29DF31421ECECA7003B2FB9 /* SupportingFiles */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
5878F0A52BD7E6BE00ADE23D /* mvmcoreui_dev.xcconfig */,
|
||||||
|
5878F0A42BD7E68800ADE23D /* mvmcoreui.xcconfig */,
|
||||||
D29DF32721EE8736003B2FB9 /* Strings */,
|
D29DF32721EE8736003B2FB9 /* Strings */,
|
||||||
D29DF26621E6A9E4003B2FB9 /* ThirdParty */,
|
D29DF26621E6A9E4003B2FB9 /* ThirdParty */,
|
||||||
D29DF31521ECECC0003B2FB9 /* Fonts */,
|
D29DF31521ECECC0003B2FB9 /* Fonts */,
|
||||||
@ -3230,6 +3234,7 @@
|
|||||||
/* Begin XCBuildConfiguration section */
|
/* Begin XCBuildConfiguration section */
|
||||||
D29DF0D221E404D4003B2FB9 /* Debug */ = {
|
D29DF0D221E404D4003B2FB9 /* Debug */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
|
baseConfigurationReference = 5878F0A52BD7E6BE00ADE23D /* mvmcoreui_dev.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
|
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
|
||||||
@ -3288,7 +3293,7 @@
|
|||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
VERSIONING_SYSTEM = "apple-generic";
|
VERSIONING_SYSTEM = "apple-generic";
|
||||||
VERSION_INFO_PREFIX = "";
|
VERSION_INFO_PREFIX = "";
|
||||||
@ -3297,6 +3302,7 @@
|
|||||||
};
|
};
|
||||||
D29DF0D321E404D4003B2FB9 /* Release */ = {
|
D29DF0D321E404D4003B2FB9 /* Release */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
|
baseConfigurationReference = 5878F0A42BD7E68800ADE23D /* mvmcoreui.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
|
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
|
||||||
|
|||||||
@ -21,8 +21,6 @@ public class ReplaceableMoleculeBehavior: PageMoleculeTransformationBehavior {
|
|||||||
private var observingForResponses: NSObjectProtocol?
|
private var observingForResponses: NSObjectProtocol?
|
||||||
private var delegateObject: MVMCoreUIDelegateObject?
|
private var delegateObject: MVMCoreUIDelegateObject?
|
||||||
|
|
||||||
public var transcendsPageUpdates: Bool { true }
|
|
||||||
|
|
||||||
public required init(model: PageBehaviorModelProtocol, delegateObject: MVMCoreUIDelegateObject?) {
|
public required init(model: PageBehaviorModelProtocol, delegateObject: MVMCoreUIDelegateObject?) {
|
||||||
moleculeIds = (model as! ReplaceableMoleculeBehaviorModel).moleculeIds
|
moleculeIds = (model as! ReplaceableMoleculeBehaviorModel).moleculeIds
|
||||||
let shouldListenForListUpdates = delegateObject?.moleculeListDelegate != nil
|
let shouldListenForListUpdates = delegateObject?.moleculeListDelegate != nil
|
||||||
@ -96,6 +94,10 @@ public class ReplaceableMoleculeBehavior: PageMoleculeTransformationBehavior {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
guard modules.count > 0 else { return }
|
guard modules.count > 0 else { return }
|
||||||
|
#if LOGGING
|
||||||
|
let requestParams = (notification.userInfo?["MVMCoreLoadObject"] as? MVMCoreLoadObject)?.requestParameters
|
||||||
|
MVMCoreLoggingHandler.shared()?.handleDebugMessage("Replacing \(modules.map { $0.id }) from \(requestParams?.url?.absoluteString ?? "unknown"), e2eId: \(requestParams?.identifier ?? "unknown")")
|
||||||
|
#endif
|
||||||
delegateObject?.moleculeDelegate?.replaceMoleculeData(modules) { replacedModels in
|
delegateObject?.moleculeDelegate?.replaceMoleculeData(modules) { replacedModels in
|
||||||
let modules = replacedModels.compactMap { modulesLoaded.dictionaryForKey($0.id) }
|
let modules = replacedModels.compactMap { modulesLoaded.dictionaryForKey($0.id) }
|
||||||
guard let viewController = self.delegateObject?.moleculeDelegate as? MVMCoreViewControllerProtocol else { return }
|
guard let viewController = self.delegateObject?.moleculeDelegate as? MVMCoreViewControllerProtocol else { return }
|
||||||
|
|||||||
13
MVMCoreUI/SupportingFiles/mvmcoreui.xcconfig
Normal file
13
MVMCoreUI/SupportingFiles/mvmcoreui.xcconfig
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
//
|
||||||
|
// mvmcore_ui.xcconfig
|
||||||
|
// MVMCoreUI
|
||||||
|
//
|
||||||
|
// Created by Kyle Hedden on 4/23/24.
|
||||||
|
// Copyright © 2024 Verizon Wireless. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
// Configuration settings file format documentation can be found at:
|
||||||
|
// https://help.apple.com/xcode/#/dev745c5c974
|
||||||
|
|
||||||
|
// Refer back to the workspace settings if they exist.
|
||||||
|
#include? "../../../workspaceSettings.xcconfig"
|
||||||
16
MVMCoreUI/SupportingFiles/mvmcoreui_dev.xcconfig
Normal file
16
MVMCoreUI/SupportingFiles/mvmcoreui_dev.xcconfig
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
//
|
||||||
|
// mvmcore_ui_dev.xcconfig
|
||||||
|
// MVMCoreUI
|
||||||
|
//
|
||||||
|
// Created by Kyle Hedden on 4/23/24.
|
||||||
|
// Copyright © 2024 Verizon Wireless. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
// Configuration settings file format documentation can be found at:
|
||||||
|
// https://help.apple.com/xcode/#/dev745c5c974
|
||||||
|
|
||||||
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) LOGGING
|
||||||
|
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) LOGGING=1
|
||||||
|
|
||||||
|
// Refer back to the workspace settings if they exist.
|
||||||
|
#include? "../../../workspaceSettings.xcconfig"
|
||||||
Loading…
Reference in New Issue
Block a user