diff --git a/packages/core/pipeline/src/plugin/api.ts b/packages/core/pipeline/src/plugin/api.ts index 4f18a9685..4da1c0d4f 100644 --- a/packages/core/pipeline/src/plugin/api.ts +++ b/packages/core/pipeline/src/plugin/api.ts @@ -6,7 +6,7 @@ import { IAccessService } from "../access/index.js"; import { IEmailService } from "../service/index.js"; import { IContext } from "../core/index.js"; import { AxiosInstance } from "axios"; -import { logger } from "../utils/index.js"; +import { ILogger, logger } from "../utils/index.js"; export enum ContextScope { global, @@ -69,6 +69,9 @@ export type TaskInstanceContext = { export abstract class AbstractTaskPlugin implements ITaskPlugin { _result: TaskResult = { clearLastStatus: false, files: [], pipelineVars: {} }; ctx!: TaskInstanceContext; + logger!: ILogger; + accessService!: IAccessService; + clearLastStatus() { this._result.clearLastStatus = true; } @@ -79,6 +82,8 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin { setCtx(ctx: TaskInstanceContext) { this.ctx = ctx; + this.logger = ctx.logger; + this.accessService = ctx.accessService; } randomFileId() { diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts index 527b01888..984cf437c 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -1,7 +1,6 @@ -import { AbstractTaskPlugin, HttpClient, IAccessService, IContext, Step, TaskInput, TaskOutput } from "@certd/pipeline"; +import { AbstractTaskPlugin, HttpClient, IContext, Step, TaskInput, TaskOutput } from "@certd/pipeline"; import dayjs from "dayjs"; import type { CertInfo } from "./acme.js"; -import { Logger } from "log4js"; import { CertReader } from "./cert-reader.js"; import JSZip from "jszip"; @@ -91,9 +90,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { // }) csrInfo!: string; - logger!: Logger; userContext!: IContext; - accessService!: IAccessService; http!: HttpClient; lastStatus!: Step; @@ -103,8 +100,6 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { cert?: CertInfo; async onInstance() { - this.accessService = this.ctx.accessService; - this.logger = this.ctx.logger; this.userContext = this.ctx.userContext; this.http = this.ctx.http; this.lastStatus = this.ctx.lastStatus as Step; diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/output-selector/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/output-selector/index.vue index 0e21fa1c7..d4230fdfd 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/output-selector/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/output-selector/index.vue @@ -23,7 +23,7 @@ export default { const currentStepIndex = inject("currentStepIndex") as Ref; const currentTask = inject("currentTask") as Ref; - const getPluginGroups = inject("getPluginGroups") as Ref; + const getPluginGroups = inject("getPluginGroups") as any; const pluginGroups = getPluginGroups(); function onCreate() { options.value = pluginGroups.getPreStepOutputOptions({ @@ -42,7 +42,7 @@ export default { watch( () => { - return pluginGroups.value.map; + return pluginGroups.value?.map; }, () => { onCreate(); diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue index b4c82a9b9..8d0b45e7b 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue @@ -61,24 +61,7 @@ - +