new sidebar stuff, fix #5 filter out dupes etc.

content/components/BugList/BugList.js

@@ -137,7 +137,7 @@ export class BugList extends React.PureComponent {
       </tbody>
     </table>);
   }
-   render() {
+  render() {
     const {props} = this;
     return (<div>
       {props.title ? <h3>{props.title}</h3> : null}

content/components/BugListView/BugListView.js

@@ -19,7 +19,8 @@ export class BugListView extends React.PureComponent {
   }
   async componentWillMount() {
     const BASE_QUERY = {
-      include_fields: this.props.columns.concat(["whiteboard", "keywords", "severity"])
+      include_fields: this.props.columns.concat(["whiteboard", "keywords", "severity"]),
+      resolved: ["---", "FIXED"]
     };
     const {bugs, query, uri} = await runQuery(Object.assign({}, BASE_QUERY, this.props.query));
     this.setState({loaded: true, bugs, query, uri});

content/components/FeatureView/FeatureView.js

@@ -46,6 +46,7 @@ export class FeatureView extends React.PureComponent {
     this.setState({bugs: [], loaded: false});
     const {bugs} = await runQuery({
       include_fields: allColumns,
+      resolved: ["---", "FIXED"],
       custom: {
         blocked: id,
       }

content/components/ReleaseReport/ReleaseReport.js

@@ -18,29 +18,34 @@ export class ReleaseReport extends React.PureComponent {
   }
   async componentWillMount() {
     this.setState({loaded: false})
-    const {bugs} = await runQuery({
+    const result = await runQuery({
       include_fields: ["id", "summary", "blocks", "status"],
       iteration: release,
+      resolved: ["---", "FIXED"],
       custom: {
         blocked: this.props.metas.map(m => m.id)
       }
     });
+    console.log(result)
     // const bugs = require("../../../sandbox_results/1520741071242_RESULTS.json").results;
-    this.setState({bugs, loaded: true});
+    this.setState({bugs: result.bugs, loaded: true});
   }
   render() {
     return (<div className={styles.container}>
       <h1>Activity Stream {release}</h1>
       <div className={styles.summary}>
         <p>MVP bugs in this release must have an iteration of <strong><code>{release}.x</code></strong> to be counted towards the total.
+        Note that resolved bugs other than <code>FIXED</code> (e.g. <code>DUPLICATE</code>) are <em>not</em> included.</p>
 
-        <br />See <a href="https://docs.google.com/spreadsheets/d/1OTNN20IhUm_sPq6awL6cqFTShi4kqCGn6IRvQBL-bcQ">this document</a> for stats on our progress.</p>
+        <p>See <a href="https://docs.google.com/spreadsheets/d/1OTNN20IhUm_sPq6awL6cqFTShi4kqCGn6IRvQBL-bcQ">this document</a> for stats on our progress.</p>
       </div>
 
       {this.state.loaded ? this.props.metas.map(meta => {
         const bugs = this.state.bugs.filter(b => b.blocks.includes(meta.id));
+        if (!bugs.length) return null;
+        const completionPercentage = Math.round((bugs.filter(b => b.status === "RESOLVED").length / bugs.length) * 100);
         return (<div key={meta.id} className={styles.feature}>
-          <h3 className={styles.h3}>{meta.displayName}</h3>
+          <h3 className={styles.h3}>{meta.displayName} ({completionPercentage}% complete)</h3>
           <p className={styles.featureSummary}>{meta.description}
           </p>
           <CompletionBar

content/components/Router/Router.js

@@ -29,6 +29,10 @@ const RouterNav = withRouter(class _RouterNav extends React.PureComponent {
         {routes.filter(route => !route.hidden).map((route, i) => route.spacer ?
           <li key={i} className={styles.spacer} /> :
           this.renderListItem(route))}
+        <li><a className={styles.navLink} href="https://github.com/k88hudson/bugzy/issues">
+          <span className={styles.icon + " " + styles["icon-alert"]} />
+          Report an issue
+        </a></li>
       </ul>
     </nav>);
   }
@@ -114,7 +118,8 @@ export class Router extends React.PureComponent {
       },
       {spacer: true},
       {
-        label: "About",
+        label: "About Bugzy",
+        icon: "info",
         routeProps: {
           path: "/about",
           component: Preferences,

content/components/Router/Router.scss

@@ -14,10 +14,11 @@
 }
 
 .navLink {
-  display: block;
   color: inherit;
   text-decoration: none;
   border-radius: 3px;
+  display: flex;
+  align-items: center;
   &.active,
   &:hover {
     background-color: #ededf0;
@@ -59,3 +60,10 @@
 .icon-rgb {
   background-image: url("../../img/icons/rgb.svg");
 }
+.icon-alert {
+  background-image: url("../../img/icons/alert.svg");
+}
+.icon-info {
+  background-image: url("../../img/icons/info.svg");
+}
+

package.json

@@ -7,7 +7,7 @@
     "start": "parcel watch content/index.html --public-url \"/\" & node server",
     "bundle": "parcel build content/index.html --public-url \"/\"",
     "start_prod": "node server",
-    "bundle_prod": "git checkout -B deploy && npm run bundle && git add -f dist",
+    "deploy": "git checkout -B deploy && npm run bundle && git add -f dist",
     "test": "mocha test/**/*.test.js"
   },
   "author": "k88hudson@gmail.com",

schema/query_options.js

@@ -125,6 +125,13 @@ const definitions = {
     description: "Array of keywords",
     type: "Array",
     examples: ["uineeded"]
+  },
+  "j_top": {
+    displayName: "Custom search AND/OR",
+    description: "How should custom searches be combined? Note: default is AND",
+    type: {oneOf: ["", "OR", "AND_G"]}, // Note: AND_G means match all of the following against the same field
+    examples: ["OR"]
+    // NOTE: Additional blocks can be j2=OR, j3=OR
   }
 };