ui_migration fix(deps): --preliminary-- Removing markRaw to static declared components. Improvement, SmartScan now works partially.

2026-02-12 23:14:53 -06:00 · 2026-02-12 23:14:53 -06:00 · ee71a416b1
commit ee71a416b1
parent dfca0ff7e0
38 changed files with 71 additions and 72 deletions
--- a/webapp/src/App.vue
+++ b/webapp/src/App.vue
@ -55,8 +55,8 @@ export default {
  name: "App",

  components: {
-    appContent: markRaw(appContent),
-    loadingContent: markRaw(loadingContent),
+    appContent,
+    loadingContent
  },

  data: function () {
--- a/webapp/src/components/appContent.vue
+++ b/webapp/src/components/appContent.vue
@ -102,9 +102,9 @@ export default {
  name: "AppContent",

  components: {
-    tabIcon: markRaw(tabIcon),
-    tabContent: markRaw(tabContent),
-    calibrationWizard: markRaw(calibrationWizard),
+    tabIcon,
+    tabContent,
+    calibrationWizard
  },
  data: function () {
    return {
--- a/webapp/src/components/labThingsComponents/actionButton.vue
+++ b/webapp/src/components/labThingsComponents/actionButton.vue
@ -51,8 +51,8 @@ export default {
  ],

  components: { 
-    ActionProgressBar: markRaw(ActionProgressBar),
-    ActionStatusModal: markRaw(ActionStatusModal)
+    ActionProgressBar,
+    ActionStatusModal
  },

  props: {
--- a/webapp/src/components/labThingsComponents/actionLogDisplay.vue
+++ b/webapp/src/components/labThingsComponents/actionLogDisplay.vue
@ -69,8 +69,7 @@ export default {
    taskStatus: {
      handler() {
        this.scrollToBottom();
-      },
-      //deep: true,
+      }
    },
  },

--- a/webapp/src/components/labThingsComponents/actionStatusModal.vue
+++ b/webapp/src/components/labThingsComponents/actionStatusModal.vue
@ -35,8 +35,8 @@ import { eventBus } from "../../eventBus.js";
 export default {
  name: "ActionStatusModal",
  components: { 
-    ActionProgressBar: markRaw(ActionProgressBar),
-    ActionLogDisplay: markRaw(ActionLogDisplay)
+    ActionProgressBar,
+    ActionLogDisplay
  },
  props: {
    title: {
--- a/webapp/src/components/labThingsComponents/inputFromSchema.vue
+++ b/webapp/src/components/labThingsComponents/inputFromSchema.vue
@ -107,7 +107,7 @@ export default {
  name: "InputFromSchema",

  components: {
-    syncPropertyButton: markRaw(syncPropertyButton),
+    syncPropertyButton
  },

  props: {
--- a/webapp/src/components/labThingsComponents/propertyControl.vue
+++ b/webapp/src/components/labThingsComponents/propertyControl.vue
@ -20,7 +20,7 @@ export default {
  name: "PropertyControl",

  components: {
-    InputFromSchema: markRaw(InputFromSchema),
+    InputFromSchema
  },

  props: {
--- a/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue
+++ b/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue
@ -25,7 +25,7 @@ export default {
  name: "ServerSpecifiedActionButton",

  components: {
-    ActionButton: markRaw(ActionButton),
+    ActionButton
  },

  props: {
--- a/webapp/src/components/labThingsComponents/serverSpecifiedPropertyControl.vue
+++ b/webapp/src/components/labThingsComponents/serverSpecifiedPropertyControl.vue
@ -19,7 +19,7 @@ export default {
  name: "ServerSpecifiedPropertyControl",

  components: {
-    PropertyControl: markRaw(PropertyControl),
+    PropertyControl
  },

  props: {
--- a/webapp/src/components/loadingContent.vue
+++ b/webapp/src/components/loadingContent.vue
@ -22,7 +22,7 @@ export default {
  name: "LoadingContent",

  components: { 
-    devTools: markRaw(devTools) 
+    devTools 
  },

  data: function () {
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationSteps/cameraMainCalibrationStep.vue
@ -26,8 +26,8 @@ export default {
  name: "CameraMainCalibrationStep",

  components: {
-    stepTemplateWithStream: markRaw(stepTemplateWithStream),
-    cameraCalibrationSettings: markRaw(cameraCalibrationSettings),
+    stepTemplateWithStream,
+    cameraCalibrationSettings
  },

  computed: {
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationTask.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraCalibrationTask.vue
@ -20,7 +20,7 @@ import { markRaw } from "vue";
 export default {
  name: "CameraCalibrationTask",
  components: { 
-    calibrationWizardTask: markRaw(calibrationWizardTask) },
+    calibrationWizardTask},
  props: {
    // Standard calibrationWizardTask props below:
    first: Boolean,
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/cameraStageMappingTask.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/cameraStageMappingTask.vue
@ -20,8 +20,8 @@ import { markRaw } from "vue";

 export default {
  name: "CameraCalibrationTask",
-  components: { 
-    calibrationWizardTask: markRaw(calibrationWizardTask) 
+  components: {
+    calibrationWizardTask
  },
  props: {
    // Standard calibrationWizardTask props below:
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/focusStep.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/focusStep.vue
@ -37,8 +37,8 @@ export default {
  name: "CameraMainCalibrationStep",

  components: {
-    stepTemplateWithStream: markRaw(stepTemplateWithStream),
-    ActionButton: markRaw(ActionButton),
+    stepTemplateWithStream,
+    ActionButton
  },
 };
 </script>
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue
@ -25,8 +25,8 @@ export default {
  name: "CameraMainCalibrationStep",

  components: {
-    stepTemplateWithStream: markRaw(stepTemplateWithStream),
-    CSMCalibrationSettings: markRaw(CSMCalibrationSettings),
+    stepTemplateWithStream,
+    CSMCalibrationSettings,
  },

  mounted() {
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/singleStepTask.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/singleStepTask.vue
@ -30,7 +30,7 @@ import { markRaw } from "vue";
 export default {
  name: "SingleStepTask",
  components: { 
-    calibrationWizardTask: markRaw(calibrationWizardTask) 
+    calibrationWizardTask
  },
  props: {
    // This must be sent
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/stepTemplateWithStream.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/stepTemplateWithStream.vue
@ -15,7 +15,7 @@ export default {
  name: "StepTemplateWithStream",

  components: {
-    miniStreamDisplay: markRaw(miniStreamDisplay),
+    miniStreamDisplay
  },
 };
 </script>
--- a/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue
+++ b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue
@ -63,7 +63,7 @@ import { markRaw } from "vue";
 export default {
  name: "StatusPane",
  components: { 
-    ActionButton: markRaw(ActionButton) 
+    ActionButton
  },

  data: function () {
--- a/webapp/src/components/tabContentComponents/aboutContent.vue
+++ b/webapp/src/components/tabContentComponents/aboutContent.vue
@ -31,8 +31,8 @@ export default {
  name: "AboutContent",

  components: {
-    devTools: markRaw(devTools),
-    statusPane: markRaw(statusPane),
+    devTools,
+    statusPane
  },
 };
 </script>
--- a/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue
+++ b/webapp/src/components/tabContentComponents/backgroundDetectComponents/paneBackgroundDetect.vue
@ -52,8 +52,8 @@ import { markRaw } from "vue";

 export default {
  components: {
-    ActionButton: markRaw(ActionButton),
-    ServerSpecifiedPropertyControl: markRaw(ServerSpecifiedPropertyControl),
+    ActionButton,
+    ServerSpecifiedPropertyControl
  },

  data() {
--- a/webapp/src/components/tabContentComponents/backgroundDetectContent.vue
+++ b/webapp/src/components/tabContentComponents/backgroundDetectContent.vue
@ -20,8 +20,8 @@ export default {
  name: "BackgroundDetectContent",

  components: {
-    paneBackgroundDetect: markRaw(paneBackgroundDetect),
-    streamDisplay: markRaw(streamDisplay),
+    paneBackgroundDetect,
+    streamDisplay
  },
 };
 </script>
--- a/webapp/src/components/tabContentComponents/controlComponents/autofocusControl.vue
+++ b/webapp/src/components/tabContentComponents/controlComponents/autofocusControl.vue
@ -26,7 +26,7 @@ export default {
  name: "AutofocusControl",

  components: {
-    ActionButton: markRaw(ActionButton),
+    ActionButton
  },

  data: function () {
--- a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
+++ b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
@ -41,9 +41,9 @@ export default {
  name: "PaneControl",

  components: {
-    ActionButton: markRaw(ActionButton),
-    positionControl: markRaw(positionControl),
-    autofocusControl: markRaw(autofocusControl),
+    ActionButton,
+    positionControl,
+    autofocusControl
  },

  computed: {
--- a/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue
+++ b/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue
@ -69,9 +69,9 @@ export default {
  name: "PaneControl",

  components: {
-    ActionButton: markRaw(ActionButton),
-    syncPropertyButton: markRaw(syncPropertyButton),
-    stageControlButtons: markRaw(stageControlButtons),
+    ActionButton,
+    syncPropertyButton,
+    stageControlButtons
  },

  data: function () {
--- a/webapp/src/components/tabContentComponents/controlContent.vue
+++ b/webapp/src/components/tabContentComponents/controlContent.vue
@ -20,8 +20,8 @@ export default {
  name: "ControlContent",

  components: {
-    paneControl: markRaw(paneControl),
-    streamDisplay: markRaw(streamDisplay) ,
+    paneControl,
+    streamDisplay
  },
 };
 </script>
--- a/webapp/src/components/tabContentComponents/loggingContent.vue
+++ b/webapp/src/components/tabContentComponents/loggingContent.vue
@ -90,8 +90,8 @@ export default {
  name: "LoggingContent",

  components: {
-    Paginate: markRaw(Paginate),
-    EndpointButton: markRaw(EndpointButton),
+    Paginate,
+    EndpointButton
  },

  data: function () {
--- a/webapp/src/components/tabContentComponents/scanListComponents/scanCard.vue
+++ b/webapp/src/components/tabContentComponents/scanListComponents/scanCard.vue
@ -89,8 +89,8 @@ import { markRaw } from "vue";
 export default {
  name: "ScanCard",
  components: { 
-    actionButton: markRaw(actionButton), 
-    EndpointButton: markRaw(EndpointButton) 
+    actionButton,
+    EndpointButton
  },

  props: {
--- a/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue
+++ b/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue
@ -61,7 +61,7 @@ import { markRaw } from "vue";
 export default {
  name: "ScanViewerModal",
  components: { 
-    OpenSeadragonViewer: markRaw(OpenSeadragonViewer) 
+    OpenSeadragonViewer
  },
  props: {
    selectedScan: {
--- a/webapp/src/components/tabContentComponents/scanListContent.vue
+++ b/webapp/src/components/tabContentComponents/scanListContent.vue
@ -108,9 +108,9 @@ import { eventBus } from "../../eventBus.js";
 export default {
  name: "ScanListContent",
  components: { 
-    actionButton: markRaw(actionButton), 
-    scanCard: markRaw(scanCard), 
-    ScanViewerModal: markRaw(ScanViewerModal) 
+    actionButton,
+    scanCard,
+    ScanViewerModal
  },

  data: function () {
--- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue
@ -25,8 +25,8 @@ export default {
  name: "CSMSettings",

  components: {
-    CSMCalibrationSettings: markRaw(CSMCalibrationSettings),
-    miniStreamDisplay: markRaw(miniStreamDisplay),
+    CSMCalibrationSettings,
+    miniStreamDisplay
  },
 };
 </script>
--- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
@ -65,8 +65,8 @@ export default {
  name: "CSMCalibrationSettings",

  components: {
-    ActionButton: markRaw(ActionButton),
-    matrixDisplay: markRaw(matrixDisplay),
+    ActionButton,
+    matrixDisplay
  },

  props: {
--- a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue
@ -33,9 +33,9 @@ export default {
  name: "CameraSettings",

  components: {
-    cameraCalibrationSettings: markRaw(cameraCalibrationSettings),
-    miniStreamDisplay: markRaw(miniStreamDisplay),
-    ServerSpecifiedPropertyControl: markRaw(ServerSpecifiedPropertyControl),
+    cameraCalibrationSettings,
+    miniStreamDisplay,
+    ServerSpecifiedPropertyControl
  },

  data() {
--- a/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue
@ -30,7 +30,7 @@ export default {
  name: "CameraCalibrationSettings",

  components: {
-    ServerSpecifiedActionButton: markRaw(ServerSpecifiedActionButton),
+    ServerSpecifiedActionButton,
  },

  props: {
--- a/webapp/src/components/tabContentComponents/settingsComponents/displaySettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/displaySettings.vue
@ -15,8 +15,8 @@ export default {
  name: "DisplaySettings",

  components: {
-    streamSettings: markRaw(streamSettings),
-    appSettings: markRaw(appSettings),
+    streamSettings,
+    appSettings
  },
 };
 </script>
--- a/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue
@ -36,7 +36,7 @@ export default {
  name: "StageSettings",

  components: {
-    ActionButton: markRaw(ActionButton),
+    ActionButton
  },

  data: function () {
--- a/webapp/src/components/tabContentComponents/settingsContent.vue
+++ b/webapp/src/components/tabContentComponents/settingsContent.vue
@ -76,9 +76,9 @@ export default {
  name: "SettingsContent",

  components: {
-    tabIcon: markRaw(tabIcon),
-    tabContent: markRaw(tabContent),
-    calibrationWizard: markRaw(calibrationWizard),
+    tabIcon,
+    tabContent,
+    calibrationWizard
  },

  data: function () {
--- a/webapp/src/components/tabContentComponents/slideScanContent.vue
+++ b/webapp/src/components/tabContentComponents/slideScanContent.vue
@ -160,12 +160,12 @@ export default {
  name: "SlideScanContent",

  components: {
-    streamDisplay: markRaw(streamDisplay),
-    propertyControl: markRaw(propertyControl),
-    actionLogDisplay: markRaw(actionLogDisplay),
-    actionProgressBar: markRaw(actionProgressBar),
-    MiniStreamDisplay: markRaw(MiniStreamDisplay),
-    ActionButton: markRaw(ActionButton),
+    streamDisplay,
+    propertyControl,
+    actionLogDisplay,
+    actionProgressBar,
+    MiniStreamDisplay,
+    ActionButton,
  },

  data() {
--- a/webapp/src/components/tabContentComponents/viewContent.vue
+++ b/webapp/src/components/tabContentComponents/viewContent.vue
@ -16,7 +16,7 @@ export default {
  name: "ViewContent",

  components: {
-    streamDisplay: markRaw(streamDisplay),
+    streamDisplay,
  },
 };
 </script>