marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added styling to all workflow actions

Browse Source
This commit is contained in:
frikky
2021-05-30 15:46:15 +02:00
parent 49453f6041
commit 23d120947a
9 changed files with 210 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app_sdk/app_base.py
+43 -9
View File
@@ -1345,7 +1345,9 @@ class AppBase:
print("[INFO] After second return")
if len(parsersplit) == 1:
return str(baseresult)+str(appendresult), False
returndata = str(baseresult)+str(appendresult)
print("RETURNING: %s" % returndata)
return returndata, False
baseresult = baseresult.replace(" True,", " true,")
baseresult = baseresult.replace(" False", " false,")
@@ -1365,7 +1367,15 @@ class AppBase:
print("[INFO] After fourth parser return as JSON")
data, is_loop = recurse_json(basejson, parsersplit[1:])
parseditem = data
print("DATA: %s" % data)
if isinstance(parseditem, dict) or isinstance(parseditem, list):
try:
parseditem = json.dumps(parseditem)
except json.decoder.JSONDecodeError as e:
print("Parseditem issue: %s" % e)
pass
print("DATA: (%s) %s" % (type(data), data))
if is_loop:
print("DATA IS A LOOP - SHOULD WRAP")
if parsersplit[-1] == "#":
@@ -1376,8 +1386,18 @@ class AppBase:
print("SET DATA WRAPPER TO %s!" % parsersplit[-1])
parseditem = "${%s%s}$" % (parsersplit[-1], json.dumps(data))
print("Before last return with %s" % appendresult)
return str(parseditem)+str(appendresult), is_loop
returndata = str(parseditem)+str(appendresult)
# New in 0.8.97: Don't return items without lists
print("RETURNDATA: %s" % returndata)
#return returndata, is_loop
try:
return json.dumps(json.loads(returndata)), is_loop
except json.decoder.JSONDecodeError as e:
print("Error in decoder: %s" % e)
return returndata, is_loop
# Parses parameters sent to it and returns whether it did it successfully with the values found
def parse_params(action, fullexecution, parameter):
@@ -1415,13 +1435,13 @@ class AppBase:
elif isinstance(value, dict) or isinstance(value, list):
# Changed from JSON dump to str() 28.05.2021
# This makes it so the parameters gets lists and dicts straight up
#parameter["value"] = parameter["value"].replace(to_be_replaced, json.dumps(value))
try:
parameter["value"] = parameter["value"].replace(to_be_replaced, str(value))
except:
parameter["value"] = parameter["value"].replace(to_be_replaced, json.dumps(value))
print("Failed parsing value as string?")
#try:
# parameter["value"] = parameter["value"].replace(to_be_replaced, str(value))
#except:
# parameter["value"] = parameter["value"].replace(to_be_replaced, json.dumps(value))
# print("Failed parsing value as string?")
else:
print("Unknown type %s" % type(value))
try:
@@ -1947,6 +1967,13 @@ class AppBase:
params[parameter["name"]] = resultarray
multi_parameters[parameter["name"]] = resultarray
if len(resultarray) == 0:
print("[WARNING] Returning empty array because the array length to be looped is 0 (1)")
action_result["status"] = "SUCCESS"
action_result["result"] = "[]"
self.send_result(action_result, headers, stream_path)
return
multi_execution_lists.append(new_replacement)
#print("MULTI finished: %s" % json_replacement)
else:
@@ -2031,6 +2058,13 @@ class AppBase:
# With this parameter ready, add it to... a greater list of parameters. Rofl
print("LENGTH OF ARR: %d" % len(resultarray))
if len(resultarray) == 0:
print("[WARNING] Returning empty array because the array length to be looped is 0 (0)")
action_result["status"] = "SUCCESS"
action_result["result"] = "[]"
self.send_result(action_result, headers, stream_path)
return
#print("RESULTARRAY: %s" % resultarray)
if resultarray not in multi_execution_lists:
multi_execution_lists.append(resultarray)
docker-compose.yml
+2 -2
View File
@@ -59,7 +59,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock
environment:
- SHUFFLE_APP_SDK_VERSION=0.8.97
- SHUFFLE_WORKER_VERSION=0.8.97
- SHUFFLE_WORKER_VERSION=nightly
- ORG_ID=${ORG_ID}
- ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
- BASE_URL=http://${OUTER_HOSTNAME}:${BACKEND_PORT}
@@ -85,7 +85,7 @@ services:
- discovery.seed_hosts=shuffle-opensearch
- cluster.initial_master_nodes=shuffle-opensearch
- bootstrap.memory_lock=true
- "OPENSEARCH_JAVA_OPTS=-Xms2048m -Xmx2048m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
- "OPENSEARCH_JAVA_OPTS=-Xms1024m -Xmx1024m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
- cluster.routing.allocation.disk.threshold_enabled=false
- opendistro_security.disabled=true
ulimits:
frontend/package.json
+1 -1
View File
@@ -15,7 +15,7 @@
"cache-base": "^4.0.0",
"class-transformer": "^0.3.1",
"create-react-app": "^2.0.3",
"cytoscape": "^3.11.0",
"cytoscape": "^3.19.0",
"cytoscape-clipboard": "^2.2.1",
"cytoscape-cxtmenu": "^3.1.1",
"cytoscape-edgehandles": "^3.6.0",
frontend/src/components/ConfigureWorkflow.jsx
+6
View File
@@ -65,6 +65,12 @@ const Workflow = (props) => {
return null
}
if (apps === undefined || apps === null || apps.length === 0) {
console.log("No apps loaded: ", apps)
setConfigureWorkflowModalOpen(false)
return null
}
setFirstLoad(workflow.id)
const newactions = []
for (var key in workflow.actions) {
frontend/src/components/ParsedAction.jsx
+2
View File
@@ -1515,6 +1515,7 @@ const ParsedAction = (props) => {
if (newValue !== undefined && newValue !== null) {
setNewSelectedAction({"target": {"value": newValue.name}})
}
}}
renderOption={(data) => {
var newActionname = data.name
@@ -1524,6 +1525,7 @@ const ParsedAction = (props) => {
const iconInfo = GetIconInfo({"name": data.name})
const useIcon = iconInfo.originalIcon
newActionname = (newActionname.charAt(0).toUpperCase()+newActionname.substring(1)).replaceAll("_", " ")
return (
frontend/src/defaultCytoscapeStyle.js
+9 -1
View File
@@ -50,7 +50,13 @@ const data = [{
'height': '30px',
'z-index': 5000,
'font-size': '0px',
},
'background-width': '75%',
'background-height': '75%',
'background-color': 'data(iconBackground)',
'background-fill': 'data(fillstyle)',
'background-gradient-direction': 'to-right',
'background-gradient-stop-colors': 'data(fillGradient)',
}
},
{
selector: `node[app_name="Testing"]`,
@@ -156,6 +162,8 @@ const data = [{
'width': '80px',
'height': '80px',
'font-size': '18px',
'background-width': '100%',
'background-height': '100%',
},
},
{
frontend/src/views/AngularWorkflow.jsx
+62 -1
View File
@@ -2193,6 +2193,20 @@ const AngularWorkflow = (props) => {
cy.add(edgeToBeAdded)
}
if (nodedata.app_name === "Shuffle Tools") {
const iconInfo = GetIconInfo(nodedata)
const svg_pin = `<svg width="${svgSize}" height="${svgSize}" viewBox="0 0 ${svgSize} ${svgSize}" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="${iconInfo.icon}" fill="${iconInfo.iconColor}"></path></svg>`
const svgpin_Url = encodeURI("data:image/svg+xml;utf-8," + svg_pin)
nodedata.large_image = svgpin_Url
nodedata.fillGradient = iconInfo.fillGradient
nodedata.fillstyle = "solid"
if (nodedata.fillGradient !== undefined && nodedata.fillGradient !== null && nodedata.fillGradient.length > 0) {
nodedata.fillstyle = 'linear-gradient'
} else {
nodedata.iconBackground = iconInfo.iconBackgroundColor
}
}
if (workflow.actions === undefined || workflow.actions === null) {
workflow.actions = [nodedata]
} else {
@@ -2882,6 +2896,25 @@ const AngularWorkflow = (props) => {
const setupGraph = () => {
const actions = workflow.actions.map(action => {
const node = {}
if (!action.isStartNode && action.app_name === "Shuffle Tools") {
const iconInfo = GetIconInfo(action)
const svg_pin = `<svg width="${svgSize}" height="${svgSize}" viewBox="0 0 ${svgSize} ${svgSize}" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="${iconInfo.icon}" fill="${iconInfo.iconColor}"></path></svg>`
const svgpin_Url = encodeURI("data:image/svg+xml;utf-8," + svg_pin)
action.large_image = svgpin_Url
action.fillGradient = iconInfo.fillGradient
action.fillstyle = "solid"
if (action.fillGradient !== undefined && action.fillGradient !== null && action.fillGradient.length > 0) {
action.fillstyle = 'linear-gradient'
//console.log("GRADIENT!: ", action)
//action.fillstyle =
//'background-fill': 'data(fillstyle)',
} else {
action.iconBackground = iconInfo.iconBackgroundColor
}
//console.log("FOUND NODE INFO: ", action)
}
node.position = action.position
node.data = action
@@ -2902,7 +2935,9 @@ const AngularWorkflow = (props) => {
const decoratorNodes = workflow.actions.map(action => {
if (!action.isStartNode) {
if (action.app_name === "Testing" || action.app_name === "Shuffle Tools") {
if (action.app_name === "Testing") {
return null
} else if (action.app_name === "Shuffle Tools") {
return null
}
}
@@ -4017,6 +4052,32 @@ const AngularWorkflow = (props) => {
selectedAction.isValid = true
selectedAction.is_valid = true
if (selectedAction.app_name === "Shuffle Tools") {
const iconInfo = GetIconInfo(selectedAction)
console.log("ICONINFO: ", iconInfo)
const svg_pin = `<svg width="${svgSize}" height="${svgSize}" viewBox="0 0 ${svgSize} ${svgSize}" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="${iconInfo.icon}" fill="${iconInfo.iconColor}"></path></svg>`
const svgpin_Url = encodeURI("data:image/svg+xml;utf-8," + svg_pin)
selectedAction.large_image = svgpin_Url
selectedAction.fillGradient = iconInfo.fillGradient
selectedAction.fillstyle = "solid"
if (selectedAction.fillGradient !== undefined && selectedAction.fillGradient !== null && selectedAction.fillGradient.length > 0) {
selectedAction.fillstyle = 'linear-gradient'
console.log("GRADIENT!: ", selectedAction)
//action.fillstyle =
//'background-fill': 'data(fillstyle)',
} else {
selectedAction.iconBackground = iconInfo.iconBackgroundColor
}
const foundnode = cy.getElementById(selectedAction.id)
if (foundnode !== null && foundnode !== undefined) {
console.log("UPDATING NODE!")
foundnode.data(selectedAction)
}
}
console.log("ACTION: ", selectedAction)
if (newaction.returns.example !== undefined && newaction.returns.example !== null && newaction.returns.example.length > 0) {
selectedAction.example = newaction.returns.example
}
frontend/src/views/Workflows.jsx
+82 -20
View File
@@ -6,6 +6,7 @@ import {Avatar, Grid, Paper, Tooltip, Divider, Button, TextField, FormControl, I
import {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';
//import {Search as SearchIcon, ArrowUpward as ArrowUpwardIcon, Visibility as VisibilityIcon, Done as DoneIcon, Close as CloseIcon, Error as ErrorIcon, FindReplace as FindreplaceIcon, ArrowLeft as ArrowLeftIcon, Cached as CachedIcon, DirectionsRun as DirectionsRunIcon, Add as AddIcon, Polymer as PolymerIcon, FormatListNumbered as FormatListNumberedIcon, Create as CreateIcon, PlayArrow as PlayArrowIcon, AspectRatio as AspectRatioIcon, MoreVert as MoreVertIcon, Apps as AppsIcon, Schedule as ScheduleIcon, FavoriteBorder as FavoriteBorderIcon, Pause as PauseIcon, Delete as DeleteIcon, AddCircleOutline as AddCircleOutlineIcon, Save as SaveIcon, KeyboardArrowLeft as KeyboardArrowLeftIcon, KeyboardArrowRight as KeyboardArrowRightIcon, ArrowBack as ArrowBackIcon, Settings as SettingsIcon, LockOpen as LockOpenIcon, ExpandMore as ExpandMoreIcon, VpnKey as VpnKeyIcon} from '@material-ui/icons';
//https://next.material-ui.com/components/material-icons/
import {DataGrid, GridToolbarContainer, GridDensitySelector, GridToolbar} from '@material-ui/data-grid';
//import JSONPretty from 'react-json-pretty';
@@ -25,6 +26,7 @@ import CytoscapeWrapper from '../components/RenderCytoscape'
const inputColor = "#383B40"
const surfaceColor = "#27292D"
const svgSize = 24
const flexContainerStyle = {
display: "flex",
@@ -81,17 +83,22 @@ const useStyles = makeStyles((theme) => ({
export const GetIconInfo = (action) => {
// Finds the icon based on the action. Should be verbs.
const iconList = [
{"key": "cache_add", "values": ["set_cache"]},
{"key": "cache_get", "values": ["get_cache"]},
{"key": "filter", "values": ["filter"]},
{"key": "merge", "values": ["join", "merge"]},
{"key": "search", "values": ["search", "find", "locate"]},
{"key": "list", "values": ["list", "head", "options"]},
{"key": "download", "values": ["get", "download", "return", "hello_world", "curl",]},
{"key": "search", "values": ["search", "find"]},
{"key": "add", "values": ["add"]},
{"key": "delete", "values": ["delete", "remove"]},
{"key": "send", "values": ["send", "dispatch", "mail", "forward", "post", "submit", "mark", "set"]},
{"key": "repeat", "values": ["repeat", "retry", "pause",]},
{"key": "execute", "values": ["execute", "run", "play", "raise",]},
{"key": "extract", "values": ["extract", "unpack", "decompress"]},
{"key": "inflate", "values": ["inflate", "pack", "compress",]},
{"key": "edit", "values": ["update", "create", "edit", "put", "patch", "change", "parse", "replace", "filter", "conver", "map", "format", "escape"]},
{"key": "compare", "values": ["compare", "convert", "to", "filter", "translate", ]},
{"key": "list", "values": ["list", "head", "options"]},
{"key": "edit", "values": ["update", "create", "edit", "put", "patch", "change", "replace", "conver", "map", "format", "escape"]},
{"key": "compare", "values": ["compare", "convert", "to", "filter", "translate", "parse"]},
]
var selectedKey = ""
@@ -99,77 +106,118 @@ export const GetIconInfo = (action) => {
} else {
const actionname = action.name.toLowerCase()
for (var key in iconList) {
//console.log(iconList[key], actionname)
const found = iconList[key].values.find(value => actionname.includes(value))
if (found !== null && found !== undefined) {
//console.log("FOUND: ", found)
selectedKey = iconList[key].key
break
}
}
}
//console.log("KEY!!: ", selectedKey)
// Some of these are manually parsed or created instead of material ui
//M8 0C3.58 0 0 1.79 0 4C0 6.21 3.58 8 8 8C12.42 8 16 6.21 16 4C16 1.79 12.42 0 8 0ZM0 6V9C0 11.21 3.58 13 8 13C12.42 13 16 11.21 16 9V6C16 8.21 12.42 10 8 10C3.58 10 0 8.21 0 6ZM0 11V14C0 16.21 3.58 18 8 18C9.41 18 10.79 17.81 12 17.46V14.46C10.79 14.81 9.41 15 8 15C3.58 15 0 13.21 0 11ZM17 11V14H14V16H17V19H19V16H22V14H19V11
//https://www.figma.com/file/uCfnMs5w6wnLx6ehPHEV74/Figma-Material-Design-System-v3_0?node-id=834%3A21
//COLORS: https://www.pinterest.co.uk/pin/326299935499972946/
const defaultColor = "#f76b1c"
const defaultGradient = ["#fad961", "#f76b1c"]
const parsedIcons = {
"cache_add": {
"icon": "M11 3C6.58 3 3 4.79 3 7C3 9.21 6.58 11 11 11C15.42 11 19 9.21 19 7C19 4.79 15.42 3 11 3ZM3 9V12C3 14.21 6.58 16 11 16C15.42 16 19 14.21 19 12V9C19 11.21 15.42 13 11 13C6.58 13 3 11.21 3 9ZM3 14V17C3 19.21 6.58 21 11 21C12.41 21 13.79 20.81 15 20.46V17.46C13.79 17.81 12.41 18 11 18C6.58 18 3 16.21 3 14ZM20 14V17H17V19H20V22H22V19H25V17H22V14",
"iconColor": "white",
"iconBackgroundColor": "#8acc3f",
"originalIcon": "",
"fillGradient": ["#8acc3f", "#459622"]
},
"cache_get": {
"icon": "M12 2C7.58 2 4 3.79 4 6C4 8.06 7.13 9.74 11.15 9.96C12.45 8.7 14.19 8 16 8C16.8 8 17.59 8.14 18.34 8.41C19.37 7.74 20 6.91 20 6C20 3.79 16.42 2 12 2ZM4 8V11C4 12.68 6.08 14.11 9 14.71C9.06 13.7 9.32 12.72 9.77 11.82C6.44 11.34 4 9.82 4 8ZM15.93 9.94C14.75 9.95 13.53 10.4 12.46 11.46C8.21 15.71 13.71 22.5 18.75 19.17L23.29 23.71L24.71 22.29L20.17 17.75C22.66 13.97 19.47 9.93 15.93 9.94ZM15.9 12C17.47 11.95 19 13.16 19 15C19 15.7956 18.6839 16.5587 18.1213 17.1213C17.5587 17.6839 16.7956 18 16 18C13.33 18 12 14.77 13.88 12.88C14.47 12.29 15.19 12 15.9 12ZM4 13V16C4 18.05 7.09 19.72 11.06 19.95C10.17 19.07 9.54 17.95 9.22 16.74C6.18 16.17 4 14.72 4 13Z",
"iconColor": "white",
"iconBackgroundColor": "#8acc3f",
"originalIcon": "",
"fillGradient": ["#8acc3f", "#459622"]
},
"repeat": {
"icon": "M19 8l-4 4h3c0 3.31-2.69 6-6 6-1.01 0-1.97-.25-2.8-.7l-1.46 1.46C8.97 19.54 10.43 20 12 20c4.42 0 8-3.58 8-8h3l-4-4zM6 12c0-3.31 2.69-6 6-6 1.01 0 1.97.25 2.8.7l1.46-1.46C15.03 4.46 13.57 4 12 4c-4.42 0-8 3.58-8 8H1l4 4 4-4H6z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": defaultColor,
"originalIcon": <CachedIcon />,
},
"add": {
"icon": "M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
"iconColor": "white",
"iconBackgroundColor": defaultColor,
"originalIcon": <AddIcon />,
},
"edit": {
"icon": "M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.9959.9959 0 00-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": defaultColor,
"originalIcon": <EditIcon />,
},
"filter": {
"icon": "M4.25 5.61C6.27 8.2 10 13 10 13v6c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-6s3.72-4.8 5.74-7.39c.51-.66.04-1.61-.79-1.61H5.04c-.83 0-1.3.95-.79 1.61z",
"iconColor": "white",
"iconBackgroundColor": "#f5515f",
"originalIcon": "",
"fillGradient": ["#f5515f", "#a1051d"],
},
"merge": {
"icon": "M17 20.41 18.41 19 15 15.59 13.59 17 17 20.41zM7.5 8H11v5.59L5.59 19 7 20.41l6-6V8h3.5L12 3.5 7.5 8z",
"iconColor": "white",
"iconBackgroundColor": "#f5515f",
"originalIcon": "",
"fillGradient": ["#f5515f", "#a1051d"],
},
"compare": {
"icon": "M10 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h5v2h2V1h-2v2zm0 15H5l5-6v6zm9-15h-5v2h5v13l-5-6v9h5c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": defaultColor,
"originalIcon": <CompareIcon />,
},
"extract": {
"icon": "M3 3h18v2H3z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": defaultColor,
"originalIcon": <MaximizeIcon />,
},
"inflate": {
"icon": "M6 19h12v2H6z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": defaultColor,
"originalIcon": <MinimizeIcon />,
},
"list": {
"icon": "M3 9h14V7H3v2zm0 4h14v-2H3v2zm0 4h14v-2H3v2zm16 0h2v-2h-2v2zm0-10v2h2V7h-2zm0 6h2v-2h-2v2z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": defaultColor,
"originalIcon": <TocIcon />,
},
"execute": {
"icon": "M8 5v14l11-7z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": defaultColor,
"originalIcon": <PlayArrowIcon />,
},
"delete": {
"icon": "M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": "#03030e",
"originalIcon": <DeleteIcon />,
"fillGradient": ["#03030e", "#205d66"]
},
"send": {
"icon": "M2.01 21L23 12 2.01 3 2 10l15 2-15 2z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": "#0373da",
"originalIcon": <SendIcon />,
"fillGradient": ["#0bc8bf", "#0373da"]
},
"download": {
"icon": "M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z",
"iconColor": "white",
"iconBackgroundColor": "orange",
"iconBackgroundColor": "#0373da",
"originalIcon": <GetAppIcon />,
"fillGradient": ["#0bc8bf", "#0373da"]
},
"search": {
"icon": "M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z",
@@ -179,7 +227,8 @@ export const GetIconInfo = (action) => {
}
}
const selectedItem = parsedIcons[selectedKey]
var selectedItem = parsedIcons[selectedKey]
if (selectedItem === undefined || selectedItem === null) {
return {
"icon": "",
@@ -189,8 +238,21 @@ export const GetIconInfo = (action) => {
}
}
if (parsedIcons[selectedKey].icon === "") {
console.log(`MISSING PATH FOR ${selectedKey} (find in scope): `, parsedIcons[selectedKey].originalIcon.type.type)
if (selectedItem.fillGradient === undefined) {
selectedItem.fillGradient = defaultGradient
selectedItem.iconBackgroundColor = defaultColor
}
if (selectedItem.icon === "" || selectedItem.icon === undefined) {
console.log(`MISSING PATH FOR ${selectedKey} (find in scope): `, selectedItem.originalIcon.type.type)
}
if (selectedItem.originalIcon === undefined || selectedItem.originalIcon === "" && (selectedItem.icon !== "" && selectedItem.icon !== undefined)) {
const svg_pin = <svg width={svgSize} height={svgSize} viewBox={`0 0 ${svgSize} ${svgSize}`} version="1.1" xmlns="http://www.w3.org/2000/svg"><path d={selectedItem.icon} fill={selectedItem.iconColor}></path></svg>
//const svgpin_Url = encodeURI("data:image/svg+xml;utf-8," + svg_pin)
selectedItem.originalIcon = svg_pin
//parsedIcons[selectedKey].originalIcon = svg_pin
//console.log("ADDED ICON: ", svg_pin)
}
return selectedItem
functions/onprem/orborus/orborus.go
+2 -2
View File
@@ -250,11 +250,11 @@ func initializeImages() {
ctx := context.Background()
if appSdkVersion == "" {
appSdkVersion = "0.8.82"
appSdkVersion = "0.8.97"
log.Printf("[WARNING] SHUFFLE_APP_SDK_VERSION not defined. Defaulting to %s", appSdkVersion)
}
if workerVersion == "" {
workerVersion = "0.8.82"
workerVersion = "nighty"
log.Printf("[WARNING] SHUFFLE_WORKER_VERSION not defined. Defaulting to %s", workerVersion)
}