Merge pull request #680 from tailwarden/develop

v3.0.9 release 🚀

.github/workflows/release.yml

@@ -102,6 +102,10 @@ jobs:
           git add .
           git config user.name "purplin"
           git config user.email "purplin@tailwarden.com"
+          if [ -z "$(git status --porcelain)" ]; then
+            echo "No changes to commit"
+            exit 0
+          fi
           git commit -m "chore: bump version to ${VERSION}"
           git push
         env:

dashboard/components/dashboard/components/cost-explorer/DashboardCostExplorerCard.tsx

@@ -7,6 +7,7 @@ import {
   Title,
   Tooltip
 } from 'chart.js';
+import Image from 'next/image';
 import { Dispatch, SetStateAction } from 'react';
 import { Bar } from 'react-chartjs-2';
 import SelectCheckbox from '../../../select-checkbox/SelectCheckbox';
@@ -113,6 +114,20 @@ function DashboardCostExplorerCard({
       <div className="mt-8"></div>
       <div className="h-full min-h-[22rem]">
         {chartData && <Bar data={chartData} options={options} />}
+        {!chartData && (
+          <div className="relative flex flex-col items-center">
+            <p className="mt-10 text-lg text-black-900">
+              No data for this time period
+            </p>
+            <Image
+              src="/assets/img/others/empty-state-cost-explorer.png"
+              width={940}
+              height={330}
+              alt="No data to display image"
+              className="absolute top-0"
+            />
+          </div>
+        )}
       </div>
     </div>
   );

dashboard/components/dashboard/components/resources-manager/DashboardResourcesManagerCard.tsx

@@ -1,4 +1,5 @@
 import { ArcElement, Chart as ChartJS, Legend, Tooltip } from 'chart.js';
+import Image from 'next/image';
 import { Dispatch, SetStateAction } from 'react';
 import { Doughnut } from 'react-chartjs-2';
 import SelectCheckbox from '../../../select-checkbox/SelectCheckbox';
@@ -30,6 +31,9 @@ function DashboardResourcesManagerCard({
     { data, setQuery, initialQuery: query }
   );
 
+  const displayChart =
+    chartData && chartData.labels && chartData.labels.length > 0;
+
   return (
     <div className="w-full rounded-lg bg-white py-4 px-6 pb-6">
       <div className="-mx-6 flex items-center justify-between border-b border-black-200/40 px-6 pb-4">
@@ -62,7 +66,22 @@ function DashboardResourcesManagerCard({
       </div>
       <div className="mt-4"></div>
       <div>
-        <Doughnut data={chartData} options={options} />
+        {displayChart && <Doughnut data={chartData} options={options} />}
+        {!displayChart && (
+          <div className="relative flex items-center gap-16 px-4 pt-10">
+            <Image
+              src="/assets/img/others/empty-state-resources-manager.png"
+              width={200}
+              height={200}
+              alt="No data to display image"
+            />
+            <p className="text-center text-lg text-black-900">
+              No resource data
+              <br />
+              to display
+            </p>
+          </div>
+        )}
       </div>
     </div>
   );

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "komiser-dashboard",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3002",

internal/internal.go

@@ -181,33 +181,39 @@ func setupSchema(c *models.Config) error {
 	untaggedResourcesView := models.View{
 		Name: "Untagged resources",
 		Filters: []models.Filter{
-			models.Filter{
+			{
 				Field:    "tags",
 				Operator: "IS_EMPTY",
 				Values:   []string{},
 			},
 		},
 	}
 
-	_, err = db.NewInsert().Model(&untaggedResourcesView).Exec(context.Background())
-	if err != nil {
-		return err
+	count, _ := db.NewSelect().Model(&untaggedResourcesView).Where("name = ?", untaggedResourcesView.Name).ScanAndCount(context.Background())
+	if count == 0 {
+		_, err = db.NewInsert().Model(&untaggedResourcesView).Exec(context.Background())
+		if err != nil {
+			return err
+		}
 	}
 
 	expensiveResourcesView := models.View{
 		Name: "Expensive resources",
 		Filters: []models.Filter{
-			models.Filter{
+			{
 				Field:    "cost",
 				Operator: "GREATER_THAN",
 				Values:   []string{"0"},
 			},
 		},
 	}
 
-	_, err = db.NewInsert().Model(&expensiveResourcesView).Exec(context.Background())
-	if err != nil {
-		return err
+	count, _ = db.NewSelect().Model(&expensiveResourcesView).Where("name = ?", expensiveResourcesView.Name).ScanAndCount(context.Background())
+	if count == 0 {
+		_, err = db.NewInsert().Model(&expensiveResourcesView).Exec(context.Background())
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil