Fix Job Parameters (#1857)
Co-authored-by: Jose Alberto Hernandez <alberto@blue-daemon.local>
This commit is contained in:
co-authored by
Jose Alberto Hernandez
parent
292a91ad00
commit
a1b39fbb0d
+1
-1
@@ -27,7 +27,7 @@ RUN npm cache clear --force
|
|||||||
RUN npm config set fetch-retry-maxtimeout 120000
|
RUN npm config set fetch-retry-maxtimeout 120000
|
||||||
RUN npm config set registry $NPM_REGISTRY_URL --location=global
|
RUN npm config set registry $NPM_REGISTRY_URL --location=global
|
||||||
|
|
||||||
RUN npm install --location=global @angular/cli@13.3.10
|
RUN npm install --location=global @angular/cli@14.2.12
|
||||||
|
|
||||||
RUN npm install
|
RUN npm install
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"build": "node version.js && npm run env -s && ng build --prod --output-hashing=none",
|
"build": "node version.js && npm run env -s && ng build --prod --output-hashing=none",
|
||||||
"build:prod": "node --max-old-space-size=16384 ./node_modules/@angular/cli/bin/ng build --prod --output-hashing=none --base-href=/web-app/",
|
"build:prod": "node version.js && node --max-old-space-size=16384 ./node_modules/@angular/cli/bin/ng build --prod --output-hashing=none --base-href=/web-app/",
|
||||||
"start": "npm run env -s && ng serve --aot --proxy-config proxy.conf.js",
|
"start": "npm run env -s && ng serve --aot --proxy-config proxy.conf.js",
|
||||||
"serve:dev": "npm run env -s && ng serve",
|
"serve:dev": "npm run env -s && ng serve",
|
||||||
"serve:sw": "npm run build -s && npx http-server ./dist -p 4200",
|
"serve:sw": "npm run build -s && npx http-server ./dist -p 4200",
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
<div *ngFor="let job of selectedJobs">
|
<div *ngFor="let job of selectedJobs">
|
||||||
<mifosx-custom-parameters-table
|
<mifosx-custom-parameters-table
|
||||||
[displayName]="job.displayName"
|
[displayName]="job.displayName"
|
||||||
[jobId]="job.id"
|
[jobId]="job.jobId"
|
||||||
[jobParameters]="job.jobParameters"
|
[jobParameters]="job.jobParameters"
|
||||||
(retrieveData)="runSelectedJobs($event)"
|
(retrieveData)="runSelectedJobs($event)"
|
||||||
>
|
>
|
||||||
|
|||||||
+2
-2
@@ -20,8 +20,8 @@ export interface RunJobWithParamPayloadType {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface JobParameterType {
|
export interface JobParameterType {
|
||||||
jobParameterName: string;
|
parameterName: string;
|
||||||
jobParameterValue: string;
|
parameterValue: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface JobDataType {
|
interface JobDataType {
|
||||||
|
|||||||
+4
-4
@@ -27,8 +27,8 @@ export class CustomParametersTableComponent implements OnInit {
|
|||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.updatedJobParameters = this.jobParameters;
|
this.updatedJobParameters = this.jobParameters;
|
||||||
this.updatedJobParameters.push({
|
this.updatedJobParameters.push({
|
||||||
jobParameterName: '',
|
parameterName: '',
|
||||||
jobParameterValue: ''
|
parameterValue: ''
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,8 +36,8 @@ export class CustomParametersTableComponent implements OnInit {
|
|||||||
this.updatedJobParameters = [
|
this.updatedJobParameters = [
|
||||||
...this.updatedJobParameters,
|
...this.updatedJobParameters,
|
||||||
{
|
{
|
||||||
jobParameterName: '',
|
parameterName: '',
|
||||||
jobParameterValue: ''
|
parameterValue: ''
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,14 +1,14 @@
|
|||||||
const { gitDescribeSync } = require('git-describe');
|
const { gitDescribeSync } = require('git-describe');
|
||||||
const { version } = require('./package.json');
|
|
||||||
const { resolve, relative } = require('path');
|
const { resolve, relative } = require('path');
|
||||||
const { writeFileSync } = require('fs-extra');
|
const { writeFileSync } = require('fs-extra');
|
||||||
|
const moment = require('moment');
|
||||||
|
|
||||||
const gitInfo = gitDescribeSync({
|
const gitInfo = gitDescribeSync({
|
||||||
dirtyMark: false,
|
dirtyMark: false,
|
||||||
dirtySemver: false
|
dirtySemver: false
|
||||||
});
|
});
|
||||||
|
|
||||||
gitInfo.version = version;
|
gitInfo.version = moment().format('YYMMDD');;
|
||||||
|
|
||||||
const file = resolve(__dirname, '.', 'src', 'environments', '.env.ts');
|
const file = resolve(__dirname, '.', 'src', 'environments', '.env.ts');
|
||||||
writeFileSync(file,
|
writeFileSync(file,
|
||||||
|
|||||||
Reference in New Issue
Block a user