Merge branch 'master' into renovate/lucide-react-0.x

suyalcinkaya · Feb 18, 2024 · 440bd4b · 440bd4b
2 parents dda6521 + b45924e
commit 440bd4b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,9 +1,15 @@
 name: CI
 
-on: push
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
 
 jobs:
-  build:
+  eslint:
+    name: Lint code
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
@@ -1,4 +1,4 @@
-name: 'Lint PR'
+name: Lint PR
 
 on:
   pull_request_target:

diff --git a/src/app/bookmarks/layout.js b/src/app/bookmarks/layout.js
@@ -22,7 +22,7 @@ export default async function BookmarksLayout({ children }) {
       <SideMenu title="Bookmarks" href="/bookmarks" isInner>
         <Suspense fallback={<LoadingSpinner />}>
           <div className="flex flex-col gap-1 text-sm">
-            {collections.map((collection) => {
+            {collections?.map((collection) => {
               return (
                 <ListItem
                   key={collection._id}

diff --git a/src/app/bookmarks/page.js b/src/app/bookmarks/page.js
@@ -19,7 +19,7 @@ export default async function Writing() {
     <ScrollArea className="flex flex-col lg:hidden">
       <FloatingHeader title="Bookmarks" />
       <div>
-        {collections.map((collection) => {
+        {collections?.map((collection) => {
           return (
             <Link
               key={collection._id}

diff --git a/src/lib/utils.js b/src/lib/utils.js
@@ -86,7 +86,7 @@ export const isDevelopment = process.env.NODE_ENV === 'development'
  * @returns The sorted array in ascending order based on the specified property.
  */
 export const sortByProperty = (arr, prop) => {
-  return arr.sort((a, b) => {
+  return arr?.sort((a, b) => {
     const itemA = a[prop].toUpperCase()
     const itemB = b[prop].toUpperCase()