Check Resource level for individual resources as well

Author: PRAN1999

SakaiClientiOS.xcworkspace/xcuserdata/pran1999.xcuserdatad/UserInterfaceState.xcuserstate

@@ -26,13 +26,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "SakaiClientiOS/Sources/Models/ResourceNode.swift"
-            timestampString = "569829109.767148"
+            timestampString = "569895505.805949"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "33"
             endingLineNumber = "33"
-            landmarkName = "unknown"
-            landmarkType = "0">
+            landmarkName = "init(data:)"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

SakaiClientiOS.xcworkspace/xcuserdata/pran1999.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.1.2</string>
 	<key>CFBundleVersion</key>
-	<string>1833</string>
+	<string>1834</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

SakaiClientiOS/Info.plist

@@ -92,19 +92,19 @@ class AssignmentPagesViewController: UIViewController {
             // and scrolls to bring submission form into view in the webView
             self?.webView?.evaluateJavaScript("""
                     CKEDITOR.instances['Assignment.view_submission_text'].destroy();
+                    var p = $('#addSubmissionForm');
+                    if (p == undefined) {
+                        p = document.body;
+                    }
+                    var offset = p.offset();
+                    $('body').scrollTop(offset.top);
                     CKEDITOR.replace('Assignment.view_submission_text', {
                         allowedContent : true,
                         toolbar: [
                                 ['Source', '-', 'Bold', 'Italic', 'Underline', '-', 'Link',
                                  'Unlink', '-', 'NumberedList','BulletedList', 'Blockquote']
                         ],
                     });
-                    var p = $('#addSubmissionForm');
-                    if (p == undefined) {
-                        p = document.body;
-                    }
-                    var offset = p.offset();
-                    $('body').scrollTop(offset.top);
                 """,
                 completionHandler: { data, err in
                     DispatchQueue.main.async {

SakaiClientiOS/Sources/Assignment/AssignmentPagesViewController.swift

@@ -56,12 +56,13 @@ class ResourceNode {
                 break
             }
             let nodeItem = data[index]
-            var node: ResourceNode?
+            let node: ResourceNode
+            guard nodeItem.level == onLevel else {
+                return (index, tree)
+            }
+            
             switch nodeItem.type {
             case .collection(let size):
-                guard nodeItem.level == onLevel else {
-                    return (index, tree)
-                }
                 guard index + 1 < data.count else {
                     node = ResourceNode(nodeItem, [])
                     break
@@ -87,9 +88,7 @@ class ResourceNode {
                 break
             }
             index += 1
-            if let n = node {
-                tree.append(n)
-            }
+            tree.append(node)
         }
         return (data.count, tree)
     }

SakaiClientiOS/Sources/Models/ResourceNode.swift

@@ -31,7 +31,7 @@ class SiteDataFetcherTests: XCTestCase {
     }
 
     func test_loadData_withSuccessfulNetworkRequest_shouldSplitSitesAndUpdateCache() {
-        guard let data = Bundle.main.data(forResource: "sites", ofType: "json") else {
+        guard let data = Bundle(for: type(of: self)).data(forResource: "sites", ofType: "json") else {
             return
         }
         let decoder = JSONDecoder()
@@ -40,12 +40,12 @@ class SiteDataFetcherTests: XCTestCase {
             return
         }
 
-        mockNetworkService.response = siteCollection.siteCollection
+        mockNetworkService.response = siteCollection
 
-        underTest.loadData { [weak self] data, err in
+        underTest.loadData { [weak self] _data, err in
             XCTAssertNil(err, "Err should be nil")
 
-            guard let data = data else {
+            guard let data = _data else {
                 XCTFail("Response should not be nil")
                 return
             }
@@ -60,8 +60,6 @@ class SiteDataFetcherTests: XCTestCase {
                     termMapIndex += 1
                 }
             }
-
-            
         }
     }
 }