From 3d25c768bf799f3eae93ab1e7a2c6c0077fb13e2 Mon Sep 17 00:00:00 2001 From: frikky Date: Fri, 4 Mar 2022 03:50:28 +0100 Subject: [PATCH] Added possibility for videos and documentation for usecases to map to workflows --- backend/go-app/go.mod | 2 +- frontend/src/views/Dashboard.jsx | 152 +++++++++++++++++++++++++------ 2 files changed, 123 insertions(+), 31 deletions(-) diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index a0289ae9..5475e9b0 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -2,7 +2,7 @@ module main go 1.16 -//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared +replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi //replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch diff --git a/frontend/src/views/Dashboard.jsx b/frontend/src/views/Dashboard.jsx index 395680b5..08c4687a 100644 --- a/frontend/src/views/Dashboard.jsx +++ b/frontend/src/views/Dashboard.jsx @@ -20,6 +20,8 @@ import { import { Close as CloseIcon, DoneAll as DoneAllIcon, + Description as DescriptionIcon, + PlayArrow as PlayArrowIcon, } from "@material-ui/icons"; import WorkflowPaper from "../components/WorkflowPaper.jsx" @@ -87,8 +89,10 @@ const UsecaseListComponent = ({keys, isCloud}) => { { if (selectedItem) { } else { - setExpandedIndex(index) - setExpandedItem(subindex) + if (subcase.description !== undefined && subcase.description !== null && subcase.description.length > 0) { + setExpandedIndex(index) + setExpandedItem(subindex) + } } }}> { @@ -96,23 +100,67 @@ const UsecaseListComponent = ({keys, isCloud}) => { }}> {!selectedItem ?
- + {subcase.name} - {finished ? - - { - }} +
+ {finished ? + - - - + { + }} + > + + + + : null} + {subcase.blogpost !== null && subcase.blogpost !== undefined && subcase.blogpost.length > 0 ? + + + { + }} + > + + + + + : null} + {subcase.video !== null && subcase.video !== undefined && subcase.video.length > 0 ? + + + { + }} + > + + + + : null} +
:
@@ -122,21 +170,65 @@ const UsecaseListComponent = ({keys, isCloud}) => { Description: {subcase.description} - - { - setExpandedItem(-1) - setExpandedIndex(-1) - }} - > - - - +
+ {subcase.blogpost !== null && subcase.blogpost !== undefined && subcase.blogpost.length > 0 ? + + + { + }} + > + + + + + : null} + {subcase.video !== null && subcase.video !== undefined && subcase.video.length > 0 ? + + + { + }} + > + + + + + : null} + + { + setExpandedItem(-1) + setExpandedIndex(-1) + }} + > + + + +