From 20e12efba0a93f763245c671b40748c37591851d Mon Sep 17 00:00:00 2001
From: AKHIL-DyC <akhiljee666@gmail.com>
Date: Wed, 22 May 2024 01:33:27 +0530
Subject: [PATCH 1/6] duplicate error fix

---
 .../pages/TemplateStore/TemplateStore.tsx         | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx b/cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx
index 2103aba1..ee13206a 100644
--- a/cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx
+++ b/cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx
@@ -172,21 +172,6 @@ const TemplateStore = () => {
 
   return (
     <div>
-      {error.message.length !== 0 && (
-        <Alert
-          message={error.message}
-          description={error.description}
-          type="error"
-          closable
-          afterClose={() => {
-            setError({
-              message: "",
-              description: "",
-            });
-          }}
-          style={{ marginBottom: "20px" }}
-        />
-      )}
       <Row gutter={[40, 0]}>
         <Col span={18}>
           <Title level={2}>Templates: {templates.length}</Title>

From bcb6dcf21ead135a5d9ede8df487ec0f3c124ea2 Mon Sep 17 00:00:00 2001
From: AKHIL-DyC <akhiljee666@gmail.com>
Date: Wed, 22 May 2024 02:47:49 +0530
Subject: [PATCH 2/6] search fix no module

---
 .../src/components/pages/Modules/Modules.tsx  | 150 ++++++++++--------
 1 file changed, 81 insertions(+), 69 deletions(-)

diff --git a/cyclops-ui/src/components/pages/Modules/Modules.tsx b/cyclops-ui/src/components/pages/Modules/Modules.tsx
index 1652e9cb..206ced47 100644
--- a/cyclops-ui/src/components/pages/Modules/Modules.tsx
+++ b/cyclops-ui/src/components/pages/Modules/Modules.tsx
@@ -142,76 +142,88 @@ const Modules = () => {
       </Row>
       <Divider orientationMargin="0" />
       <Row gutter={[16, 16]}>
-        {filteredData.map((module: any, index) => (
-          <Col key={index} xs={24} sm={12} md={8} lg={8} xl={6}>
-            <a href={"/modules/" + module.name}>
-              <Card
-                title={module.name}
-                style={{
-                  borderLeft: "solid " + getStatusColor(module) + " 5px",
-                  width: "100%",
-                  maxWidth: "500px",
-                }}
-                className={styles.modulecard}
-              >
-                <Row gutter={[16, 16]}>
-                  <Col
-                    span={24}
-                    style={{
-                      whiteSpace: "nowrap",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      display: "block",
-                    }}
-                  >
-                    Repo:
-                    <Link aria-level={3} href={module.template.repo}>
-                      {" " + module.template.repo}
-                    </Link>
-                  </Col>
-                </Row>
-                <Row gutter={[16, 16]}>
-                  <Col
-                    span={24}
-                    style={{
-                      whiteSpace: "nowrap",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      display: "block",
-                    }}
-                  >
-                    Path:
-                    <Link
-                      aria-level={3}
-                      href={
-                        module.template.repo +
-                        `/tree/` +
-                        getTemplateVersion(module.template.version) +
-                        `/` +
-                        module.template.path
-                      }
+        {filteredData.length == 0 ? (
+          <Card
+            title={"No Module Found"}
+            style={{
+              borderLeft: "solid " + getStatusColor(module) + " 5px",
+              width: "100%",
+              maxWidth: "200px",
+            }}
+            className={styles.modulecard}
+          ></Card>
+        ) : (
+          filteredData.map((module: any, index) => (
+            <Col key={index} xs={24} sm={12} md={8} lg={8} xl={6}>
+              <a href={"/modules/" + module.name}>
+                <Card
+                  title={module.name}
+                  style={{
+                    borderLeft: "solid " + getStatusColor(module) + " 5px",
+                    width: "100%",
+                    maxWidth: "500px",
+                  }}
+                  className={styles.modulecard}
+                >
+                  <Row gutter={[16, 16]}>
+                    <Col
+                      span={24}
+                      style={{
+                        whiteSpace: "nowrap",
+                        overflow: "hidden",
+                        textOverflow: "ellipsis",
+                        display: "block",
+                      }}
                     >
-                      {" " + module.template.path}
-                    </Link>
-                  </Col>
-                </Row>
-                <Row gutter={[16, 16]}>
-                  <Col
-                    span={24}
-                    style={{
-                      whiteSpace: "nowrap",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      display: "block",
-                    }}
-                  >
-                    Version: {getTemplateVersion(module.template.version)}
-                  </Col>
-                </Row>
-              </Card>
-            </a>
-          </Col>
-        ))}
+                      Repo:
+                      <Link aria-level={3} href={module.template.repo}>
+                        {" " + module.template.repo}
+                      </Link>
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col
+                      span={24}
+                      style={{
+                        whiteSpace: "nowrap",
+                        overflow: "hidden",
+                        textOverflow: "ellipsis",
+                        display: "block",
+                      }}
+                    >
+                      Path:
+                      <Link
+                        aria-level={3}
+                        href={
+                          module.template.repo +
+                          `/tree/` +
+                          getTemplateVersion(module.template.version) +
+                          `/` +
+                          module.template.path
+                        }
+                      >
+                        {" " + module.template.path}
+                      </Link>
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col
+                      span={24}
+                      style={{
+                        whiteSpace: "nowrap",
+                        overflow: "hidden",
+                        textOverflow: "ellipsis",
+                        display: "block",
+                      }}
+                    >
+                      Version: {getTemplateVersion(module.template.version)}
+                    </Col>
+                  </Row>
+                </Card>
+              </a>
+            </Col>
+          ))
+        )}
       </Row>
     </div>
   );

From 517f4938844a8ba3620c7eac5f401c210b0af6eb Mon Sep 17 00:00:00 2001
From: AKHIL-DyC <akhiljee666@gmail.com>
Date: Wed, 22 May 2024 16:04:41 +0530
Subject: [PATCH 3/6] Revert "duplicate error fix"

This reverts commit 20e12efba0a93f763245c671b40748c37591851d.
---
 .../pages/TemplateStore/TemplateStore.tsx         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx b/cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx
index ee13206a..2103aba1 100644
--- a/cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx
+++ b/cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx
@@ -172,6 +172,21 @@ const TemplateStore = () => {
 
   return (
     <div>
+      {error.message.length !== 0 && (
+        <Alert
+          message={error.message}
+          description={error.description}
+          type="error"
+          closable
+          afterClose={() => {
+            setError({
+              message: "",
+              description: "",
+            });
+          }}
+          style={{ marginBottom: "20px" }}
+        />
+      )}
       <Row gutter={[40, 0]}>
         <Col span={18}>
           <Title level={2}>Templates: {templates.length}</Title>

From 13307cc9f4fe41c6abdd054f7aa40ca6ba287026 Mon Sep 17 00:00:00 2001
From: AKHIL-DyC <akhiljee666@gmail.com>
Date: Wed, 22 May 2024 20:25:16 +0530
Subject: [PATCH 4/6] ubdate

---
 .../src/components/pages/Modules/Modules.tsx      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/cyclops-ui/src/components/pages/Modules/Modules.tsx b/cyclops-ui/src/components/pages/Modules/Modules.tsx
index 206ced47..e8de4d4b 100644
--- a/cyclops-ui/src/components/pages/Modules/Modules.tsx
+++ b/cyclops-ui/src/components/pages/Modules/Modules.tsx
@@ -12,6 +12,7 @@ import {
   Space,
   Card,
   Alert,
+  Empty,
 } from "antd";
 import { useNavigate } from "react-router";
 import axios from "axios";
@@ -143,15 +144,11 @@ const Modules = () => {
       <Divider orientationMargin="0" />
       <Row gutter={[16, 16]}>
         {filteredData.length == 0 ? (
-          <Card
-            title={"No Module Found"}
-            style={{
-              borderLeft: "solid " + getStatusColor(module) + " 5px",
-              width: "100%",
-              maxWidth: "200px",
-            }}
-            className={styles.modulecard}
-          ></Card>
+          <Empty description="No Module">
+            <Button onClick={handleClick} block>
+              Create
+            </Button>
+          </Empty>
         ) : (
           filteredData.map((module: any, index) => (
             <Col key={index} xs={24} sm={12} md={8} lg={8} xl={6}>

From fafe05f24c90860f41a8ca74d4cdcd1e4a2fa626 Mon Sep 17 00:00:00 2001
From: AKHIL-DyC <akhiljee666@gmail.com>
Date: Wed, 22 May 2024 20:47:43 +0530
Subject: [PATCH 5/6] ubdate 2

---
 cyclops-ui/src/components/pages/Modules/Modules.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cyclops-ui/src/components/pages/Modules/Modules.tsx b/cyclops-ui/src/components/pages/Modules/Modules.tsx
index e8de4d4b..4be2a272 100644
--- a/cyclops-ui/src/components/pages/Modules/Modules.tsx
+++ b/cyclops-ui/src/components/pages/Modules/Modules.tsx
@@ -144,11 +144,9 @@ const Modules = () => {
       <Divider orientationMargin="0" />
       <Row gutter={[16, 16]}>
         {filteredData.length == 0 ? (
-          <Empty description="No Module">
-            <Button onClick={handleClick} block>
-              Create
-            </Button>
-          </Empty>
+          <div style={{ width: "100%" }}>
+            <Empty description="No Module Found"></Empty>
+          </div>
         ) : (
           filteredData.map((module: any, index) => (
             <Col key={index} xs={24} sm={12} md={8} lg={8} xl={6}>

From 1d92e67c9acda7b5a82ec0a9a38fbb5a9e396624 Mon Sep 17 00:00:00 2001
From: AKHIL-DyC <119416316+AKHIL-DyC@users.noreply.github.com>
Date: Wed, 22 May 2024 21:50:08 +0530
Subject: [PATCH 6/6] Update
 cyclops-ui/src/components/pages/Modules/Modules.tsx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Petar Cvitanović <72022639+petar-cvit@users.noreply.github.com>
---
 cyclops-ui/src/components/pages/Modules/Modules.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cyclops-ui/src/components/pages/Modules/Modules.tsx b/cyclops-ui/src/components/pages/Modules/Modules.tsx
index 4be2a272..5016d4e6 100644
--- a/cyclops-ui/src/components/pages/Modules/Modules.tsx
+++ b/cyclops-ui/src/components/pages/Modules/Modules.tsx
@@ -145,7 +145,7 @@ const Modules = () => {
       <Row gutter={[16, 16]}>
         {filteredData.length == 0 ? (
           <div style={{ width: "100%" }}>
-            <Empty description="No Module Found"></Empty>
+            <Empty description="No Modules Found"></Empty>
           </div>
         ) : (
           filteredData.map((module: any, index) => (