Feature/ewi merge dev

.prettierrc.json

@@ -0,0 +1,10 @@
+{
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "semi": true,
+    "singleQuote": false,
+    "bracketSpacing": false,
+    "jsxSingleQuote": false,
+    "printWidth": 120,
+    "quoteProps": "preserve"
+}

app-requirements/apple-app-site-association

@@ -0,0 +1,13 @@
+{
+  "applinks": {
+      "apps": [],
+      "details": [
+          {
+              "appID": "ZYJ4TZX4UU.nl.surf.edubadges",
+              "paths": [ 
+                "*/public/catalog/*"
+              ]
+          }
+      ]
+  }
+}

app-requirements/assetlinks.json

@@ -0,0 +1,15 @@
+[
+  {
+    "relation": [
+      "delegate_permission/common.handle_all_urls"
+    ],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "nl.surf.edubadges",
+      "sha256_cert_fingerprints": [
+        "3F:33:6F:50:AA:2F:47:D1:A8:75:56:C5:85:8B:DE:9E:1B:29:C0:3F:8A:2F:2E:88:DD:13:3F:BB:A5:C9:DA:C9",
+        "77:0B:37:AF:8E:ED:7D:02:1D:70:25:DF:CC:E4:0B:01:DE:04:02:E5:64:0F:A8:6E:E8:51:BA:E3:6C:89:34:87"
+      ]
+    }
+  }
+]

src/App.svelte

@@ -40,7 +40,6 @@
     import Insights from "./routes/teachers/Insights.svelte";
     import CollectionForm from "./components/students/CollectionForm.svelte";
     import PublicCollectionPage from "./routes/students/PublicCollectionPage.svelte";
-    import BadgeImported from "./routes/students/BadgeImported.svelte";
     import LTI from "./components/teachers/lti/LTI.svelte";
     import LTILaunch from "./components/teachers/lti/LTILaunch.svelte";
     import {constructUserName} from "./util/users";
@@ -51,6 +50,7 @@
     import {translatePropertiesRawQueries} from "./util/utils";
     import ImpersonateNew from "./routes/teachers/ImpersonateNew.svelte";
     import NotificationsNew from "./components/teachers/NotificationsNew.svelte";
+    import DirectAwardAuditTrail from "./routes/teachers/DirectAwardAuditTrail.svelte";
     import PublicMarkdownPage from "./routes/PublicMarkdownPage.svelte";
 
 
@@ -187,9 +187,6 @@
                     <Route path="/details/:entityId/" let:params>
                         <BadgeDetails entityId={params.entityId}/>
                     </Route>
-                    <Route path="/import/:entityId/" let:params>
-                        <BadgeImported entityId={params.entityId}/>
-                    </Route>
                     <Route path="/direct-award/:entityId/" let:params>
                         <DirectAward entityId={params.entityId}/>
                     </Route>
@@ -207,6 +204,7 @@
                     </Route>
                     <Route path="/permissions/:entity" component={TeacherPermissions}/>
                     <Route path="/impersonate" component={ImpersonateNew}/>
+                    <Route path="/directaward-audittrail" component={DirectAwardAuditTrail}/>
                     <Route path="/management-queries" component={ManagementQueries}/>
                     <Route path="/insights" component={Insights}/>
                     <Route path="/launch/lti" component={LTILaunch}/>

src/__tests__/util/users.test.js

@@ -1,4 +1,4 @@
-import {constructUserName, validatedUserName} from "../../util/users";
+import {constructUserName, displayUserName} from "../../util/users";
 
 const constructUser = (firstName, lastName) => ({user: {firstName, lastName}})
 
@@ -18,5 +18,5 @@ test("User name double comma's", () => {
 });
 
 test("Validated user name", () => {
-    expect(validatedUserName("Rob Leeuwen, van")).toStrictEqual("Rob van Leeuwen");
+    expect(displayUserName("Rob Leeuwen, van")).toStrictEqual("Rob van Leeuwen");
 });