Merge branch 'master' into Delete_Action/Workflow

Author: m4dcoder

README.md

@@ -39,6 +39,12 @@ then you need to bootstrap the micromodules
 $ lerna bootstrap
 ```
 
+to avoid conflicts on node_modules, delete those generated by lerna:
+
+```shell
+$ rm -rf apps/st2-workflows/node_modules/
+```
+
 and finally run build system to fetch the font, compile css and so on
 
 ```shell

apps/st2-history/history-details.component.js

@@ -112,7 +112,7 @@ export default class HistoryDetails extends React.Component {
     }
 
     setTitle([ execution.action.ref, 'History' ]);
-
+    
     return (
       <PanelDetails data-test="details">
         <DetailsHeader

apps/st2-history/history-popup.component.js

@@ -46,6 +46,9 @@ export default class HistoryPopup extends React.Component {
       payload: {
         ...props.payload,
       },
+      payloadCopy: {
+        ...props.payload,       // Here first made copy of data for later comparison
+      },
       ...state,
     };
   }
@@ -59,8 +62,32 @@ export default class HistoryPopup extends React.Component {
   }
 
   handleSubmit(e) {
+    // 1. Whenever user changes any parameter,it is stored into payload.So we get changed data into payload. 
+    // 2. We have copy of original data without any parameter change in payloadCopy object on line no 49.
+    // 3. Here we are first identifying key name of secret parameter, payloadKey is key variable name for 
+    //    payload object and payloadCopyKey is variable name for payloadCopy object.
+    // 4. Once we get both key, we are checking value of that key in both object.
+    // 5. So if user change secret parameter data, it will get in payload.
+    // 6. When user does not change secret parameter,in payload secret parameter value is *** and in 
+    //    payloadCopyKey object it is always *** because we are getting changed value in payload object only.
+    // 7. If data in both key same, then there is no any change and if data is not same in both key 
+    //    i.e payloadKey and payloadCopyKey, data is changed and we will send changed data to API.
     e.preventDefault();
-
+    const hasValue = Object.values(this.state.payload).includes('********');
+    let payLoadKey;
+    if (hasValue === true) {
+      payLoadKey =  Object.keys(this.state.payload).find(key => this.state.payload[key] === '********');
+    }
+
+    const isValue = Object.values(this.state.payloadCopy).includes('********');
+    let payloadCopyKey ;
+    if (isValue === true) {
+      payloadCopyKey =  Object.keys(this.state.payloadCopy).find(key => this.state.payloadCopy[key] === '********');
+    }
+    
+    if (this.state.payload[payLoadKey] === this.state.payloadCopy[payloadCopyKey]) {
+      delete this.state.payload[payLoadKey];
+    }
     this.props.onSubmit(this.state.payload);
   }
 

config.js

@@ -23,7 +23,8 @@ angular.module('main')
     // render and likely freeze the browser window for deeply nested JSON object results.
     // Value is in bytes.
     // max_execution_result_size_for_render: 200 * 1024,
-    //
+    // set application inactivity time default for 2 hr, here it is in seconds.
+    // application_inactivity_time : 7200,
     // Set to true to display StackStorm and st2web version in the header
     //show_version_in_header: false;
 

modules/st2-action-reporter/reporters/run-local.js

@@ -28,14 +28,17 @@ export default function runLocal(execution) {
     execution.result && execution.result.stderr ? [
       <div key="error" className={style.source}>Error</div>,
       <Highlight well lines={20} className={style.highlight} key="error-code" code={execution.result.stderr} type="result" id={execution.id} />,
+    ] : execution.result && execution.result.error ? [ 
+      <div key="error" className={style.source}>Error</div>,
+      <Highlight well lines={20} className={style.highlight} key="error-code" code={execution.result.error} type="result" id={execution.id} />,
     ] : null,
 
     execution.result && execution.result.traceback ? [
       <div key="traceback" className={style.source}>Traceback</div>,
       <Highlight well lines={20} className={style.highlight} key="traceback-code" code={[ execution.result.error, execution.result.traceback ].join('\n')} type="result" id={execution.id} />,
     ] : null,
 
-    !execution.result || (!execution.result.stdout && !execution.result.stderr && !execution.result.traceback) ? (
+    !execution.result || (!execution.result.stdout && !execution.result.stderr && !execution.result.error && !execution.result.traceback) ? (
       <Highlight well className={style.highlight} key="none" code="// Action produced no data" type="result" id={execution.id} />
     ) : null,
   ];

modules/st2-action-reporter/reporters/run-python.js

@@ -33,14 +33,17 @@ export default function runPython(execution) {
     execution.result && execution.result.stderr ? [
       <div key="error" className={style.source}>Error</div>,
       <Highlight well lines={20} className={style.highlight} key="error-code" code={execution.result.stderr} type="result" id={execution.id} />,
+    ] : execution.result && execution.result.error ? [ 
+      <div key="error" className={style.source}>Error</div>,
+      <Highlight well lines={20} className={style.highlight} key="error-code" code={execution.result.error} type="result" id={execution.id} />,
     ] : null,
 
     execution.result && execution.result.traceback ? [
       <div key="traceback" className={style.source}>Traceback</div>,
       <Highlight well lines={20} className={style.highlight} key="traceback-code" code={[ execution.result.error, execution.result.traceback ].join('\n')} type="result" id={execution.id} />,
     ] : null,
 
-    !execution.result || (!execution.result.result && !execution.result.stdout && !execution.result.stderr && !execution.result.traceback) ? (
+    !execution.result || (!execution.result.result && !execution.result.stdout && !execution.result.stderr && !execution.result.error && !execution.result.traceback) ? (
       <Highlight well className={style.highlight} key="none" code="// Action produced no data" />
     ) : null,
   ].filter(v => v);

modules/st2-action-reporter/reporters/run-remote.js

@@ -39,14 +39,17 @@ export default function runRemote(execution) {
       result && result.stderr ? [
         <div key="error" className={style.source}>Error</div>,
         <Highlight well lines={20} className={style.highlight} key="error-code" code={result.stderr} type="result" id={execution.id} />,
+      ] :result && result.error ? [
+        <div key="error" className={style.source}>Error</div>,
+        <Highlight well lines={20} className={style.highlight} key="error-code" code={result.error} type="result" id={execution.id} />,
       ] : null,
 
       result && result.traceback ? [
         <div key="traceback" className={style.source}>Traceback</div>,
         <Highlight well lines={20} className={style.highlight} key="traceback-code" code={[ result.error, result.traceback ].join('\n')} type="result" id={execution.id} />,
       ] : null,
 
-      !result || (!result.result && !result.stderr && !result.stdout && !result.traceback) ? (
+      !result || (!result.result && !result.stderr &&  !result.stdout && !result.error  && !result.traceback) ? (
         <Highlight well className={style.highlight} key="none" code="// Action produced no data" />
       ) : null,
     ];

modules/st2-login/login.component.js

@@ -219,6 +219,7 @@ export default class Login extends React.Component {
               placeholder="Username"
               required
               value={this.state.username}
+              maxLength="256"
               onChange={({ target: { value: username } }) => this.setState({ username })}
             />
           </LoginRow>
@@ -230,6 +231,7 @@ export default class Login extends React.Component {
               placeholder="Password"
               required
               value={this.state.password}
+              maxLength="256"
               onChange={({ target: { value: password } }) => this.setState({ password })}
             />
           </LoginRow>

modules/st2-menu/menu.component.js

@@ -22,6 +22,7 @@ import api from '@stackstorm/module-api';
 import Link from '@stackstorm/module-router/link.component';
 
 import componentStyle from './style.css';
+const APPLICATION_INACTIVITY_TIME = 7200; // 2 hr time here it is in seconds
 
 class Icon extends React.Component {
   static propTypes = {
@@ -63,17 +64,42 @@ export default class Menu extends React.Component {
     style: componentStyle,
   }
 
-  componentDidMount() {
+  componentDidMount () {
+    this.idleLogout();
     window.addEventListener('storage', this.storageChange());
-  }
 
+  }
+ 
   componentWillUnmount() {
     window.removeEventListener('storage',this.storageChange());
   }
 
   docsLink = 'https://docs.stackstorm.com/'
   supportLink = 'https://forum.stackstorm.com/'
 
+  idleLogout() {
+    let t;
+    window.onload = resetTimer;
+    window.onmousemove = resetTimer;
+    window.onmousedown = resetTimer;  // catches touchscreen presses as well      
+    window.ontouchstart = resetTimer; // catches touchscreen swipes as well 
+    window.onclick = resetTimer;      // catches touchpad clicks as well
+    window.onkeydown = resetTimer;   
+    window.addEventListener('scroll', resetTimer, true); 
+
+    function logoutFunction() {
+      // your logout code for too long inactivity goes here
+      api.disconnect();
+      window.location.reload();
+    }
+
+    function resetTimer() {
+      window.clearTimeout(t);
+      const millisecondTime =  window.st2constants.st2Config.application_inactivity_time * 1000 || APPLICATION_INACTIVITY_TIME * 1000;
+      t = window.setTimeout(logoutFunction, millisecondTime);  // time is in milliseconds,application will logout after 2 hr. We can set whatever time we want.
+    }
+  }
+
   storageChange () {
     window.addEventListener('storage', (event) => {
       if (event.key === 'logged_in' && (event.oldValue !== event.newValue)) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "st2web",
   "version": "2.4.3",
-  "st2_version": "3.5dev",
+  "st2_version": "3.6dev",
   "private": true,
   "scripts": {
     "eslint": "eslint .",