From 7bfec45f8b2befddeb8dafdcad4996197002ae66 Mon Sep 17 00:00:00 2001
From: Volker Austrup <volker.andreas.austrup@cern.ch>
Date: Thu, 8 May 2025 11:32:41 +0100
Subject: [PATCH] clean up code in components

---
 src/components/ChannelListItem.vue            | 17 +------
 src/components/ProcessListItem.vue            | 14 +-----
 src/components/WorkspaceListItem.vue          | 45 ++++++-----------
 src/components/WorkspaceLoader.vue            |  2 +-
 .../charts/ModifierStructureChart.vue         | 13 ++---
 src/components/charts/NormalizedBarChart.vue  | 14 ++----
 src/components/charts/StackedChart.vue        | 46 ++++-------------
 src/core/hepdata.ts                           | 50 +++++++++----------
 8 files changed, 61 insertions(+), 140 deletions(-)

diff --git a/src/components/ChannelListItem.vue b/src/components/ChannelListItem.vue
index 96ca2e1..8e57ad5 100644
--- a/src/components/ChannelListItem.vue
+++ b/src/components/ChannelListItem.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useWorkspaceStore } from 'src/stores/workspace';
 import { QPopupEdit } from 'quasar';
-import { ref, reactive, nextTick } from 'vue';
+import { ref } from 'vue';
 
 const props = defineProps<{
   id: number;
@@ -12,22 +12,9 @@ const workspace_store = useWorkspaceStore(props.id)();
 
 const popup = ref<InstanceType<typeof QPopupEdit>>();
 
-const state = reactive({ popup_disabled: true });
-
-// when clicking the edit button, the popup element is enabled
-// we then wait for the next tick for the information to propagate
-// afterwards we can actually show the popup
 async function edit_process_title(): Promise<void> {
-  enable_popup();
-  await nextTick();
   popup.value?.show();
 }
-function disable_popup(): void {
-  state.popup_disabled = true;
-}
-function enable_popup(): void {
-  state.popup_disabled = false;
-}
 
 async function update_download_buttons(): Promise<void> {
   workspace_store.update_all_svg_urls();
@@ -40,13 +27,11 @@ async function update_download_buttons(): Promise<void> {
       <q-item-label lines="1">
         {{ workspace_store.channels[channel_id].title }}
         <q-popup-edit
-          :disable="state.popup_disabled"
           ref="popup"
           v-model="workspace_store.channels[channel_id]._title"
           auto-save
           v-slot="scope"
           @hide="
-            disable_popup();
             update_download_buttons();
           "
         >
diff --git a/src/components/ProcessListItem.vue b/src/components/ProcessListItem.vue
index 754a8d6..8b5fadd 100644
--- a/src/components/ProcessListItem.vue
+++ b/src/components/ProcessListItem.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useWorkspaceStore } from 'src/stores/workspace';
 import { QPopupEdit } from 'quasar';
-import { ref, reactive, nextTick } from 'vue';
+import { ref } from 'vue';
 import { color_scheme } from 'src/utils/colors';
 
 const props = defineProps<{
@@ -13,19 +13,9 @@ const workspace_store = useWorkspaceStore(props.id)();
 
 const popup = ref<InstanceType<typeof QPopupEdit>>();
 
-const state = reactive({ popup_disabled: true });
-
 async function edit_process_title(): Promise<void> {
-  enable_popup();
-  await nextTick();
   popup.value?.show();
 }
-function disable_popup(): void {
-  state.popup_disabled = true;
-}
-function enable_popup(): void {
-  state.popup_disabled = false;
-}
 
 const color = ref(workspace_store.colors[props.process_name]);
 
@@ -44,13 +34,11 @@ async function update_download_buttons(): Promise<void> {
       <q-item-label lines="1">
         {{ workspace_store.process_titles[process_name] }}
         <q-popup-edit
-          :disable="state.popup_disabled"
           ref="popup"
           v-model="workspace_store.process_title_index[process_name]"
           auto-save
           v-slot="scope"
           @hide="
-            disable_popup();
             update_download_buttons();
           "
         >
diff --git a/src/components/WorkspaceListItem.vue b/src/components/WorkspaceListItem.vue
index 33bf1dc..99d18b1 100644
--- a/src/components/WorkspaceListItem.vue
+++ b/src/components/WorkspaceListItem.vue
@@ -1,46 +1,31 @@
 <script setup lang="ts">
-import { ref, reactive, nextTick } from 'vue';
+import { ref } from 'vue';
 import { QPopupEdit } from 'quasar';
 import { useWorkspaceStore } from 'src/stores/workspace';
 
-const props = defineProps<{
-  id: number;
-}>();
+const props = defineProps<{ id: number }>();
 
-const workspace_store = useWorkspaceStore(props.id)();
+const workspaceStore = useWorkspaceStore(props.id)();
 
-const popup = ref<InstanceType<typeof QPopupEdit>>();
-
-const state = reactive({ popup_disabled: true });
-
-async function edit_workspace_name(): Promise<void> {
-  enable_popup();
-  await nextTick();
-  popup.value?.show();
-}
-function disable_popup(): void {
-  state.popup_disabled = true;
-}
-function enable_popup(): void {
-  state.popup_disabled = false;
+const popupRef = ref();
+function editWorkspaceName(): void {
+  popupRef.value?.show();
 }
 </script>
 
 <template>
   <q-item>
     <q-item-section>
-      <div v-if="workspace_store.loading">
-        <q-skeleton type="text" width="75px"></q-skeleton>
+      <div v-if="workspaceStore.loading">
+        <q-skeleton type="text" width="75px" />
       </div>
       <div v-else>
-        {{ workspace_store.name }}
+        {{ workspaceStore.name }}
         <q-popup-edit
-          :disable="state.popup_disabled"
-          ref="popup"
-          v-model="workspace_store.name"
+          v-model="workspaceStore.name"
+          ref="popupRef"
           auto-save
           v-slot="scope"
-          @hide="disable_popup"
         >
           <q-input
             v-model="scope.value"
@@ -53,15 +38,15 @@ function enable_popup(): void {
     </q-item-section>
     <q-item-section side top>
       <q-btn
-        :disable="workspace_store.loading"
-        @click="edit_workspace_name()"
+        :disable="workspaceStore.loading"
+        @click="editWorkspaceName()"
         icon="edit"
       />
     </q-item-section>
     <q-item-section side bottom>
       <q-btn
-        :disable="workspace_store.loading"
-        @click="workspace_store.delete_workspace()"
+        :disable="workspaceStore.loading"
+        @click="workspaceStore.delete_workspace()"
         icon="delete"
       />
     </q-item-section>
diff --git a/src/components/WorkspaceLoader.vue b/src/components/WorkspaceLoader.vue
index f1c1b30..e58d87c 100644
--- a/src/components/WorkspaceLoader.vue
+++ b/src/components/WorkspaceLoader.vue
@@ -8,7 +8,7 @@ import type { IAnalysis, IAnalysisOption } from 'src/interfaces';
 const storeid_store = useStoreIDStore();
 
 const hepdata_id = ref('');
-const analyses = ref([] as IAnalysis[]);
+const analyses = ref<IAnalysis[]>([]);
 let analyses_to_load = [] as IAnalysisOption[];
 const files = ref();
 const button_is_disabled = computed(() => {
diff --git a/src/components/charts/ModifierStructureChart.vue b/src/components/charts/ModifierStructureChart.vue
index 1dc89eb..b5df067 100644
--- a/src/components/charts/ModifierStructureChart.vue
+++ b/src/components/charts/ModifierStructureChart.vue
@@ -69,14 +69,11 @@ const legend_height = computed(() => {
 });
 
 // pre-compute positions of rects
-const x_pos = computed(() => {
-  // return list of x-positions for the modifiers
-  return workspace_store.modifier_names.map(
-    (_, index) => index * size + ylabel_length.value + label_offset
-  );
-});
+const x_pos: number[] = workspace_store.modifier_names.map(
+  (_, index) => index * size + ylabel_length.value + label_offset
+);
 
-const y_pos = computed(() => {
+const y_pos: number[][] = (() => {
   const positions: number[][] = [];
   let channel_offset = 0;
   for (const channel of workspace_store.channels) {
@@ -87,7 +84,7 @@ const y_pos = computed(() => {
     channel_offset += channel.samples.length * size + padding;
   }
   return positions;
-});
+})();
 
 // make interactive
 const state = reactive({
diff --git a/src/components/charts/NormalizedBarChart.vue b/src/components/charts/NormalizedBarChart.vue
index 34e89a3..1b7844d 100644
--- a/src/components/charts/NormalizedBarChart.vue
+++ b/src/components/charts/NormalizedBarChart.vue
@@ -29,18 +29,12 @@ const offset =
   (bar_height + padding) * workspace_store.channels.length + padding;
 
 // create strings for path of axes
-const y_ticks = [
-  ...Array(workspace_store.channels.length)
-    .fill(0)
-    .map((_, i) => (i + 0.5) * bar_height + (i + 1) * padding),
-];
+const y_ticks = Array.from({ length: workspace_store.channels.length }, (_, i) =>
+  (i + 0.5) * bar_height + (i + 1) * padding
+);
 const yaxis_path = axis_path(0, 0, offset, y_ticks, false, true);
 
-const x_ticks = [
-  ...Array(number_of_ticks)
-    .fill(0)
-    .map((_, i) => i * (x_range / (number_of_ticks - 1))),
-];
+const x_ticks = Array.from({ length: number_of_ticks }, (_, i) => i * (x_range / (number_of_ticks - 1)));
 const xaxis_path = axis_path(0, offset, x_range, x_ticks, true, true);
 
 // the height of the plot should be at least the height of the bars corresponding to the different channels
diff --git a/src/components/charts/StackedChart.vue b/src/components/charts/StackedChart.vue
index ec1430a..1eb9f5d 100644
--- a/src/components/charts/StackedChart.vue
+++ b/src/components/charts/StackedChart.vue
@@ -21,27 +21,14 @@ const channel = workspace_store.channels[props.channel_index];
 
 const number_of_bins = channel.samples[0].data.length;
 
-const bins = Array.from({ length: number_of_bins }, (e, i) => i);
+const bins = Array.from({ length: number_of_bins }, (_, i) => i);
 
 const maximum = computed(() => {
   let max = 0;
-  for (
-    let i_bin = 0;
-    i_bin < channel.stacked_data_per_bin.content.length;
-    i_bin++
-  ) {
-    const high_value =
-      channel.stacked_data_per_bin.content[i_bin][
-        workspace_store.process_names.length - 1
-      ].high;
-    if (max < high_value) {
-      max = high_value;
-    }
-    const data_value = channel.stacked_data_per_bin.data[i_bin];
-    if (max < data_value) {
-      max = data_value;
-    }
-  }
+  channel.stacked_data_per_bin.content.forEach((binContent, i_bin) => {
+    const high = binContent[workspace_store.process_names.length - 1].high;
+    max = Math.max(max, high, channel.stacked_data_per_bin.data[i_bin]);
+  });
   return max;
 });
 
@@ -90,23 +77,16 @@ const y_ticks = computed(() => {
   } else if (max >= 3) {
     stepsize = 1;
   }
-  let i = 0;
   const ticks = [];
-  while (i <= max) {
+  for (let i = 0; i <= max; i+= stepsize) {
     ticks.push(i);
-    i += stepsize;
   }
   return ticks;
 });
 
-const y_tick_positions = computed(() => {
-  const max = maximum_normalised.value;
-  let tick_positions = [];
-  for (const tick of y_ticks.value) {
-    tick_positions.push(-(300 / max) * tick);
-  }
-  return tick_positions;
-});
+const y_tick_positions = computed(() =>
+  y_ticks.value.map(tick => -(300 / maximum_normalised.value) * tick)
+);
 
 const yaxis_path = axis_path(100, 350, 40, y_tick_positions.value, false, true);
 </script>
@@ -226,14 +206,10 @@ const yaxis_path = axis_path(100, 350, 40, y_tick_positions.value, false, true);
 </template>
 
 <style scoped>
-rect.isnothighlighted {
-  fill-opacity: 0.5;
-  transition: fill-opacity 0.5s ease;
-}
-
+rect.isnothighlighted,
 path.isnothighlighted {
   fill-opacity: 0.5;
-  transition: fill-opacity 0.5s ease;
+  transition: fill-opacity 0.5s ease, fill 0.5s ease;
 }
 
 text.isnothighlighted {
diff --git a/src/core/hepdata.ts b/src/core/hepdata.ts
index b4a3dbd..0dad73d 100644
--- a/src/core/hepdata.ts
+++ b/src/core/hepdata.ts
@@ -3,6 +3,19 @@ import { useWorkspaceStore } from 'src/stores/workspace';
 import type { IAnalysis, IHEPdataentry, IWorkspace } from 'src/interfaces';
 import { Notify } from 'quasar';
 
+type HEPDataFileResponse = {
+  file_contents: string;
+};
+
+async function fetchJson<T>(url: string): Promise<T | null> {
+  try {
+    const response = await fetch(url);
+    return await response.json();
+  } catch {
+    return null;
+  }
+}
+
 export async function check_workspaces_on_HEPdata(
   hepdata_id: string
 ): Promise<IAnalysis[]> {
@@ -12,10 +25,8 @@ export async function check_workspaces_on_HEPdata(
     'https://www.hepdata.net/record/ins' +
     hepdata_id +
     '?format=json&light=true';
-  let hepdata_entry: IHEPdataentry | null = null;
-  try {
-    hepdata_entry = await (await fetch(hepdata_url)).json();
-  } catch {
+  const hepdata_entry = await fetchJson<IHEPdataentry>(hepdata_url);
+  if (!hepdata_entry?.record?.analyses) {
     Notify.create({
       message:
         'Invalid JSON encountered. Are you sure you provided the correct HEPdata ID?',
@@ -25,20 +36,10 @@ export async function check_workspaces_on_HEPdata(
     });
     return [];
   }
-  const analyses: IAnalysis[] | undefined = [];
-  if (hepdata_entry?.record.analyses === undefined) {
-    return [];
-  }
-  for (const analysis of hepdata_entry?.record.analyses) {
-    if (analysis.type !== 'HistFactory') {
-      continue;
-    }
-    analyses.push({
-      name: analysis.filename,
-      url: analysis.analysis,
-    });
-  }
-  if (analyses === undefined || analyses.length === 0) {
+  const analyses = hepdata_entry.record.analyses
+    .filter(a => a.type === 'HistFactory')
+    .map(a => ({ name: a.filename, url: a.analysis }));
+  if (analyses.length === 0) {
     Notify.create({
       message:
         'No JSON workspaces are available for this HEPData entry. Are you sure you provided the correct HEPdata ID?',
@@ -46,31 +47,26 @@ export async function check_workspaces_on_HEPdata(
       icon: 'report_problem',
       position: 'top',
     });
-    return [];
   }
   store_id_store.checking = false;
   return analyses;
 }
 
 export async function load_workspaces_from_HEPdata(analyses: IAnalysis[]): Promise<void> {
-  for (const analysis of analyses) {
-    load_workspace_from_HEPdata(analysis);
-  }
+  await Promise.all(analyses.map(load_workspace_from_HEPdata));
 }
 
 export async function load_workspace_from_HEPdata_resource(record_id: string): Promise<void> {
   const analysis: IAnalysis = {name: 'Resource ID: ' + record_id, url: 'https://www.hepdata.net/record/resource/'+record_id+'?landing_page=true'}
-  load_workspace_from_HEPdata(analysis);
+  await load_workspace_from_HEPdata(analysis);
 }
 
 export async function load_workspace_from_HEPdata(analysis: IAnalysis): Promise<void> {
   const store_id_store = useStoreIDStore();
   const id = store_id_store.add_store_with_id();
   const workspace_store = useWorkspaceStore(id)();
-  const response = await (
-    await fetch(analysis.url.replace('landing_page=true', 'format=json'))
-  ).json()
-  let workspace = {} as IWorkspace
+  const response = await fetchJson<HEPDataFileResponse>(analysis.url.replace('landing_page=true', 'format=json'));
+  let workspace: IWorkspace;
   if (response.file_contents === 'Large text file') {
     workspace = await (
       await fetch(