Merge pull request #178 from klauer/fix_offline

FIX/ENH: a few more fixes for cached/offline mode + plugin only mode
pcdshub · Oct 10, 2023 · 52d508d · 52d508d
2 parents 71200d9 + 23cf731
commit 52d508d
Show file tree

Hide file tree

Showing 26 changed files with 304 additions and 184 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -11,10 +11,12 @@
   },
   "dependencies": {
     "@types/d3-graphviz": "^2.6.7",
-    "axios": "^1.4.0",
+    "@types/pako": "^2.0.0",
+    "axios": "^1.5.0",
     "d3-graphviz": "^5.1.0",
     "d3-selection": "^3.0.0",
     "es6-promise": "^4.2.8",
+    "pako": "^2.1.0",
     "pinia": "^2.1.6",
     "primeflex": "^3.3.1",
     "primeicons": "^6.0.1",

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -5,23 +5,32 @@
 
 <script lang="ts">
 import TabMenu from "primevue/tabmenu";
-import { plugins } from "./settings.ts";
+import { plugins, plugins_only_mode } from "./settings.ts";
 
 export default {
   name: "App",
   components: {
     TabMenu,
   },
   data() {
-    let tab_menu_items = [
-      { label: "Records", icon: "pi pi-fw pi-tags", to: { name: "whatrec" } },
-      { label: "IOCs", icon: "pi pi-fw pi-sitemap", to: { name: "iocs" } },
-      {
+    let tab_menu_items = [];
+    if (!plugins_only_mode) {
+      tab_menu_items.push({
+        label: "Records",
+        icon: "pi pi-fw pi-tags",
+        to: { name: "whatrec" },
+      });
+      tab_menu_items.push({
+        label: "IOCs",
+        icon: "pi pi-fw pi-sitemap",
+        to: { name: "iocs" },
+      });
+      tab_menu_items.push({
         label: "PV Map",
         icon: "pi pi-fw pi-compass",
         to: { name: "pv-relations" },
-      },
-    ];
+      });
+    }
     for (const plugin of plugins) {
       tab_menu_items.push({
         label: plugin.label,
@@ -34,11 +43,13 @@ export default {
       icon: "pi pi-fw pi-shield",
       to: { name: "gateway" },
     });
-    tab_menu_items.push({
-      label: "Duplicates",
-      icon: "pi pi-pause",
-      to: { name: "duplicates" },
-    });
+    if (!plugins_only_mode) {
+      tab_menu_items.push({
+        label: "Duplicates",
+        icon: "pi pi-pause",
+        to: { name: "duplicates" },
+      });
+    }
     tab_menu_items.push({
       label: "Logs",
       icon: "pi pi-fw pi-list",

diff --git a/frontend/src/components/epics-format-record.vue b/frontend/src/components/epics-format-record.vue
@@ -36,7 +36,7 @@
       <router-link
         :to="{
           name: 'whatrec',
-          query: { pattern: pvagroup, record: pvagroup, use_regex: 'false' },
+          query: { pattern: pvagroup, record: pvagroup, regex: 'false' },
         }"
       >
         {{ pvagroup }}
@@ -67,7 +67,7 @@
             query: {
               pattern: field.record_name,
               record: field.record_name,
-              use_regex: 'false',
+              regex: 'false',
             },
           }"
           :title="JSON.stringify(field.metadata, null, 2)"

diff --git a/frontend/src/components/gateway-matches.vue b/frontend/src/components/gateway-matches.vue
@@ -20,7 +20,7 @@
               query: {
                 pattern: match.rule.pattern,
                 record: [],
-                use_regex: 'true',
+                regex: 'true',
               },
             }"
           >

diff --git a/frontend/src/components/recordinfo.vue b/frontend/src/components/recordinfo.vue
@@ -47,16 +47,14 @@
   </template>
 
   <template v-if="streamdevice_metadata">
-    <details>
+    <details class="streamdevice">
       <summary>
-        StreamDevice protocol (
-        <span class="monospace">
-          {{ streamdevice_metadata.protocol_file }} </span
-        >,
-        <span class="monospace">
-          "{{ streamdevice_metadata.protocol_name }}"
-        </span>
-        )
+        StreamDevice protocol
+        <script-context-link
+          :context="streamdevice_metadata.context"
+          :short="2"
+          prefix=""
+        />
       </summary>
       <dictionary-table
         :dict="streamdevice_metadata as any"
@@ -271,7 +269,7 @@ export default {
           instance: this.record,
           plugin_matches: get_plugin_matches(this.record.metadata),
         });
-        console.log("matches", result);
+        console.debug("Found match:", result);
       }
       if (this.pva_group != null) {
         result.push({
@@ -289,18 +287,6 @@ export default {
       }
       return url + this.record.name;
     },
-    graph_link() {
-      if (!this.store.is_online) {
-        return null;
-      }
-      return `/api/pv/graph?pv=${this.whatrec.name}&format=svg`;
-    },
-    script_graph_link() {
-      if (!this.store.is_online) {
-        return null;
-      }
-      return `/api/pv/script-graph?pv=${this.whatrec.name}&format=svg`;
-    },
     available_protocols() {
       let protocols = [];
       if (this.record != null) {
@@ -377,6 +363,8 @@ export default {
       const link_tab = this.$refs.link_tab as HTMLElement | null;
       if (!graph_div || !link_tab) {
         console.error("What happened? No graph or tab?");
+        this.pv_graph_dot_source = "digraph { unknown error }";
+        this.show_graph = false;
         return;
       }
       this.graph_width = graph_div.clientWidth || window.innerWidth * 0.75;
@@ -433,4 +421,8 @@ iframe {
   min-width: 50%;
   min-height: 50%;
 }
+
+.streamdevice .context {
+  display: inline;
+}
 </style>
diff --git a/frontend/src/router.ts b/frontend/src/router.ts
@@ -27,16 +27,6 @@ let routes: RouteRecordRaw[] = [
     path: "/",
     redirect: "/whatrec",
   },
-  {
-    name: "whatrec",
-    path: "/whatrec",
-    component: WhatRec,
-    props: (route) => ({
-      pattern: route.query.pattern ?? "*",
-      use_regex: route.query.regex === "true",
-      record: nullable_string_to_array(route.query.record),
-    }),
-  },
   {
     name: "file",
     path: "/file",
@@ -46,7 +36,21 @@ let routes: RouteRecordRaw[] = [
       line: route.query.line ? parseInt(route.query.line.toString()) : 0,
     }),
   },
-  {
+];
+
+if (true) {
+  routes.push({
+    name: "whatrec",
+    path: "/whatrec",
+    component: WhatRec,
+    props: (route) => ({
+      pattern: route.query.pattern ?? "*",
+      use_regex: route.query.regex === "true",
+      record: nullable_string_to_array(route.query.record),
+    }),
+  });
+
+  routes.push({
     name: "iocs",
     path: "/iocs/",
     component: IocView,
@@ -55,13 +59,20 @@ let routes: RouteRecordRaw[] = [
       ioc_filter: route.query.ioc_filter ?? "",
       record_filter: route.query.record_filter ?? "",
     }),
-  },
-  {
+  });
+
+  routes.push({
     name: "pv-relations",
     path: "/pv-relations",
     component: PVRelationsView,
-  },
-];
+  });
+
+  routes.push({
+    name: "duplicates",
+    path: "/duplicates",
+    component: DuplicateView,
+  });
+}
 
 if (happi_enabled) {
   routes.push({
@@ -108,12 +119,6 @@ if (epicsarch_enabled) {
   });
 }
 
-routes.push({
-  name: "duplicates",
-  path: "/duplicates",
-  component: DuplicateView,
-});
-
 routes.push({
   name: "logs",
   path: "/logs",
@@ -127,7 +132,7 @@ routes.push({
 });
 
 export const router = VueRouter.createRouter({
-  history: VueRouter.createWebHistory(),
+  history: VueRouter.createWebHashHistory(import.meta.env.BASE_URL),
   routes: routes,
   scrollBehavior() {
     const app = document.getElementById("app");

diff --git a/frontend/src/settings.ts b/frontend/src/settings.ts
@@ -1,6 +1,7 @@
 export const enabled_plugins = (
   import.meta.env.WHATRECORD_PLUGINS || "happi twincat_pytmc netconfig"
 ).split(" ");
+export const plugins_only_mode = import.meta.env.WHATRECORD_PLUGINS_ONLY == "1";
 export const happi_enabled = enabled_plugins.indexOf("happi") >= 0;
 export const netconfig_enabled = enabled_plugins.indexOf("netconfig") >= 0;
 export const twincat_pytmc_enabled =

diff --git a/frontend/src/stores/api.ts b/frontend/src/stores/api.ts
@@ -443,5 +443,11 @@ export const api_server_store = defineStore("api-server", {
       }
       return matches;
     },
+    async get_server_logs(): Promise<string[]> {
+      const response = await this.run_query<string[]>("/api/logs/get", {
+        params: {},
+      });
+      return response?.data ?? ["(Error loading logs)"];
+    },
   },
 });