Added example modal to popup windows
This commit is contained in:
@@ -18,13 +18,6 @@ cd Shuffle
|
|||||||
3. Fix prerequisites for the Opensearch database (Elasticsearch):
|
3. Fix prerequisites for the Opensearch database (Elasticsearch):
|
||||||
```
|
```
|
||||||
sudo chown 1000:1000 -R shuffle-database # Required for Opensearch
|
sudo chown 1000:1000 -R shuffle-database # Required for Opensearch
|
||||||
sudo sysctl -w vm.max_map_count=262144 # https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html
|
|
||||||
|
|
||||||
# To make the changes permanent, do:
|
|
||||||
# 1. Open the file /etc/sysctl.conf
|
|
||||||
# 2. Go to the bottom of the file
|
|
||||||
# 3. Add this line:
|
|
||||||
vm.max_map_count=262144
|
|
||||||
```
|
```
|
||||||
|
|
||||||
4. Run docker-compose.
|
4. Run docker-compose.
|
||||||
@@ -49,23 +42,6 @@ This step is for setting up with Docker on windows from scratch.
|
|||||||
OUTER_HOSTNAME=YOUR.IP.HERE
|
OUTER_HOSTNAME=YOUR.IP.HERE
|
||||||
```
|
```
|
||||||
|
|
||||||
5. Configure max memory (WSL) by opening a new CMD/Powershell window. Run each command one-by-one, or else installation might not work. (Required for fixing consistent restart of Elasticsearch issue in Windows Operation System).
|
|
||||||
```
|
|
||||||
wsl -d docker-desktop
|
|
||||||
```
|
|
||||||
```
|
|
||||||
sysctl -w vm.max_map_count=262144
|
|
||||||
```
|
|
||||||
```
|
|
||||||
echo "vm.max_map_count = 262144" > /etc/sysctl.d/99-docker-desktop.conf
|
|
||||||
```
|
|
||||||
```
|
|
||||||
echo -e "\nvm.max_map_count = 262144\n" >> /etc/sysctl.d/00-alpine.conf
|
|
||||||
```
|
|
||||||
```
|
|
||||||
# https://stackoverflow.com/questions/42111566/elasticsearch-in-windows-docker-image-vm-max-map-count
|
|
||||||
```
|
|
||||||
|
|
||||||
6. Run docker-compose
|
6. Run docker-compose
|
||||||
```
|
```
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
|
|||||||
@@ -4978,6 +4978,7 @@ func handleStopCloudSync(syncUrl string, org shuffle.Org) (*shuffle.Org, error)
|
|||||||
return &org, err
|
return &org, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FIXME: If it says bad API-key, stop cloud sync for the Org
|
||||||
if newresp.StatusCode != 200 {
|
if newresp.StatusCode != 200 {
|
||||||
return &org, errors.New(fmt.Sprintf("Got status code %d when disabling org remotely. Expected 200. Contact support.", newresp.StatusCode))
|
return &org, errors.New(fmt.Sprintf("Got status code %d when disabling org remotely. Expected 200. Contact support.", newresp.StatusCode))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -901,7 +901,7 @@ func runWorkflowExecutionTransaction(ctx context.Context, attempts int64, workfl
|
|||||||
//log.Printf("BASE LENGTH: %d", len(workflowExecution.Results))
|
//log.Printf("BASE LENGTH: %d", len(workflowExecution.Results))
|
||||||
workflowExecution, dbSave, err := shuffle.ParsedExecutionResult(ctx, *workflowExecution, actionResult, false)
|
workflowExecution, dbSave, err := shuffle.ParsedExecutionResult(ctx, *workflowExecution, actionResult, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("[ERROR] Failed execution of parsedexecution: %s", err)
|
log.Printf("[ERROR] Failed running of parsedexecution: %s", err)
|
||||||
resp.WriteHeader(401)
|
resp.WriteHeader(401)
|
||||||
resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting execution"}`)))
|
resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed getting execution"}`)))
|
||||||
return
|
return
|
||||||
@@ -3865,6 +3865,7 @@ func IterateAppGithubFolders(ctx context.Context, fs billy.Filesystem, dir []os.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(buildLaterList) > 0 {
|
||||||
log.Printf("[INFO] Starting build of %d skipped docker images", len(buildLaterList))
|
log.Printf("[INFO] Starting build of %d skipped docker images", len(buildLaterList))
|
||||||
for _, item := range buildLaterList {
|
for _, item := range buildLaterList {
|
||||||
err = buildImageMemory(fs, item.Tags, item.Extra, true)
|
err = buildImageMemory(fs, item.Tags, item.Extra, true)
|
||||||
@@ -3879,6 +3880,7 @@ func IterateAppGithubFolders(ctx context.Context, fs billy.Filesystem, dir []os.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return buildLaterFirst, buildLaterList, err
|
return buildLaterFirst, buildLaterList, err
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -62,7 +62,7 @@ services:
|
|||||||
- SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
|
- SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
|
||||||
- SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
|
- SHUFFLE_PASS_APP_PROXY=${SHUFFLE_PASS_APP_PROXY}
|
||||||
- SHUFFLE_ORBORUS_EXECUTION_TIMEOUT=600
|
- SHUFFLE_ORBORUS_EXECUTION_TIMEOUT=600
|
||||||
- SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=50
|
- SHUFFLE_ORBORUS_EXECUTION_CONCURRENCY=15
|
||||||
- CLEANUP=${SHUFFLE_CONTAINER_AUTO_CLEANUP}
|
- CLEANUP=${SHUFFLE_CONTAINER_AUTO_CLEANUP}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
opensearch:
|
opensearch:
|
||||||
|
|||||||
@@ -54,6 +54,9 @@ const ParsedAction = (props) => {
|
|||||||
|
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const classes = useStyles()
|
const classes = useStyles()
|
||||||
|
|
||||||
|
const [expansionModalOpen, setExpansionModalOpen] = React.useState(false);
|
||||||
|
|
||||||
const keywords = ["len(", "lower(", "upper(", "trim(", "split(", "length(", "number(", "parse(", "join("]
|
const keywords = ["len(", "lower(", "upper(", "trim(", "split(", "length(", "number(", "parse(", "join("]
|
||||||
const getParents = (action) => {
|
const getParents = (action) => {
|
||||||
if (cy === undefined) {
|
if (cy === undefined) {
|
||||||
@@ -869,7 +872,8 @@ const ParsedAction = (props) => {
|
|||||||
fullWidth
|
fullWidth
|
||||||
multiline={multiline}
|
multiline={multiline}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
//console.log("Clicked field: ", clickedFieldId)
|
console.log("Clicked field: ", clickedFieldId)
|
||||||
|
setExpansionModalOpen(false)
|
||||||
if (setScrollConfig !== undefined && scrollConfig !== null && scrollConfig !== undefined && scrollConfig.selected !== clickedFieldId) {
|
if (setScrollConfig !== undefined && scrollConfig !== null && scrollConfig !== undefined && scrollConfig.selected !== clickedFieldId) {
|
||||||
scrollConfig.selected = clickedFieldId
|
scrollConfig.selected = clickedFieldId
|
||||||
setScrollConfig(scrollConfig)
|
setScrollConfig(scrollConfig)
|
||||||
@@ -1420,6 +1424,27 @@ const ParsedAction = (props) => {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const expansionModal =
|
||||||
|
<Dialog modal
|
||||||
|
open={expansionModalOpen}
|
||||||
|
onClose={() => {
|
||||||
|
setExpansionModalOpen(false)
|
||||||
|
}}
|
||||||
|
PaperProps={{
|
||||||
|
style: {
|
||||||
|
backgroundColor: theme.palette.surfaceColor,
|
||||||
|
color: "white",
|
||||||
|
minWidth: 600,
|
||||||
|
padding: 50,
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<DialogTitle><span style={{color: "white"}}>Workflow Variable</span></DialogTitle>
|
||||||
|
<DialogContent>
|
||||||
|
Hello
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
|
||||||
//const CustomPopper = function (props) {
|
//const CustomPopper = function (props) {
|
||||||
// const classes = useStyles()
|
// const classes = useStyles()
|
||||||
// return <Popper {...props} className={classes.root} placement="bottom" />
|
// return <Popper {...props} className={classes.root} placement="bottom" />
|
||||||
@@ -1428,6 +1453,7 @@ const ParsedAction = (props) => {
|
|||||||
const baselabel = selectedAction.label
|
const baselabel = selectedAction.label
|
||||||
return (
|
return (
|
||||||
<div style={appApiViewStyle} id="parsed_action_view">
|
<div style={appApiViewStyle} id="parsed_action_view">
|
||||||
|
{expansionModal}
|
||||||
{hideExtraTypes === true ? null :
|
{hideExtraTypes === true ? null :
|
||||||
<span>
|
<span>
|
||||||
<div style={{display: "flex", minHeight: 40, marginBottom: 30}}>
|
<div style={{display: "flex", minHeight: 40, marginBottom: 30}}>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ require (
|
|||||||
github.com/docker/docker v20.10.5+incompatible
|
github.com/docker/docker v20.10.5+incompatible
|
||||||
github.com/docker/go-connections v0.4.0 // indirect
|
github.com/docker/go-connections v0.4.0 // indirect
|
||||||
github.com/docker/go-units v0.4.0 // indirect
|
github.com/docker/go-units v0.4.0 // indirect
|
||||||
github.com/frikky/shuffle-shared v0.0.88
|
github.com/frikky/shuffle-shared v0.0.95
|
||||||
github.com/fsouza/go-dockerclient v1.7.2
|
github.com/fsouza/go-dockerclient v1.7.2
|
||||||
github.com/go-git/go-billy/v5 v5.3.1 // indirect
|
github.com/go-git/go-billy/v5 v5.3.1 // indirect
|
||||||
github.com/go-git/go-git/v5 v5.4.2 // indirect
|
github.com/go-git/go-git/v5 v5.4.2 // indirect
|
||||||
|
|||||||
Reference in New Issue
Block a user