Merge pull request #16 from sharadregoti/v0.5.2

V0.5.2
sharadregoti · Aug 12, 2023 · 4c0cf43 · 4c0cf43
2 parents fd566de + f266bf2
commit 4c0cf43
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 10 deletions.
diff --git a/.github/workflows/version-release.yaml b/.github/workflows/version-release.yaml
@@ -64,7 +64,7 @@ jobs:
           git checkout ${{ steps.current-branch.outputs.branch}}
           git checkout -b "temp-branch"
           TIMESTAMP=$(date +%s)
-          git tag -a "v0.5.1" -m "dummy tag"
+          git tag -a "v0.5.2" -m "dummy tag"
           echo "TIMESTAMP=$TIMESTAMP" >> $GITHUB_ENV
 
           echo "Running script..."

diff --git a/cmd/devops/main.go b/cmd/devops/main.go
@@ -24,7 +24,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const VERSION = "0.5.1"
+const VERSION = "0.5.2"
 
 // @title NEW Devops API
 // @version v0.1.0

diff --git a/devops-frontend/src/components/recentlyUsed/RecentlyUsed.tsx b/devops-frontend/src/components/recentlyUsed/RecentlyUsed.tsx
@@ -25,7 +25,7 @@ const RecentlyUsed: React.FC<RecentlyUsedPropsTypes> = ({ title, recentlyUsedIte
         // display: "block",
     };
 
-    const [selectedTags, setSelectedTags] = useState<string[]>(['Books']);
+    const [selectedTags, setSelectedTags] = useState<string[]>([]);
 
     const handleChange = (tag: string, checked: boolean) => {
         const nextSelectedTags = checked

diff --git a/devops-frontend/src/components/resourceTable/ResourceTable.css b/devops-frontend/src/components/resourceTable/ResourceTable.css
@@ -2,6 +2,14 @@
     background-color: lightskyblue;
 }
 
+/* Change background color on hover */
+tr:hover {
+    opacity: 0.5;
+}
+.ant-table-tbody>tr.ant-table-row:hover>td {
+    background: none !important;
+}
+
 .darkorange {
     background-color: darkorange;
 }

diff --git a/devops-frontend/src/components/resourceTable/ResourceTable.tsx b/devops-frontend/src/components/resourceTable/ResourceTable.tsx
@@ -1,6 +1,6 @@
 import { DeleteOutlined, DownOutlined, EditOutlined, FileAddOutlined, MoreOutlined, ReadOutlined } from '@ant-design/icons';
 import type { TableColumnsType } from 'antd';
-import { Badge, Col, Dropdown, Menu, Row, Space, Table, Typography } from 'antd';
+import { Badge, Col, Dropdown, Menu, Row, Space, Table, Tooltip, Typography } from 'antd';
 import React, { useEffect, useState } from 'react';
 import { ModelFrontendEvent, ProtoAction } from "../../generated-sources/openapi";
 import './ResourceTable.css';
@@ -164,7 +164,25 @@ const ResourceTable: React.FC<ResourceTablePropsType> = ({ onEvent, handleCloseG
         title,
         dataIndex: index,
         key: index,
-      }));
+        defaultSortOrder: 'descend',
+        sorter: (a, b) => a[index].length - b[index].length,
+        // filters: () => {
+        //   return []
+        // },
+        // filterMode: 'tree',
+        // filterSearch: true,
+        // onFilter: (value: string, record) => record[index].startsWith(value),
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (address) => (
+          <Tooltip placement="topLeft" title={address}>
+            {address}
+          </Tooltip>
+        ),
+      }
+
+      ));
 
       if (wsTableName !== message.name) {
         count = 0;
@@ -284,7 +302,7 @@ const ResourceTable: React.FC<ResourceTablePropsType> = ({ onEvent, handleCloseG
                   />
                 </Col>
 
-                {wsTableName === defaultIsolatorResourceType &&
+                {itableName === defaultIsolatorResourceType &&
                   <Col>
                     <FileAddOutlined
                       style={{ color: "gray" }}
@@ -422,7 +440,7 @@ const ResourceTable: React.FC<ResourceTablePropsType> = ({ onEvent, handleCloseG
       <Table
         title={() => (
           <center>
-            <Typography.Title style={{ margin: "8px" }} level={5}>
+            <Typography.Title style={{ padding: 0, margin: 0 }} level={5}>
               {itableName.charAt(0).toUpperCase() + itableName.slice(1)} ({idataRows.length})
             </Typography.Title>
           </center>
@@ -451,6 +469,8 @@ const ResourceTable: React.FC<ResourceTablePropsType> = ({ onEvent, handleCloseG
           };
         }}
         // scroll={{ y: 1000 }}
+        scroll={{ x: 'max-content' }}
+        // tableLayout='auto'
         pagination={false}
         // pagination={{
         //   pageSize: 100,

diff --git a/devops-frontend/src/pages/Home.tsx b/devops-frontend/src/pages/Home.tsx
@@ -900,14 +900,14 @@ const Home: React.FC = () => {
                     }, {})}
                   />
                 </Col> */}
-                  <Col style={{ "margin": "8px" }}>
+                  {/* <Col style={{ "margin": "8px" }}>
                     <InfoCard
                       title='Specific Actions'
                       content={currentResourceSpecificActions?.reduce((acc, curVal) => {
                         return { ...acc, [curVal.key_binding]: curVal.name }
                       }, {})}
                     />
-                  </Col>
+                  </Col> */}
                   <Col style={{ "margin": "8px" }}>
                     <RecentlyUsed
                       title='Recently Used'

diff --git a/readme.md b/readme.md
@@ -18,7 +18,7 @@ This project is inspired from the following softwares terraform, K9s, Lens.
 ## Installation
 **Linux & Mac**
 
-`curl https://storage.googleapis.com/devops-cli-artifacts/releases/devops/0.5.1/install.sh | bash`
+`curl https://storage.googleapis.com/devops-cli-artifacts/releases/devops/0.5.2/install.sh | bash`
 
 ## Usage