Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: StackStorm/st2web
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fbafac9685cef2f749525a2d31a5f575742502c0
Choose a base ref
..
head repository: StackStorm/st2web
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d1ec0fe42e207daa2fbcaea00941edc0721527e
Choose a head ref
Showing with 26 additions and 3 deletions.
  1. +1 −1 apps/st2-rules/panels/enforcements.js
  2. +1 −1 package.json
  3. +1 −1 rpm/st2web.spec
  4. +1 −0 tasks/production/index.js
  5. +22 −0 tasks/production/package-metadata.js
2 changes: 1 addition & 1 deletion apps/st2-rules/panels/enforcements.js
Original file line number Diff line number Diff line change
@@ -91,7 +91,7 @@ export default class EnforcementPanel extends DetailsPanel {
<DetailsPanelBodyLine label="Trigger Instance">
{enforcement.trigger_instance_id}
</DetailsPanelBodyLine>
<DetailsPanelBodyLine label="Enforcement ID">
<DetailsPanelBodyLine label="Execution ID">
{
enforcement.execution_id ? (
enforcement.execution_id
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
},
"repository": "stackstorm/st2web",
"engines": {
"node": "10.12.0",
"node": "10.13.0",
"npm": "6.1.0"
},
"browserify": {
2 changes: 1 addition & 1 deletion rpm/st2web.spec
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ Prefix: /opt/stackstorm/static/webui


%description
Angular-based HTML5 real-time Web UI interface for StackStorm open-source automation platform.
React-based HTML5 real-time Web UI interface for StackStorm open-source automation platform.
Allows to control the whole process of execution, from running an action to seeing the results of the execution.
It also helps to explore workflow executions up to the results of individual tasks.

1 change: 1 addition & 0 deletions tasks/production/index.js
Original file line number Diff line number Diff line change
@@ -10,4 +10,5 @@ gulp.task('production', gulp.series([
'production-scripts',
'production-styles',
'production-static',
'production-package-metadata',
]));
22 changes: 22 additions & 0 deletions tasks/production/package-metadata.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';

const gulp = require('gulp');
const child_process = require('child_process');
const fs = require('fs');
const path = require('path');

gulp.task('production-package-metadata', (done) => {
const circle_build_url = process.env.CIRCLE_BUILD_URL;

const result = child_process.spawnSync('git', [ 'rev-parse', '--short', 'HEAD' ]);
const git_sha = result.stdout.toString().trim();

const pkg_version = require(path.resolve('./package.json')).st2_version;

const data = `[st2web]\nversion = ${pkg_version}\ngit_sha = ${git_sha}\ncircle_build_url = ${circle_build_url}\n`;

const file_path = path.join(path.resolve('./build'), 'package.meta');

fs.writeFileSync(file_path, data);
done();
});