Merge pull request #47 from timo/patch-1

cro web: allow F5 to work even after navigating

Author: jnthn

lib/Cro/Tools/Web.pm6

@@ -32,6 +32,9 @@ sub web(Str $host, Int $port, $runner) is export {
         get -> {
             content 'text/html', %?RESOURCES<web/index.html>.slurp;
         }
+        get -> $app-route {
+            content 'text/html', %?RESOURCES<web/index.html>.slurp;
+        }
         post -> 'service' {
             request-body -> %json {
                 my @commands = <start restart stop

resources/web/js/app.js

@@ -57175,7 +57175,7 @@ var App = function (_React$Component) {
         ),
         _react2.default.createElement(
           "select",
-          { id: "templateSelectInput", defaultValue: this.props.stubReducer.current.id, className: "form-control", onChange: function onChange(e) {
+          { id: "templateSelectInput", defaultValue: this.props.stubReducer.current && this.props.stubReducer.current.id || '', className: "form-control", onChange: function onChange(e) {
               return _this2.props.onStubSelect(e.target.selectedIndex);
             } },
           this.props.stubReducer.templates.map(function (t) {
@@ -57186,7 +57186,7 @@ var App = function (_React$Component) {
             );
           })
         ),
-        _react2.default.createElement(Template, { fullPath: this.props.stubReducer.fullPath,
+        this.props.stubReducer.current && _react2.default.createElement(Template, { fullPath: this.props.stubReducer.fullPath,
           idText: this.props.stubReducer.idText,
           nameText: this.props.stubReducer.nameText,
           pathText: this.props.stubReducer.pathText,

web-frontend/src/stub-service/components.js

@@ -63,24 +63,25 @@ class App extends React.Component {
               <div className="alert alert-danger" role="alert">{this.props.stubReducer.notify} {this.props.stubReducer.stubErrors}</div>
             }
             <label className="control-label" htmlFor="templateSelectInput">Service Template</label>
-            <select id="templateSelectInput" defaultValue={this.props.stubReducer.current.id} className="form-control" onChange={(e) => this.props.onStubSelect(e.target.selectedIndex)}>
+            <select id="templateSelectInput" defaultValue={this.props.stubReducer.current && this.props.stubReducer.current.id || ''} className="form-control" onChange={(e) => this.props.onStubSelect(e.target.selectedIndex)}>
               {this.props.stubReducer.templates.map(t => (
                 <option key={t.id} value={t.id}>{t.name}</option>
               ))}
             </select>
-            <Template fullPath={this.props.stubReducer.fullPath}
-                      idText={this.props.stubReducer.idText}
-                      nameText={this.props.stubReducer.nameText}
-                      pathText={this.props.stubReducer.pathText}
-                      template={this.props.stubReducer.current}
-                      links={this.props.stubReducer.links}
-                      disable={this.props.stubReducer.disable}
-                      onChangeIdText={this.props.onChangeIdText}
-                      onChangePathText={this.props.onChangePathText}
-                      onChangeNameText={this.props.onChangeNameText}
-                      onChangeOption={this.props.onChangeOption}
-                      onChangeLink={this.props.onChangeLink}
-                      onStubSent={this.props.onStubSent} />
+            {this.props.stubReducer.current &&
+                <Template fullPath={this.props.stubReducer.fullPath}
+                          idText={this.props.stubReducer.idText}
+                          nameText={this.props.stubReducer.nameText}
+                          pathText={this.props.stubReducer.pathText}
+                          template={this.props.stubReducer.current}
+                          links={this.props.stubReducer.links}
+                          disable={this.props.stubReducer.disable}
+                          onChangeIdText={this.props.onChangeIdText}
+                          onChangePathText={this.props.onChangePathText}
+                          onChangeNameText={this.props.onChangeNameText}
+                          onChangeOption={this.props.onChangeOption}
+                          onChangeLink={this.props.onChangeLink}
+                          onStubSent={this.props.onStubSent} />}
           </div>
         );
     }