Merge branch 'master' into bugfix/MBL-19564-Domain-Lookup-Search-Enhanced

Author: suhaibabsi-inst

Core/Core/Common/CommonModels/AppEnvironment/ExperimentalFeature.swift

@@ -30,6 +30,7 @@ public enum ExperimentalFeature: String, CaseIterable, Codable {
     case whatIfScore = "what_if_score"
     case rebuiltCalendar = "rebuilt_calendar"
     case revertToOldStudentToDo = "revert_to_old_student_todo"
+    case studentLearnerDashboard = "student_learner_dashboard"
 
     private static var sharedUserDefaults: UserDefaults {
         UserDefaults(suiteName: Bundle.main.appGroupID()) ?? .standard

Core/Core/Common/CommonUI/CoreWebView/Model/CoreWebViewStudioFeaturesInteractor.swift

@@ -78,7 +78,7 @@ public class CoreWebViewStudioFeaturesInteractor {
         resetStoreSubscription()
     }
 
-    func urlForStudioImmersiveView(of action: WKNavigationAction) -> URL? {
+    func urlForStudioImmersiveView(of action: NavigationActionRepresentable) -> URL? {
         guard action.isStudioImmersiveViewLinkTap, var url = action.request.url else {
             return nil
         }
@@ -173,22 +173,22 @@ public class CoreWebViewStudioFeaturesInteractor {
 
 // MARK: - WKNavigationAction Extensions
 
-extension WKNavigationAction {
+extension NavigationActionRepresentable {
 
     fileprivate var isStudioImmersiveViewLinkTap: Bool {
         guard let path = request.url?.path else { return false }
 
         let isExpandLink =
-            navigationType == .other
-            && path.contains("/media_attachments/") == true
-            && path.hasSuffix("/immersive_view") == true
-            && sourceFrame.isMainFrame == false
+        navigationType == .other
+        && path.contains("/media_attachments/")
+        && path.hasSuffix("/immersive_view")
+        && sourceInfoFrame.isMainFrame == false
 
         let isDetailsLink =
-            navigationType == .linkActivated
-            && path.contains("/media_attachments/") == true
-            && path.hasSuffix("/immersive_view") == true
-            && (targetFrame?.isMainFrame ?? false) == false
+        navigationType == .linkActivated
+        && path.contains("/media_attachments/")
+        && path.hasSuffix("/immersive_view")
+        && (targetInfoFrame?.isMainFrame ?? false) == false
 
         return isExpandLink || isDetailsLink
     }

Core/Core/Common/CommonUI/CoreWebView/Model/NavigationActionRepresentable.swift

@@ -0,0 +1,43 @@
+//
+// This file is part of Canvas.
+// Copyright (C) 2025-present  Instructure, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+//
+
+import Foundation
+import WebKit
+
+protocol FrameInfoRepresentable {
+    var isMainFrame: Bool { get }
+}
+
+protocol NavigationActionRepresentable {
+    var request: URLRequest { get }
+    var navigationType: WKNavigationType { get }
+    var sourceInfoFrame: FrameInfoRepresentable { get }
+    var targetInfoFrame: FrameInfoRepresentable? { get }
+}
+
+extension WKFrameInfo: FrameInfoRepresentable {}
+
+extension WKNavigationAction: NavigationActionRepresentable {
+    var sourceInfoFrame: FrameInfoRepresentable {
+        self.sourceFrame
+    }
+
+    var targetInfoFrame: FrameInfoRepresentable? {
+        self.targetFrame
+    }
+}

Core/Core/Common/CommonUI/CoreWebView/View/CoreWebView.swift

@@ -495,6 +495,10 @@ open class CoreWebView: WKWebView {
             )
             .store(in: &subscriptions)
     }
+
+    func isSourceFrameSameAsTarget(_ action: WKNavigationAction) -> Bool {
+        return action.sourceFrame == action.targetFrame
+    }
 }
 
 // MARK: - WKNavigationDelegate
@@ -526,7 +530,7 @@ extension CoreWebView: WKNavigationDelegate {
 
         // Scroll to fragment if this is a #fragment link click on the same site
         if action.navigationType == .linkActivated,
-           action.sourceFrame == action.targetFrame,
+           isSourceFrameSameAsTarget(action),
            let url = action.request.url, let fragment = url.fragment,
            // self.url isn't set when using loadHTMLString, so we check the baseURL that is set when calling that method
            let lhsString: String.SubSequence = (self.url ?? baseURL)?.absoluteString.split(separator: "#").first,

Core/Core/Common/Extensions/Foundation/StringExtensions.swift

@@ -68,6 +68,12 @@ extension String {
         }
     }
 
+    public var containsLetter: Bool {
+        return unicodeScalars.contains { char in
+            CharacterSet.letters.contains(char)
+        }
+    }
+
     /// - returns: True if the receiver string only contains decimal digits or if the string is empty.
     public var containsOnlyNumbers: Bool {
         unicodeScalars.allSatisfy { CharacterSet.decimalDigits.contains($0) }

Core/Core/Features/Dashboard/Container/View/DashboardContainerView.swift

@@ -158,6 +158,7 @@ public struct DashboardContainerView: View, ScreenViewTrackable {
         }
         .frame(width: 44, height: 44).padding(.trailing, -6)
         .accessibilityLabel(Text("Dashboard Options", bundle: .core))
+        .identifier("Dashboard.optionsButton")
         .confirmationDialog("", isPresented: $isShowingKebabDialog) {
             Button {
                 if offlineModeViewModel.isOffline {
@@ -168,6 +169,8 @@ public struct DashboardContainerView: View, ScreenViewTrackable {
             } label: {
                 Text("Manage Offline Content", bundle: .core)
             }
+            .identifier("Dashboard.manageOfflineButton")
+
             Button {
                 guard controller.value.presentedViewController == nil else {
                     controller.value.presentedViewController?.dismiss(animated: true)
@@ -177,6 +180,7 @@ public struct DashboardContainerView: View, ScreenViewTrackable {
             } label: {
                 Text("Dashboard Settings", bundle: .core)
             }
+            .identifier("Dashboard.settingsButton")
         }
     }
 
@@ -195,7 +199,7 @@ public struct DashboardContainerView: View, ScreenViewTrackable {
         }
         .frame(width: 44, height: 44).padding(.trailing, -6)
         .accessibilityLabel(Text("Dashboard settings", bundle: .core))
-        .accessibilityIdentifier("Dashboard.settingsButton")
+        .identifier("Dashboard.settingsButton")
     }
 
     // MARK: Nav Bar Buttons -

Core/Core/Features/Dashboard/Container/View/DashboardNavigationBar.swift

@@ -67,7 +67,7 @@ struct DashboardNavigationBar: ViewModifier {
 
 extension View {
 
-    func navigationBarDashboard() -> some View {
+    public func navigationBarDashboard() -> some View {
         modifier(DashboardNavigationBar())
     }
 }

Core/Core/Features/Grades/Model/GradeFormatter.swift

@@ -209,11 +209,23 @@ public class GradeFormatter {
                 return medium(score: score, grade: grade)
             }
         case .letter_grade:
+
+            /// This is to protect against the case where grade is retrieved from
+            /// backend as numeric value for an assignment with `letter_grade`
+            /// grading style.
+            let isLetterGradeValue = grade?.containsLetter == true
+            let letterGrade = isLetterGradeValue ? grade : {
+                if let normalizedScore {
+                    return gradingScheme?.convertNormalizedScoreToLetterGrade(normalizedScore)
+                }
+                return nil
+            }()
+
             switch gradeStyle {
             case .short:
-                return grade
+                return letterGrade
             case .medium:
-                return medium(score: score, grade: grade)
+                return medium(score: score, grade: letterGrade)
             }
         case .not_graded:
             return nil

Core/Core/Features/GradingSchemes/Model/Entities/GradingScheme.swift

@@ -38,6 +38,11 @@ extension GradingScheme {
     }
 
     public func convertNormalizedScoreToLetterGrade(_ normalizedScore: Double) -> String? {
+        // Those meant for 0-points assignments
+        if normalizedScore == .infinity { return entries.first?.name }
+        if normalizedScore == (-1 * .infinity) { return entries.last?.name }
+        if normalizedScore.isNaN { return nil }
+
         // Teachers can add extra points so the "normalized" score can be higher than 1.0. But 10 would be very suspicious.
         assert(abs(normalizedScore) < 10)
 

Core/Core/Features/Inbox/ComposeMessage/View/ComposeMessageView.swift

@@ -130,9 +130,9 @@ public struct ComposeMessageView: View, ScreenViewTrackable {
         .sheet(isPresented: $model.isImagePickerVisible) {
             AttachmentPickerAssembly.makeImagePicker(onSelect: model.addFile)
         }
-        .sheet(isPresented: $model.isTakePhotoVisible) {
+        .fullScreenCover(isPresented: $model.isTakePhotoVisible) {
             AttachmentPickerAssembly.makeImageRecorder(onSelect: model.addFile)
-                .interactiveDismissDisabled()
+                .ignoresSafeArea()
         }
         .sheet(isPresented: $model.isAudioRecordVisible) {
             AttachmentPickerAssembly.makeAudioRecorder(env: model.env, onSelect: model.addFile)