Fix run filtering and apply filters to report buttons (ibutsu#528)

* Fix result-list and run-list navigate calls * Fix run list button to apply active filters
Fynardo · Nov 25, 2024 · 0d98808 · 0d98808
1 parent dfbac97
commit 0d98808
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/frontend/src/result-list.js b/frontend/src/result-list.js
@@ -45,11 +45,13 @@ export class ResultList extends React.Component {
   static propTypes = {
     location: PropTypes.object,
     navigate: PropTypes.func,
-    eventEmitter: PropTypes.object
+    eventEmitter: PropTypes.object,
+    params: PropTypes.object,
   }
 
   constructor(props) {
     super(props);
+    // TODO just use props.params when converting to funcational component
     const params = new URLSearchParams(props.location.search);
     let page = 1, pageSize = 20, filters = {};
     if (params.toString() !== '') {
@@ -299,7 +301,7 @@ export class ResultList extends React.Component {
   };
 
   applyReport = () => {
-    this.props.navigate('/reports?' + buildParams(this.state.filters).join('&'))
+    this.props.navigate('/project/' + this.props.params.project_id + '/reports?' + buildParams(this.state.filters).join('&'))
   };
 
   updateFilters(name, operator, value, callback) {

diff --git a/frontend/src/run-list.js b/frontend/src/run-list.js
@@ -90,7 +90,8 @@ export class RunList extends React.Component {
   static propTypes = {
     location: PropTypes.object,
     navigate: PropTypes.func,
-    eventEmitter: PropTypes.object
+    eventEmitter: PropTypes.object,
+    params: PropTypes.object,
   }
 
   constructor(props) {
@@ -143,6 +144,10 @@ export class RunList extends React.Component {
     });
   }
 
+  applyReport = () => {
+    this.props.navigate('/project/' + this.props.params.project_id + '/reports?' + buildParams(this.state.filters).join('&'))
+  };
+
   onFieldToggle = () => {
     this.setState({isFieldOpen: !this.state.isFieldOpen});
   };
@@ -292,7 +297,7 @@ export class RunList extends React.Component {
     let params = buildParams(this.state.filters);
     params.push('page=' + this.state.page);
     params.push('pageSize=' + this.state.pageSize);
-    this.props.navigate('/runs?' + params.join('&'))
+    this.props.navigate('?' + params.join('&'))
   }
 
   setPage = (_event, pageNumber) => {
@@ -575,6 +580,7 @@ export class RunList extends React.Component {
                 onApplyFilter={this.applyFilter}
                 onRemoveFilter={this.removeFilter}
                 onClearFilters={this.clearFilters}
+                onApplyReport={this.applyReport}
                 onSetPage={this.setPage}
                 onSetPageSize={this.setPageSize}
                 hideFilters={["project_id"]}

diff --git a/scripts/ibutsu-pod.sh b/scripts/ibutsu-pod.sh
@@ -123,7 +123,7 @@ podman run -dt \
        $POSTGRES_EXTRA_ARGS \
        --name ibutsu-postgres \
        --rm \
-       postgres:15
+       postgres:12
 echo "done."
 echo -n "Adding redis to the pod:    "
 podman run -dt \