-
- Your subscription{selectedOrganization.subscriptions.length > 1 ? "s" : ""}
-
-
- {selectedOrganization.subscriptions.reverse().map((sub, index) => {
- return (
-
-
- Type: {sub.level}
- Recurrence: {sub.recurrence}
- {sub.active ?
-
-
- )
+ return (
+
+
+ )
})}
+
+
- {curTab === 1 ? "Add user" : curTab === 7 ? "Add Sub-Organization" : "Add environment"}
+ {curTab === 1 ? "Add user" : curTab === 6 ? "Add Sub-Organization" : "Add environment"}
{curTab === 1 && isCloud ?
@@ -1821,7 +1825,7 @@ const Admin = (props) => {
We'll send an email to invite them to your organization.
:
- curTab === 7 ?
+ curTab === 6 ?
The organization created will become a child of your current organization, and be available to you.
@@ -1876,7 +1880,7 @@ const Admin = (props) => {
}
- : curTab === 7 ?
+ : curTab === 6 ?
- Started: {new Date(sub.startdate*1000).toISOString()}
-
-
- :
-
- Cancelled: {new Date(sub.cancellationdate*1000).toISOString()}
-
- Status: Deactivated
-
-
- }
-
+
+ Your subscription{selectedOrganization.subscriptions.length > 1 ? "s" : ""}
+
+
+ {selectedOrganization.subscriptions.reverse().map((sub, index) => {
+ return (
+
+
+ Type: {sub.level}
+ Recurrence: {sub.recurrence}
+ {sub.active ?
+
+
+ )
+ })}
@@ -1813,7 +1817,7 @@ const Admin = (props) => {
}}
>
+ Started: {new Date(sub.startdate*1000).toISOString()}
+
+
+ :
+
+ Cancelled: {new Date(sub.cancellationdate*1000).toISOString()}
+
+ Status: Deactivated
+
+
+ }
+
Name
{
} else {
submitUser(modalUser)
}
- } else if (curTab === 7) {
+ } else if (curTab === 6) {
createSubOrg(selectedOrganization.id, orgName)
} else if (curTab === 5) {
submitEnvironment(modalUser)
@@ -2513,6 +2517,7 @@ const Admin = (props) => {
bgColor = "#1f2023"
}
+
return (
{
: null
- const organizationsTab = curTab === 7 ?
+ const organizationsTab = curTab === 6 ?
Organizations
@@ -2716,17 +2721,21 @@ const Admin = (props) => {Hybrid
@@ -2836,9 +2861,9 @@ const Admin = (props) => {
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index 87c4830e..ac279bd7 100644
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -1,6 +1,7 @@
import React, { useEffect} from 'react';
import { useInterval } from 'react-powerhooks';
import { makeStyles } from '@material-ui/core/styles';
+import { useTheme } from '@material-ui/core/styles';
import {Avatar, Grid, Paper, Tooltip, Divider, Button, TextField, FormControl, IconButton, Menu, MenuItem, FormControlLabel, Chip, Switch, Typography, Zoom, CircularProgress, Dialog, DialogTitle, DialogActions, DialogContent} from '@material-ui/core';
import {Close as CloseIcon, Compare as CompareIcon, Maximize as MaximizeIcon, Minimize as MinimizeIcon, AddCircle as AddCircleIcon, Toc as TocIcon, Send as SendIcon, Search as SearchIcon, FileCopy as FileCopyIcon, Delete as DeleteIcon, BubbleChart as BubbleChartIcon, Restore as RestoreIcon, Cached as CachedIcon, GetApp as GetAppIcon, Apps as AppsIcon, Edit as EditIcon, MoreVert as MoreVertIcon, PlayArrow as PlayArrowIcon, Add as AddIcon, Publish as PublishIcon, CloudUpload as CloudUploadIcon, CloudDownload as CloudDownloadIcon} from '@material-ui/icons';
@@ -328,6 +329,7 @@ export const validateJson = (showResult) => {
const Workflows = (props) => {
const { globalUrl, isLoggedIn, isLoaded, removeCookie, cookies, userdata} = props;
document.title = "Shuffle - Workflows"
+ const theme = useTheme();
const referenceUrl = globalUrl+"/api/v1/hooks/"
const alert = useAlert()
@@ -391,6 +393,10 @@ const Workflows = (props) => {
return true
} else if (curWorkflow.tags.includes(filter)) {
return true
+ } else if (curWorkflow.owner === filter) {
+ return true
+ } else if (curWorkflow.org_id === filter) {
+ return true
} else if (curWorkflow.actions !== null && curWorkflow.actions !== undefined) {
const newfilter = filter.toLowerCase()
for (var key in curWorkflow.actions) {
@@ -1065,16 +1071,38 @@ const Workflows = (props) => {
parsedName = parsedName.slice(0,26)+".."
}
-
const actions = data.actions !== null ? data.actions.length : 0
const [triggers, schedules, webhooks, subflows] = getWorkflowMeta(data)
+ const imagesize = 22
+ const foundOrg = userdata.orgs.find(org => org.id === data["org_id"])
+
+ //position: "absolute", bottom: 5, right: -5,
+ const imageStyle = {width: imagesize, height: imagesize, pointerEvents: "none", marginRight: 10, marginLeft: data.creator_org !== undefined && data.creator_org.length > 0 ? 20 : 0, borderRadius: 10, border: foundOrg.id === userdata.active_org.id ? `4px solid ${boxColor}` : null, cursor: "pointer", marginRight: 10, }
+
+ //
+ const image = foundOrg.image === "" ?
+ 
+ :
+ 
{
+ //setFilteredWorkflows(newWorkflows)
+ }}/>
+
return (
+
+
{
+ addFilter(foundOrg.id)
+ //setFilters(["Org "+foundOrg.name])
+ //setFilteredWorkflows(newWorkflows)
+ }}>
+ {image}
+
+