Merge branch 'master' into 3-css-grid-timeline

src/components/pages/ModuleDashboard/index.tsx

@@ -5,6 +5,7 @@ import styles from "./style.module.scss";
 import classNames from "classnames";
 import { faGlobe, faLink } from "@fortawesome/free-solid-svg-icons";
 import PageButtonGroup from "components/molecules/PageButtonGroup";
+import queryString from "query-string";
 
 import { request } from "../../../utils/api";
 import { api, methods } from "../../../constants/routes";
@@ -33,13 +34,19 @@ const ModuleDashboard: React.FC = () => {
       data.json().then((json) => {
         for (const key in json) {
           let resource = json[key];
-          if (resource.type !== "link") continue;
+          let resourceURL = queryString.parseUrl(resource.path);
 
-          newButtons.push({
-            title: resource.title,
-            icon: faLink,
-            url: resource.path,
-          });
+          if (
+            resource.type === "link" &&
+            resourceURL.url !==
+              "https://imperial.cloud.panopto.eu/Panopto/Pages/Viewer.aspx"
+          ) {
+            newButtons.push({
+              title: resource.title,
+              icon: faLink,
+              url: resource.path,
+            });
+          }
         }
         setButtons((b) => b.concat(newButtons));
       });
@@ -63,7 +70,10 @@ const ModuleDashboard: React.FC = () => {
       <Dandruff heading={generateHeading(id)} />
 
       <h4 className={classNames(styles.moduleSectionHeader)}>Module Aims</h4>
-      <div className={styles.moduleDashboardText} style={{ paddingTop: "0.75rem" }}>
+      <div
+        className={styles.moduleDashboardText}
+        style={{ paddingTop: "0.75rem" }}
+      >
         <span>In this module you will have the opportunity to:</span>
         <ul>
           <li>

src/components/pages/ModuleResources/index.tsx

@@ -58,16 +58,17 @@ class ModuleResources extends React.Component<ResourcesProps, ResourceState> {
 
           let resourceURL = queryString.parseUrl(resource.path);
           let thumbnail = undefined;
+          let altType = undefined;
           if (
-            resource.type === "video" &&
             resourceURL.url ===
-              "https://imperial.cloud.panopto.eu/Panopto/Pages/Viewer.aspx"
+            "https://imperial.cloud.panopto.eu/Panopto/Pages/Viewer.aspx"
           ) {
+            altType = "video";
             thumbnail = `https://imperial.cloud.panopto.eu/Panopto/Services/FrameGrabber.svc/FrameRedirect?objectId=${resourceURL.query.id}&mode=Delivery`;
           }
           resourceArr.push({
             title: resource.title,
-            type: resource.type,
+            type: altType || resource.type,
             tags: resource.tags,
             folder: resource.category.toLowerCase(),
             thumbnail: thumbnail,
@@ -79,12 +80,11 @@ class ModuleResources extends React.Component<ResourcesProps, ResourceState> {
       });
     };
     const onFailure = (error: { text: () => Promise<any> }) => {
-			if (error.text){
-				error.text().then((errorText) => {
-					this.setState({ error: errorText, isLoaded: true });
-				});
-			}
-
+      if (error.text) {
+        error.text().then((errorText) => {
+          this.setState({ error: errorText, isLoaded: true });
+        });
+      }
     };
 
     request(api.MATERIALS_RESOURCES, methods.GET, onSuccess, onFailure, {