querysub 0.694.0 → 0.695.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.694.0",
+  "version": "0.695.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/components/ServiceDetailPage.tsx

@@ -595,19 +595,6 @@ export class ServiceDetailPage extends qreact.Component {
                         Old instances shut down in {formatTime(scheduledDeploy.switchTime + scheduledDeploy.overlapTime - now)} ({formatDateTimeDetailed(scheduledDeploy.switchTime + scheduledDeploy.overlapTime)})
                     </div>
                     <div className={css.hbox(8)}>
-                        <button
-                            className={css.pad2(12, 8).button.bord2(0, 0, 20).hsl(0, 70, 90)}
-                            onClick={() => {
-                                this.runControllerAction(async () => {
-                                    let cancelled = await controller.cancelScheduledDeploy.promise(selectedServiceId);
-                                    // Keep the cancelled changes in the editor, so they aren't lost (Discard Changes drops them)
-                                    Querysub.commit(() => {
-                                        this.state.editorState = cancelled;
-                                    });
-                                });
-                            }}>
-                            Cancel Scheduled Deploy
-                        </button>
                         <button
                             className={css.pad2(12, 8).button.bord2(45, 80, 35).hsl(45, 85, 82)}
                             disabled={this.state.isDeploying}

package/src/deployManager/machineSchema.ts

@@ -415,20 +415,6 @@ export class MachineServiceControllerBase {
         void this.notifyMachines([], getConfigMachineIds(normalizeServiceConfig(serviceConfig)));
     }
 
-    /** Cancels parameters that are scheduled to deploy (releaseTime in the future), reverting to what is currently live. Returns the cancelled config, so the caller can keep the edits (ex, back in the editor). */
-    public async cancelScheduledDeploy(serviceId: string): Promise<ServiceConfig> {
-        let record = await serviceConfigs.get(serviceId);
-        if (!record) {
-            throw new Error(`Service ${serviceId} does not exist`);
-        }
-        normalizeServiceConfig(record);
-        if (!record.parameters.releaseTime || Date.now() >= record.parameters.releaseTime || !record.oldParameters) {
-            throw new Error(`Service ${serviceId} has no scheduled deploy to cancel (it may have already gone live)`);
-        }
-        await serviceConfigs.set(serviceId, { ...record, parameters: record.oldParameters, oldParameters: undefined });
-        void this.notifyMachines(getConfigMachineIds(record), []);
-        return stripReleaseState(record);
-    }
     public async getServiceConfigType(): Promise<string> {
         return extractType(module, "ServiceConfig");
     }
@@ -657,7 +643,6 @@ export const MachineServiceController = getSyncedController(
             setMachineConfig: {},
             addServiceConfig: {},
             setServiceConfigs: {},
-            cancelScheduledDeploy: {},
             getServiceConfigType: {},
             deleteServiceConfig: {},
             getGitInfo: {},
@@ -682,7 +667,6 @@ export const MachineServiceController = getSyncedController(
             setMachineConfig: ["MachineConfig", "MachineConfigList"],
             addServiceConfig: ["ServiceConfig", "ServiceConfigList"],
             setServiceConfigs: ["ServiceConfig"],
-            cancelScheduledDeploy: ["ServiceConfig"],
             deleteServiceConfig: ["ServiceConfig", "ServiceConfigList"],
             commitPushService: ["gitInfo", "ServiceConfig"],
             commitPushAndPublishQuerysub: ["gitInfo", "ServiceConfig"],