From b4e1d1c161e43766cd8d09feb2a2f54f17b76da1 Mon Sep 17 00:00:00 2001 From: Frikky Date: Mon, 20 Oct 2025 13:10:26 +0200 Subject: [PATCH 1/7] Update install-guide.md --- .github/install-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/install-guide.md b/.github/install-guide.md index cf2186e6..67ada37a 100755 --- a/.github/install-guide.md +++ b/.github/install-guide.md @@ -18,7 +18,7 @@ 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 From a836d7c0fe44ecf2398828d0b124c412d0ab276c Mon Sep 17 00:00:00 2001 From: Frikky Date: Mon, 20 Oct 2025 13:12:16 +0200 Subject: [PATCH 2/7] Fix prerequisites for Opensearch database setup Updated instructions for setting up the Opensearch database. --- .github/install-guide.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/install-guide.md b/.github/install-guide.md index 67ada37a..5010c671 100755 --- a/.github/install-guide.md +++ b/.github/install-guide.md @@ -27,7 +27,6 @@ cd Shuffle 3. Fix prerequisites for the Opensearch database (Elasticsearch): ```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 From fedfa80d27b4ae0372c4ad84fd9aadb991d478f1 Mon Sep 17 00:00:00 2001 From: Frikky Date: Mon, 20 Oct 2025 13:12:45 +0200 Subject: [PATCH 3/7] Update install-guide.md --- .github/install-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/install-guide.md b/.github/install-guide.md index 5010c671..d7b50a35 100755 --- a/.github/install-guide.md +++ b/.github/install-guide.md @@ -25,7 +25,7 @@ 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 sudo chown -R 1000:1000 shuffle-database # IF you get an error using 'chown', add the user first with 'sudo useradd opensearch' From 7e5086f79ba182cdef3b5d3fe352f5cb22564674 Mon Sep 17 00:00:00 2001 From: Frikky Date: Mon, 20 Oct 2025 13:13:15 +0200 Subject: [PATCH 4/7] Change 'docker-compose' to 'docker compose' Update docker-compose command to use the new syntax. --- .github/install-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/install-guide.md b/.github/install-guide.md index d7b50a35..113ac1fc 100755 --- a/.github/install-guide.md +++ b/.github/install-guide.md @@ -34,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 From d79e131751e12ed66aca0af31a2fb4beb7d2de58 Mon Sep 17 00:00:00 2001 From: Frikky Date: Wed, 22 Oct 2025 12:53:46 +0200 Subject: [PATCH 5/7] Latest rebuild --- .github/workflows/dockerbuild.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index 3aa07ae6..28675b83 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -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 From 6da383232c503db545108440398b939707401142 Mon Sep 17 00:00:00 2001 From: Frikky Date: Wed, 22 Oct 2025 12:54:48 +0200 Subject: [PATCH 6/7] Rebuild --- backend/go-app/main.go | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/go-app/main.go b/backend/go-app/main.go index 633cd6f4..5b26b726 100755 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -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 } From c6bb1e4fa199ab8831e971335173974a542b5821 Mon Sep 17 00:00:00 2001 From: Frikky Date: Wed, 22 Oct 2025 13:10:55 +0200 Subject: [PATCH 7/7] Tried recentering workflow trxt + image --- frontend/src/views/Workflows2.jsx | 35 ++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/frontend/src/views/Workflows2.jsx b/frontend/src/views/Workflows2.jsx index 2732279a..157b7ee7 100644 --- a/frontend/src/views/Workflows2.jsx +++ b/frontend/src/views/Workflows2.jsx @@ -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 ? image { 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) => { { + {data.tags !== undefined && data.tags !== null