feat(sdf, web): Rename the variant_defs route

Variant definitions no longer exist so we now use variants as the route instead

Author: stack72

app/web/src/store/asset.store.ts

@@ -23,8 +23,8 @@ import { useRouterStore } from "./router.store";
 
 export type AssetId = string;
 
-export interface ListVariantDefsResponse {
-  variantDefs: ListedVariantDef[];
+export interface ListVariantsResponse {
+  variants: ListedVariant[];
 }
 
 export interface InstalledPkgAssetView {
@@ -70,7 +70,7 @@ export interface DetachedValidationPrototype {
   propKind: PropKind;
 }
 
-export interface ListedVariantDef {
+export interface ListedVariant {
   id: AssetId;
   name: string;
   displayName?: string;
@@ -83,15 +83,15 @@ export interface ListedVariantDef {
   updatedAt: IsoDateString;
 }
 
-export interface VariantDef extends ListedVariantDef {
+export interface Variant extends ListedVariant {
   link?: string;
   code: string;
   types?: string;
   hasComponents: boolean;
 }
 
-export type Asset = VariantDef;
-export type AssetListEntry = ListedVariantDef;
+export type Asset = Variant;
+export type AssetListEntry = ListedVariant;
 export type AssetSaveRequest = Visibility &
   Omit<Asset, "createdAt" | "updatedAt" | "variantExists" | "hasComponents">;
 export type AssetCreateRequest = Omit<
@@ -170,7 +170,7 @@ export const useAssetStore = () => {
           const assetsWithSchemaVariantId = _.filter(
             this.assets,
             (a) => a.id !== undefined,
-          ) as (VariantDef & {
+          ) as (Variant & {
             schemaVariantId: string;
           })[];
 
@@ -267,7 +267,7 @@ export const useAssetStore = () => {
             AssetCreateRequest
           >({
             method: "post",
-            url: "/variant_def/create_variant_def",
+            url: "/variant/create_variant",
             params: {
               ...visibility,
               ..._.omit(asset, [
@@ -292,7 +292,7 @@ export const useAssetStore = () => {
           >({
             method: "post",
             keyRequestStatusBy: assetId,
-            url: "/variant_def/clone_variant_def",
+            url: "/variant/clone_variant",
             params: {
               ...visibility,
               id: assetId,
@@ -328,7 +328,7 @@ export const useAssetStore = () => {
           return new ApiRequest<{ success: boolean }, AssetSaveRequest>({
             method: "post",
             keyRequestStatusBy: asset.id,
-            url: "/variant_def/save_variant_def",
+            url: "/variant/save_variant",
             optimistic: () => {
               if (isHead) return () => {};
 
@@ -356,7 +356,7 @@ export const useAssetStore = () => {
               id: AssetId;
             }
           >({
-            url: "/variant_def/get_variant_def",
+            url: "/variant/get_variant",
             keyRequestStatusBy: assetId,
             params: {
               id: assetId,
@@ -369,11 +369,11 @@ export const useAssetStore = () => {
         },
 
         async LOAD_ASSET_LIST() {
-          return new ApiRequest<ListVariantDefsResponse, Visibility>({
-            url: "/variant_def/list_variant_defs",
+          return new ApiRequest<ListVariantsResponse, Visibility>({
+            url: "/variant/list_variants",
             params: { ...visibility },
             onSuccess: (response) => {
-              this.assetList = response.variantDefs;
+              this.assetList = response.variants;
             },
           });
         },
@@ -397,7 +397,7 @@ export const useAssetStore = () => {
             AssetSaveRequest
           >({
             method: "post",
-            url: "/variant_def/exec_variant_def",
+            url: "/variant/exec_variant",
             keyRequestStatusBy: assetId,
             params: {
               ...visibility,
@@ -420,21 +420,21 @@ export const useAssetStore = () => {
             },
           },
           {
-            eventType: "SchemaVariantDefinitionCreated",
+            eventType: "SchemaVariantCreated",
             callback: (data) => {
               if (data.changeSetId !== changeSetId) return;
               this.LOAD_ASSET_LIST();
             },
           },
           {
-            eventType: "SchemaVariantDefinitionCloned",
+            eventType: "SchemaVariantCloned",
             callback: (data) => {
               if (data.changeSetId !== changeSetId) return;
               this.LOAD_ASSET_LIST();
             },
           },
           {
-            eventType: "SchemaVariantDefinitionSaved",
+            eventType: "SchemaVariantSaved",
             callback: (data) => {
               if (data.changeSetId !== changeSetId) return;
               this.LOAD_ASSET_LIST();
@@ -478,7 +478,7 @@ export const useAssetStore = () => {
             },
           },
           {
-            eventType: "SchemaVariantDefinitionFinished",
+            eventType: "SchemaVariantFinished",
             callback: async ({
               taskId,
               schemaVariantId,

app/web/src/store/realtime/realtime_events.ts

@@ -220,21 +220,21 @@ export type WsEventPayloadMap = {
     secretId: SecretId;
     changeSetId: ChangeSetId;
   };
-  SchemaVariantDefinitionCreated: {
-    schemaVariantDefinitionId: string;
+  SchemaVariantCreated: {
+    schemaVariantId: string;
     changeSetId: ChangeSetId;
   };
-  SchemaVariantDefinitionCloned: {
-    schemaVariantDefinitionId: string;
+  SchemaVariantCloned: {
+    schemaVariantId: string;
     changeSetId: ChangeSetId;
   };
-  SchemaVariantDefinitionFinished: {
+  SchemaVariantFinished: {
     taskId: string;
     schemaVariantId: string;
     detachedAttributePrototypes: DetachedAttributePrototype[];
   };
-  SchemaVariantDefinitionSaved: {
-    schemaVariantDefinitionId: string;
+  SchemaVariantSaved: {
+    schemaVariantId: string;
     changeSetId: ChangeSetId;
   };
   FuncCreated: {

lib/dal/src/func.rs

@@ -239,21 +239,18 @@ impl Func {
         func_backend_response_type: FuncBackendResponseType,
     ) -> FuncResult<FuncKind> {
         match func_backend_kind {
-            FuncBackendKind::JsAttribute => {
-                return match func_backend_response_type {
-                    FuncBackendResponseType::CodeGeneration => Ok(FuncKind::CodeGeneration),
-                    FuncBackendResponseType::Qualification => Ok(FuncKind::Qualification),
-                    FuncBackendResponseType::SchemaVariantDefinition => {
-                        dbg!("THIS IS FUCKED!");
-                        Ok(FuncKind::SchemaVariantDefinition)
-                    }
-                    _ => Ok(FuncKind::Attribute),
-                }
-            }
-            FuncBackendKind::JsAction => return Ok(FuncKind::Action),
-            FuncBackendKind::JsAuthentication => return Ok(FuncKind::Authentication),
-            FuncBackendKind::JsSchemaVariantDefinition => {
-                return Ok(FuncKind::SchemaVariantDefinition)
+            FuncBackendKind::JsAttribute => match func_backend_response_type {
+                FuncBackendResponseType::CodeGeneration => Ok(FuncKind::CodeGeneration),
+                FuncBackendResponseType::Qualification => Ok(FuncKind::Qualification),
+                _ => Ok(FuncKind::Attribute),
+            },
+            FuncBackendKind::JsAction => Ok(FuncKind::Action),
+            FuncBackendKind::JsAuthentication => Ok(FuncKind::Authentication),
+            FuncBackendKind::JsSchemaVariantDefinition => Ok(FuncKind::SchemaVariantDefinition),
+            FuncBackendKind::JsValidation => {
+                dbg!("Old func kind identifed so marked as unknown");
+                dbg!(&func_name, &func_backend_kind, &func_backend_response_type);
+                Ok(FuncKind::Unknown)
             }
             FuncBackendKind::Array
             | FuncBackendKind::Boolean
@@ -264,7 +261,7 @@ impl Func {
             | FuncBackendKind::Object
             | FuncBackendKind::String
             | FuncBackendKind::Unset
-            | FuncBackendKind::Validation => return Ok(FuncKind::Intrinsic),
+            | FuncBackendKind::Validation => Ok(FuncKind::Intrinsic),
             _ => {
                 dbg!(&func_name, &func_backend_kind, &func_backend_response_type);
                 Err(FuncError::UnknownFunctionType)

lib/dal/src/schema/variant.rs

@@ -41,9 +41,9 @@ use crate::workspace_snapshot::WorkspaceSnapshotError;
 use crate::{
     pk,
     schema::variant::leaves::{LeafInput, LeafInputLocation, LeafKind},
-    ActionPrototype, ActionPrototypeError, AttributePrototype, AttributePrototypeId, ComponentId,
-    ComponentType, DalContext, Func, FuncId, InputSocket, OutputSocket, OutputSocketId, Prop,
-    PropId, PropKind, Schema, SchemaError, SchemaId, SocketArity, Timestamp, TransactionsError,
+    ActionPrototype, AttributePrototype, AttributePrototypeId, ComponentId, ComponentType,
+    DalContext, Func, FuncId, InputSocket, OutputSocket, OutputSocketId, Prop, PropId, PropKind,
+    Schema, SchemaError, SchemaId, SocketArity, Timestamp, TransactionsError,
 };
 use crate::{FuncBackendResponseType, InputSocketId};
 
@@ -184,7 +184,7 @@ impl SchemaVariant {
             display_name: display_name.into(),
             component_type: component_type.into(),
             description: description.into(),
-            asset_func_id: asset_func_id.into(),
+            asset_func_id,
         };
 
         let (hash, _) = ctx
@@ -455,7 +455,7 @@ impl SchemaVariant {
     }
 
     pub fn asset_func_id(&self) -> Option<FuncId> {
-        self.asset_func_id.clone()
+        self.asset_func_id
     }
 
     pub async fn get_root_prop_id(
@@ -1057,13 +1057,9 @@ impl SchemaVariant {
                     .await?
                     .get_func_node_weight()?;
 
-                match node_weight.func_kind() {
-                    FuncKind::Attribute => {
-                        let func = Func::get_by_id(ctx, func_id).await?;
-                        all_funcs.push(func);
-                    }
-
-                    _ => {}
+                if node_weight.func_kind() == FuncKind::Attribute {
+                    let func = Func::get_by_id(ctx, func_id).await?;
+                    all_funcs.push(func);
                 }
             }
 

lib/sdf-server/src/server/routes.rs

@@ -45,10 +45,7 @@ pub fn routes(state: AppState) -> Router {
         // .nest("/api/fix", crate::server::service::fix::routes())
         // .nest("/api/pkg", crate::server::service::pkg::routes())
         // .nest("/api/status", crate::server::service::status::routes())
-        .nest(
-            "/api/variant_def",
-            crate::server::service::variant_definition::routes(),
-        )
+        .nest("/api/variant", crate::server::service::variant::routes())
         .layer(CompressionLayer::new());
 
     // Load dev routes if we are in dev mode (decided by "opt-level" at the moment).

lib/sdf-server/src/server/service.rs

@@ -12,7 +12,7 @@ pub mod ws;
 
 // pub mod pkg;
 // pub mod status;
-pub mod variant_definition;
+pub mod variant;
 
 /// A module containing dev routes for local development only.
 #[cfg(debug_assertions)]

…src/server/service/variant_definition.rs …sdf-server/src/server/service/variant.rslib/sdf-server/src/server/service/variant_definition.rs renamed to lib/sdf-server/src/server/service/variant.rs lib/sdf-server/src/server/service/variant_definition.rs renamed to lib/sdf-server/src/server/service/variant.rs

@@ -9,8 +9,8 @@ use crate::server::state::AppState;
 // pub mod clone_variant_def;
 // pub mod create_variant_def;
 // pub mod exec_variant_def;
-pub mod get_variant_def;
-pub mod list_variant_defs;
+pub mod get_variant;
+pub mod list_variants;
 // pub mod save_variant_def;
 
 #[remain::sorted]
@@ -699,11 +699,8 @@ impl IntoResponse for SchemaVariantError {
 
 pub fn routes() -> Router<AppState> {
     Router::new()
-        .route(
-            "/list_variant_defs",
-            get(list_variant_defs::list_variant_defs),
-        )
-        .route("/get_variant_def", get(get_variant_def::get_variant_def))
+        .route("/list_variants", get(list_variants::list_variants))
+        .route("/get_variant", get(get_variant::get_variant))
     // .route(
     //     "/save_variant_def",
     //     post(save_variant_def::save_variant_def),