Add sub-title for downloading and/or installing python packages

web/src/api/types/events.ts

@@ -464,10 +464,21 @@ export function isPublishRestorePythonEnvProgress(arg: Events):
   return arg.type === 'publish/restorePythonEnv/progress';
 }
 
+type packageRuntime = 'r' | 'python';
+type packageStatus = 'download+install' | 'download' | 'install';
+
 export interface PublishRestorePythonEnvStatus extends EventStreamMessage {
   type: 'publish/restorePythonEnv/status',
-  // structured data not guaranteed, use selective or generic queries
-  // from data map
+  data: {
+    level: 'INFO',
+    localId: string,
+    message: string,
+    name: string,
+    runtime: packageRuntime,
+    source: 'serverp.log',
+    status: packageStatus,
+    version: string
+  }
 }
 export type OnPublishRestorePythonEnvStatusCallback = (
   msg: PublishRestorePythonEnvStatus

web/src/components/publishProcess/PublishStep.vue

@@ -4,6 +4,7 @@
   <q-step
     :name="name"
     title="This is a step"
+    :caption="caption"
     :icon="icon"
     :active-icon="hasError ? 'warning' : icon"
     :active-color="hasError ? 'red' : undefined"
@@ -48,6 +49,7 @@ const colorStore = useColorStore();
 
 const props = defineProps({
   name: { type: [String, Number], required: true },
+  caption: { type: String, required: false, default: undefined },
   icon: { type: String, required: true },
   summary: { type: String, required: true },
   messages: { type: Array as PropType<EventStreamMessage[]>, required: false, default: () => [] },

web/src/components/publishProcess/steps/RestorePythonEnvironment.vue

@@ -8,6 +8,7 @@
     summary="Installing the dependent python packages on the server in order to reproduce your runtime environment."
     :done="done"
     :messages="messages"
+    :caption="caption"
   />
 </template>
 
@@ -27,6 +28,7 @@ const $eventStream = useEventStream();
 
 const done = ref(false);
 const messages = ref<EventStreamMessage[]>([]);
+const caption = ref<string | undefined>();
 
 const startCb = $eventStream.addEventMonitorCallback('publish/restorePythonEnv/start', (msg) => {
   messages.value.push(msg);
@@ -35,11 +37,30 @@ const startCb = $eventStream.addEventMonitorCallback('publish/restorePythonEnv/s
 const logCb = $eventStream.addEventMonitorCallback('publish/restorePythonEnv/log', (msg) => {
   messages.value.push(msg);
 });
-const progressCb = $eventStream.addEventMonitorCallback('publish/restorePythonEnv/progress', (msg) => {
-  messages.value.push(msg);
+const statusCb = $eventStream.addEventMonitorCallback('publish/restorePythonEnv/status', (msg) => {
+  let newCaption: string;
+
+  const { status: packageStatus, name: packageName, version } = msg.data;
+  switch (packageStatus) {
+    case 'download+install':
+      newCaption = `Downloading and installing package: `;
+      break;
+    case 'download':
+      newCaption = `Downloading package: `;
+      break;
+    case 'install':
+      newCaption = `Installing package: `;
+      break;
+  }
+  newCaption += packageName;
+  if (version) {
+    newCaption += ` (${version})`;
+  }
+  caption.value = newCaption;
 });
 const successCb = $eventStream.addEventMonitorCallback('publish/restorePythonEnv/success', (msg) => {
   messages.value.push(msg);
+  caption.value = undefined;
   done.value = true;
   emit('start');
 });
@@ -50,7 +71,7 @@ const failureCb = $eventStream.addEventMonitorCallback('publish/restorePythonEnv
 onBeforeUnmount(() => {
   $eventStream.delEventFilterCallback(startCb);
   $eventStream.delEventFilterCallback(logCb);
-  $eventStream.delEventFilterCallback(progressCb);
+  $eventStream.delEventFilterCallback(statusCb);
   $eventStream.delEventFilterCallback(successCb);
   $eventStream.delEventFilterCallback(failureCb);
 });