#245: Loads of new introduction features, including a basic app selector
This commit is contained in:
@@ -2,7 +2,7 @@ module main
|
|||||||
|
|
||||||
go 1.15
|
go 1.15
|
||||||
|
|
||||||
//replace github.com/shuffle/shuffle-shared => ../../../../git/shuffle-shared
|
replace github.com/shuffle/shuffle-shared => ../../../../git/shuffle-shared
|
||||||
|
|
||||||
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
|
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
|
||||||
//replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch
|
//replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch
|
||||||
|
|||||||
@@ -5765,6 +5765,8 @@ func initHandlers() {
|
|||||||
// App specific
|
// App specific
|
||||||
// From here down isnt checked for org specific
|
// From here down isnt checked for org specific
|
||||||
r.HandleFunc("/api/v1/apps/{appId}/activate", shuffle.ActivateWorkflowApp).Methods("GET", "OPTIONS")
|
r.HandleFunc("/api/v1/apps/{appId}/activate", shuffle.ActivateWorkflowApp).Methods("GET", "OPTIONS")
|
||||||
|
r.HandleFunc("/api/v1/apps/frameworkConfiguration", shuffle.GetFrameworkConfiguration).Methods("GET", "OPTIONS")
|
||||||
|
r.HandleFunc("/api/v1/apps/frameworkConfiguration", shuffle.SetFrameworkConfiguration).Methods("POST", "OPTIONS")
|
||||||
r.HandleFunc("/api/v1/apps/{appId}", shuffle.UpdateWorkflowAppConfig).Methods("PATCH", "OPTIONS")
|
r.HandleFunc("/api/v1/apps/{appId}", shuffle.UpdateWorkflowAppConfig).Methods("PATCH", "OPTIONS")
|
||||||
r.HandleFunc("/api/v1/apps/{appId}", shuffle.DeleteWorkflowApp).Methods("DELETE", "OPTIONS")
|
r.HandleFunc("/api/v1/apps/{appId}", shuffle.DeleteWorkflowApp).Methods("DELETE", "OPTIONS")
|
||||||
r.HandleFunc("/api/v1/apps/{appId}/config", shuffle.GetWorkflowAppConfig).Methods("GET", "OPTIONS")
|
r.HandleFunc("/api/v1/apps/{appId}/config", shuffle.GetWorkflowAppConfig).Methods("GET", "OPTIONS")
|
||||||
|
|||||||
@@ -31,8 +31,7 @@ import MyView from "./views/MyView";
|
|||||||
|
|
||||||
import { createMuiTheme, MuiThemeProvider } from "@material-ui/core/styles";
|
import { createMuiTheme, MuiThemeProvider } from "@material-ui/core/styles";
|
||||||
|
|
||||||
import DetectionFramework from "./components/DetectionFramework.jsx";
|
import FrameworkWrapper from "./views/FrameworkWrapper.jsx";
|
||||||
import FrameworkData from "./components/FrameworkData";
|
|
||||||
import ScrollToTop from "./components/ScrollToTop";
|
import ScrollToTop from "./components/ScrollToTop";
|
||||||
import AlertTemplate from "./components/AlertTemplate";
|
import AlertTemplate from "./components/AlertTemplate";
|
||||||
import { useAlert, positions, Provider } from "react-alert";
|
import { useAlert, positions, Provider } from "react-alert";
|
||||||
@@ -386,8 +385,7 @@ const App = (message, props) => {
|
|||||||
exact
|
exact
|
||||||
path="/detectionframework"
|
path="/detectionframework"
|
||||||
element={
|
element={
|
||||||
<DetectionFramework
|
<FrameworkWrapper
|
||||||
frameworkData={FrameworkData}
|
|
||||||
selectedOption={"Draw"}
|
selectedOption={"Draw"}
|
||||||
showOptions={false}
|
showOptions={false}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -21,6 +21,7 @@ import {
|
|||||||
IconButton,
|
IconButton,
|
||||||
Grid,
|
Grid,
|
||||||
} from "@material-ui/core";
|
} from "@material-ui/core";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
MeetingRoom as MeetingRoomIcon,
|
MeetingRoom as MeetingRoomIcon,
|
||||||
Settings as SettingsIcon,
|
Settings as SettingsIcon,
|
||||||
|
|||||||
@@ -978,8 +978,8 @@ const ParsedAction = (props) => {
|
|||||||
return helperText
|
return helperText
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("AUTH: ", authenticationType)
|
//console.log("AUTH: ", authenticationType)
|
||||||
if (authenticationType.type === "oauth2") {
|
if (authenticationType !== undefined && authenticationType !== null && authenticationType.type === "oauth2") {
|
||||||
return (
|
return (
|
||||||
<Typography variant="body1" color="textSecondary" style={{marginTop: 15}}>
|
<Typography variant="body1" color="textSecondary" style={{marginTop: 15}}>
|
||||||
You must authenticate before using oauth2 apps.
|
You must authenticate before using oauth2 apps.
|
||||||
@@ -1082,7 +1082,7 @@ const ParsedAction = (props) => {
|
|||||||
) {
|
) {
|
||||||
placeholder = data.example;
|
placeholder = data.example;
|
||||||
|
|
||||||
if (data.name === "url" && data.value.length === 0) {
|
if (data.name === "url" && data.value !== undefined && data.value !== null && data.value.length === 0) {
|
||||||
data.value = data.example;
|
data.value = data.example;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -384,6 +384,13 @@ const data = [
|
|||||||
"font-size": "0px",
|
"font-size": "0px",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
selector: "node:selected",
|
||||||
|
css: {
|
||||||
|
"border-color": "#f86a3e",
|
||||||
|
"border-width": "7px",
|
||||||
|
},
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
//{
|
//{
|
||||||
|
|||||||
@@ -90,6 +90,13 @@ const data = [{
|
|||||||
"source-arrow-color": "#337ab7",
|
"source-arrow-color": "#337ab7",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
selector: "node:selected",
|
||||||
|
css: {
|
||||||
|
"border-color": "#f86a3e",
|
||||||
|
"border-width": "3px",
|
||||||
|
},
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
export default data
|
export default data
|
||||||
|
|||||||
@@ -2584,7 +2584,7 @@ const GettingStarted = (props) => {
|
|||||||
<Typography color="textSecondary" variant="body2" style={{marginTop: 5,}} >
|
<Typography color="textSecondary" variant="body2" style={{marginTop: 5,}} >
|
||||||
We help with automation, scaling, training and more. Get involved!
|
We help with automation, scaling, training and more. Get involved!
|
||||||
</Typography>
|
</Typography>
|
||||||
<Link to="" style={{textDecoration: "none",}}>
|
<a href="https://discord.gg/B2CBzUm" style={{textDecoration: "none",}}>
|
||||||
<Button
|
<Button
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
style={{marginTop: 10}}
|
style={{marginTop: 10}}
|
||||||
|
|||||||
Reference in New Issue
Block a user