Merge pull request #74 from fair-software/46-prep-release-0.1.0

46 prep release 0.1.0
fair-software · Mar 9, 2021 · d6733d3 · d6733d3
2 parents e19ed9c + 04d2ffb
commit d6733d3
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 10 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -32,5 +32,5 @@ license: "Apache-2.0"
 message: "If you use this software, please cite it using these metadata."
 repository-code: "https://github.com/fair-software/fairtally"
 title: fairtally
-version: "0.0.0"
+version: "0.1.0"
 ...
diff --git a/docs/_static/fairtally_example.html b/docs/_static/fairtally_example.html
@@ -15,7 +15,23 @@
 <body>
   <div id="q-app" style="min-height: 100vh;">
     <div class="q-pa-md">
-      <q-table title="Fairtally results" :rows="rows" :columns="columns" row-key="url" :pagination.sync="pagination" >
+      <q-table
+        title="Fairtally results"
+        :rows="rows"
+        :columns="columns"
+        :filter="filter"
+        :filter-method="filterUrl"
+        :pagination.sync="pagination"
+        row-key="url"
+      >
+
+        <template v-slot:top-right>
+          <q-input borderless dense debounce="300" v-model="filter" placeholder="Search url">
+            <template v-slot:append>
+              <q-icon name="search" />
+            </template>
+          </q-input>
+        </template>
 
         <template v-slot:header="props">
           <q-tr :props="props">
@@ -85,7 +101,7 @@
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/quasar.umd.prod.js"></script>
 
   <script>
-
+    const { ref } = Vue
     const columns = [
       {
         name: 'url',
@@ -145,17 +161,32 @@
         align: 'center'
       },
     ];
-    const rows = [{"url": "https://github.com/fair-software/fairtally", "badge": "https://img.shields.io/badge/fair--software.eu-%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8B-yellow", "repository": true, "license": true, "registry": true, "citation": true, "checklist": false, "count": 4, "stdout": "", "stderr": "/home/verhoes/git/fair-software/fairtally/env/lib/python3.8/site-packages/howfairis/workarounds/remove_comments_rst.py:5: UserWarning: Unable to ignore comments in RestructuredText format of README.rst, checks will also see comments\n  warnings.warn(\"Unable to ignore comments in RestructuredText format of {0}, checks will also see comments\".format(fname))\n"}, {"url": "https://github.com/fair-software/howfairis", "badge": "https://img.shields.io/badge/fair--software.eu-%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F-green", "repository": true, "license": true, "registry": true, "citation": true, "checklist": true, "count": 5, "stdout": "", "stderr": ""}];
+    const rows = [{"url": "https://github.com/fair-software/fairtally", "badge": "https://img.shields.io/badge/fair--software.eu-%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8B-yellow", "repository": true, "license": true, "registry": true, "citation": true, "checklist": false, "count": 4, "stdout": "", "stderr": ""}, {"url": "https://github.com/fair-software/howfairis", "badge": "https://img.shields.io/badge/fair--software.eu-%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F%20%20%E2%97%8F-green", "repository": true, "license": true, "registry": true, "citation": true, "checklist": true, "count": 5, "stdout": "", "stderr": ""}];
 
     const app = Vue.createApp({
       setup() {
         return {
           columns,
           rows,
+          filter: ref(''),
           pagination: {
             rowsPerPage: 0
           },
         }
+      },
+      methods: {
+        filterUrl (rows, terms, cols, cellValue) {
+          const lowerTerms = terms ? terms.toLowerCase() : ''
+          return rows.filter(
+            row => cols.filter( col =>
+              col.name === 'url'
+            ).some(col => {
+              const val = cellValue(col, row) + ''
+              const haystack = (val === 'undefined' || val === 'null') ? '' : val.toLowerCase()
+              return haystack.indexOf(lowerTerms) !== -1
+            })
+          )
+        }
       }
     })
 

diff --git a/docs/_static/fairtally_example.png b/docs/_static/fairtally_example.png
diff --git a/fairtally/__version__.py b/fairtally/__version__.py
@@ -1 +1 @@
-__version__ = "0.0.0"
+__version__ = "0.1.0"
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.0
+current_version = 0.1.0
 
 [bumpversion:file:fairtally/__version__.py]
 search = __version__ = "{current_version}"
@@ -14,10 +14,8 @@ search = version: "{current_version}"
 replace = version: "{new_version}"
 
 [aliases]
-# Define `python setup.py test`
-test=pytest
+test = pytest
 
-# Define `python setup.py build_sphinx`
 [build_sphinx]
 source-dir = docs
 build-dir = docs/_build

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
     entry_points={
         "console_scripts": ["fairtally=fairtally.cli:cli"],
     },
-    version="0.0.0",
+    version="0.1.0",
     description="Make a report based on howfairis results",
     long_description=readme + "\n\n",
     author="FAIR Software",