case 4769 - remove the subscription server last update age notification

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sockeye",
-  "version": "8.1.0",
+  "version": "8.1.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

src/App.vue

@@ -242,6 +242,7 @@ import gznotify from "./components/gznotify";
 import openObjectHandler from "./api/open-object-handler";
 import notifyPoll from "./api/notifypoll";
 import { processLogout } from "./api/authutil";
+import insertDateShortcut from "./api/insert-date-shortcut";
 export default {
   components: {
     gzconfirm,
@@ -310,10 +311,12 @@ export default {
     window.$gz.dialog.wireUpEventHandlers(this);
     openObjectHandler.wireUpEventHandlers(this);
     window.$gz.translation.setVuetifyDefaultLanguageElements(this);
+    insertDateShortcut.wireUp();
   },
   beforeDestroy() {
     //UNWIRE ALL EVENT HANDLERS FROM GZEVENTBUS
     window.$gz.eventBus.$off();
+    insertDateShortcut.unwire();
   },
   mounted() {
     const vm = this;

src/api/biz-role-rights.js

@@ -41,8 +41,6 @@ export default {
   License: { Change: 32842, ReadFullRecord: 65797, Select: 131071 },
   TrialLicenseRequest: { Change: 32842, ReadFullRecord: 65797, Select: 131071 },
   SubscriptionServer: { Change: 32842, ReadFullRecord: 65797, Select: 131071 },
-  Purchase: { Change: 32842, ReadFullRecord: 65797, Select: 131071 },
-  VendorNotification: { Change: 32842, ReadFullRecord: 65797, Select: 131071 },
   Product: { Change: 32842, ReadFullRecord: 65797, Select: 131071 },
   GZCase: { Change: 32842, ReadFullRecord: 65797, Select: 131071 },
   Subscription: { Change: 32842, ReadFullRecord: 65797, Select: 131071 },

src/api/initialize.js

@@ -203,20 +203,6 @@ ServiceContractor = 5 */
     key: key++
   });
 
-  sub.push({
-    title: "PurchaseList",
-    icon: "$sockiShoppingCart",
-    route: "/biz-purchase-list",
-    key: key++
-  });
-
-  sub.push({
-    title: "VendorNotificationList",
-    icon: "$sockiCommentDollar",
-    route: "/biz-vendor-notification-list",
-    key: key++
-  });
-
   sub.push({
     title: "ProductList",
     icon: "$sockiBarCode",

src/api/insert-date-shortcut.js

@@ -0,0 +1,67 @@
+/////////////////////////////////////////////////////////////////////
+// case 4756: keyboard shortcut to insert today's date in any text field
+// Ctrl+;       inserts "2026-10-26 - "
+// Ctrl+Shift+; inserts "2026-10-26 14:30 - "
+// at the cursor (replacing any selected text) of the text box being typed in, on the browser's clock
+// (same keys as Excel and Google Sheets)
+//
+function pad(n) {
+  return n < 10 ? "0" + n : "" + n;
+}
+
+export function dateText(now, withTime) {
+  let text = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(
+    now.getDate()
+  )}`;
+  if (withTime) {
+    text += ` ${pad(now.getHours())}:${pad(now.getMinutes())}`;
+  }
+  return text + " - ";
+}
+
+function isPlainTextField(el) {
+  if (!el || el.readOnly || el.disabled) {
+    return false;
+  }
+  //the report editor (Monaco) has its own keyboard handling
+  if (el.closest && el.closest(".monaco-editor")) {
+    return false;
+  }
+  if (el.tagName === "TEXTAREA") {
+    return true;
+  }
+  return (
+    el.tagName === "INPUT" &&
+    ["text", "search", ""].includes(
+      (el.getAttribute("type") || "").toLowerCase()
+    )
+  );
+}
+
+export function handleKeydown(e) {
+  if (!e.ctrlKey || e.altKey || e.metaKey || e.code !== "Semicolon") {
+    return;
+  }
+  const el = document.activeElement;
+  if (!isPlainTextField(el)) {
+    return;
+  }
+  e.preventDefault();
+  el.setRangeText(
+    dateText(new Date(), e.shiftKey),
+    el.selectionStart,
+    el.selectionEnd,
+    "end"
+  );
+  //let Vue's v-model see the change, as typing would
+  el.dispatchEvent(new Event("input", { bubbles: true }));
+}
+
+export default {
+  wireUp() {
+    document.addEventListener("keydown", handleKeydown);
+  },
+  unwire() {
+    document.removeEventListener("keydown", handleKeydown);
+  }
+};

src/api/locale.js

@@ -37,7 +37,7 @@ export default {
   // Get users default time zone
   // first check if overriden in useroptions
   // if not then use browsers own setting
-  // if that is empty then final default of "America/New_York"
+  // if the browser can't name its time zone then its current offset from UTC
   //https://www.iana.org/time-zones
   //https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
   getResolvedTimeZoneName() {
@@ -49,7 +49,14 @@ export default {
       if (!window.$gz.util.stringIsNullOrEmpty(tz)) {
         return tz;
       } else {
-        return "America/New_York";
+        //case 4739: e.g. a new Windows time zone the browser doesn't know yet; this used to be "America/New_York"
+        //a fixed offset zone in whole hours, the only kind every browser and luxon accept by name
+        //(Etc/GMT signs are reversed: UTC-7 is Etc/GMT+7, which is what getTimezoneOffset returns, 420 minutes)
+        const hours = Math.round(new Date().getTimezoneOffset() / 60);
+        if (hours == 0) {
+          return "Etc/GMT";
+        }
+        return `Etc/GMT${hours > 0 ? "+" : "-"}${Math.abs(hours)}`;
       }
     }
   },

src/api/open-object-handler.js

@@ -235,20 +235,6 @@ export default {
             });
             break;
 
-          case socktype.Purchase:
-            vm.$router.push({
-              name: "purchase-edit",
-              params: { recordid: tid.id }
-            });
-            break;
-
-          case socktype.VendorNotification:
-            vm.$router.push({
-              name: "vendor-notification-edit",
-              params: { recordid: tid.id }
-            });
-            break;
-
           case socktype.License:
             vm.$router.push({
               name: "license-edit",

src/api/sockeye-version.js

@@ -1,4 +1,5 @@
 export default {
-  version: "8.0.17",
-  copyright: "© 1999-2024, Ground Zero Tech-Works Inc."
+  version: "8.1.4",
+  //case 4630: the year is set when the client is built (vue.config.js)
+  copyright: `© ${process.env.VUE_APP_BUILD_YEAR}, Ground Zero Tech-Works Inc.`
 };

src/api/translation.js

@@ -261,9 +261,7 @@ export default {
     "TrialLicenseRequestList",
     "SubscriptionServerList",
     "ProductList",
-    "PurchaseList",
     "GZCaseList",
-    "VendorNotificationList",
     "SubscriptionList",
     "SubscriptionItemList"
   ],

src/components/extension-close-cases-control.vue

@@ -0,0 +1,114 @@
+<template>
+  <!-- case 4742: close or reopen the selected cases in one go (Sockeye only, so plain English, no translation keys) -->
+  <v-expansion-panel v-if="available == true">
+    <v-expansion-panel-header
+      disable-icon-rotate
+      expand-icon="$sockiCheckCircle"
+      >Close / reopen cases</v-expansion-panel-header
+    >
+    <v-expansion-panel-content>
+      <v-btn
+        color="blue darken-1"
+        text
+        :disabled="jobActive"
+        :loading="jobActive && !opening"
+        data-cy="extCloseCases"
+        @click="doAction(false)"
+        >Close</v-btn
+      >
+      <v-btn
+        color="blue darken-1"
+        text
+        :disabled="jobActive"
+        :loading="jobActive && opening"
+        data-cy="extOpenCases"
+        @click="doAction(true)"
+        >Reopen</v-btn
+      >
+      <v-btn
+        v-if="jobActive"
+        color="red darken-1"
+        text
+        @click="requestCancel()"
+      >
+        {{ $sock.t("Cancel") }}</v-btn
+      ><span v-if="jobActive">{{ progress }}</span>
+    </v-expansion-panel-content>
+  </v-expansion-panel>
+</template>
+<script>
+export default {
+  props: {
+    dataListSelection: { type: Object, default: null }
+  },
+  data: () => ({
+    jobActive: false,
+    opening: false,
+    currentJobId: null,
+    progress: ""
+  }),
+  computed: {
+    available() {
+      return (
+        this.dataListSelection != null &&
+        this.dataListSelection.SockType == window.$gz.type.GZCase &&
+        window.$gz.role.getRights(window.$gz.type.GZCase).change
+      );
+    }
+  },
+  methods: {
+    async requestCancel() {
+      await window.$gz.api.upsert(
+        "job-operations/request-cancel",
+        this.currentJobId
+      );
+    },
+    async doAction(open) {
+      const vm = this;
+      //Clear any possible prior errors
+      vm.$emit("ext-show-job-log", "clear");
+      vm.opening = open;
+      const url = `job-operations/batch-close-cases?open=${open}`;
+      try {
+        this.progress = "";
+        let jobId = await window.$gz.api.upsert(url, this.dataListSelection);
+        if (jobId.error) {
+          throw new Error(window.$gz.errorHandler.errorToString(jobId, vm));
+        }
+        this.currentJobId = jobId.jobId;
+        vm.jobActive = true;
+        let jobProgress = {};
+        while (vm.jobActive == true) {
+          await window.$gz.util.sleepAsync(2000);
+          jobProgress = await window.$gz.api.get(
+            `job-operations/progress/${this.currentJobId}`
+          );
+          if (jobProgress.error) {
+            throw new Error(
+              window.$gz.errorHandler.errorToString(jobProgress, vm)
+            );
+          }
+          jobProgress = jobProgress.data;
+          this.progress = jobProgress.progress;
+          if (jobProgress.jobStatus == 4 || jobProgress.jobStatus == 0) {
+            if (jobProgress.jobStatus == 4) {
+              //emit job id and event to parent for log viewing
+              vm.$emit("ext-show-job-log", jobId);
+            }
+            throw new Error("Job failed");
+          }
+          if (jobProgress.jobStatus == 3) {
+            vm.jobActive = false;
+          }
+        }
+        //Here if it's completed successfully
+        window.$gz.eventBus.$emit("notify-success", vm.$sock.t("JobCompleted"));
+        vm.$emit("ext-close-refresh");
+      } catch (error) {
+        vm.jobActive = false;
+        window.$gz.eventBus.$emit("notify-error", vm.$sock.t("JobFailed"));
+      }
+    }
+  }
+};
+</script>

src/components/extensions-control.vue

@@ -24,6 +24,11 @@
         <v-expansion-panels focusable>
           <ExtensionTags :data-list-selection="dataListSelection" />
           <ExtensionExport :data-list-selection="dataListSelection" />
+          <ExtensionCloseCases
+            :data-list-selection="dataListSelection"
+            @ext-close-refresh="close({ refresh: true })"
+            @ext-show-job-log="handleError($event)"
+          />
           <ExtensionDelete
             :data-list-selection="dataListSelection"
             @ext-close-refresh="close({ refresh: true })"
@@ -43,12 +48,14 @@
 import ExtensionTags from "./extension-tags-control.vue";
 import ExtensionExport from "./extension-export-control.vue";
 import ExtensionDelete from "./extension-delete-control.vue";
+import ExtensionCloseCases from "./extension-close-cases-control.vue";
 
 export default {
   components: {
     ExtensionTags,
     ExtensionExport,
-    ExtensionDelete
+    ExtensionDelete,
+    ExtensionCloseCases
   },
   data: () => ({
     isVisible: false,

src/components/ssh-control.vue

@@ -27,39 +27,18 @@ export default {
   methods: {
     openUrl() {
       if (this.value) {
-        window.open(`ssh:${this.value}`, "ssh");
+        //case 4663: ssh://root@host is the form OpenSSH understands; "ssh:host" (the PuTTY-era link) is not
+        window.open(`ssh://root@${this.value.trim()}`, "ssh");
       }
     }
   }
 };
 /*
-TO USE THIS: 
-Must have a SSH URI handler set in registry on windows to open putty like this:
+TO USE THIS (case 4663): Windows must open ssh:// links in Windows Terminal, which runs Windows' own OpenSSH
+(it uses the keys in the KeePassXC SSH agent). The registry handler, under HKEY_CLASSES_ROOT\ssh\shell\open\command:
 
-----------------
-Windows Registry Editor Version 5.00
+  "C:\Users\<you>\AppData\Local\Microsoft\WindowsApps\wt.exe" ssh "%1"
 
-[HKEY_CLASSES_ROOT\ssh]
-@="URL:SSH Protocol"
-"URL Protocol"=""
-
-[HKEY_CLASSES_ROOT\ssh\DefaultIcon]
-@="%%ProgramFiles%%\\PuTTY\\putty.exe"
-
-[HKEY_CLASSES_ROOT\ssh\shell]
-
-[HKEY_CLASSES_ROOT\ssh\shell\open]
-
-[HKEY_CLASSES_ROOT\ssh\shell\open\command]
-@="C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe -Command \"$val='%l'; $val = $val.TrimEnd('/');if ($val.StartsWith('ssh://')) { $val = $val.SubString(6) };if ($val.StartsWith('ssh:')) { $val = $val.SubString(4) }; & 'C:\\Program Files\\PuTTY\\putty.exe' \"$val\"\""
-
-
-----------------
-
-Also in putty need to set default to use pagent agent and then open the keys in KeePass so relies on a lot specific to us but it works great
-https://documentation.help/PuTTY/config-saving.html#S4.1.2
-
-
-C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "$val='%l'; $val = $val.TrimEnd('/');if ($val.StartsWith('ssh://')) { $val = $val.SubString(6) };if ($val.StartsWith('ssh:')) { $val = $val.SubString(4) }; & 'C:\Program Files\PuTTY\putty.exe' "$val""
+plus the "URL Protocol" value on HKEY_CLASSES_ROOT\ssh so the browser offers it.
 */
 </script>

src/components/time-control.vue

@@ -142,7 +142,7 @@ export default {
       );
     },
     updateTimeValue(v) {
-      this.updateValue(this.dateValue, v);
+      this.updateValue(null, v);
     },
     updateValue(theDate, theTime) {
       const vm = this;

src/router.js

@@ -359,34 +359,6 @@ export default new Router({
           /* webpackChunkName: "biz" */ "./views/biz-subscription-server.vue"
         )
     },
-    {
-      path: "/biz-purchase-list",
-      name: "biz-purchase-list",
-      component: () =>
-        import(/* webpackChunkName: "biz" */ "./views/biz-purchase-list.vue")
-    },
-    {
-      path: "/biz-purchase-list/:recordid",
-      name: "purchase-edit",
-      component: () =>
-        import(/* webpackChunkName: "biz" */ "./views/biz-purchase.vue")
-    },
-    {
-      path: "/biz-vendor-notification-list",
-      name: "biz-vendor-notification-list",
-      component: () =>
-        import(
-          /* webpackChunkName: "biz" */ "./views/biz-vendor-notification-list.vue"
-        )
-    },
-    {
-      path: "/biz-vendor-notification-list/:recordid",
-      name: "vendor-notification-edit",
-      component: () =>
-        import(
-          /* webpackChunkName: "biz" */ "./views/biz-vendor-notification.vue"
-        )
-    },
     {
       path: "/biz-product-list",
       name: "biz-product-list",

src/views/biz-gzcase-list.vue

@@ -1,5 +1,44 @@
 <template>
   <div>
+    <!-- case 4764: open a case by its number, as AyaNova's work order list (Sockeye only, so plain English) -->
+    <v-row dense justify="center">
+      <v-dialog
+        v-model="openDialog"
+        persistent
+        max-width="600px"
+        @keydown.esc="openDialog = false"
+        @keydown.enter="openCase()"
+      >
+        <v-card>
+          <v-card-title>
+            <span class="text-h5">Open case</span>
+          </v-card-title>
+          <v-card-text>
+            <v-text-field
+              v-model="openCaseNumber"
+              label="Case number"
+              autofocus
+              required
+              type="number"
+              data-cy="openCaseNumber"
+            ></v-text-field>
+          </v-card-text>
+          <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn color="blue darken-1" text @click="openDialog = false">{{
+              $sock.t("Cancel")
+            }}</v-btn>
+            <v-btn
+              color="blue darken-1"
+              text
+              :disabled="!openCaseNumber"
+              @click="openCase()"
+              >{{ $sock.t("OK") }}</v-btn
+            >
+          </v-card-actions>
+        </v-card>
+      </v-dialog>
+    </v-row>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <gz-extensions
       ref="extensions"
@@ -36,7 +75,9 @@ export default {
       preFilterMode: null,
       objectId: null,
       aForType: null,
-      name: null
+      name: null,
+      openDialog: false,
+      openCaseNumber: null
     };
   },
   created() {
@@ -72,6 +113,27 @@ export default {
     handleSelected(selected) {
       this.selectedItems = selected;
     },
+    async openCase() {
+      //case 4764
+      if (!this.openCaseNumber) {
+        return;
+      }
+      const res = await window.$gz.api.get(
+        "gzcase/id-from-number/" + this.openCaseNumber
+      );
+      if (res.error) {
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          `Case ${this.openCaseNumber} was not found`
+        );
+        return;
+      }
+      this.openDialog = false;
+      this.$router.push({
+        name: "gzcase-edit",
+        params: { recordid: res.data }
+      });
+    },
     clearPreFilter() {
       this.clientCriteria = null;
       this.preFilterMode = null;
@@ -96,6 +158,10 @@ async function clickHandler(menuItem) {
           params: { recordid: 0 }
         });
         break;
+      case "open":
+        m.vm.openCaseNumber = null;
+        m.vm.openDialog = true;
+        break;
       case "extensions":
         {
           const res = await m.vm.$refs.extensions.open(
@@ -175,6 +241,14 @@ function generateMenu(vm) {
     key: FORM_KEY + ":extensions",
     vm: vm
   });
+  //case 4764
+  menuOptions.menuItems.push({
+    title: "Open case",
+    notrans: true,
+    icon: "$sockiCoffee",
+    key: FORM_KEY + ":open",
+    vm: vm
+  });
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 </script>

src/views/biz-gzcase.vue

@@ -66,23 +66,33 @@
               v-model="obj.created"
               :label="$sock.t('Created')"
               :rules="[form().required(this, 'created')]"
-              :readonly="formState.readOnly"
+              :readonly="true"
               :error-messages="form().serverErrors(this, 'created')"
               data-cy="created"
               @input="fieldValueChanged('created')"
             ></gz-date-time-picker>
           </v-col>
 
+          <!-- case 4604: closed is set by the Close / Reopen button, not picked (Sockeye only, so plain English) -->
           <v-col cols="12" sm="6" lg="4" xl="3">
             <gz-date-time-picker
               ref="closed"
               v-model="obj.closed"
               :label="$sock.t('GZCaseClosed')"
-              :readonly="formState.readOnly"
+              :readonly="true"
               :error-messages="form().serverErrors(this, 'closed')"
               data-cy="closed"
               @input="fieldValueChanged('closed')"
             ></gz-date-time-picker>
+            <v-btn
+              v-if="!formState.readOnly && obj.id != 0"
+              color="primary"
+              text
+              :disabled="formState.loading"
+              data-cy="closeOpen"
+              @click="setClosed(obj.closed == null)"
+              >{{ obj.closed == null ? "Close case" : "Reopen case" }}</v-btn
+            >
           </v-col>
 
           <!-- --------------------------------- -->
@@ -212,6 +222,10 @@ export default {
           this.obj = this.$route.params.obj;
           this.obj.concurrency = undefined;
           this.obj.id = 0;
+          //case 4714: a duplicate is a new, open case: the server gives it the next case number when saved
+          this.obj.caseId = 0;
+          this.obj.closed = null;
+          this.obj.created = window.$gz.locale.nowUTC8601String();
           this.obj.name = `${this.obj.name} - ${window.$gz.translation.get(
             "Copy"
           )}`;
@@ -259,6 +273,15 @@ export default {
     form() {
       return window.$gz.form;
     },
+    async setClosed(close) {
+      //case 4604: Close sets the closed date to now, saves the case and goes back; Open clears it and saves
+      this.obj.closed = close ? window.$gz.locale.nowUTC8601String() : null;
+      this.fieldValueChanged("closed");
+      await this.submit();
+      if (close && !this.formState.dirty) {
+        this.$router.go(-1);
+      }
+    },
     fieldValueChanged(ref) {
       if (
         this.formState.ready &&

src/views/biz-purchase-list.vue

@@ -1,184 +0,0 @@
-<template>
-  <div>
-    <gz-report-selector ref="reportSelector"></gz-report-selector>
-    <gz-extensions
-      ref="extensions"
-      :aya-type="aType"
-      :selected-items="selectedItems"
-    >
-    </gz-extensions>
-    <gz-data-table
-      ref="gzdatatable"
-      form-key="purchase-list"
-      data-list-key="PurchaseDataList"
-      :show-select="rights.read"
-      :reload="reload"
-      data-cy="purchasesTable"
-      :client-criteria="clientCriteria"
-      :pre-filter-mode="preFilterMode"
-      @selection-change="handleSelected"
-      @clear-pre-filter="clearPreFilter"
-    >
-    </gz-data-table>
-  </div>
-</template>
-
-<script>
-const FORM_KEY = "purchase-list";
-export default {
-  data() {
-    return {
-      rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.Purchase,
-      selectedItems: [],
-      reload: false,
-      clientCriteria: undefined,
-      preFilterMode: null,
-      objectId: null,
-      aForType: null,
-      name: null
-    };
-  },
-  created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.Purchase);
-    window.$gz.eventBus.$on("menu-click", clickHandler);
-
-    //------ pre-filter ----
-    //OPTIONAL "Show All purchases of head office" FILTER
-    this.objectId = window.$gz.util.stringToIntOrNull(
-      this.$route.params.objectId
-    );
-    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
-
-    if (this.objectId && this.objectId != 0 && this.aForType) {
-      //OBJECTID,AYATYPE
-      this.clientCriteria = `${this.objectId},${this.aForType}`;
-
-      this.preFilterMode = {
-        icon: window.$gz.util.iconForType(this.aForType),
-        id: this.objectId,
-        socktype: this.aForType,
-        viz: this.$route.params.name,
-        clearable: true
-      };
-    }
-    //------ /pre-filter ----
-    generateMenu(this);
-  },
-  beforeDestroy() {
-    window.$gz.eventBus.$off("menu-click", clickHandler);
-  },
-  methods: {
-    handleSelected(selected) {
-      this.selectedItems = selected;
-    },
-    clearPreFilter() {
-      this.clientCriteria = null;
-      this.preFilterMode = null;
-      this.reload = !this.reload;
-    }
-  }
-};
-
-/////////////////////////////
-//
-//
-async function clickHandler(menuItem) {
-  if (!menuItem) {
-    return;
-  }
-  const m = window.$gz.menu.parseMenuItem(menuItem);
-  if (m.owner == FORM_KEY && !m.disabled) {
-    switch (m.key) {
-      case "new":
-        m.vm.$router.push({
-          name: "purchase-edit",
-          params: { recordid: 0 }
-        });
-        break;
-      case "extensions":
-        {
-          const res = await m.vm.$refs.extensions.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.Purchase
-            )
-          );
-          if (res && res.refresh == true) {
-            m.vm.reload = !m.vm.reload;
-          }
-        }
-        break;
-      case "report":
-        {
-          const res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.Purchase
-            ),
-            m.id
-          );
-          if (res == null) {
-            return;
-          }
-          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
-        }
-        break;
-      default:
-        window.$gz.eventBus.$emit(
-          "notify-warning",
-          FORM_KEY + "::context click: [" + m.key + "]"
-        );
-    }
-  }
-}
-
-//////////////////////
-//
-//
-function generateMenu(vm) {
-  const menuOptions = {
-    isMain: true,
-    icon: "$sockiShoppingCart",
-    title: "PurchaseList",
-    menuItems: [],
-    formData: {
-      sockType: window.$gz.type.Purchase
-    }
-  };
-
-  if (vm.rights.change) {
-    menuOptions.menuItems.push({
-      title: "New",
-      icon: "$sockiPlus",
-      surface: true,
-      key: FORM_KEY + ":new",
-      vm: vm
-    });
-  }
-
-  menuOptions.menuItems.push({
-    title: "Report",
-    icon: "$sockiFileAlt",
-    key: FORM_KEY + ":report",
-    vm: vm
-  });
-
-  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
-  if (lastReport != null) {
-    menuOptions.menuItems.push({
-      title: lastReport.name,
-      notrans: true,
-      icon: "$sockiFileAlt",
-      key: FORM_KEY + ":report:" + lastReport.id,
-      vm: vm
-    });
-  }
-
-  menuOptions.menuItems.push({
-    title: "Extensions",
-    icon: "$sockiPuzzlePiece",
-    key: FORM_KEY + ":extensions",
-    vm: vm
-  });
-  window.$gz.eventBus.$emit("menu-change", menuOptions);
-}
-</script>

src/views/biz-purchase.vue

@@ -1,715 +0,0 @@
-<template>
-  <div>
-    <gz-report-selector ref="reportSelector"></gz-report-selector>
-    <div v-if="formState.ready">
-      <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-      <v-form ref="form">
-        <v-row dense>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-pick-list
-              ref="customerId"
-              v-model="obj.customerId"
-              :aya-type="sockTypes().Customer"
-              show-edit-icon
-              :readonly="formState.readOnly"
-              :label="$sock.t('Customer')"
-              :error-messages="form().serverErrors(this, 'customerId')"
-              @input="fieldValueChanged('customerId')"
-            ></gz-pick-list>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-pick-list
-              ref="productId"
-              v-model="obj.productId"
-              :aya-type="sockTypes().Product"
-              show-edit-icon
-              :readonly="formState.readOnly"
-              :label="$sock.t('Product')"
-              :error-messages="form().serverErrors(this, 'productId')"
-              :rules="[form().required(this, 'productId')]"
-              @input="fieldValueChanged('productId')"
-            ></gz-pick-list>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-text-field
-              ref="quantity"
-              v-model="obj.quantity"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('PurchaseQuantity')"
-              :error-messages="form().serverErrors(this, 'quantity')"
-              :rules="[form().required(this, 'quantity')]"
-              data-cy="quantity"
-              :counter="10"
-              type="number"
-              step="none"
-              @input="fieldValueChanged('quantity')"
-            ></v-text-field>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-pick-list
-              ref="vendorId"
-              v-model="obj.vendorId"
-              :aya-type="sockTypes().Vendor"
-              show-edit-icon
-              :readonly="formState.readOnly"
-              :label="$sock.t('Vendor')"
-              :error-messages="form().serverErrors(this, 'vendorId')"
-              :rules="[form().required(this, 'vendorId')]"
-              @input="fieldValueChanged('vendorId')"
-            ></gz-pick-list>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-text-field
-              ref="salesOrderNumber"
-              v-model="obj.salesOrderNumber"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('PurchaseSalesOrderNumber')"
-              :rules="[form().required(this, 'salesOrderNumber')]"
-              :error-messages="form().serverErrors(this, 'salesOrderNumber')"
-              data-cy="salesOrderNumber"
-              @input="fieldValueChanged('salesOrderNumber')"
-            ></v-text-field>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              ref="isRenewal"
-              v-model="obj.isRenewal"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('PurchaseIsRenewal')"
-              data-cy="isRenewal"
-              :error-messages="form().serverErrors(this, 'isRenewal')"
-              @change="fieldValueChanged('isRenewal')"
-            ></v-checkbox>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-date-time-picker
-              ref="purchaseDate"
-              v-model="obj.purchaseDate"
-              :label="$sock.t('PurchaseDate')"
-              :rules="[form().required(this, 'purchaseDate')]"
-              :readonly="formState.readOnly"
-              :error-messages="form().serverErrors(this, 'purchaseDate')"
-              data-cy="purchaseDate"
-              @input="fieldValueChanged('purchaseDate')"
-            ></gz-date-time-picker>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-date-time-picker
-              ref="expireDate"
-              v-model="obj.expireDate"
-              :label="$sock.t('PurchaseExpireDate')"
-              :readonly="formState.readOnly"
-              :error-messages="form().serverErrors(this, 'expireDate')"
-              data-cy="expireDate"
-              @input="fieldValueChanged('expireDate')"
-            ></gz-date-time-picker>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-date-time-picker
-              ref="cancelDate"
-              v-model="obj.cancelDate"
-              :label="$sock.t('PurchaseCancelDate')"
-              :readonly="formState.readOnly"
-              :error-messages="form().serverErrors(this, 'cancelDate')"
-              data-cy="cancelDate"
-              @input="fieldValueChanged('cancelDate')"
-            ></gz-date-time-picker>
-          </v-col>
-          <v-col
-            v-if="obj.vendorNotificationId != null"
-            cols="12"
-            sm="6"
-            lg="4"
-            xl="3"
-          >
-            <div>
-              <v-btn @click="openVendorNotification">
-                {{ obj.vendorNotificationId }}
-                <v-icon right>$sockiCommentDollar</v-icon>
-              </v-btn>
-            </div>
-          </v-col>
-
-          <v-col
-            v-if="obj.pGroup == 3 || obj.pGroup == 2"
-            cols="12"
-            sm="6"
-            lg="4"
-            xl="3"
-          >
-            <v-text-field
-              ref="dbId"
-              v-model="obj.dbId"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('DatabaseID')"
-              data-cy="dbId"
-              :error-messages="form().serverErrors(this, 'dbId')"
-              @input="fieldValueChanged('dbId')"
-            ></v-text-field>
-          </v-col>
-
-          <v-col
-            v-if="form().showMe(this, 'PurchaseCouponCode')"
-            cols="12"
-            sm="6"
-            lg="4"
-            xl="3"
-          >
-            <v-text-field
-              ref="couponCode"
-              v-model="obj.couponCode"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('PurchaseCouponCode')"
-              :error-messages="form().serverErrors(this, 'couponCode')"
-              data-cy="couponCode"
-              @input="fieldValueChanged('couponCode')"
-            ></v-text-field>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              ref="renewNoticeSent"
-              v-model="obj.renewNoticeSent"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('PurchaseRenewNoticeSent')"
-              data-cy="renewNoticeSent"
-              :error-messages="form().serverErrors(this, 'renewNoticeSent')"
-              @change="fieldValueChanged('renewNoticeSent')"
-            ></v-checkbox>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <v-checkbox
-              ref="processed"
-              v-model="obj.processed"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('PurchaseProcessed')"
-              data-cy="processed"
-              :error-messages="form().serverErrors(this, 'processed')"
-              @change="fieldValueChanged('processed')"
-            ></v-checkbox>
-          </v-col>
-
-          <v-col v-if="form().showMe(this, 'PurchaseNotes')" cols="12">
-            <v-textarea
-              ref="notes"
-              v-model="obj.notes"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('PurchaseNotes')"
-              :error-messages="form().serverErrors(this, 'notes')"
-              data-cy="notes"
-              auto-grow
-              @input="fieldValueChanged('notes')"
-            ></v-textarea>
-          </v-col>
-
-          <!-- --------------------------------- -->
-
-          <v-col v-if="form().showMe(this, 'Tags')" cols="12">
-            <gz-tag-picker
-              ref="tags"
-              v-model="obj.tags"
-              :readonly="formState.readOnly"
-              data-cy="tags"
-              :error-messages="form().serverErrors(this, 'tags')"
-              @input="fieldValueChanged('tags')"
-            ></gz-tag-picker>
-          </v-col>
-
-          <v-col v-if="form().showMe(this, 'Wiki')" cols="12">
-            <gz-wiki
-              ref="wiki"
-              v-model="obj.wiki"
-              :aya-type="sockType"
-              :aya-id="obj.id"
-              :readonly="formState.readOnly"
-              @input="fieldValueChanged('wiki')"
-            ></gz-wiki
-          ></v-col>
-
-          <v-col v-if="form().showMe(this, 'Attachments') && obj.id" cols="12">
-            <gz-attachments
-              :readonly="formState.readOnly"
-              :aya-type="sockType"
-              :aya-id="obj.id"
-            ></gz-attachments
-          ></v-col>
-        </v-row>
-      </v-form>
-    </div>
-    <v-overlay :value="!formState.ready || formState.loading">
-      <v-progress-circular indeterminate :size="64" />
-    </v-overlay>
-  </div>
-</template>
-<script>
-const FORM_KEY = "purchase-edit";
-const API_BASE_URL = "purchase/";
-const FORM_CUSTOM_TEMPLATE_KEY = "Purchase";
-export default {
-  data() {
-    return {
-      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      obj: {
-        id: 0,
-        concurrency: 0,
-        customerId: 0,
-        vendorId: 1,
-        productId: null,
-        pGroup: 1,
-        salesOrderNumber: null,
-        dbId: null,
-        purchaseDate: window.$gz.locale.nowUTC8601String(),
-        expireDate: null,
-        cancelDate: null,
-        couponCode: null,
-        notes: null,
-        renewNoticeSent: false,
-        quantity: 1,
-        processedDate: null,
-        vendorNotificationId: null,
-        wiki: null,
-        tags: []
-      },
-      formState: {
-        ready: false,
-        dirty: false,
-        valid: true,
-        readOnly: false,
-        loading: true,
-        errorBoxMessage: null,
-        appError: null,
-        serverError: {}
-      },
-      rights: window.$gz.role.defaultRightsObject(),
-      sockType: window.$gz.type.Purchase
-    };
-  },
-  watch: {
-    formState: {
-      handler: function(val) {
-        if (this.formState.loading) {
-          return;
-        }
-
-        if (val.dirty && val.valid && !val.readOnly) {
-          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
-        } else {
-          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
-        }
-
-        if (!val.dirty && val.valid && !val.readOnly) {
-          window.$gz.eventBus.$emit(
-            "menu-enable-item",
-            FORM_KEY + ":duplicate"
-          );
-          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
-        } else {
-          window.$gz.eventBus.$emit(
-            "menu-disable-item",
-            FORM_KEY + ":duplicate"
-          );
-          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
-        }
-      },
-      deep: true
-    }
-  },
-  async created() {
-    const vm = this;
-    try {
-      await initForm(vm);
-      vm.rights = window.$gz.role.getRights(window.$gz.type.Purchase);
-      vm.formState.readOnly = !vm.rights.change;
-      window.$gz.eventBus.$on("menu-click", clickHandler);
-      //---------------------------------
-      let setDirty = false;
-      //id 0 means create or duplicate to new
-      if (vm.$route.params.recordid != 0) {
-        //is there already an obj from a prior operation?
-        if (this.$route.params.obj) {
-          //yes, no need to fetch it
-          this.obj = this.$route.params.obj;
-        } else {
-          await vm.getDataFromApi(vm.$route.params.recordid);
-        }
-      } else {
-        //Might be a duplicate and contain another record
-        if (this.$route.params.obj) {
-          this.obj = this.$route.params.obj;
-          this.obj.concurrency = undefined;
-          this.obj.id = 0;
-          this.obj.name = `${this.obj.name} - ${window.$gz.translation.get(
-            "Copy"
-          )}`;
-          setDirty = true;
-        }
-      }
-      window.$gz.form.setFormState({
-        vm: vm,
-        loading: false,
-        dirty: setDirty,
-        valid: true
-      });
-      //----------------------------
-      generateMenu(vm);
-    } catch (error) {
-      window.$gz.errorHandler.handleFormError(error, vm);
-    } finally {
-      vm.formState.ready = true;
-    }
-  },
-  async beforeRouteLeave(to, from, next) {
-    if (!this.formState.dirty || JUST_DELETED) {
-      next();
-      return;
-    }
-    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
-      next();
-    } else {
-      next(false);
-    }
-  },
-  beforeDestroy() {
-    window.$gz.eventBus.$off("menu-click", clickHandler);
-  },
-  methods: {
-    openVendorNotification: function() {
-      window.$gz.eventBus.$emit("openobject", {
-        type: window.$gz.type.VendorNotification,
-        id: this.obj.vendorNotificationId
-      });
-    },
-    canSave: function() {
-      return this.formState.valid && this.formState.dirty;
-    },
-    canDuplicate: function() {
-      return this.formState.valid && !this.formState.dirty;
-    },
-    sockTypes: function() {
-      return window.$gz.type;
-    },
-    form() {
-      return window.$gz.form;
-    },
-    fieldValueChanged(ref) {
-      if (
-        this.formState.ready &&
-        !this.formState.loading &&
-        !this.formState.readOnly
-      ) {
-        window.$gz.form.fieldValueChanged(this, ref);
-      }
-    },
-    async getDataFromApi(recordId) {
-      const vm = this;
-      window.$gz.form.setFormState({
-        vm: vm,
-        loading: true
-      });
-      if (!recordId) {
-        throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
-      }
-      try {
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        const res = await window.$gz.api.get(API_BASE_URL + recordId);
-        if (res.error) {
-          if (res.error.code == "2010") {
-            window.$gz.form.handleObjectNotFound(vm);
-          }
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
-        } else {
-          vm.obj = res.data;
-          generateMenu(vm);
-          window.$gz.form.setFormState({
-            vm: vm,
-            dirty: false,
-            valid: true,
-            loading: false
-          });
-        }
-      } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, vm);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
-      }
-    },
-    async submit() {
-      const vm = this;
-      if (vm.canSave == false) {
-        return;
-      }
-      try {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: true
-        });
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
-        if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
-        } else {
-          if (res.data.id) {
-            //POST
-            vm.obj = res.data;
-            this.$router.replace({
-              name: "purchase-edit",
-              params: {
-                recordid: res.data.id,
-                obj: res.data
-              }
-            });
-          } else {
-            //PUT
-            vm.obj.concurrency = res.data.concurrency;
-          }
-          window.$gz.form.setFormState({
-            vm: vm,
-            dirty: false,
-            valid: true
-          });
-        }
-      } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
-      }
-    },
-    async remove() {
-      try {
-        const dialogResult = await window.$gz.dialog.confirmDelete();
-        if (dialogResult != true) {
-          return;
-        }
-        window.$gz.form.setFormState({
-          vm: this,
-          loading: true
-        });
-
-        if (this.$route.params.recordid == 0) {
-          JUST_DELETED = true;
-
-          this.$router.go(-1);
-        } else {
-          window.$gz.form.deleteAllErrorBoxErrors(this);
-          const res = await window.$gz.api.remove(
-            API_BASE_URL + this.$route.params.recordid
-          );
-          if (res.error) {
-            this.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(this);
-          } else {
-            JUST_DELETED = true;
-            this.$router.go(-1);
-          }
-        }
-      } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, this);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: this,
-          loading: false
-        });
-      }
-    },
-    duplicate() {
-      this.$router.push({
-        name: "purchase-edit",
-        params: {
-          recordid: 0,
-          obj: this.obj
-        }
-      });
-    }
-  }
-};
-
-/////////////////////////////
-//
-//
-async function clickHandler(menuItem) {
-  if (!menuItem) {
-    return;
-  }
-  const m = window.$gz.menu.parseMenuItem(menuItem);
-  if (m.owner == FORM_KEY && !m.disabled) {
-    switch (m.key) {
-      case "save":
-        m.vm.submit();
-        break;
-      case "delete":
-        m.vm.remove();
-        break;
-      case "new":
-        m.vm.$router.push({
-          name: "purchase-edit",
-          params: { recordid: 0 }
-        });
-        break;
-      case "duplicate":
-        m.vm.duplicate();
-        break;
-      case "report":
-        {
-          const res = await m.vm.$refs.reportSelector.open(
-            {
-              AType: window.$gz.type.Purchase,
-              selectedRowIds: [m.vm.obj.id]
-            },
-            m.id
-          );
-          if (res == null) {
-            return;
-          }
-          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
-        }
-        break;
-
-      default:
-        window.$gz.eventBus.$emit(
-          "notify-warning",
-          FORM_KEY + "::context click: [" + m.key + "]"
-        );
-    }
-  }
-}
-
-//////////////////////
-//
-//
-function generateMenu(vm) {
-  const menuOptions = {
-    isMain: false,
-    readOnly: vm.formState.readOnly,
-    icon: "$sockiShoppingCart",
-    title: "Purchase",
-    formData: {
-      sockType: window.$gz.type.Purchase,
-      recordId: vm.$route.params.recordid,
-      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      recordName: vm.obj.name
-    },
-    menuItems: []
-  };
-
-  if (vm.rights.change) {
-    menuOptions.menuItems.push({
-      title: "Save",
-      icon: "$sockiSave",
-      surface: true,
-      key: FORM_KEY + ":save",
-      vm: vm
-    });
-  }
-
-  menuOptions.menuItems.push({
-    title: "Report",
-    icon: "$sockiFileAlt",
-    key: FORM_KEY + ":report",
-    vm: vm
-  });
-
-  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
-  if (lastReport != null) {
-    menuOptions.menuItems.push({
-      title: lastReport.name,
-      notrans: true,
-      icon: "$sockiFileAlt",
-      key: FORM_KEY + ":report:" + lastReport.id,
-      vm: vm
-    });
-  }
-
-  if (vm.rights.change) {
-    menuOptions.menuItems.push({
-      title: "New",
-      icon: "$sockiPlus",
-      key: FORM_KEY + ":new",
-      vm: vm
-    });
-  }
-
-  if (vm.rights.change && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Duplicate",
-      icon: "$sockiClone",
-      key: FORM_KEY + ":duplicate",
-      vm: vm
-    });
-  }
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$sockiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-  menuOptions.menuItems.push({ divider: true, inset: false });
-
-  menuOptions.menuItems.push({ divider: true, inset: false });
-  window.$gz.eventBus.$emit("menu-change", menuOptions);
-}
-
-let JUST_DELETED = false;
-
-/////////////////////////////////
-//
-//
-async function initForm(vm) {
-  await fetchTranslatedText();
-  await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
-}
-
-//////////////////////////////////////////////////////////
-//
-// Ensures UI translated text is available
-//
-async function fetchTranslatedText() {
-  await window.$gz.translation.cacheTranslations([
-    "Purchase",
-    "PurchaseSalesOrderNumber",
-    "Vendor",
-    "Customer",
-    "Product",
-    "PurchaseSalesOrderNumber",
-    "PurchaseDate",
-    "PurchaseExpireDate",
-    "PurchaseCancelDate",
-    "PurchaseCouponCode",
-    "PurchaseNotes",
-    "PurchaseRenewNoticeSent",
-    "PurchaseQuantity",
-    "PurchaseProcessed",
-    "PurchaseVendorNotificationId",
-    "VendorNotification",
-    "DatabaseID",
-    "PurchaseIsRenewal"
-  ]);
-}
-</script>

src/views/biz-subscription-server.vue

@@ -143,7 +143,8 @@
             ></gz-date-time-picker>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3">
+          <!-- case 4600: expiry only applies to trial servers; a paid server renews monthly -->
+          <v-col v-if="obj.trial" cols="12" sm="6" lg="4" xl="3">
             <v-row no-gutters>
               <v-col cols="1">
                 <v-menu offset-y>
@@ -394,6 +395,7 @@ export default {
         serverStates: [],
         dataCenters: [
           { id: "SF", name: "San Francisco" },
+          { id: "ATL", name: "Atlanta" },
           { id: "NY", name: "New York" },
           { id: "TOR", name: "Toronto" },
           { id: "AMS", name: "Amsterdam" },
@@ -1205,6 +1207,10 @@ export default {
           loading: true
         });
         window.$gz.form.deleteAllErrorBoxErrors(vm);
+        //case 4600: expiry is hidden and unused for a paid server, but the record still needs a date
+        if (!vm.obj.trial && !vm.obj.subscriptionExpire) {
+          vm.obj.subscriptionExpire = window.$gz.locale.nowUTC8601String();
+        }
         if (vm.obj.operatingSystem == null) {
           vm.obj.operatingSystem = "Ubuntu 22.10";
         }
@@ -1361,6 +1367,8 @@ DOMAINNAME='${m.vm.obj.name}'
 #############################
 echo STARTING...
 timedatectl set-timezone $TIMEZONE
+# no phased updates, so weekly updates match what was tested on devtest first
+echo 'APT::Get::Never-Include-Phased-Updates "true";' > /etc/apt/apt.conf.d/52no-phasing
 apt-get update
 apt-get dist-upgrade -y
 dpkg-reconfigure unattended-upgrades
@@ -1373,18 +1381,25 @@ echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab
 echo 'vm.swappiness=10' | sudo tee -a /etc/sysctl.conf
 echo 'vm.vfs_cache_pressure=50' | sudo tee -a /etc/sysctl.conf
 echo INSTALL .NET CORE
-apt-get install -y aspnetcore-runtime-8.0
+apt-get install -y aspnetcore-runtime-10.0
+echo GENERATE SERVER SECRETS
+# unique per server, letters and digits only so they are safe in SQL, JSON and the connection string
+DBPASSWORD=$(openssl rand -hex 24)
+JWTSECRET=$(openssl rand -hex 16)
+echo "PostgreSQL postgres password: $DBPASSWORD" > /root/ayanova-secrets.txt
+echo "AYANOVA_JWT_SECRET: $JWTSECRET" >> /root/ayanova-secrets.txt
+chmod 600 /root/ayanova-secrets.txt
 echo INSTALL POSTGRESQL
-sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
-sudo apt-get update
+# PostgreSQL project repository (same PostgreSQL build on every Ubuntu release); apt-key no longer exists on newer Ubuntu
+apt-get install -y postgresql-common
+/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
 sudo apt-get -y install postgresql
-sudo -u postgres psql -U postgres -d postgres -c "alter user postgres with password 'YOUR_PASSWORD_HERE';"
+sudo -u postgres psql -U postgres -d postgres -c "alter user postgres with password '$DBPASSWORD';"
 echo INSTALL REPORTING LIBS
 
-# Ubuntu 24.04
+# Ubuntu 24.04 and 26.04
 sudo apt-get update
-sudo apt-get install -y libatk1.0-0t64 libc6 libcairo2 libdbus-1-3 libexpat1 libfontconfig1 libgcc-s1 libgdk-pixbuf2.0-0 libglib2.0-0t64 libgtk-3-0t64 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libnss3 lsb-release libgbm-dev xdg-utils 
+sudo apt-get install -y libatk1.0-0t64 libc6 libcairo2 libdbus-1-3 libexpat1 libfontconfig1 libgcc-s1 libgdk-pixbuf-2.0-0 libglib2.0-0t64 libgtk-3-0t64 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libnss3 lsb-release libgbm-dev xdg-utils 
 sudo apt-get update
 sudo apt-get install -y libatk-bridge2.0-0t64 libcups2t64 libxcomposite1 libxdamage1 libpangocairo-1.0-0 libxfixes3 libxrandr2 libgbm1 libcairo2 libpango-1.0-0 libasound2t64 wget
 # NOTE: for future releases of ubuntu when need to update packages this was helpful https://itsfoss.com/unable-to-locate-package-error-ubuntu/
@@ -1392,15 +1407,19 @@ echo INSTALL AYANOVA
 apt install zip unzip -y
 mkdir /var/ayanova
 mkdir /var/ayanova/data
-mkdir /var/ayanova/Chrome
-mkdir /var/ayanova/ChromeHeadlessShell
 cd /var/ayanova
 curl -O https://www.ayanova.com/download/ayanova-subscription-linux-x64-server.zip && unzip -o ayanova-subscription-linux-x64-server.zip
+# put this server's own secrets in place of the shipped defaults
+sed -i "s/Password=YOUR_PASSWORD_HERE;/Password=$DBPASSWORD;/" /var/ayanova/config.json
+sed -i "s/12345YourRandom32CharacterSecret/$JWTSECRET/" /var/ayanova/config.json
+# nginx is the only way in: listen on this server only, not on its public address
+sed -i 's#http://[*]:7575#http://127.0.0.1:7575#' /var/ayanova/config.json
 chown -vR :www-data /var/ayanova
+# program files read only for the service account; it writes to data only
+chmod -R go-w /var/ayanova
 chmod -R g+rw /var/ayanova/data
-chmod -R g+rwx /var/ayanova/Chrome
-chmod -R g+rwx /var/ayanova/ChromeHeadlessShell
-chmod g+rw /var/ayanova/
+# config.json holds the database password: readable by root and the service group only
+chmod 640 /var/ayanova/config.json
 echo '[Unit]' >> /etc/systemd/system/ayanova.service
 echo 'Description=AyaNova server' >> /etc/systemd/system/ayanova.service
 echo '' >> /etc/systemd/system/ayanova.service
@@ -1414,6 +1433,11 @@ echo 'SyslogIdentifier=ayanova-server' >> /etc/systemd/system/ayanova.service
 echo 'User=www-data' >> /etc/systemd/system/ayanova.service
 echo 'Environment=ASPNETCORE_ENVIRONMENT=Production' >> /etc/systemd/system/ayanova.service
 echo 'Environment=DOTNET_PRINT_TELEMETRY_MESSAGE=false' >> /etc/systemd/system/ayanova.service
+echo 'NoNewPrivileges=true' >> /etc/systemd/system/ayanova.service
+echo 'ProtectSystem=strict' >> /etc/systemd/system/ayanova.service
+echo 'ReadWritePaths=/var/ayanova/data' >> /etc/systemd/system/ayanova.service
+echo 'PrivateTmp=true' >> /etc/systemd/system/ayanova.service
+echo 'ProtectHome=true' >> /etc/systemd/system/ayanova.service
 echo '' >> /etc/systemd/system/ayanova.service
 echo '[Install]' >> /etc/systemd/system/ayanova.service
 echo 'WantedBy=multi-user.target' >> /etc/systemd/system/ayanova.service

src/views/biz-trial-request.vue

@@ -454,6 +454,10 @@ async function clickHandler(menuItem) {
       case "save":
         m.vm.submit();
         break;
+      //case 4487
+      case "delete":
+        m.vm.remove();
+        break;
 
       case "report":
         {
@@ -508,6 +512,17 @@ function generateMenu(vm) {
     });
   }
 
+  //case 4487: a request could not be deleted (e.g. one stuck waiting for a mistyped email to be confirmed)
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$sockiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
   menuOptions.menuItems.push({
     title: "Report",
     icon: "$sockiFileAlt",

src/views/biz-vendor-notification-list.vue

@@ -1,184 +0,0 @@
-<template>
-  <div>
-    <gz-report-selector ref="reportSelector"></gz-report-selector>
-    <gz-extensions
-      ref="extensions"
-      :aya-type="aType"
-      :selected-items="selectedItems"
-    >
-    </gz-extensions>
-    <gz-data-table
-      ref="gzdatatable"
-      form-key="vendor-notification-list"
-      data-list-key="VendorNotificationDataList"
-      :show-select="rights.read"
-      :reload="reload"
-      data-cy="purchasesTable"
-      :client-criteria="clientCriteria"
-      :pre-filter-mode="preFilterMode"
-      @selection-change="handleSelected"
-      @clear-pre-filter="clearPreFilter"
-    >
-    </gz-data-table>
-  </div>
-</template>
-
-<script>
-const FORM_KEY = "vendor-notification-list";
-export default {
-  data() {
-    return {
-      rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.VendorNotification,
-      selectedItems: [],
-      reload: false,
-      clientCriteria: undefined,
-      preFilterMode: null,
-      objectId: null,
-      aForType: null,
-      name: null
-    };
-  },
-  created() {
-    this.rights = window.$gz.role.getRights(window.$gz.type.VendorNotification);
-    window.$gz.eventBus.$on("menu-click", clickHandler);
-
-    //------ pre-filter ----
-    //OPTIONAL "Show All purchases of head office" FILTER
-    this.objectId = window.$gz.util.stringToIntOrNull(
-      this.$route.params.objectId
-    );
-    this.aForType = window.$gz.util.stringToIntOrNull(this.$route.params.aType);
-
-    if (this.objectId && this.objectId != 0 && this.aForType) {
-      //OBJECTID,AYATYPE
-      this.clientCriteria = `${this.objectId},${this.aForType}`;
-
-      this.preFilterMode = {
-        icon: window.$gz.util.iconForType(this.aForType),
-        id: this.objectId,
-        socktype: this.aForType,
-        viz: this.$route.params.name,
-        clearable: true
-      };
-    }
-    //------ /pre-filter ----
-    generateMenu(this);
-  },
-  beforeDestroy() {
-    window.$gz.eventBus.$off("menu-click", clickHandler);
-  },
-  methods: {
-    handleSelected(selected) {
-      this.selectedItems = selected;
-    },
-    clearPreFilter() {
-      this.clientCriteria = null;
-      this.preFilterMode = null;
-      this.reload = !this.reload;
-    }
-  }
-};
-
-/////////////////////////////
-//
-//
-async function clickHandler(menuItem) {
-  if (!menuItem) {
-    return;
-  }
-  const m = window.$gz.menu.parseMenuItem(menuItem);
-  if (m.owner == FORM_KEY && !m.disabled) {
-    switch (m.key) {
-      case "new":
-        m.vm.$router.push({
-          name: "vendor-notification-edit",
-          params: { recordid: 0 }
-        });
-        break;
-      case "extensions":
-        {
-          const res = await m.vm.$refs.extensions.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.VendorNotification
-            )
-          );
-          if (res && res.refresh == true) {
-            m.vm.reload = !m.vm.reload;
-          }
-        }
-        break;
-      case "report":
-        {
-          const res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.VendorNotification
-            ),
-            m.id
-          );
-          if (res == null) {
-            return;
-          }
-          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
-        }
-        break;
-      default:
-        window.$gz.eventBus.$emit(
-          "notify-warning",
-          FORM_KEY + "::context click: [" + m.key + "]"
-        );
-    }
-  }
-}
-
-//////////////////////
-//
-//
-function generateMenu(vm) {
-  const menuOptions = {
-    isMain: true,
-    icon: "$sockiCommentDollar",
-    title: "VendorNotificationList",
-    menuItems: [],
-    formData: {
-      sockType: window.$gz.type.VendorNotification
-    }
-  };
-
-  if (vm.rights.change) {
-    menuOptions.menuItems.push({
-      title: "New",
-      icon: "$sockiPlus",
-      surface: true,
-      key: FORM_KEY + ":new",
-      vm: vm
-    });
-  }
-
-  menuOptions.menuItems.push({
-    title: "Report",
-    icon: "$sockiFileAlt",
-    key: FORM_KEY + ":report",
-    vm: vm
-  });
-
-  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
-  if (lastReport != null) {
-    menuOptions.menuItems.push({
-      title: lastReport.name,
-      notrans: true,
-      icon: "$sockiFileAlt",
-      key: FORM_KEY + ":report:" + lastReport.id,
-      vm: vm
-    });
-  }
-
-  menuOptions.menuItems.push({
-    title: "Extensions",
-    icon: "$sockiPuzzlePiece",
-    key: FORM_KEY + ":extensions",
-    vm: vm
-  });
-  window.$gz.eventBus.$emit("menu-change", menuOptions);
-}
-</script>

src/views/biz-vendor-notification.vue

@@ -1,486 +0,0 @@
-<template>
-  <div>
-    <gz-report-selector ref="reportSelector"></gz-report-selector>
-    <div v-if="formState.ready">
-      <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
-      <v-form ref="form">
-        <v-row dense>
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-pick-list
-              ref="vendorId"
-              v-model="obj.vendorId"
-              :aya-type="sockTypes().Vendor"
-              show-edit-icon
-              :readonly="formState.readOnly"
-              :label="$sock.t('Vendor')"
-              :error-messages="form().serverErrors(this, 'vendorId')"
-              :rules="[form().required(this, 'vendorId')]"
-              @input="fieldValueChanged('vendorId')"
-            ></gz-pick-list>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-date-time-picker
-              ref="created"
-              v-model="obj.created"
-              :label="$sock.t('VendorNotificationCreated')"
-              :rules="[form().required(this, 'created')]"
-              :readonly="formState.readOnly"
-              :error-messages="form().serverErrors(this, 'created')"
-              data-cy="created"
-              @input="fieldValueChanged('created')"
-            ></gz-date-time-picker>
-          </v-col>
-
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <gz-date-time-picker
-              ref="processed"
-              v-model="obj.processed"
-              :label="$sock.t('VendorNotificationProcessed')"
-              :readonly="formState.readOnly"
-              :error-messages="form().serverErrors(this, 'processed')"
-              data-cy="processed"
-              @input="fieldValueChanged('processed')"
-            ></gz-date-time-picker>
-          </v-col>
-
-          <v-col cols="12">
-            <v-textarea
-              ref="vendorData"
-              v-model="obj.vendorData"
-              dense
-              :readonly="formState.readOnly"
-              :label="$sock.t('VendorNotificationVendorData')"
-              :error-messages="form().serverErrors(this, 'vendorData')"
-              data-cy="vendorData"
-              auto-grow
-              @input="fieldValueChanged('vendorData')"
-            ></v-textarea>
-          </v-col>
-        </v-row>
-      </v-form>
-    </div>
-    <v-overlay :value="!formState.ready || formState.loading">
-      <v-progress-circular indeterminate :size="64" />
-    </v-overlay>
-  </div>
-</template>
-<script>
-const FORM_KEY = "vendor-notification-edit";
-const API_BASE_URL = "vendor-notification/";
-export default {
-  data() {
-    return {
-      obj: {
-        id: 0,
-        concurrency: 0,
-        vendorId: 1,
-        created: window.$gz.locale.nowUTC8601String(),
-        processed: null,
-        vendorData: null
-      },
-      formState: {
-        ready: false,
-        dirty: false,
-        valid: true,
-        readOnly: false,
-        loading: true,
-        errorBoxMessage: null,
-        appError: null,
-        serverError: {}
-      },
-      rights: window.$gz.role.defaultRightsObject(),
-      sockType: window.$gz.type.VendorNotification
-    };
-  },
-  watch: {
-    formState: {
-      handler: function(val) {
-        if (this.formState.loading) {
-          return;
-        }
-
-        if (val.dirty && val.valid && !val.readOnly) {
-          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
-        } else {
-          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
-        }
-
-        if (!val.dirty && val.valid && !val.readOnly) {
-          window.$gz.eventBus.$emit(
-            "menu-enable-item",
-            FORM_KEY + ":duplicate"
-          );
-          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
-        } else {
-          window.$gz.eventBus.$emit(
-            "menu-disable-item",
-            FORM_KEY + ":duplicate"
-          );
-          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
-        }
-      },
-      deep: true
-    }
-  },
-  async created() {
-    const vm = this;
-    try {
-      await initForm(vm);
-      vm.rights = window.$gz.role.getRights(window.$gz.type.VendorNotification);
-      vm.formState.readOnly = !vm.rights.change;
-      window.$gz.eventBus.$on("menu-click", clickHandler);
-      //---------------------------------
-      let setDirty = false;
-      //id 0 means create or duplicate to new
-      if (vm.$route.params.recordid != 0) {
-        //is there already an obj from a prior operation?
-        if (this.$route.params.obj) {
-          //yes, no need to fetch it
-          this.obj = this.$route.params.obj;
-        } else {
-          await vm.getDataFromApi(vm.$route.params.recordid);
-        }
-      } else {
-        //Might be a duplicate and contain another record
-        if (this.$route.params.obj) {
-          this.obj = this.$route.params.obj;
-          this.obj.concurrency = undefined;
-          this.obj.id = 0;
-          this.obj.name = `${this.obj.name} - ${window.$gz.translation.get(
-            "Copy"
-          )}`;
-          setDirty = true;
-        }
-      }
-      window.$gz.form.setFormState({
-        vm: vm,
-        loading: false,
-        dirty: setDirty,
-        valid: true
-      });
-      //----------------------------
-      generateMenu(vm);
-    } catch (error) {
-      window.$gz.errorHandler.handleFormError(error, vm);
-    } finally {
-      vm.formState.ready = true;
-    }
-  },
-  async beforeRouteLeave(to, from, next) {
-    if (!this.formState.dirty || JUST_DELETED) {
-      next();
-      return;
-    }
-    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
-      next();
-    } else {
-      next(false);
-    }
-  },
-  beforeDestroy() {
-    window.$gz.eventBus.$off("menu-click", clickHandler);
-  },
-  methods: {
-    canSave: function() {
-      return this.formState.valid && this.formState.dirty;
-    },
-    canDuplicate: function() {
-      return this.formState.valid && !this.formState.dirty;
-    },
-    sockTypes: function() {
-      return window.$gz.type;
-    },
-    form() {
-      return window.$gz.form;
-    },
-    fieldValueChanged(ref) {
-      if (
-        this.formState.ready &&
-        !this.formState.loading &&
-        !this.formState.readOnly
-      ) {
-        window.$gz.form.fieldValueChanged(this, ref);
-      }
-    },
-    async getDataFromApi(recordId) {
-      const vm = this;
-      window.$gz.form.setFormState({
-        vm: vm,
-        loading: true
-      });
-      if (!recordId) {
-        throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
-      }
-      try {
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        const res = await window.$gz.api.get(API_BASE_URL + recordId);
-        if (res.error) {
-          if (res.error.code == "2010") {
-            window.$gz.form.handleObjectNotFound(vm);
-          }
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
-        } else {
-          vm.obj = res.data;
-          generateMenu(vm);
-          window.$gz.form.setFormState({
-            vm: vm,
-            dirty: false,
-            valid: true,
-            loading: false
-          });
-        }
-      } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, vm);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
-      }
-    },
-    async submit() {
-      const vm = this;
-      if (vm.canSave == false) {
-        return;
-      }
-      try {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: true
-        });
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
-        if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
-        } else {
-          if (res.data.id) {
-            //POST
-            vm.obj = res.data;
-            this.$router.replace({
-              name: "vendor-notification-edit",
-              params: {
-                recordid: res.data.id,
-                obj: res.data
-              }
-            });
-          } else {
-            //PUT
-            vm.obj.concurrency = res.data.concurrency;
-          }
-          window.$gz.form.setFormState({
-            vm: vm,
-            dirty: false,
-            valid: true
-          });
-        }
-      } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
-      }
-    },
-    async remove() {
-      try {
-        const dialogResult = await window.$gz.dialog.confirmDelete();
-        if (dialogResult != true) {
-          return;
-        }
-        window.$gz.form.setFormState({
-          vm: this,
-          loading: true
-        });
-
-        if (this.$route.params.recordid == 0) {
-          JUST_DELETED = true;
-
-          this.$router.go(-1);
-        } else {
-          window.$gz.form.deleteAllErrorBoxErrors(this);
-          const res = await window.$gz.api.remove(
-            API_BASE_URL + this.$route.params.recordid
-          );
-          if (res.error) {
-            this.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(this);
-          } else {
-            JUST_DELETED = true;
-            this.$router.go(-1);
-          }
-        }
-      } catch (error) {
-        window.$gz.errorHandler.handleFormError(error, this);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: this,
-          loading: false
-        });
-      }
-    },
-    duplicate() {
-      this.$router.push({
-        name: "vendor-notification-edit",
-        params: {
-          recordid: 0,
-          obj: this.obj
-        }
-      });
-    }
-  }
-};
-
-/////////////////////////////
-//
-//
-async function clickHandler(menuItem) {
-  if (!menuItem) {
-    return;
-  }
-  const m = window.$gz.menu.parseMenuItem(menuItem);
-  if (m.owner == FORM_KEY && !m.disabled) {
-    switch (m.key) {
-      case "save":
-        m.vm.submit();
-        break;
-      case "delete":
-        m.vm.remove();
-        break;
-      case "new":
-        m.vm.$router.push({
-          name: "vendor-notification-edit",
-          params: { recordid: 0 }
-        });
-        break;
-      case "duplicate":
-        m.vm.duplicate();
-        break;
-      case "report":
-        {
-          const res = await m.vm.$refs.reportSelector.open(
-            {
-              AType: window.$gz.type.VendorNotification,
-              selectedRowIds: [m.vm.obj.id]
-            },
-            m.id
-          );
-          if (res == null) {
-            return;
-          }
-          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
-        }
-        break;
-
-      default:
-        window.$gz.eventBus.$emit(
-          "notify-warning",
-          FORM_KEY + "::context click: [" + m.key + "]"
-        );
-    }
-  }
-}
-
-//////////////////////
-//
-//
-function generateMenu(vm) {
-  const menuOptions = {
-    isMain: false,
-    readOnly: vm.formState.readOnly,
-    icon: "$sockiCommentDollar",
-    title: "VendorNotification",
-    formData: {
-      sockType: window.$gz.type.VendorNotification,
-      recordId: vm.$route.params.recordid,
-      recordName: vm.obj.name
-    },
-    menuItems: []
-  };
-
-  if (vm.rights.change) {
-    menuOptions.menuItems.push({
-      title: "Save",
-      icon: "$sockiSave",
-      surface: true,
-      key: FORM_KEY + ":save",
-      vm: vm
-    });
-  }
-
-  menuOptions.menuItems.push({
-    title: "Report",
-    icon: "$sockiFileAlt",
-    key: FORM_KEY + ":report",
-    vm: vm
-  });
-
-  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
-  if (lastReport != null) {
-    menuOptions.menuItems.push({
-      title: lastReport.name,
-      notrans: true,
-      icon: "$sockiFileAlt",
-      key: FORM_KEY + ":report:" + lastReport.id,
-      vm: vm
-    });
-  }
-
-  if (vm.rights.change) {
-    menuOptions.menuItems.push({
-      title: "New",
-      icon: "$sockiPlus",
-      key: FORM_KEY + ":new",
-      vm: vm
-    });
-  }
-
-  if (vm.rights.change && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Duplicate",
-      icon: "$sockiClone",
-      key: FORM_KEY + ":duplicate",
-      vm: vm
-    });
-  }
-  if (vm.rights.delete && vm.$route.params.recordid != 0) {
-    menuOptions.menuItems.push({
-      title: "Delete",
-      icon: "$sockiTrashAlt",
-      surface: false,
-      key: FORM_KEY + ":delete",
-      vm: vm
-    });
-  }
-  menuOptions.menuItems.push({ divider: true, inset: false });
-
-  menuOptions.menuItems.push({ divider: true, inset: false });
-  window.$gz.eventBus.$emit("menu-change", menuOptions);
-}
-
-let JUST_DELETED = false;
-
-/////////////////////////////////
-//
-//
-async function initForm() {
-  await fetchTranslatedText();
-}
-
-//////////////////////////////////////////////////////////
-//
-// Ensures UI translated text is available
-//
-async function fetchTranslatedText() {
-  await window.$gz.translation.cacheTranslations([
-    "VendorNotification",
-    "VendorNotificationCreated",
-    "Vendor",
-    "VendorNotificationVendorData",
-    "VendorNotificationProcessed"
-  ]);
-}
-</script>

src/views/cust-customer.vue

@@ -1261,16 +1261,6 @@ async function clickHandler(menuItem) {
           }
         });
         break;
-      case "PurchaseList":
-        m.vm.$router.push({
-          name: "biz-purchase-list",
-          params: {
-            aType: m.vm.sockType,
-            objectId: m.vm.obj.id,
-            name: m.vm.obj.name
-          }
-        });
-        break;
       case "LicenseList":
         m.vm.$router.push({
           name: "biz-license-list",
@@ -1401,13 +1391,6 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  menuOptions.menuItems.push({
-    title: "PurchaseList",
-    icon: "$sockiShoppingCart",
-    key: FORM_KEY + ":PurchaseList",
-    vm: vm
-  });
-
   menuOptions.menuItems.push({
     title: "LicenseList",
     icon: "$sockiGem",

src/views/home-notify-subscription.vue

@@ -273,7 +273,6 @@ export default {
         case 29:
         case 10:
         case 37:
-        case 39:
           return true;
         default:
           return false;
@@ -726,9 +725,7 @@ async function populateSelectionLists(vm) {
 ServerStateStatusChange = 36,
 ServerStateStatusAge=37,
 SubscriptionServerExpiring = 38,
-SubscriptionServerLastUpdateAge = 39,
 SubscriptionServerRequestReceived = 40,
-LicenseTrialRequestReceived = 41,
-PurchaseNotificationReceived = 42
+LicenseTrialRequestReceived = 41
 */
 </script>

src/views/home-review.vue

@@ -4,7 +4,7 @@
     <div v-if="formState.ready">
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
       <v-form ref="form">
-        <div v-if="obj.aType" class="mb-6">
+        <div v-if="obj.sockType" class="mb-6">
           <v-icon large @click="navToTarget()">{{ iconForType }}</v-icon
           ><span class="text-h5" @click="navToTarget()"> {{ name }}</span>
         </div>
@@ -191,7 +191,7 @@ export default {
         userId: window.$gz.store.state.userId,
         assignedByUserId: window.$gz.store.state.userId,
         objectId: null,
-        aType: null,
+        sockType: null, //case 4468: the server field is SockType; the form used AyaNova's AType, so reviews were saved with no type
         overDue: false
       },
       formState: {
@@ -222,7 +222,7 @@ export default {
     },
 
     iconForType() {
-      return window.$gz.util.iconForType(this.obj.aType);
+      return window.$gz.util.iconForType(this.obj.sockType);
     },
     hasSupervisorRole: function() {
       return window.$gz.role.hasRole([
@@ -298,10 +298,10 @@ export default {
           vm.obj.objectId = window.$gz.util.stringToIntOrNull(
             vm.$route.params.objectId
           );
-          vm.obj.aType = window.$gz.util.stringToIntOrNull(
+          vm.obj.sockType = window.$gz.util.stringToIntOrNull(
             vm.$route.params.aType
           );
-          if (!vm.obj.objectId || !vm.obj.aType) {
+          if (!vm.obj.objectId || !vm.obj.sockType) {
             throw "SockType and ObjectId are required to create a review";
           }
         }
@@ -337,7 +337,7 @@ export default {
   methods: {
     navToTarget: function() {
       window.$gz.eventBus.$emit("openobject", {
-        type: this.obj.aType,
+        type: this.obj.sockType,
         id: this.obj.objectId
       });
     },
@@ -515,7 +515,7 @@ async function clickHandler(menuItem) {
           name: "review-edit",
           params: {
             recordid: 0,
-            aType: m.vm.obj.aType,
+            aType: m.vm.obj.sockType,
             objectId: m.vm.obj.objectId,
             name: m.vm.name
           }

src/views/ops-backup.vue

@@ -39,7 +39,10 @@
               dense
               :readonly="formState.readOnly"
               :label="$sock.t('BackupSetsToKeep')"
-              :rules="[form().integerValid(this, 'backupSetsToKeep')]"
+              :rules="[
+                form().integerValid(this, 'backupSetsToKeep'),
+                form().minValueValid(this, 'backupSetsToKeep', 1)
+              ]"
               :error-messages="form().serverErrors(this, 'backupSetsToKeep')"
               type="number"
               @input="fieldValueChanged('backupSetsToKeep')"

vue.config.js

@@ -1,5 +1,9 @@
 const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 
+//case 4630: the year the client is built, for the copyright line (src/api/sockeye-version.js); VUE_APP_ variables
+//are compiled into the client
+process.env.VUE_APP_BUILD_YEAR = new Date().getFullYear().toString();
+
 module.exports = {
   //https://medium.com/@mrodal/how-to-make-lazy-loading-actually-work-in-vue-cli-3-7f3f88cfb102
   chainWebpack: config => {