Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve action rules #1156

Merged
merged 62 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
b14e9af
wip
luanfreitasdev Sep 16, 2023
f55cc83
Merge branch '5.x' of github.com:Power-Components/livewire-powergrid …
luanfreitasdev Sep 16, 2023
e2199cb
refactor ActionRules
luanfreitasdev Sep 17, 2023
d78d744
wip
luanfreitasdev Sep 17, 2023
7569a06
wip
luanfreitasdev Sep 17, 2023
2ea6725
wip
luanfreitasdev Sep 17, 2023
ce20228
wip
luanfreitasdev Sep 17, 2023
6b519f5
wip
luanfreitasdev Sep 17, 2023
820c840
wip
luanfreitasdev Sep 17, 2023
29e15bc
wip
luanfreitasdev Sep 17, 2023
de27380
wip
luanfreitasdev Sep 17, 2023
cf6138a
wip
luanfreitasdev Sep 17, 2023
05b76a9
wip
luanfreitasdev Sep 17, 2023
64c3187
wip
luanfreitasdev Sep 17, 2023
74d643e
wip
luanfreitasdev Sep 17, 2023
708cc18
wip
luanfreitasdev Sep 17, 2023
71129b2
wip
luanfreitasdev Sep 17, 2023
8b98e95
wip
luanfreitasdev Sep 17, 2023
a6b1b9c
wip
luanfreitasdev Sep 17, 2023
cf8d2fc
wip
luanfreitasdev Sep 17, 2023
91de5e1
wip
luanfreitasdev Sep 17, 2023
9f30767
wip
luanfreitasdev Sep 17, 2023
b328aa8
wip
luanfreitasdev Sep 17, 2023
3f7eb5b
wip
luanfreitasdev Sep 17, 2023
866691e
wip
luanfreitasdev Sep 17, 2023
8a4c495
wip
luanfreitasdev Sep 17, 2023
2ab7c80
wip
luanfreitasdev Sep 17, 2023
eb72c4a
wip
luanfreitasdev Sep 17, 2023
c75d3dc
wip
luanfreitasdev Sep 17, 2023
8f87268
wip
luanfreitasdev Sep 17, 2023
b8a31b8
wip
luanfreitasdev Sep 17, 2023
e9f14dc
wip
luanfreitasdev Sep 17, 2023
d817b55
wip
luanfreitasdev Sep 17, 2023
4cfa573
wip
luanfreitasdev Sep 17, 2023
75eedfc
wip
luanfreitasdev Sep 17, 2023
3e129fb
wip
luanfreitasdev Sep 17, 2023
9524c52
wip
luanfreitasdev Sep 17, 2023
ef6f99c
wip
luanfreitasdev Sep 17, 2023
c966904
wip
luanfreitasdev Sep 17, 2023
965363b
wip
luanfreitasdev Sep 17, 2023
bfb1f57
wip
luanfreitasdev Sep 17, 2023
1eb800e
wip
luanfreitasdev Sep 17, 2023
cafaef8
wip
luanfreitasdev Sep 17, 2023
0345c32
wip
luanfreitasdev Sep 17, 2023
41503a2
wip
luanfreitasdev Sep 17, 2023
fa13e63
pipeline
luanfreitasdev Sep 19, 2023
66fc73e
pipeline
luanfreitasdev Sep 19, 2023
c1b82d2
pipeline
luanfreitasdev Sep 19, 2023
aeb773e
wip
luanfreitasdev Sep 19, 2023
bbda258
wip
luanfreitasdev Sep 20, 2023
7b94f9c
Merge branch 'improve-action-rules' into cypress
luanfreitasdev Sep 20, 2023
82918bf
add cypress tests to radio rules
luanfreitasdev Sep 20, 2023
64ce020
add cypress tests to checkbox, radio, rows
luanfreitasdev Sep 20, 2023
36c6d3a
fix loop
luanfreitasdev Sep 20, 2023
40b2114
fix checkbox
luanfreitasdev Sep 20, 2023
1ddaa9b
fix phpstan
luanfreitasdev Sep 20, 2023
c720a23
fix tests
luanfreitasdev Sep 20, 2023
bf734a9
Add Cypress test (#1158)
luanfreitasdev Sep 20, 2023
613fa8d
remove ds_store
luanfreitasdev Sep 20, 2023
3a3c5ae
refactor component
luanfreitasdev Sep 21, 2023
3daf963
resolve conflicts
luanfreitasdev Sep 21, 2023
ed05e64
refactor component
luanfreitasdev Sep 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Code style

on:
push:
branches:
- "**"
paths-ignore:
- "art/**"
- "README.md"
pull_request:
types: [ready_for_review, synchronize, opened]
paths-ignore:
- "art/**"
- "README.md"

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
php: [ 8.2 ]
laravel: [ 10.* ]
dependency-version: [ prefer-stable ]

name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}

if: github.ref != 'refs/heads/todo-tests'

steps:
- name: Checkout
uses: actions/[email protected]

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
tools: composer:v2
coverage: none

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v3
with:
path: $(composer config cache-files-dir)
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

- name: Install Composer dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
rm composer.lock
composer install

- name: Pint
run: composer test:pint
84 changes: 84 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: Cypress

on:
push:
branches:
- "**"
paths-ignore:
- "art/**"
- "README.md"
pull_request:
types: [ready_for_review, synchronize, opened]
paths-ignore:
- "art/**"
- "README.md"

jobs:
build:
runs-on: ubuntu-latest

services:
mysql:
image: mysql:5.7
env:
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: powergridtest
ports:
- 3307:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

strategy:
matrix:
php: [ 8.2 ]
laravel: [ 10.* ]
dependency-version: [ prefer-stable ]

name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}

if: github.ref != 'refs/heads/todo-tests'

steps:
- name: Checkout
uses: actions/[email protected]

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
tools: composer:v2
coverage: none

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v3
with:
path: $(composer config cache-files-dir)
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

- name: Install Composer dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
rm composer.lock
composer install

- name: Install openspout/openspout
if: matrix.php == '8.2'
run: composer require openspout/openspout

- name: Cypress
run: |
npm install
git clone https://github.com/Power-Components/powergrid-demo-misc.git tests/cypress/app
cd tests/cypress &&
cp stubs/CypressTable.php app/app/Livewire/CypressTable.php &&
cp stubs/rules-controllers.blade.php app/resources/views/components/header/rules-controllers.blade.php
cd ./../../
chmod +x ./tests/cypress/run.sh
./tests/cypress/run.sh
cd ./tests/cypress/app && php artisan serve & sleep 5 &
cd ./tests/cypress && npx cypress run
shell: bash
73 changes: 73 additions & 0 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: MySQL

on:
push:
branches:
- "**"
paths-ignore:
- "art/**"
- "README.md"
pull_request:
types: [ready_for_review, synchronize, opened]
paths-ignore:
- "art/**"
- "README.md"

jobs:
build:
runs-on: ubuntu-latest

services:
mysql:
image: mysql:5.7
env:
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: powergridtest
ports:
- 3307:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

strategy:
matrix:
php: [ 8.2, 8.1 ]
laravel: [ 10.* ]
dependency-version: [ prefer-stable ]

name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}

if: github.ref != 'refs/heads/todo-tests'

steps:
- name: Checkout
uses: actions/[email protected]

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
tools: composer:v2
coverage: none

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v3
with:
path: $(composer config cache-files-dir)
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

- name: Install Composer dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
rm composer.lock
composer install

- name: Install openspout/openspout
if: matrix.php == '8.2'
run: composer require openspout/openspout

- name: MySQL
run: composer test:mysql
24 changes: 1 addition & 23 deletions .github/workflows/php.yml → .github/workflows/pgsql.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Powergrid Tests
name: PostGreSQL

on:
push:
Expand All @@ -18,15 +18,6 @@ jobs:
runs-on: ubuntu-latest

services:
mysql:
image: mysql:5.7
env:
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: powergridtest
ports:
- 3307:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

postgres:
image: postgres:9.6
env:
Expand Down Expand Up @@ -79,18 +70,5 @@ jobs:
if: matrix.php == '8.2'
run: composer require openspout/openspout

- name: Pint
if: matrix.php == '8.1'
run: composer test:pint

- name: Larastan
run: composer test:types

- name: SQLite
run: composer test:sqlite

- name: MySQL
run: composer test:mysql

- name: PostGreSQL
run: composer test:pgsql
58 changes: 58 additions & 0 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: PHPStan

on:
push:
branches:
- "**"
paths-ignore:
- "art/**"
- "README.md"
pull_request:
types: [ready_for_review, synchronize, opened]
paths-ignore:
- "art/**"
- "README.md"

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
php: [ 8.2 ]
laravel: [ 10.* ]
dependency-version: [ prefer-stable ]

name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}

if: github.ref != 'refs/heads/todo-tests'

steps:
- name: Checkout
uses: actions/[email protected]

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
tools: composer:v2
coverage: none

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v3
with:
path: $(composer config cache-files-dir)
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

- name: Install Composer dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
rm composer.lock
composer install

- name: Larastan
run: composer test:types
62 changes: 62 additions & 0 deletions .github/workflows/sqlite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: SQLite

on:
push:
branches:
- "**"
paths-ignore:
- "art/**"
- "README.md"
pull_request:
types: [ready_for_review, synchronize, opened]
paths-ignore:
- "art/**"
- "README.md"

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
php: [ 8.2, 8.1 ]
laravel: [ 10.* ]
dependency-version: [ prefer-stable ]

name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}

if: github.ref != 'refs/heads/todo-tests'

steps:
- name: Checkout
uses: actions/[email protected]

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
tools: composer:v2
coverage: none

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v3
with:
path: $(composer config cache-files-dir)
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

- name: Install Composer dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
rm composer.lock
composer install

- name: Install openspout/openspout
if: matrix.php == '8.2'
run: composer require openspout/openspout

- name: SQLite
run: composer test:sqlite
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ pnpm-lock.yaml
tmp/
dist/powergrid.js.LICENSE.txt
.env
tests/cypress/app/
.DS_Store
Loading
Loading