-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #54 from flagbit/form-extension-fix
Fix of select form extension in product export filters
- Loading branch information
Showing
9 changed files
with
70 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,11 +24,9 @@ jobs: | |
php-version: "${{ matrix.php-versions }}" | ||
extensions: "intl, xdebug, imagick, apcu" | ||
|
||
# Install / Prepare | ||
- name: "Install PHP dependencies" | ||
run: "composer install --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress" | ||
|
||
# CI | ||
- name: "Linting" | ||
run: "vendor/bin/phplint ./src" | ||
- name: "Code Sniffer" | ||
|
@@ -56,10 +54,10 @@ jobs: | |
- name: "Install PHP dependencies" | ||
run: "composer install --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress" | ||
|
||
# - name: "yarn install" | ||
# uses: "borales/[email protected]" | ||
# with: | ||
# cmd: "install" | ||
- name: "yarn install" | ||
uses: "borales/[email protected]" | ||
with: | ||
cmd: "install" | ||
|
||
# - name: "Check for obsolete ts exports" | ||
# run: "yarn run tests" | ||
- name: "Run frontend tests" | ||
run: "yarn run test" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# 4.0.1 | ||
|
||
## Bug fixes | ||
|
||
- Fix of select form extension in product export filters [#54][pr54] | ||
|
||
# 4.0.0 | ||
|
||
[pr54]: https://github.com/flagbit/akeneo-table-attribute-bundle/pull/54 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
module.exports = { | ||
verbose: true, | ||
rootDir: './', | ||
testURL: 'http://localhost/', | ||
testMatch: ['**/jest/**/*.test.js'], | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
describe('Form Extensions', function() { | ||
it('table attribute overrides akeneo-attribute-select-filter', function() { | ||
const formExtensions = require('../../tests/public/js/extensions.json'); | ||
|
||
const expected = { | ||
module: 'pim/filter/attribute/select', | ||
parent: null, | ||
targetZone: 'self', | ||
zones: [], | ||
aclResourceId: null, | ||
config: { | ||
url: 'pim_ui_ajaxentity_list', | ||
entityClass: 'Flagbit\\Bundle\\TableAttributeBundle\\Entity\\AttributeOption', | ||
operators: [ 'IN', 'EMPTY', 'NOT EMPTY' ] | ||
}, | ||
position: 100, | ||
code: 'akeneo-attribute-select-filter' | ||
}; | ||
|
||
expect(formExtensions.extensions).toContainEqual(expected); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"name": "pim-enterprise-standard", | ||
"description": "Akeneo PIM Enterprise Standard Edition", | ||
"homepage": "http://www.akeneo.com", | ||
"private": true, | ||
"config": { | ||
"source": "vendor/akeneo/pim-community-dev", | ||
"styles": "vendor/akeneo/pim-community-dev/frontend/build/compile-less.js" | ||
}, | ||
"scripts": { | ||
"update-extensions": "cd tests && node ../vendor/akeneo/pim-community-dev/frontend/build/update-extensions.js", | ||
"test": "yarn update-extensions && jest --no-cache --config jest.config.js" | ||
}, | ||
"workspaces": [ | ||
"vendor/akeneo/pim-community-dev", | ||
"vendor/akeneo/pim-community-dev/src/Akeneo/Connectivity/Connection/front" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
module.exports = [ | ||
"../vendor/akeneo/pim-community-dev/src/Akeneo/Platform/Bundle/UIBundle", | ||
"../src"] |