Merge branch 'develop'

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,9 +9,7 @@ labels: 'feature request'
 ## Feature Request
 
 ### Important ###
-Please follow this template strictly when requesting features.
-
-Reports that do not adhere to this template will not be addressed and will be closed.
+Requests that do not adhere to this template will not be addressed and will be closed.
 
 If your feature request is more of a **loose idea** and you are **unsure about its implementation or potential impact**, please discuss it first in the [GitHub Discussions section](https://github.com/ransome1/sleek/discussions).
 

.github/workflows/code-scan.yml

@@ -7,27 +7,25 @@ jobs:
   snyk:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Install dependencies
-      run: npm install
-    - name: Run Snyk to check for vulnerabilities
-      uses: snyk/actions/node@master
-      env:
-        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      - uses: actions/checkout@master
+      - name: Run Snyk to check for vulnerabilities
+        uses: snyk/actions/node@master
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
   njsscan:
     needs: snyk
     name: njsscan
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the code
-      uses: actions/checkout@v3
+      uses: actions/checkout@master
     - name: nodejsscan scan
       id: njsscan
       uses: ajinabraham/njsscan-action@master
       with:
         args: '. --sarif --output results.sarif || true'
     - name: Upload njsscan report
-      uses: github/codeql-action/upload-sarif@v2
+      uses: github/codeql-action/upload-sarif@v3
       with:
         sarif_file: results.sarif
   codecov:
@@ -41,16 +39,16 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@master
-      - name: Set up Node 18
-        uses: actions/setup-node@v3
+      - name: Set up latest available Nodejs
+        uses: actions/setup-node@master
       - name: Install dependencies
         run: npm install        
       - name: Build
         run: yarn run build
       - name: Run tests
         run: yarn run test
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
   codeql:
@@ -63,26 +61,26 @@ jobs:
         language: [ 'javascript' ]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
-    - name: Set up Node 18
-      uses: actions/setup-node@v3      
+      uses: actions/checkout@master
+    - name: Set up latest available Nodejs
+      uses: actions/setup-node@master      
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
   mirror:
     name: Mirror code to opencode.net
     runs-on: ubuntu-latest
     needs: codeql
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@master
       with:
         fetch-depth: 0
-    - uses: pixta-dev/repository-mirroring-action@v1
+    - uses: pixta-dev/repository-mirroring-action@master
       with:
         target_repo_url:
           [email protected]:ransome/sleek.git

.github/workflows/prepare-release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Trigger Flathub build
-      uses: peter-evans/repository-dispatch@v2.1.2
+      uses: peter-evans/repository-dispatch@v3
       with:
         token: ${{ secrets.TRIGGER_FLATHUB_BUILD }}
         repository: ransome1/com.github.ransome1.sleek
@@ -23,9 +23,9 @@ jobs:
         os: [macos-latest]
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@master
       - name: Install Node and NPM
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@master
         with:
           node-version: 18
           cache: 'yarn'
@@ -54,9 +54,9 @@ jobs:
         os: [windows-latest]
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@master
       - name: Install Node and NPM
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@master
         with:
           node-version: 18
           cache: 'yarn'
@@ -78,9 +78,9 @@ jobs:
         os: [ubuntu-latest]
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@master
       - name: Install Node and NPM
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@master
         with:
           node-version: 18
           cache: 'yarn'

assets/mas/entitlements.mas.plist

@@ -10,8 +10,6 @@
 		</array>
 		<key>com.apple.security.network.client</key>
 		<true/>
-		<key>com.apple.security.files.user-selected.read-only</key>
-		<true/>
 		<key>com.apple.security.files.user-selected.read-write</key>
 		<true/>
 		<key>com.apple.security.files.bookmarks.document-scope</key>

flatpak/com.github.ransome1.sleek.appdata.xml

@@ -9,7 +9,7 @@
   <developer_name>Robin Ahle</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="2.0.9" date="2024-02-09"/>
+    <release version="2.0.10" date="2024-02-25"/>
   </releases>
   <url type="homepage">https://github.com/ransome1/sleek</url>
   <url type="contact">https://github.com/ransome1/sleek/issues</url>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "main": "./src/main/main.tsx",
   "scripts": {
     "build": "concurrently \"yarn run peggy\" \"yarn run build:main\" \"yarn run build:renderer\"",
@@ -113,7 +113,7 @@
     "css-minimizer-webpack-plugin": "^6.0.0",
     "depcheck": "^1.4.7",
     "detect-port": "^1.5.1",
-    "electron": "^28.2.1",
+    "electron": "28.2.4",
     "electron-builder": "^24.2.1",
     "electron-devtools-installer": "^3.2.0",
     "electronmon": "^2.0.2",
@@ -147,7 +147,7 @@
     "webpack-merge": "^5.9.0"
   },
   "build": {
-    "buildVersion": "38",
+    "buildVersion": "39",
     "asar": true,
     "asarUnpack": "**\\*.{node,dll}",
     "files": [

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "synopsis": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "keywords": [

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: sleek
 base: core20
-version: "2.0.9"
+version: "2.0.10"
 summary: todo.txt manager for Linux, free and open-source (FOSS)
 description: |
   sleek is an open-source (FOSS) todo manager based on the todo.txt syntax. Stripped down to only the most necessary features, and with a clean and simple interface, sleek aims to help you focus on getting things done.

src/__tests__/__mock__/recurrence.txt

@@ -1,15 +1,15 @@
 
-2024-02-09 Line 1 rec:1d due:2024-02-10
-2024-02-09 Line 1 rec:w due:2024-02-16
-2024-02-09 Line 1 rec:2m due:2024-04-09
-2024-02-09 Line 1 rec:+1d due:2024-02-11
-2024-02-09 Line 1 rec:7w due:2024-03-29
-2024-02-09 Line 1 due:2023-07-24 rec:+1b
-2024-02-09 taxes are due in one year t:2022-03-30 due:2022-04-30 rec:+1y
-2024-02-09 Water plants @home +quick due:2024-02-16 t:2024-02-06 rec:1w
-2024-02-09 Line 1 rec:+1d t:2023-09-20
-2024-02-09 Line 1 rec:1d pri:A due:2024-02-10
-2024-02-09 (A) Do something rec:d t:2024-02-10 @SomeContext
-2024-02-09 Do something rec:0d
-2024-02-09 Do something rec:0d due:2024-02-09
-2024-02-09 Do something rec:0d due:2024-02-09 t:2024-02-09
+2024-02-25 Line 1 rec:1d due:2024-02-26
+2024-02-25 Line 1 rec:w due:2024-03-03
+2024-02-25 Line 1 rec:2m due:2024-04-25
+2024-02-25 Line 1 rec:+1d due:2024-02-27
+2024-02-25 Line 1 rec:7w due:2024-04-14
+2024-02-25 Line 1 due:2023-07-24 rec:+1b
+2024-02-25 taxes are due in one year t:2022-03-30 due:2022-04-30 rec:+1y
+2024-02-25 Water plants @home +quick due:2024-03-03 t:2024-02-22 rec:1w
+2024-02-25 Line 1 rec:+1d t:2023-09-20
+2024-02-25 Line 1 rec:1d pri:A due:2024-02-26
+2024-02-25 (A) Do something rec:d t:2024-02-26 @SomeContext
+2024-02-25 Do something rec:0d
+2024-02-25 Do something rec:0d due:2024-02-25
+2024-02-25 Do something rec:0d due:2024-02-25 t:2024-02-25

src/__tests__/main/Filters.tsx

@@ -19,6 +19,7 @@ describe('Should filter todos based on passed filters', () => {
     }
     const expected = [
       { id: 1, body: 'Test', created: null, complete: false, completed: null, priority: null, contexts: null, projects: ['Project 1'], due: '2023-01-01', dueString: '2023-01-01', t: null, tString: null, rec: null, hidden: false, pm: null, visible: true, string: '' },
+      { id: 2, body: 'Test', created: null, complete: true, completed: null, priority: null, contexts: null, projects: ['Project 2'], due: '2023-02-01', dueString: '2023-02-01', t: null, tString: null, rec: null, hidden: false, pm: null, visible: false, string: '' },
       { id: 3, body: 'Test', created: null, complete: false, completed: null, priority: null, contexts: null, projects: ['Project 1'], due: '2023-03-01', dueString: '2023-03-01', t: null, tString: null, rec: null, hidden: false, pm: null, visible: true, string: '' },
     ];
     const result = applyFilters(todoObjects, filters);