⚡ add blueprint spec version

zcubbs · May 20, 2024 · 5fbbba4 · 5fbbba4
1 parent fb4d23a
commit 5fbbba4
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 35 deletions.
diff --git a/cmd/server/api/rpc_get_blueprints.go b/cmd/server/api/rpc_get_blueprints.go
@@ -11,8 +11,9 @@ func (s *Server) GetBlueprints(_ context.Context, req *pb.GetBlueprintListReques
 	blueprints := make([]*pb.Blueprint, 0)
 	for _, bpt := range blueprint.GetAllBlueprints() {
 		blueprints = append(blueprints, &pb.Blueprint{
-			Spec: toSpecPb(bpt.Spec),
-			Type: string(bpt.Type),
+			Spec:    toSpecPb(bpt.Spec),
+			Type:    string(bpt.Type),
+			Version: bpt.Spec.Version,
 		})
 	}
 

diff --git a/cmd/server/docs/swagger/api.swagger.json b/cmd/server/docs/swagger/api.swagger.json
@@ -159,6 +159,9 @@
         },
         "type": {
           "type": "string"
+        },
+        "version": {
+          "type": "string"
         }
       }
     },

diff --git a/proto/gen/v1/blueprint.pb.go b/proto/gen/v1/blueprint.pb.go
diff --git a/proto/gen/v1/blueprint_service.pb.go b/proto/gen/v1/blueprint_service.pb.go
diff --git a/proto/gen/v1/blueprint_service_grpc.pb.go b/proto/gen/v1/blueprint_service_grpc.pb.go
diff --git a/proto/gen/v1/empty.pb.go b/proto/gen/v1/empty.pb.go
diff --git a/proto/gen/v1/rpc_generate_project.pb.go b/proto/gen/v1/rpc_generate_project.pb.go
diff --git a/proto/gen/v1/rpc_get_blueprints.pb.go b/proto/gen/v1/rpc_get_blueprints.pb.go
diff --git a/proto/gen/v1/rpc_get_bucket_objects.pb.go b/proto/gen/v1/rpc_get_bucket_objects.pb.go
diff --git a/proto/gen/v1/rpc_ping.pb.go b/proto/gen/v1/rpc_ping.pb.go
diff --git a/proto/v1/blueprint.proto b/proto/v1/blueprint.proto
@@ -7,6 +7,7 @@ option go_package = "github.com/zcubbs/power";
 message Blueprint {
   Spec spec = 1;
   string type = 2;
+  string version = 3;
 }
 
 message Spec {

diff --git a/web/start/src/components/BlueprintCustomizationDialog.tsx b/web/start/src/components/BlueprintCustomizationDialog.tsx
@@ -104,7 +104,9 @@ const BlueprintCustomizationDialog: React.FC<BlueprintCustomizationDialogProps>
   return (
     <Dialog open={open} onOpenChange={setOpen}>
       <DialogTrigger asChild>
-        <Button variant="outline">Use</Button>
+        <Button variant="secondary">
+          Use
+        </Button>
       </DialogTrigger>
       <DialogContent>
         <DialogHeader>

diff --git a/web/start/src/components/BlueprintTile.tsx b/web/start/src/components/BlueprintTile.tsx
@@ -50,20 +50,20 @@ const BlueprintTile: React.FC<BlueprintTileProps> = ({blueprint}) => {
 
   const getColoredBadge = () => {
     if (blueprint.type === 'built-in') {
-      return <Badge variant="secondary">Built-in</Badge>;
+      return <Badge variant="secondary" className="text-sm">Built-in</Badge>;
     } else if (blueprint.type === 'plugin') {
-      return <Badge variant="default">Plugin</Badge>;
+      return <Badge variant="secondary" className="text-sm">Plugin</Badge>;
     } else if (blueprint.type === 'registrar') {
-      return <Badge variant="default">Registrar</Badge>;
+      return <Badge variant="secondary" className="text-sm">Registrar</Badge>;
     } else {
-      return <Badge variant="outline">Unknown</Badge>;
+      return <Badge variant="outline" className="text-sm">Unknown</Badge>;
     }
   }
 
   return (
     <Card className="rounded-lg shadow-lg">
       <CardHeader>
-        <CardTitle className="text-xl font-bold">
+        <CardTitle className="text-xl font-bold shadow-lg">
           {blueprint.spec.name}
         </CardTitle>
         <CardDescription>{blueprint.spec.description}</CardDescription>
@@ -73,6 +73,9 @@ const BlueprintTile: React.FC<BlueprintTileProps> = ({blueprint}) => {
           <div className="flex items-center justify-between col-span-2">
             <div className="flex items-center">
               {getColoredBadge()}
+              <Badge variant="secondary" className="ml-2 fw-bold text-sm">
+                {blueprint.version}
+              </Badge>
             </div>
             <div className="flex items-center justify-end col-span-2">
               <BlueprintCustomizationDialog blueprint={blueprint} onGenerate={handleGenerate}/>

diff --git a/web/start/src/types.ts b/web/start/src/types.ts
@@ -1,6 +1,7 @@
 export interface Blueprint {
   spec: Spec;
   type: string;
+  version: string;
 }
 
 export interface Spec {