[ontology/search] - added explicit not found check to ontology search…

… query
synnaxlabs · Aug 16, 2024 · acaa5bb · acaa5bb
1 parent 4017abc
commit acaa5bb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/console/src/range/slice.ts b/console/src/range/slice.ts
@@ -52,6 +52,8 @@ export const { actions, reducer } = createSlice({
       });
     },
     remove: (state, { payload: { keys } }: PA<RemovePayload>) => {
+      if (state.activeRange != null && keys.includes(state.activeRange))
+        state.activeRange = null;
       keys.forEach((k) => delete state.ranges[k]);
     },
     setActive: (state, { payload }: PA<SetActivePayload>) => {

diff --git a/pluto/src/channel/LinePlot.css b/pluto/src/channel/LinePlot.css
@@ -14,4 +14,4 @@
     border: var(--pluto-border);
     border-color: var(--haul-border-color);
     border-radius: var(--pluto-border-radius);
-}
+}
diff --git a/pluto/src/haul/Haul.css b/pluto/src/haul/Haul.css
@@ -10,6 +10,6 @@
  */
 
 html {
-    --haul-background: var(--pluto-primary-z-40);
-    --haul-border-color: var(--pluto-primary-z-80);
+    --haul-background: var(--pluto-gray-l7-20);
+    --haul-border-color: var(--pluto-gray-l7-50);
 }
diff --git a/synnax/pkg/distribution/ontology/ontology.go b/synnax/pkg/distribution/ontology/ontology.go
@@ -172,8 +172,12 @@ func (o *Ontology) Search(ctx context.Context, req search.Request) ([]Resource,
 	if err != nil {
 		return nil, err
 	}
-	var resources []Resource
-	return resources, o.NewRetrieve().WhereIDs(ids...).Entries(&resources).Exec(ctx, o.DB)
+	resources := make([]Resource, 0, len(ids))
+	err = o.NewRetrieve().WhereIDs(ids...).Entries(&resources).Exec(ctx, o.DB)
+	if errors.Is(err, query.NotFound) {
+		err = nil
+	}
+	return resources, err
 }
 
 func (o *Ontology) SearchIDs(ctx context.Context, req search.Request) ([]ID, error) {

diff --git a/synnax/pkg/distribution/ontology/retrieve.go b/synnax/pkg/distribution/ontology/retrieve.go
@@ -157,13 +157,11 @@ func (r Retrieve) Exec(ctx context.Context, tx gorp.Tx) error {
 		if i != 0 {
 			clause.WhereKeys(nextIDs...)
 		}
-		if err := clause.Exec(ctx, tx); err != nil {
-			return err
-		}
+		cErr := clause.Exec(ctx, tx)
 		atLast := len(r.query.Clauses) == i+1
 		resources, err := r.retrieveEntities(ctx, clause, tx)
-		if err != nil || len(resources) == 0 || atLast {
-			return err
+		if cErr != nil || err != nil || len(resources) == 0 || atLast {
+			return errors.CombineErrors(cErr, err)
 		}
 		if nextIDs, err = r.traverse(
 			ctx,
@@ -220,10 +218,12 @@ func (r Retrieve) retrieveEntities(
 	clause gorp.Retrieve[ID, Resource],
 	tx gorp.Tx,
 ) ([]Resource, error) {
-	entries := gorp.GetEntries[ID, Resource](clause.Params)
-	excludeFieldData := getExcludeFieldData(clause.Params)
-	includeSchema := getIncludeSchema(clause.Params)
-	retrieveResource := (!excludeFieldData) || includeSchema
+	var (
+		entries          = gorp.GetEntries[ID, Resource](clause.Params)
+		excludeFieldData = getExcludeFieldData(clause.Params)
+		includeSchema    = getIncludeSchema(clause.Params)
+		retrieveResource = (!excludeFieldData) || includeSchema
+	)
 	// Iterate over the entries in place, retrieving the resource if the query requires it.
 	err := entries.MapInPlace(func(res Resource) (Resource, bool, error) {
 		if res.ID.IsZero() {