Limit take param to reduce load

ni · Jul 1, 2024 · 6762d89 · 6762d89
1 parent 1d17fef
commit 6762d89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/datasources/asset/AssetDataSource.ts b/src/datasources/asset/AssetDataSource.ts
@@ -42,15 +42,15 @@ export class AssetDataSource extends DataSourceBase<AssetQuery> {
     const minionIds = replaceVariables(query.minionIds, this.templateSrv);
     let workspaceId = this.templateSrv.replace(query.workspace);
     const conditions = [];
-    if (workspaceId) {
-      conditions.push(`workspace = "${workspaceId}"`);
-    }
     if (minionIds.length) {
       const systemsCondition = minionIds.map(id => `${AssetFilterProperties.LocationMinionId} = "${id}"`)
       conditions.push(`(${systemsCondition.join(' or ')})`);
     }
+    if (workspaceId) {
+      conditions.push(`workspace = "${workspaceId}"`);
+    }
     const assetFilter = conditions.join(' and ');
-    const assets: AssetModel[] = await this.queryAssets(assetFilter);
+    const assets: AssetModel[] = await this.queryAssets(assetFilter, 1000);
     const workspaces = await this.getWorkspaces();
     result.fields = [
       { name: 'id', values: assets.map(a => a.id) },

diff --git a/src/datasources/asset/types.ts b/src/datasources/asset/types.ts
@@ -55,6 +55,7 @@ export interface AssetModel {
 
 export interface AssetPresenceWithSystemConnectionModel {
   assetPresence: "INITIALIZING" | "UNKNOWN" | "NOT_PRESENT" | "PRESENT" | string,
+  // to be compatible with both SLS and SLE
   systemConnection?: "APPROVED" | "DISCONNECTED" | "CONNECTED_UPDATE_PENDING" | "CONNECTED_UPDATE_SUCCESSFUL" | "CONNECTED_UPDATE_FAILED" | "UNSUPPORTED" | "ACTIVATED" | "CONNECTED" | string
 }