diff --git a/runtime/parser/parse_node.go b/runtime/parser/parse_node.go index 4e950135a35..9685bb4ef4f 100644 --- a/runtime/parser/parse_node.go +++ b/runtime/parser/parse_node.go @@ -248,26 +248,26 @@ func (p *Parser) parseStem(paths []string, ymlPath, yml, sqlPath, sql string) (* v, ok := v.(string) if !ok { err = fmt.Errorf("invalid type %T for property 'type'", v) - break - } - res.Kind, err = ParseResourceKind(v) - if err != nil { - break + } else { + res.Kind, err = ParseResourceKind(v) } case "name": v, ok := v.(string) if !ok { err = fmt.Errorf("invalid type %T for property 'name'", v) - break + } else { + res.Name = v } - res.Name = v case "connector": v, ok := v.(string) if !ok { err = fmt.Errorf("invalid type %T for property 'connector'", v) - break + } else { + res.Connector = v } - res.Connector = v + } + if err != nil { + break } } if err != nil { diff --git a/runtime/parser/parser.go b/runtime/parser/parser.go index 32db87f77d7..5cb9110809c 100644 --- a/runtime/parser/parser.go +++ b/runtime/parser/parser.go @@ -646,12 +646,13 @@ func (p *Parser) parsePaths(ctx context.Context, paths []string) error { // NOTE 2: Using a map since the two-way check (necessary for reparses) may match the same resource twice. modelsWithNameErrs := make(map[ResourceName]string) for _, r := range p.insertedResources { - if r.Name.Kind == ResourceKindSource { + switch r.Name.Kind { + case ResourceKindSource: n := ResourceName{Kind: ResourceKindModel, Name: r.Name.Name}.Normalized() if _, ok := p.Resources[n]; ok { modelsWithNameErrs[n] = r.Name.Name } - } else if r.Name.Kind == ResourceKindModel { + case ResourceKindModel: n := ResourceName{Kind: ResourceKindSource, Name: r.Name.Name}.Normalized() if r2, ok := p.Resources[n]; ok { modelsWithNameErrs[r.Name.Normalized()] = r2.Name.Name diff --git a/web-admin/src/components/layout/ContentContainer.svelte b/web-admin/src/components/layout/ContentContainer.svelte index ecc1cfbcba7..b4e089acceb 100644 --- a/web-admin/src/components/layout/ContentContainer.svelte +++ b/web-admin/src/components/layout/ContentContainer.svelte @@ -2,10 +2,12 @@ export let title = ""; export let maxWidth = 800; export let showTitle = true; + export let flush = false;
@@ -21,3 +23,9 @@
+ + diff --git a/web-admin/src/components/nav/LeftNav.svelte b/web-admin/src/components/nav/LeftNav.svelte index 241c65e22fe..9a02ea57349 100644 --- a/web-admin/src/components/nav/LeftNav.svelte +++ b/web-admin/src/components/nav/LeftNav.svelte @@ -9,17 +9,20 @@ label: string; route: string; hasPermission?: boolean; + matchPrefix?: boolean; }[];