Merge pull request #2037 from nextcloud/refactor/rework-recipe-list-filter

Refactor/rework recipe list filter

Author: christianlupus

.eslintrc.yml

@@ -53,4 +53,7 @@ overrides:
     - files: [ "src/composables/**/*.js" ]
       rules:
         import/prefer-default-export: off
+    - files: [ "src/tests/**/*.test.js"]
+      env:
+          jest: true
 

.github/workflows/tests.yml

@@ -435,6 +435,36 @@ jobs:
     - name: Check the code base
       run: docker run --rm -v $(pwd):/work:ro php-lint-tester
 
+
+  run-jest:
+    name: "Run JS tests"
+    runs-on: ubuntu-22.04
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+    - name: Checkout of the app
+      uses: actions/checkout@v4
+    - name: Get the date
+      id: date
+      run: echo "date=$(date +%Y-%m-%d)" >> $GITHUB_OUTPUT
+    - name: Cache NPM cache
+      uses: actions/[email protected]
+      with:
+        path: |
+          ~/.npm
+          node_modules
+        key: ${{ runner.os }}-node-${{ steps.date.outputs.date }}-${{ hashFiles('package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-${{ steps.date.outputs.date }}-
+          ${{ runner.os }}-node-
+    - name: Install the NPM dependencies
+      run: npm ci
+    - name: Run the tests
+      run: npm run ci-test
+
+
   successful_run:
     name: The tests have successfully run
     runs-on: ubuntu-22.04
@@ -444,6 +474,7 @@ jobs:
       - source-package
       - lint-php
       - event_file
+      - run-jest
     steps:
       - name: Run successfully
         shell: bash

CHANGELOG.md

@@ -1,17 +1,26 @@
 ## [Unreleased]
 
 ### Added
-- Toast with success/error message after trying to copy ingredients [#2040](https://github.com./nextcloud/cookbook/pull/2040) @seyfeb
-- Seconds can now be specified for recipe times [#2014](https://github.com./nextcloud/cookbook/pull/2014) @seyfeb
+- Toast with success/error message after trying to copy ingredients
+  [#2040](https://github.com./nextcloud/cookbook/pull/2040) @seyfeb
+- Seconds can now be specified for recipe times
+  [#2014](https://github.com./nextcloud/cookbook/pull/2014) @seyfeb
+- New filter UI in recipe lists
+  [#2037](https://github.com./nextcloud/cookbook/pull/2037) @seyfeb
 
 ### Fixed
-- Prevent yield calculation for ## as ingredient headline [#1998](https://github.com./nextcloud/cookbook/pull/1998) @j0hannesr0th
-- Improved styling of times in recipe view [#2014](https://github.com./nextcloud/cookbook/pull/2014) @seyfeb
-- Add missing translatable string for recipe-creation button in empty list view [#2015](https://github.com./nextcloud/cookbook/pull/2015) @seyfeb
-- Prevent recalculation algorithm if no yield is given [#2003](https://github.com./nextcloud/cookbook/pull/2003) @j0hannesr0th
+- Prevent yield calculation for ## as ingredient headline
+  [#1998](https://github.com./nextcloud/cookbook/pull/1998) @j0hannesr0th
+- Improved styling of times in recipe view
+  [#2014](https://github.com./nextcloud/cookbook/pull/2014) @seyfeb
+- Add missing translatable string for recipe-creation button in empty list view
+  [#2015](https://github.com./nextcloud/cookbook/pull/2015) @seyfeb
+- Prevent recalculation algorithm if no yield is given
+  [#2003](https://github.com./nextcloud/cookbook/pull/2003) @j0hannesr0th
 
 ### Documentation
-- Improve  structure of `README.md` [#1989](https://github.com./nextcloud/cookbook/pull/1989) @seyfeb
+- Improve  structure of `README.md`
+  [#1989](https://github.com./nextcloud/cookbook/pull/1989) @seyfeb
 
 ## 0.11.0 - 2023-12-14
 

babel.config.js

@@ -0,0 +1,3 @@
+const babelConfig = require('@nextcloud/babel-config');
+
+module.exports = babelConfig;

jest.config.js

@@ -0,0 +1,16 @@
+// Jest configuration
+module.exports = {
+    testEnvironment: 'node',
+    moduleFileExtensions: ['js', 'vue'],
+    modulePaths: [
+        '<rootDir>/src/'
+    ],
+    modulePathIgnorePatterns: [
+        '<rootDir>/.github/'
+    ],
+    transform: {
+        '.*\\.js$': '<rootDir>/node_modules/babel-jest',
+        '.*\\.(vue)$': '<rootDir>/node_modules/@vue/vue2-jest',
+    },
+    transformIgnorePatterns: ['node_modules/(?!variables/.*)'],
+};