Merge pull request #1854 from Shuffle/main
Rebase back from main changes
This commit is contained in:
Frikky
GitHub
@@ -18,16 +18,15 @@ The Docker setup is the default setup, and is ran with docker compose. This is [
|
||||
|
||||
**PS: if you're setting up Shuffle on Windows, go to the next step (Windows Docker setup)**
|
||||
|
||||
1. Make sure you have [Docker](https://docs.docker.com/get-docker/) installed, and that you have a minimum of **4Gb of RAM** available.
|
||||
1. Make sure you have [Docker](https://docs.docker.com/get-docker/) and [git](https://git-scm.com/downloads)(for downloading) installed, and that you have a minimum of **4Gb of RAM** available. More RAM = better.
|
||||
2. Download Shuffle
|
||||
```bash
|
||||
git clone https://github.com/Shuffle/Shuffle
|
||||
cd Shuffle
|
||||
```
|
||||
|
||||
3. Fix prerequisites for the Opensearch database (Elasticsearch):
|
||||
3. Fix prerequisites for the Opensearch database (Elasticsearch also works). This requires the `shuffle-database` folder to exist.
|
||||
```bash
|
||||
mkdir shuffle-database # Create a database folder
|
||||
sudo chown -R 1000:1000 shuffle-database # IF you get an error using 'chown', add the user first with 'sudo useradd opensearch'
|
||||
|
||||
sudo swapoff -a # Disable swap
|
||||
@@ -35,7 +34,7 @@ sudo swapoff -a # Disable swap
|
||||
|
||||
4. Run docker-compose.
|
||||
```bash
|
||||
docker-compose up -d
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
5. Recommended for Opensearch to work well
|
||||
|
||||
@@ -20,19 +20,19 @@ jobs:
|
||||
include:
|
||||
- app: frontend
|
||||
path: frontend
|
||||
version: 2.1.0
|
||||
version: 2.1.1
|
||||
experimental: true
|
||||
- app: backend
|
||||
path: backend
|
||||
version: 2.1.0
|
||||
version: 2.1.1
|
||||
experimental: true
|
||||
- app: orborus
|
||||
path: functions/onprem/orborus
|
||||
version: 2.1.0
|
||||
version: 2.1.1
|
||||
experimental: true
|
||||
- app: worker
|
||||
path: functions/onprem/worker
|
||||
version: 2.1.0
|
||||
version: 2.1.1
|
||||
experimental: true
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
@@ -5694,7 +5694,6 @@ func initHandlers() {
|
||||
|
||||
// Had to move away from mux, which means Method is fucked up right now.
|
||||
func main() {
|
||||
|
||||
if os.Getenv("DEBUG") == "true" {
|
||||
debug = true
|
||||
}
|
||||
|
||||
@@ -2173,8 +2173,11 @@ const Workflows2 = (props) => {
|
||||
display: "flex",
|
||||
width: 160,
|
||||
height: 44,
|
||||
marginTop: 5,
|
||||
justifyContent: "space-between",
|
||||
fontFamily: theme.typography?.fontFamily,
|
||||
textAlign: "center",
|
||||
margin: "auto",
|
||||
};
|
||||
|
||||
const exportAllWorkflows = (allWorkflows) => {
|
||||
@@ -3077,8 +3080,8 @@ const Workflows2 = (props) => {
|
||||
}
|
||||
}
|
||||
|
||||
const isPublicWorkflow = data?.objectId === undefined || data?.objectId === null
|
||||
const foundImage = !isPublicWorkflow ? "" : data?.image_url === undefined || data?.image_url === null || data?.image_url === "" ? data?.image : data?.image_url
|
||||
//const isPublicWorkflow = data?.objectID === undefined || data?.objectID === null
|
||||
const foundImage = data?.image_url === undefined || data?.image_url === null || data?.image_url === "" ? data?.image : data?.image_url
|
||||
|
||||
const foundTimeline = workflowTimelines.find((timeline) => timeline.id === data.id)
|
||||
return (
|
||||
@@ -3087,7 +3090,7 @@ const Workflows2 = (props) => {
|
||||
style={{ width: "100%", minWidth: 320, position: "relative", border: highlightIds.includes(data.id) ? "2px solid #f85a3e" : isDistributed || hasSuborgs ? `2px solid ${theme.palette.distributionColor}` : "inherit", borderRadius: theme.palette?.borderRadius, backgroundColor: "#212121", fontFamily: theme.typography?.fontFamily, overflow: "hidden", }}
|
||||
>
|
||||
|
||||
{isPublicWorkflow && foundImage?.length > 0 ?
|
||||
{foundImage?.length > 0 ?
|
||||
<img src={foundImage} alt="image" style={{
|
||||
maxHeight: 250,
|
||||
minHeight: 250,
|
||||
@@ -3096,10 +3099,14 @@ const Workflows2 = (props) => {
|
||||
cursor: "pointer",
|
||||
}}
|
||||
onClick={() => {
|
||||
if (isCloud) {
|
||||
navigate(`/workflows/${data.objectID}`)
|
||||
if (data?.objectID === undefined || data?.objectID === null) {
|
||||
navigate(`/workflows/${data.id}`)
|
||||
} else {
|
||||
window.open(`https://shuffler.io/workflows/${data.objectID}`, "_blank")
|
||||
if (isCloud) {
|
||||
navigate(`/workflows/${data.objectID}`)
|
||||
} else {
|
||||
window.open(`https://shuffler.io/workflows/${data.objectID}`, "_blank")
|
||||
}
|
||||
}
|
||||
}}
|
||||
/>
|
||||
@@ -3221,13 +3228,19 @@ const Workflows2 = (props) => {
|
||||
|
||||
<Typography
|
||||
style={{
|
||||
textAlign: "center",
|
||||
marginBottom: 0,
|
||||
paddingBottom: 0,
|
||||
fontSize: 18,
|
||||
fontSize: 22,
|
||||
maxHeight: 30,
|
||||
flex: 10,
|
||||
|
||||
fontFamily: theme.typography?.fontFamily,
|
||||
fontWeight: 500,
|
||||
minWidth: 375,
|
||||
maxWidth: 375,
|
||||
margin: "auto",
|
||||
overflow: "hidden",
|
||||
}}
|
||||
>
|
||||
<Link
|
||||
@@ -3412,14 +3425,20 @@ const Workflows2 = (props) => {
|
||||
</span>
|
||||
</Tooltip>
|
||||
</Grid>
|
||||
|
||||
<Grid
|
||||
item
|
||||
style={{
|
||||
justifyContent: "left",
|
||||
overflow: "hidden",
|
||||
marginTop: 8,
|
||||
marginTop: 13,
|
||||
maxHeight: 35,
|
||||
fontFamily: theme.typography?.fontFamily,
|
||||
|
||||
textAlign: "center",
|
||||
minWidth: 200,
|
||||
maxWidth: 200,
|
||||
margin: "auto",
|
||||
}}
|
||||
>
|
||||
{data.tags !== undefined && data.tags !== null
|
||||
|
||||
Reference in New Issue
Block a user