From 59e09e26a5f4432fbfb397287f1fdd4f656d761e Mon Sep 17 00:00:00 2001 From: dc Date: Thu, 29 Oct 2026 18:34:08 +0000 Subject: [PATCH] fix(deploy): drop the deprecated service-pack deploy from the setup screen The Viya setup screen still carried a path that deployed the backend as a service pack from a viya.json (`deployServicePack`). That is no longer how a deployment works: the frontend and services arrive with the sasjs deploy, and the only thing left to do is create the control library and its configuration data, which `makedata` does - and then deletes itself. The path was already unreachable from the UI (its button had been commented out "for reference"), so the wizard only ever ran `makedata` in practice while its copy still claimed to deploy services. Removed: - `executeJson()` and the `viya.json` upload plumbing: `readFile`, `clearUploadInput`, and the fields and status flag that fed them - the "Deploy SAS Jobs" row in the completion modal, which could never show - the commented-out button and file input that kept the dead path visible The screen now says what it does: it runs the one-off job that creates the control library and its configuration data, and the status row reads "Create control library" rather than "Create database". --- .../automatic/automatic.component.html | 73 ++--------------- .../sections/automatic/automatic.component.ts | 82 +++---------------- client/src/app/services/deploy.service.ts | 18 ---- 3 files changed, 15 insertions(+), 158 deletions(-) diff --git a/client/src/app/deploy/sections/automatic/automatic.component.html b/client/src/app/deploy/sections/automatic/automatic.component.html index 5c87846..42f3964 100644 --- a/client/src/app/deploy/sections/automatic/automatic.component.html +++ b/client/src/app/deploy/sections/automatic/automatic.component.html @@ -8,20 +8,6 @@ @if (autodeployDone) {

Done

- @if (autoDeployStatus.deployServicePack !== null) { -
- @if (autoDeployStatus.deployServicePack === true) { - - } - @if (!autoDeployStatus.deployServicePack === false) { - - } -

Deploy SAS Jobs

-
- } @if (autoDeployStatus.runMakeData !== null) {
@if (autoDeployStatus.runMakeData) { @@ -33,16 +19,13 @@ @if (autoDeployStatus.runMakeData === false) { } -

Create database

+

Create control library

}
} - - - - -
- - - - - - - - -

Warning

diff --git a/client/src/app/deploy/sections/automatic/automatic.component.ts b/client/src/app/deploy/sections/automatic/automatic.component.ts index 6eb6c3b..f25c62b 100644 --- a/client/src/app/deploy/sections/automatic/automatic.component.ts +++ b/client/src/app/deploy/sections/automatic/automatic.component.ts @@ -51,16 +51,10 @@ export class AutomaticComponent implements OnInit { public selectedComputeContext: string = '' public makeDataResponse: string = '' - public jsonFile: any = null public autodeploying: boolean = false public autodeployDone: boolean = false public recreateDatabaseModal: boolean = false - public isSubmittingJson: boolean = false - public isJsonSubmitted: boolean = false - /** - * Default was `false` when deploy was done with frontend and backend separately. - * Now we are using only streaming app, so we always want to recreate database (makedata) - */ + /** Whether `makedata` runs as part of the deploy. */ public recreateDatabase: boolean = true public createDatabaseLoading: boolean = false public adminGroupsLoading: boolean = false @@ -86,18 +80,14 @@ export class AutomaticComponent implements OnInit { public currentUserInfo: ViyaApiCurrentUser | null = null public computeContexts: ComputeContextItem[] = [] - /** autoDeployStatus - * This object presents the status for two steps that we have for deploy. - * `deployServicePack` - Creating services based on `viya.json` - * `runMakeData` - Running `makedata` service - * If any of them is `null` or `false` that means step failed - * and will be shown to user on deploy done modal. + /** + * Status of the one step this screen runs: `makedata`, which creates the + * control library and its configuration data and then deletes itself. + * `null` means it has not run yet, `false` that it failed. */ public autoDeployStatus: { - deployServicePack: any runMakeData: any } = { - deployServicePack: null, runMakeData: null } @@ -420,56 +410,14 @@ export class AutomaticComponent implements OnInit { } /** - * Executes sas.json file to deploy the backend - * Method will first try to run the `auto deploy` - * If that fails the rest of the code is ignored. - * If request is successfull, method will continue to try - * to create database if checkbox is toggled on + * Runs the deployment. The control library and its configuration data are + * created by `makedata`, which self-deletes once it has run; the frontend and + * services arrived with the sasjs deploy, so there is nothing else to deploy + * from here. */ - public async executeJson() { - this.isSubmittingJson = true - - try { - let uploadJsonFile = await this.sasJs.deployServicePack( - this.jsonFile, - this.dcAdapterSettings?.appLoc, - undefined, - undefined, - true - ) - - this.autoDeployStatus.deployServicePack = true - this.isJsonSubmitted = true - } catch (ex: any) { - let textEx = '' - - if (typeof ex.message !== 'string') { - textEx = JSON.stringify(ex).replace(/\\/gm, '') - } else { - textEx = ex.message - } - - this.autoDeployStatus.deployServicePack = false - this.eventService.showInfoModal( - 'Deploy error', - `Exception: \n ${textEx !== '' ? textEx : ex}` - ) - this.autodeploying = false - this.autodeployDone = false - - return - } - - this.isSubmittingJson = false - } - - public async runAutoDeploy(executeJson: boolean = false) { + public async runAutoDeploy() { if (!this.deployInNewWindow) this.autodeploying = true - if (executeJson) { - this.executeJson() - } - if (this.recreateDatabase) { this.createDatabase() } else { @@ -708,22 +656,12 @@ export class AutomaticComponent implements OnInit { this.deployService.downloadFile(content, filename, extension) } - public async onJsonFileChange(event: any) { - let file = event.target.files[0] - - this.jsonFile = await this.deployService.readFile(file) - } - public recreateDatabaseClicked(event: Event) { ;(event.target).checked === true ? (this.recreateDatabaseModal = true) : '' } - public clearUploadInput(event: Event) { - this.deployService.clearUploadInput(event) - } - public openSasRequestsModal() { this.eventService.openRequestsModal() } diff --git a/client/src/app/services/deploy.service.ts b/client/src/app/services/deploy.service.ts index d302c0b..200bedd 100644 --- a/client/src/app/services/deploy.service.ts +++ b/client/src/app/services/deploy.service.ts @@ -26,22 +26,4 @@ export class DeployService { document.body.removeChild(downloadLink) } } - - public readFile(file: File): Promise { - return new Promise((resolve, reject) => { - let JsonFileReader = new FileReader() - - JsonFileReader.onload = () => { - if (JsonFileReader.result) { - resolve(JSON.parse(JsonFileReader.result.toString())) - } - } - - JsonFileReader.readAsText(file) - }) - } - - public clearUploadInput(event: Event) { - ;(event.target).value = '' - } }