Merge pull request #120 from voxpupuli/fix-all-environments

Don't query for environment when all environments is selected

Author: sebastianrakel

ui/src/pages/DashboardPage.vue

@@ -61,7 +61,9 @@ function loadPopulation() {
 function loadResources() {
   if (!settings.environment) return;
   const builder = new PqlQuery(PqlEntity.Resources);
-  builder.filter().and().equal('environment', settings.environment);
+  if (settings.hasEnvironment()) {
+    builder.filter().and().equal('environment', settings.environment);
+  }
   builder.addProjectionField('count()');
 
   void Backend.getQueryResult<CountResult[]>(builder).then((result) => {
@@ -76,7 +78,7 @@ function loadData() {
   void Backend.getViewNodeOverview(settings.environment).then((result) => {
     if (result.status === 200) {
       nodes.value = result.data.Data.map((s) =>
-        PuppetNodeWithEventCount.fromApi(s)
+        PuppetNodeWithEventCount.fromApi(s),
       );
     }
   });
@@ -88,11 +90,14 @@ function load() {
   loadData();
 }
 
-
 onMounted(() => {
-  watch(() => settings.environment, () => {
-    load();
-  }, { immediate: true });
+  watch(
+    () => settings.environment,
+    () => {
+      load();
+    },
+    { immediate: true },
+  );
 });
 </script>
 

ui/src/pages/node/NodeDetailPage.vue

@@ -70,22 +70,38 @@ const pagination = ref({
 });
 
 function loadFacts() {
-  const query = `facts {certname = '${node.value}' and environment = '${settings.environment}' }`;
-
-  void Backend.getRawQueryResult<ApiPuppetFact[]>(query).then((result) => {
-    if (result.status === 200) {
-      node_facts.value = result.data.Data.Data.map((s) =>
-        PuppetFact.fromApi(s),
-      );
-    }
-  });
+  const queryBuilder = new PqlQuery(PqlEntity.Facts);
+  queryBuilder.filter().and().equal('certname', node.value);
+
+  if (settings.hasEnvironment()) {
+    queryBuilder.filter().and().equal('environment', settings.environment);
+  }
+
+  void Backend.getRawQueryResult<ApiPuppetFact[]>(queryBuilder.build()).then(
+    (result) => {
+      if (result.status === 200) {
+        node_facts.value = result.data.Data.Data.map((s) =>
+          PuppetFact.fromApi(s),
+        );
+      }
+    },
+  );
 }
 
 function loadNodeInfo() {
-  const query = `nodes { certname = '${node.value}' and catalog_environment = '${settings.environment}' }`;
+  const queryBuilder = new PqlQuery(PqlEntity.Nodes);
+  queryBuilder.filter().and().equal('certname', node.value);
+
+  if (settings.hasEnvironment()) {
+    queryBuilder
+      .filter()
+      .and()
+      .equal('catalog_environment', settings.environment);
+  }
+
   isLoading.value = true;
 
-  void Backend.getRawQueryResult<ApiPuppetNode[]>(query)
+  void Backend.getRawQueryResult<ApiPuppetNode[]>(queryBuilder.build())
     .then((result) => {
       if (result.status === 200) {
         node_info.value = PuppetNode.fromApi(result.data.Data.Data[0]!);

ui/src/pages/report/ReportOverviewPage.vue

@@ -131,7 +131,9 @@ function loadReports() {
     query.filter().and().equal('latest_report?', true);
   }
 
-  query.filter().and().equal('environment', settings.environment);
+  if (settings.hasEnvironment()) {
+    query.filter().and().equal('environment', settings.environment);
+  }
 
   const start = ((page ?? 1) - 1) * (rowsPerPage ?? 0);