new dashboard

.github/workflows/release.yaml

@@ -135,7 +135,7 @@ jobs:
       - build-component-images
       - build-dashboard-image
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.DISPATCH_PAT }}
           script: |

.local-dev/config/ns.yaml

@@ -36,6 +36,7 @@ components:
         platformAPI: "0.11"
     controller:
       url: http://ns-controller:10000
+    priority: 0
 
   controller:
     port: 10000

.local-dev/ext-builder/config.yaml

@@ -39,3 +39,4 @@ components:
         platformAPI: "0.11"
     controller:
       url: http://host.docker.internal:10000
+    priority: 10

.local-dev/manifest/ns-system/config/ns.yaml

@@ -43,6 +43,7 @@ components:
         platformAPI: "0.11"
     controller:
       url: http://ns-controller.ns-system.svc.cluster.local:10000
+    priority: 0
 
   controller:
     port: 10000

api/proto/neoshowcase/protobuf/controller.proto

@@ -21,6 +21,11 @@ message BuilderRequest {
   }
 }
 
+message ConnectedBody {
+  // Larger value means higher priority
+  int64 priority = 1;
+}
+
 message BuildStarted {
   string build_id = 1;
 }
@@ -49,9 +54,10 @@ message BuilderResponse {
   }
   Type type = 1;
   oneof body {
-    BuildStarted started = 2;
-    BuildSettled settled = 3;
-    BuildLogPortion log = 4;
+    ConnectedBody connected = 2;
+    BuildStarted started = 3;
+    BuildSettled settled = 4;
+    BuildLogPortion log = 5;
   }
 }
 

api/proto/neoshowcase/protobuf/gateway.proto

@@ -19,6 +19,8 @@ message AvailableDomain {
   string domain = 1;
   repeated string exclude_domains = 2;
   bool auth_available = 3;
+  // already_bound ドメインが他のアプリケーションによって専有されているか
+  bool already_bound = 4;
 }
 
 message AvailablePort {
@@ -368,8 +370,10 @@ message GetApplicationsRequest {
   enum Scope {
     MINE = 0;
     ALL = 1;
+    REPOSITORY = 2;
   }
   Scope scope = 1;
+  optional string repository_id = 2;
 }
 
 message UpdateApplicationRequest {

cmd/config.go

@@ -58,6 +58,7 @@ type BuilderConfig struct {
 		K8s     bk8simpl.Config    `mapstructure:"k8s" yaml:"k8s"`
 	}
 	Controller grpc.ControllerServiceClientConfig `mapstructure:"controller" yaml:"controller"`
+	Priority   int                                `mapstructure:"priority" yaml:"priority"`
 }
 
 type ControllerConfig struct {
@@ -161,6 +162,8 @@ func init() {
 
 	viper.SetDefault("components.builder.controller.url", "http://ns-controller:10000")
 
+	viper.SetDefault("components.builder.priority", 0)
+
 	viper.SetDefault("components.controller.port", 10000)
 	viper.SetDefault("components.controller.mode", "docker")
 

cmd/providers.go

@@ -67,7 +67,7 @@ var providers = wire.NewSet(
 	grpc.NewControllerService,
 	grpc.NewControllerServiceClient,
 	grpc.NewControllerBuilderService,
-	grpc.NewControllerBuilderServiceClient,
+	provideControllerBuilderServiceClient,
 	grpc.NewControllerSSGenService,
 	grpc.NewControllerSSGenServiceClient,
 	healthcheck.NewServer,
@@ -131,6 +131,13 @@ func provideAuthDevServer(c Config) *authdev.Server {
 	return authdev.NewServer(cc.Header, cc.Port, cc.User)
 }
 
+func provideControllerBuilderServiceClient(c Config) domain.ControllerBuilderServiceClient {
+	return grpc.NewControllerBuilderServiceClient(
+		c.Components.Builder.Controller,
+		c.Components.Builder.Priority,
+	)
+}
+
 func provideBuildpackBackend(c Config) (builder.BuildpackBackend, error) {
 	cc := c.Components.Builder
 	switch cc.Buildpack.Backend {

cmd/wire.go

@@ -29,7 +29,6 @@ func NewAuthDev(c Config) (component, error) {
 func NewBuilder(c Config) (component, error) {
 	wire.Build(
 		providers,
-		wire.FieldsOf(new(BuilderConfig), "Controller"),
 		wire.Bind(new(component), new(*builder.Server)),
 		wire.Struct(new(builder.Server), "*"),
 	)

dashboard/biome.json

@@ -1,9 +1,9 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.0.0/schema.json",
+  "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
   "formatter": {
     "enabled": true,
     "indentStyle": "space",
-    "indentSize": 2,
+    "indentWidth": 2,
     "lineWidth": 120
   },
   "javascript": {
@@ -16,10 +16,16 @@
   "linter": {
     "enabled": true,
     "rules": {
-      "recommended": true
+      "recommended": true,
+      "nursery": {
+        "noUnusedImports": "error"
+      },
+      "style": {
+         "noNonNullAssertion": "warn"
+      }
     }
   },
   "files": {
-    "ignore": ["src/api/*"]
+    "ignore": ["src/api/*", "package.json"]
   }
 }

dashboard/index.html

@@ -4,7 +4,6 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <title>NeoShowcase</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

dashboard/package.json

@@ -12,34 +12,41 @@
     "lint:force": "biome check src --apply-unsafe",
     "fix": "yarn fmt:apply && yarn lint:force",
     "typecheck": "tsc --noEmit",
-    "ci": "biome ci src"
+    "ci": "biome ci src",
+    "analyze": "vite build --mode analyze"
   },
   "license": "MIT",
   "devDependencies": {
-    "@biomejs/biome": "1.2.2",
+    "@biomejs/biome": "1.3.3",
     "@macaron-css/core": "1.2.0",
     "@macaron-css/solid": "1.4.1",
     "@macaron-css/vite": "1.4.3",
-    "@types/node": "20.8.0",
-    "typescript": "5.2.2",
-    "vite": "4.4.9",
+    "@tanstack/virtual-core": "^3.0.0-alpha.1",
+    "@types/node": "20.9.4",
+    "rollup-plugin-visualizer": "^5.9.3",
+    "typescript": "5.3.2",
+    "unplugin-fonts": "^1.0.3",
+    "vite": "5.0.2",
     "vite-plugin-compression": "0.5.1",
-    "vite-plugin-fonts": "0.7.0",
-    "vite-plugin-solid": "2.7.0",
-    "vite-plugin-solid-svg": "0.6.1"
+    "vite-plugin-solid": "2.7.2",
+    "vite-plugin-solid-svg": "0.7.0"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "1.4.1",
-    "@connectrpc/connect": "1.1.2",
-    "@connectrpc/connect-web": "1.1.2",
+    "@bufbuild/protobuf": "1.4.2",
+    "@connectrpc/connect": "1.1.3",
+    "@connectrpc/connect-web": "1.1.3",
+    "@kobalte/core": "^0.11.2",
+    "@modular-forms/solid": "^0.20.0",
     "@solid-primitives/refs": "1.0.5",
-    "@solidjs/router": "0.8.3",
+    "@solidjs/meta": "^0.29.1",
+    "@solidjs/router": "0.9.1",
+    "@tanstack/solid-virtual": "^3.0.0-beta.6",
     "ansi-to-html": "0.7.2",
     "chart.js": "4.4.0",
-    "fuse.js": "6.6.2",
+    "fuse.js": "7.0.0",
     "solid-chartjs": "1.3.8",
-    "solid-icons": "1.0.12",
-    "solid-js": "1.7.12",
+    "solid-icons": "1.1.0",
+    "solid-js": "1.8.6",
     "solid-tippy": "0.2.1",
     "solid-toast": "0.5.0",
     "tippy.js": "6.3.7"

dashboard/src/App.tsx

@@ -1,21 +1,29 @@
-import Routes from '/@/routes'
+import { MetaProvider, Title } from '@solidjs/meta'
 import { Router } from '@solidjs/router'
-import type { Component } from 'solid-js'
+import { type Component, ErrorBoundary } from 'solid-js'
 import { Toaster } from 'solid-toast'
+import Routes from '/@/routes'
+import ErrorView from './components/layouts/ErrorView'
+import { WithHeader } from './components/layouts/WithHeader'
 
 const App: Component = () => {
   return (
-    <>
+    <MetaProvider>
+      <Title>NeoShowcase</Title>
       <Toaster
         toastOptions={{
           duration: 10000,
-          position: 'bottom-right',
+          position: 'bottom-left',
         }}
       />
       <Router>
-        <Routes />
+        <WithHeader>
+          <ErrorBoundary fallback={(props) => <ErrorView {...props} />}>
+            <Routes />
+          </ErrorBoundary>
+        </WithHeader>
       </Router>
-    </>
+    </MetaProvider>
   )
 }
 

dashboard/src/api/neoshowcase/protobuf/gateway_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.4.1 with parameter "target=ts"
+// @generated by protoc-gen-es v1.5.0 with parameter "target=ts"
 // @generated from file neoshowcase/protobuf/gateway.proto (package neoshowcase.protobuf, syntax proto3)
 /* eslint-disable */
 // @ts-nocheck
@@ -179,6 +179,13 @@ export class AvailableDomain extends Message<AvailableDomain> {
    */
   authAvailable = false;
 
+  /**
+   * already_bound ドメインが他のアプリケーションによって専有されているか
+   *
+   * @generated from field: bool already_bound = 4;
+   */
+  alreadyBound = false;
+
   constructor(data?: PartialMessage<AvailableDomain>) {
     super();
     proto3.util.initPartial(data, this);
@@ -190,6 +197,7 @@ export class AvailableDomain extends Message<AvailableDomain> {
     { no: 1, name: "domain", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "exclude_domains", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
     { no: 3, name: "auth_available", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
+    { no: 4, name: "already_bound", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): AvailableDomain {
@@ -2622,6 +2630,11 @@ export class GetApplicationsRequest extends Message<GetApplicationsRequest> {
    */
   scope = GetApplicationsRequest_Scope.MINE;
 
+  /**
+   * @generated from field: optional string repository_id = 2;
+   */
+  repositoryId?: string;
+
   constructor(data?: PartialMessage<GetApplicationsRequest>) {
     super();
     proto3.util.initPartial(data, this);
@@ -2631,6 +2644,7 @@ export class GetApplicationsRequest extends Message<GetApplicationsRequest> {
   static readonly typeName = "neoshowcase.protobuf.GetApplicationsRequest";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "scope", kind: "enum", T: proto3.getEnumType(GetApplicationsRequest_Scope) },
+    { no: 2, name: "repository_id", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): GetApplicationsRequest {
@@ -2663,11 +2677,17 @@ export enum GetApplicationsRequest_Scope {
    * @generated from enum value: ALL = 1;
    */
   ALL = 1,
+
+  /**
+   * @generated from enum value: REPOSITORY = 2;
+   */
+  REPOSITORY = 2,
 }
 // Retrieve enum metadata with: proto3.getEnumType(GetApplicationsRequest_Scope)
 proto3.util.setEnumType(GetApplicationsRequest_Scope, "neoshowcase.protobuf.GetApplicationsRequest.Scope", [
   { no: 0, name: "MINE" },
   { no: 1, name: "ALL" },
+  { no: 2, name: "REPOSITORY" },
 ]);
 
 /**

dashboard/src/api/neoshowcase/protobuf/null_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.4.1 with parameter "target=ts"
+// @generated by protoc-gen-es v1.5.0 with parameter "target=ts"
 // @generated from file neoshowcase/protobuf/null.proto (package neoshowcase.protobuf, syntax proto3)
 /* eslint-disable */
 // @ts-nocheck