fix: support multiple icons for assets [CORE-3097] (#60)

Allows using different icons for light and dark theme, and adds it to all assets.
kapetacom · Jun 26, 2024 · 385fcb1 · 385fcb1
1 parent 512d146
commit 385fcb1
Show file tree

Hide file tree

Showing 41 changed files with 472 additions and 214 deletions.
diff --git a/packages/go/model/model.go b/packages/go/model/model.go
diff --git a/packages/go/schemas/abstracts/core/block-definition.json b/packages/go/schemas/abstracts/core/block-definition.json
@@ -4,11 +4,7 @@
  "title": "BlockDefinition",
  "type": "object",
  "additionalProperties": false,
- "required": [
- "kind",
- "metadata",
- "spec"
- ],
+ "required": ["kind", "metadata", "spec"],
  "properties": {
  "kind": {
  "type": "string"
@@ -38,6 +34,12 @@
  },
  "icon": {
  "$ref": "/core/icon-value"
+ },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
  }
  }
  },
@@ -48,4 +50,4 @@
  }
  }
  }
-}
+}
diff --git a/packages/go/schemas/concepts/core/block-type-executable.json b/packages/go/schemas/concepts/core/block-type-executable.json
@@ -30,6 +30,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "dependencies": {
  "$ref": "/core/dependencies"
  },

diff --git a/packages/go/schemas/concepts/core/block-type-operator.json b/packages/go/schemas/concepts/core/block-type-operator.json
@@ -30,6 +30,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "dependencies": {
  "$ref": "/core/dependencies"
  },

diff --git a/packages/go/schemas/concepts/core/block-type.json b/packages/go/schemas/concepts/core/block-type.json
@@ -28,6 +28,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "dependencies": {
  "$ref": "/core/dependencies"
  },

diff --git a/packages/go/schemas/concepts/core/deployment-target.json b/packages/go/schemas/concepts/core/deployment-target.json
@@ -27,6 +27,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "color": {
  "$ref": "/core/color-value"
  },
@@ -58,6 +64,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "service": {
  "$ref": "/core/remote-service"
  },

diff --git a/packages/go/schemas/concepts/core/language-target.json b/packages/go/schemas/concepts/core/language-target.json
@@ -109,6 +109,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "local": {
  "title": "LocalDevContainer",
  "description": "if type is \"docker\" or empty - Local development container using a fixed docker image. User code will be mounted into the container.\nif type is \"dockerfile\" - Local development container using a Dockerfile. User code will be built into the container.",

diff --git a/packages/go/schemas/concepts/core/resource-type-extension.json b/packages/go/schemas/concepts/core/resource-type-extension.json
@@ -31,6 +31,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "schema": {
  "$ref": "/core/schema"
  },

diff --git a/packages/go/schemas/concepts/core/resource-type-internal.json b/packages/go/schemas/concepts/core/resource-type-internal.json
@@ -30,6 +30,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "configuration": {
  "$ref": "/core/configuration-schema"
  },

diff --git a/packages/go/schemas/concepts/core/resource-type-operator.json b/packages/go/schemas/concepts/core/resource-type-operator.json
@@ -42,6 +42,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "ports": {
  "type": "array",
  "minItems": 1,

diff --git a/packages/go/schemas/types/core/icon-value.json b/packages/go/schemas/types/core/icon-value.json
@@ -18,6 +18,13 @@
  },
  "value": {
  "type": "string"
+ },
+ "theme": {
+ "type": "string",
+ "enum": [
+ "light",
+ "dark"
+ ]
  }
  }
 }
diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/BlockDefinitionSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/BlockDefinitionSpec.java
@@ -7,7 +7,9 @@ public class BlockDefinitionSpec {
  private EntityList configuration;
  private List<Resource> consumers;
  private EntityList entities;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private List<Resource> providers;
  private LanguageTargetReference target;
 }
diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/BlockTypeExecutableSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/BlockTypeExecutableSpec.java
@@ -7,7 +7,9 @@
 public class BlockTypeExecutableSpec {
  private ConfigurationSchema configuration;
  private List<Dependency> dependencies;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private Map<String, Object> schema;
  private List<Versioning> versioning;
 }
diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/BlockTypeOperatorSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/BlockTypeOperatorSpec.java
@@ -7,7 +7,9 @@
 public class BlockTypeOperatorSpec {
  private ConfigurationSchema configuration;
  private List<Dependency> dependencies;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private LocalInstance local;
  private OperatorPorts ports;
  private Map<String, Object> schema;

diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/BlockTypeSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/BlockTypeSpec.java
@@ -7,7 +7,9 @@
 public class BlockTypeSpec {
  private Port defaultPort;
  private List<Dependency> dependencies;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private Map<String, Object> schema;
  private List<Versioning> versioning;
 }
diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/DeploymentTargetOperator.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/DeploymentTargetOperator.java
@@ -1,11 +1,15 @@
 package com.kapeta.schemas.entity;
 
+import java.util.List;
+
 @lombok.Data
 public class DeploymentTargetOperator {
  private ColorValue color;
  private ConfigurationSchema configuration;
  private String description;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private URLValue link;
  private String title;
 }
diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/DeploymentTargetSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/DeploymentTargetSpec.java
@@ -6,7 +6,9 @@
 @lombok.Data
 public class DeploymentTargetSpec {
  private ConfigurationSchema configuration;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private Map<String, DeploymentTargetOperator> operators;
  private RemoteService service;
  private List<Versioning> versioning;

diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/IconValue.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/IconValue.java
@@ -4,4 +4,5 @@
 public class IconValue {
  private IconType type;
  private String value;
+ private String theme;
 }
diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/LanguageTargetSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/LanguageTargetSpec.java
@@ -5,7 +5,9 @@
 
 @lombok.Data
 public class LanguageTargetSpec {
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private LocalDevContainer local;
  private Map<String, Object> schema;
  private List<Versioning> versioning;

diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/ResourceTypeExtensionSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/ResourceTypeExtensionSpec.java
@@ -6,7 +6,9 @@
 @lombok.Data
 public class ResourceTypeExtensionSpec {
  private ConfigurationSchema configuration;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private List<Port> ports;
  private Map<String, Object> schema;
  private List<Versioning> versioning;

diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/ResourceTypeInternalSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/ResourceTypeInternalSpec.java
@@ -6,7 +6,9 @@
 @lombok.Data
 public class ResourceTypeInternalSpec {
  private ConfigurationSchema configuration;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private List<Port> ports;
  private Map<String, Object> schema;
  private List<Versioning> versioning;

diff --git a/packages/maven/src/main/java/com/kapeta/schemas/entity/ResourceTypeOperatorSpec.java b/packages/maven/src/main/java/com/kapeta/schemas/entity/ResourceTypeOperatorSpec.java
@@ -7,7 +7,9 @@
 public class ResourceTypeOperatorSpec {
  private ColorValue color;
  private ConfigurationSchema configuration;
+ @Deprecated
  private IconValue icon;
+ private List<IconValue> icons;
  private LocalInstance local;
  private List<Port> ports;
  private Map<String, Object> schema;

diff --git a/packages/maven/src/main/resources/schemas/abstracts/core/block-definition.json b/packages/maven/src/main/resources/schemas/abstracts/core/block-definition.json
@@ -38,6 +38,12 @@
  },
  "icon": {
  "$ref": "/core/icon-value"
+ },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
  }
  }
  },

diff --git a/packages/maven/src/main/resources/schemas/concepts/core/block-type-executable.json b/packages/maven/src/main/resources/schemas/concepts/core/block-type-executable.json
@@ -30,6 +30,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "dependencies": {
  "$ref": "/core/dependencies"
  },

diff --git a/packages/maven/src/main/resources/schemas/concepts/core/block-type-operator.json b/packages/maven/src/main/resources/schemas/concepts/core/block-type-operator.json
@@ -30,6 +30,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "dependencies": {
  "$ref": "/core/dependencies"
  },

diff --git a/packages/maven/src/main/resources/schemas/concepts/core/block-type.json b/packages/maven/src/main/resources/schemas/concepts/core/block-type.json
@@ -28,6 +28,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "dependencies": {
  "$ref": "/core/dependencies"
  },

diff --git a/packages/maven/src/main/resources/schemas/concepts/core/deployment-target.json b/packages/maven/src/main/resources/schemas/concepts/core/deployment-target.json
@@ -27,6 +27,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "color": {
  "$ref": "/core/color-value"
  },
@@ -58,6 +64,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "service": {
  "$ref": "/core/remote-service"
  },

diff --git a/packages/maven/src/main/resources/schemas/concepts/core/language-target.json b/packages/maven/src/main/resources/schemas/concepts/core/language-target.json
@@ -109,6 +109,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "local": {
  "title": "LocalDevContainer",
  "description": "if type is \"docker\" or empty - Local development container using a fixed docker image. User code will be mounted into the container.\nif type is \"dockerfile\" - Local development container using a Dockerfile. User code will be built into the container.",

diff --git a/packages/maven/src/main/resources/schemas/concepts/core/resource-type-extension.json b/packages/maven/src/main/resources/schemas/concepts/core/resource-type-extension.json
@@ -31,6 +31,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "schema": {
  "$ref": "/core/schema"
  },

diff --git a/packages/maven/src/main/resources/schemas/concepts/core/resource-type-internal.json b/packages/maven/src/main/resources/schemas/concepts/core/resource-type-internal.json
@@ -30,6 +30,12 @@
  "icon": {
  "$ref": "/core/icon-value"
  },
+ "icons": {
+ "type": "array",
+ "items": {
+ "$ref": "/core/icon-value"
+ }
+ },
  "configuration": {
  "$ref": "/core/configuration-schema"
  },