From 8b429dc3c94961cb5a55a67e60a082587b4eb63e Mon Sep 17 00:00:00 2001 From: Harmen Janssen Date: Tue, 3 Dec 2024 14:00:14 +0100 Subject: [PATCH 1/2] Use the configured Nova resource in menu items --- src/MenuItemTypes/PageMenuItem.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MenuItemTypes/PageMenuItem.php b/src/MenuItemTypes/PageMenuItem.php index dbf2056..5d3df91 100644 --- a/src/MenuItemTypes/PageMenuItem.php +++ b/src/MenuItemTypes/PageMenuItem.php @@ -55,7 +55,8 @@ public static function getName(): string */ public static function getOptions(): array { - return PageResource::getPageOptionsForSelect(); + $resourceClass = config('nova-pages-tool.pageResourceClass'); + return $resourceClass::getPageOptionsForSelect(); } /** From b587b2c55512a55e541053208e4ddde87b471414 Mon Sep 17 00:00:00 2001 From: Harmen Janssen Date: Tue, 3 Dec 2024 14:01:30 +0100 Subject: [PATCH 2/2] Update deprecated workflows --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d2ba99..8ce5f3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,14 +25,14 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Get Composer Cache Directory id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -56,7 +56,7 @@ jobs: DB_PASSWORD: root - name: Upload logs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: Laravel logs @@ -66,11 +66,11 @@ jobs: name: Code style runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: '12.x' + node-version: '20.x' - run: npm install