Merge remote-tracking branch 'origin/master'

neopostmodern · Oct 26, 2024 · d765f8f · d765f8f
2 parents 585b3f6 + b0eb966
commit d765f8f
Show file tree

Hide file tree

Showing 29 changed files with 2,501 additions and 846 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -21,11 +21,11 @@ jobs:
         os: [ macos-latest, ubuntu-latest, windows-latest ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up node / npm with caching
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
@@ -51,7 +51,7 @@ jobs:
       - name: Pack setup
         run: tar cf setup.tar *
       - name: Store setup (as artifact)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: setup-${{ matrix.os }}
           retention-days: 1
@@ -63,7 +63,7 @@ jobs:
     needs: [setup]
     steps:
       - name: Download setup (from artifact)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: setup-ubuntu-latest
       - name: Unpack setup
@@ -88,7 +88,7 @@ jobs:
     needs: [setup]
     steps:
       - name: Download setup (from artifact)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: setup-${{ matrix.os }}
       - name: Unpack setup
@@ -111,7 +111,7 @@ jobs:
           key: ${{ secrets.SSH_KEY }}
           known_hosts: ${{ secrets.KNOWN_HOSTS }}
       - name: Download setup (from artifact)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: setup-ubuntu-latest
       - name: Unpack setup

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -21,11 +21,11 @@ jobs:
         os: [ macos-latest, ubuntu-latest, windows-latest ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up node / npm with caching
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: |
             package-lock.json
@@ -51,7 +51,7 @@ jobs:
       - name: Pack setup
         run: tar cf setup.tar *
       - name: Store setup (as artifact)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: setup-${{ matrix.os }}
           retention-days: 1
@@ -63,7 +63,7 @@ jobs:
     needs: [setup]
     steps:
       - name: Download setup (from artifact)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: setup-ubuntu-latest
       - name: Unpack setup
@@ -88,15 +88,15 @@ jobs:
     needs: [setup]
     steps:
       - name: Download setup (from artifact)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: setup-${{ matrix.os }}
       - name: Unpack setup
         run: tar xf setup.tar && rm setup.tar
       - name: Build Electron app
         run: npm run client:build:electron
       - name: Store installers as artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Installer ${{ runner.os }}
           path: client/release/build/structure-*
@@ -115,7 +115,7 @@ jobs:
           key: ${{ secrets.SSH_KEY }}
           known_hosts: ${{ secrets.KNOWN_HOSTS }}
       - name: Download setup (from artifact)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: setup-ubuntu-latest
       - name: Unpack setup

diff --git a/client/src/renderer/actions/userInterface.ts b/client/src/renderer/actions/userInterface.ts
@@ -18,6 +18,7 @@ export enum ArchiveState {
 export enum SortBy {
   CREATED_AT = 'CREATED_AT',
   UPDATED_AT = 'UPDATED_AT',
+  CHANGED_AT = 'CHANGED_AT',
 }
 
 export const REQUEST_LOGIN = 'REQUEST_LOGIN';

diff --git a/client/src/renderer/components/EntityMetadata.tsx b/client/src/renderer/components/EntityMetadata.tsx
@@ -12,6 +12,7 @@ const EntityMetadata = ({
   entity: {
     createdAt: DateOrTimestamp;
     updatedAt: DateOrTimestamp;
+    changedAt: DateOrTimestamp;
     user: {
       name: string;
     };
@@ -32,9 +33,13 @@ const EntityMetadata = ({
     </ButtonLike>
     <ButtonLike
       startIcon={<Edit />}
-      tooltip={`Updated at ${dateToCustomizedLongISO8061(entity.updatedAt)}`}
+      tooltip={`Changed at ${dateToCustomizedLongISO8061(
+        entity.changedAt
+      )} (last database update at ${dateToCustomizedLongISO8061(
+        entity.updatedAt
+      )})`}
     >
-      Updated {dateToShortISO8601(entity.updatedAt)}
+      Changed {dateToShortISO8601(entity.changedAt)}
     </ButtonLike>
   </>
 );

diff --git a/client/src/renderer/containers/LinkPage.tsx b/client/src/renderer/containers/LinkPage.tsx
@@ -28,6 +28,7 @@ const LINK_QUERY = gql`
       _id
       createdAt
       updatedAt
+      changedAt
       archivedAt
       user {
         ...BaseUser
@@ -51,6 +52,7 @@ const UPDATE_LINK_MUTATION = gql`
       _id
       createdAt
       updatedAt
+      changedAt
       url
       domain
       name

diff --git a/client/src/renderer/containers/TagPage.tsx b/client/src/renderer/containers/TagPage.tsx
@@ -71,6 +71,7 @@ const UPDATE_TAG_MUTATION = gql`
           name
           createdAt
           archivedAt
+          changedAt
           description
           tags {
             _id

diff --git a/client/src/renderer/containers/TextPage.tsx b/client/src/renderer/containers/TextPage.tsx
@@ -27,6 +27,7 @@ const TEXT_QUERY = gql`
       _id
       createdAt
       updatedAt
+      changedAt
       archivedAt
       user {
         ...BaseUser
@@ -48,6 +49,7 @@ const UPDATE_TEXT_MUTATION = gql`
       _id
       createdAt
       updatedAt
+      changedAt
       archivedAt
       name
       description