Merge remote-tracking branch 'origin' into update_tar_6.1.11

m4dcoder · m4dcoder · commit 110528544e53 · 2021-12-16T18:32:20.000Z
diff --git a/apps/st2-actions/actions-details.component.js b/apps/st2-actions/actions-details.component.js
@@ -26,6 +26,9 @@ import { Link } from '@stackstorm/module-router';
 import ActionReporter from '@stackstorm/module-action-reporter';
 import AutoForm from '@stackstorm/module-auto-form';
 import StringField from '@stackstorm/module-auto-form/fields/string';
+import EnumField from '@stackstorm/module-auto-form/fields/enum';
+import get from 'lodash/fp/get';
+
 import {
   FlexTable,
   FlexTableRow,
@@ -48,7 +51,6 @@ import {
 } from '@stackstorm/module-panel';
 import Time from '@stackstorm/module-time';
 
-
 @connect((state) => {
   const { action, executions, entrypoint } = state;
   return { action, executions, entrypoint };
@@ -64,14 +66,28 @@ export default class ActionsDetails extends React.Component {
     action: PropTypes.object,
     executions: PropTypes.array,
     entrypoint: PropTypes.string,
+    groups: PropTypes.array,
+    filter: PropTypes.string,
+    match: PropTypes.shape({
+      params: PropTypes.shape({
+        ref: PropTypes.string,
+        section: PropTypes.string,
+      }),
+    }),
   }
 
   state = {
     runPreview: false,
     runValue: null,
     runTrace: null,
     executionsVisible: {},
-    isChecked:false,
+    openModel: false,
+    isChecked: false,
+    destinationPack:'',
+    destinationAction:'',
+    packs:[],
+    isRemoveFiles : false,
+    
   }
 
   componentDidMount() {
@@ -129,11 +145,29 @@ export default class ActionsDetails extends React.Component {
     }
   }
 
-  componentDidUpdate(prevProps) {
-    const { id } = this.props;
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    const {groups, filter} = nextProps;
+    const packs = [];
+    if(!filter) {
+      groups && groups.map(data => {
+        packs.push(data.pack);
+      });
+
+      this.setState({packs : packs});
+    }
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    const { id , filter} = this.props;
+
+ 
     if (id && id !== prevProps.id) {
       this.fetchAction(id);
     }
+
+    if(filter && filter !== prevProps.filter) {
+      this.setState({packs: prevState.packs});
+    }
   }
 
   componentWillUnmount() {
@@ -254,6 +288,101 @@ export default class ActionsDetails extends React.Component {
     return this.props.handleRun(...args);
   }
 
+  handleClone(e, srcPack,srcAction, destAction,destPack, overwrite) {
+    e.preventDefault();
+    return store.dispatch({
+      type: 'CLONE_ACTION',
+      promise: api.request({
+        method: 'post',
+        path: `/actions/${srcPack}.${srcAction}/clone`,    
+      },{
+        'dest_pack': destPack, 
+        'dest_action': destAction, 
+        'overwrite': overwrite,
+      
+      })
+        .then((execution) => {
+          document.getElementById('overlay').style.display = 'none';
+          notification.success(`Action "${srcAction}" has been cloned successfully.`);
+          this.getActions();
+          return execution;
+        })
+        .catch((err) => {
+          if (err.response) {
+            const error = document.getElementById('error');
+            error.textContent = err.response.data.faultstring;
+            error.style.color = 'red';
+          }
+        }),
+    });
+  }
+
+  getActions() {
+    return store.dispatch({
+      type: 'FETCH_GROUPS',
+      promise: api.request({ 
+        path: '/actions', 
+        query: {
+          include_attributes: [
+            'ref',
+            'pack',
+            'name',
+            'description',
+            'runner_type',
+          ],
+        },
+      })
+        .catch((err) => {
+          notification.error('Unable to retrieve actions.', { err });
+          throw err;
+        }),
+    })
+      .then(() => {
+        const { id } = this.urlParams;
+        const { groups } = this.props;
+
+        if (id && groups && !groups.some(({ actions }) => actions.some(({ ref }) => ref === id))) {
+          this.navigate({ id: false });
+        }
+      })
+    ;
+  }
+
+  get urlParams() {
+    const {
+      ref = get('groups[0].actions[0].ref', this.props),
+      section = 'general',
+    } = this.props.match.params;
+
+    return {
+      id: ref,
+      section,
+    };
+  }
+
+  openModel (e) {
+    const {action} = this.props;
+    const el =  document.getElementById('overlay');
+    el.style.display = 'block'; 
+    this.setState({ destinationPack:action.pack, destinationAction:'', isChecked: false});
+  }
+
+  closeModel() {
+    document.getElementById('overlay').style.display = 'none';
+  }
+
+  handleDropdown(e) {
+    const error = document.getElementById('error');
+    error.textContent = '';
+    this.setState({destinationPack:e});
+  }
+
+  handleInput(e) {
+    const error = document.getElementById('error');
+    error.textContent = '';
+    this.setState({destinationAction:e});
+  }
+
   handleChange(e) {
     const isChecked = document.getElementById('checkbox').checked;
     if(isChecked) {
@@ -264,28 +393,37 @@ export default class ActionsDetails extends React.Component {
     }
   }
 
-  openModel (e) {
-    this.setState({isChecked: false});
-    const el =  document.getElementById('overlay');
+  handleDeleteChange(e) {
+    const isChecked = document.getElementById('deletecheckbox').checked;
+    if(isChecked) {
+      this.setState({isRemoveFiles:true});
+    } 
+    else {
+      this.setState({isRemoveFiles:false});
+    }
+  }
+ 
+  openDeleteModel (e) {
+    this.setState({isRemoveFiles: false});
+    const el =  document.getElementById('delete');
     el.style.display = 'block'; 
   }
 
   handleDelete (e) {
     e.preventDefault();
     const { id } = this.props;
-    const {isChecked}  = this.state;
-    document.getElementById('overlay').style.display = 'none';
-    return this.props.handleDelete(id, isChecked);
+    const {isRemoveFiles}  = this.state;
+    document.getElementById('delete').style.display = 'none';
+    return this.props.handleDelete(id, isRemoveFiles);
   }
 
-  closeModel() {
-   
-    document.getElementById('overlay').style.display = 'none';
+  closeDeleteModel() {
+    document.getElementById('delete').style.display = 'none';
   }
-  
 
   render() {
-    const { section, action, executions, entrypoint } = this.props;
+    const { section, action, executions, entrypoint} = this.props;
+
     if (!action) {
       return null;
     }
@@ -325,7 +463,8 @@ export default class ActionsDetails extends React.Component {
               />
               <Button flat value="Preview" onClick={() => this.handleToggleRunPreview()} />
               <DetailsToolbarSeparator />
-              <Button className="st2-forms__button st2-details__toolbar-button"  value="Delete"  onClick={(e) => this.openModel(e)}  />
+              <Button disabled={this.props.id !== action.ref} className="st2-forms__button st2-details__toolbar-button"  value="Clone" onClick={(e) => this.openModel(e)}   />
+              <Button className="st2-forms__button st2-details__toolbar-button"  value="Delete" onClick={(e) => this.openDeleteModel(e)}  />
 
               { action.runner_type === 'mistral-v2' || action.runner_type === 'orquesta' ? (
                 <Link
@@ -425,15 +564,29 @@ export default class ActionsDetails extends React.Component {
             </DetailsPanel>
           </DetailsBody>
         ) : null }
+        
+        {/* Written pop-up box code here  */}
+        <div id="overlay" className="web_dialog_overlay" style={{display: 'none', position: 'fixed', zIndex: '10', left: '0',top: '0',width: '100%', minHeight: '-webkit-fill-available', overflow: 'auto', backgroundColor: 'rgba(0,0,0,0.4)' }}> 
+          <div id="dialog" className="web_dialog" style={{backgroundColor: '#fefefe' ,margin: '15% auto',padding: '20px', border: '1px solid #888' ,width: '28%' ,height:'50%' }}> 
+            <EnumField name="Destination Pack Name *" value={this.state.destinationPack ? this.state.destinationPack : action.pack} spec={{enum: this.state.packs}}  onChange={(e) => this.handleDropdown(e)} /><br /><br />
+            <StringField  style={{height:'30%'}} name="Destination Action Name *" value={this.state.destinationAction} onChange={(e) => this.handleInput(e)} required /><br /><br />
 
+            <input id="checkbox" name="checkbox" type="checkbox" checked={this.state.isChecked} value={this.state.isChecked} onChange={(e) => this.handleChange(e)}  /> Overwrite <br /><br /><br />
+            <span id="error" /><br /><br />
+            <div style={{width:'100%', display:'inline-block'}}>
+              <button  onClick={(e) => this.handleClone(e, action.pack,action.name,this.state.destinationAction,this.state.destinationPack, this.state.isChecked )}  type="submit" className="btn" style={{backgroundColor: '#04AA6D' , color: 'white',padding: '16px 20px' ,border: 'none', cursor: 'pointer', width: '45%' ,marginBottom:'10px' , opacity: '0.8',float:'left'}}>Submit</button>
+              <button onClick={(e) => this.closeModel(e)} type="close" className="btn cancel" style={{backgroundColor: 'red' , color: 'white',padding: '16px 20px' ,border: 'none', cursor: 'pointer', width: '45%' ,marginBottom:'10px' , opacity: '0.8', float:'right'}}>Close</button>
+            </div>
+          </div>
+        </div>
 
-        <div id="overlay" className="web_dialog_overlay" style={{display: 'none', position: 'fixed', zIndex: '10', left: '0',top: '0',width: '100%', minHeight: '-webkit-fill-available', overflow: 'auto', backgroundColor: 'rgba(0,0,0,0.4)' }}> 
+        <div id="delete" className="web_dialog_overlay" style={{display: 'none', position: 'fixed', zIndex: '10', left: '0',top: '0',width: '100%', minHeight: '-webkit-fill-available', overflow: 'auto', backgroundColor: 'rgba(0,0,0,0.4)' }}> 
           <div id="dialog" className="web_dialog" style={{backgroundColor: '#fefefe' ,margin: '15% auto',padding: '20px', border: '1px solid #888' ,width: '24%' ,height:'20%' }}>
             <p> You are about to delete the action. Are you sure? </p>
-            <input id="checkbox" name="checkbox" type="checkbox" checked={this.state.isChecked} value={this.state.isChecked} onChange={(e) => this.handleChange(e)}  /> Remove Files (This operation is irreversible.) <br /><br /><br />
+            <input id="deletecheckbox" name="checkbox" type="checkbox" checked={this.state.isRemoveFiles} value={this.state.isRemoveFiles} onChange={(e) => this.handleDeleteChange(e)} /> Remove Files (This operation is irreversible.) <br /><br /><br />
             <div style={{width:'100%', display:'inline-block'}}>
               <button  onClick={(e) => this.handleDelete(e)}  type="submit" className="btn" style={{backgroundColor: '#04AA6D' , color: 'white',padding: '16px 20px' ,border: 'none', cursor: 'pointer', width: '45%' ,marginBottom:'10px' , opacity: '0.8',float:'left'}}>Submit</button>
-              <button onClick={(e) => this.closeModel(e)} type="close" className="btn cancel" style={{backgroundColor: 'red' , color: 'white',padding: '16px 20px' ,border: 'none', cursor: 'pointer', width: '45%' ,marginBottom:'10px' , opacity: '0.8', float:'right'}}>Close</button>
+              <button onClick={(e) => this.closeDeleteModel(e)} type="close" className="btn cancel" style={{backgroundColor: 'red' , color: 'white',padding: '16px 20px' ,border: 'none', cursor: 'pointer', width: '45%' ,marginBottom:'10px' , opacity: '0.8', float:'right'}}>Close</button>
             </div>
           </div>
         </div>
diff --git a/apps/st2-actions/actions-panel.component.js b/apps/st2-actions/actions-panel.component.js
@@ -222,7 +222,6 @@ export default class ActionsPanel extends React.Component {
         .then((res) => {
           notification.success(`Action "${ref}" has been deleted successfully.`);
           this.navigate({ id: null });
-          store.dispatch(flexActions.toggleAll());
           this.fetchGroups();
           return res;
         })
@@ -311,6 +310,8 @@ export default class ActionsPanel extends React.Component {
 
           id={id}
           section={section}
+          groups={groups}
+          filter={filter}
         />
       </Panel>
     );
diff --git a/apps/st2-workflows/package.json b/apps/st2-workflows/package.json
@@ -71,7 +71,7 @@
     "react-redux": "^6.0.1",
     "react-router-dom": "^5.0.0",
     "redux": "^4.0.1",
-    "urijs": "^1.19.4 "
+    "urijs": "^1.19.7"
   },
   "devDependencies": {
     "@babel/core": "7.4.3",
diff --git a/modules/st2-login/login.component.js b/modules/st2-login/login.component.js
@@ -164,7 +164,7 @@ export default class Login extends React.Component {
   }
 
   docsLink = 'https://docs.stackstorm.com/'
-  supportLink = 'https://forum.stackstorm.com/'
+  supportLink = 'https://github.com/StackStorm/st2/discussions'
 
   connect(e) {
     e.preventDefault();
diff --git a/modules/st2-menu/menu.component.js b/modules/st2-menu/menu.component.js
@@ -75,7 +75,7 @@ export default class Menu extends React.Component {
   }
 
   docsLink = 'https://docs.stackstorm.com/'
-  supportLink = 'https://forum.stackstorm.com/'
+  supportLink = 'https://github.com/StackStorm/st2/discussions'
 
   idleLogout() {
     let t;
diff --git a/package.json b/package.json
@@ -79,15 +79,15 @@
     "moment": "2.24.0",
     "node": "^14.16.1",
     "node-uuid": "^1.4.4",
-    "open": "^6.0.0",
-    "qs": "^6.0.4",
+    "open": "^8.4.0",
+    "qs": "^6.10.2",
     "react": "16.8.6",
     "react-dom": "16.8.6",
     "react-redux": "7.0.2",
     "redux": "^4.0.1",
     "set-value": "^4.1.0",
     "tar": "^6.1.11",
-    "urijs": "^1.19.4",
+    "urijs": "^1.19.7",
     "websocket-extensions": "^0.1.4"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
@@ -6832,11 +6832,6 @@ is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -8793,12 +8788,14 @@ open@^0.0.5:
   resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"
   integrity sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=
 
-open@^6.0.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
-  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
+open@^8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
+  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
   dependencies:
-    is-wsl "^1.1.0"
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
 
 optionator@^0.8.1, optionator@^0.8.2, optionator@^0.8.3:
   version "0.8.3"
@@ -9889,7 +9886,14 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.0.4, qs@^6.9.4:
+qs@^6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"
+  integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==
+  dependencies:
+    side-channel "^1.0.4"
+
+qs@^6.9.4:
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
   integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
@@ -12164,10 +12168,10 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urijs@^1.19.4, "urijs@^1.19.4 ":
-  version "1.19.6"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.6.tgz#51f8cb17ca16faefb20b9a31ac60f84aa2b7c870"
-  integrity sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw==
+urijs@^1.19.7:
+  version "1.19.7"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.7.tgz#4f594e59113928fea63c00ce688fb395b1168ab9"
+  integrity sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==
 
 urix@^0.1.0:
   version "0.1.0"

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ export default class Login extends React.Component {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`docsLink = 'https://docs.stackstorm.com/'`
`167`		`- supportLink = 'https://forum.stackstorm.com/'`
	`167`	`+ supportLink = 'https://github.com/StackStorm/st2/discussions'`
`168`	`168`
`169`	`169`	`connect(e) {`
`170`	`170`	`e.preventDefault();`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ export default class Menu extends React.Component {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`docsLink = 'https://docs.stackstorm.com/'`
`78`		`- supportLink = 'https://forum.stackstorm.com/'`
	`78`	`+ supportLink = 'https://github.com/StackStorm/st2/discussions'`
`79`	`79`
`80`	`80`	`idleLogout() {`
`81`	`81`	`let t;`