Skip to content

Commit

Permalink
Merge branch '4.1' into temp_2.3_to_4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
barw4 authored Jul 6, 2022
2 parents 8a41e6e + 2e2cb40 commit 4122ace
Show file tree
Hide file tree
Showing 1,898 changed files with 41,485 additions and 28,884 deletions.
33 changes: 1 addition & 32 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,3 @@
{
"plugins": ["react"],
"extends": ["eslint:recommended", "plugin:react/recommended"],
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"node": true
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"sourceType": "module",
"ecmaVersion": 9
},
"rules": {
"no-const-assign": "warn",
"no-this-before-super": "warn",
"no-undef": "warn",
"no-unreachable": "warn",
"no-unused-vars": "warn",
"constructor-super": "warn",
"valid-typeof": "warn",
"no-extra-semi": "error",
"no-extra-boolean-cast": "off",
"react/jsx-uses-react": "error",
"react/jsx-uses-vars": "error",
"jsx-quotes": ["error", "prefer-double"],
"quotes": ["error", "single", { "allowTemplateLiterals": true }],
"eqeqeq": ["error", "always"],
"indent": ["error", 4]
}
"extends": "eslint-config-ibexa/eslint"
}
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| BC breaks? | yes/no
| Tests pass? | yes/no
| Doc needed? | yes/no
| License | [GPL-2.0](https://github.com/ezsystems/ezplatform-admin-ui/blob/master/LICENSE)
| License | [GPL-2.0](https://github.com/ibexa/admin-ui/blob/main/LICENSE)
<!-- Keep in mind: Your contribution has to be compatible with GPL-2.0 as well: https://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html#GPLModuleLicense -->


Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/browser-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Browser tests
on:
push:
branches:
- master
- main
- '[0-9]+.[0-9]+'
pull_request: ~

Expand All @@ -13,8 +13,9 @@ jobs:
uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
with:
project-edition: 'oss'
project-version: '^3.3.x-dev'
project-version: '4.1.x-dev'
test-suite: '--profile=browser --suite=admin-ui-full'
test-setup-phase-1: '--profile=setup --suite=personas --mode=standard'
timeout: 40
secrets:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
6 changes: 1 addition & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ name: CI
on:
push:
branches:
- master
- main
- '[0-9]+.[0-9]+'
pull_request: ~

env:
COMPOSER_ROOT_VERSION: 2.3.x-dev

jobs:
cs-fix:
name: Run code style check
Expand Down Expand Up @@ -45,7 +42,6 @@ jobs:
fail-fast: false
matrix:
php:
- '7.3'
- '7.4'
- '8.0'
- '8.1'
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/frontend-ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Frontend build

on:
push:
paths:
- "**.js"
- "**.scss"
branches:
- main
- '[0-9]+.[0-9]+'
pull_request:
paths:
- "**.js"
- "**.scss"

jobs:
frontend-test:
name: Frontend build test
runs-on: "ubuntu-20.04"
timeout-minutes: 5

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '14'
- run: yarn install
- run: yarn test
7 changes: 6 additions & 1 deletion .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
->buildConfig()
->setFinder(
PhpCsFixer\Finder::create()
->in(__DIR__ . '/src')
->in(
array_filter([
__DIR__ . '/src',
__DIR__ . '/tests',
], 'is_dir')
)
->files()->name('*.php')
);
10 changes: 0 additions & 10 deletions .prettierrc

This file was deleted.

47 changes: 24 additions & 23 deletions behat_suites.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
browser:
extensions:
Behat\MinkExtension:
files_path: '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/src/lib/Behat/TestFiles/'
files_path: '%paths.base%/vendor/ibexa/admin-ui/src/lib/Behat/TestFiles/'
suites:
admin-ui:
paths:
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/standard'
- '%paths.base%/vendor/ibexa/admin-ui/features/standard'
filters:
tags: "~@broken"
contexts:
- EzSystems\Behat\API\Context\ContentContext
- EzSystems\Behat\API\Context\ContentTypeContext
- EzSystems\Behat\API\Context\RoleContext
- EzSystems\Behat\API\Context\TestContext
- EzSystems\Behat\API\Context\TrashContext
- EzSystems\Behat\API\Context\UserContext
- Ibexa\Behat\API\Context\ContentTypeContext
- Ibexa\Behat\API\Context\ContentContext
- Ibexa\Behat\API\Context\RoleContext
- Ibexa\Behat\API\Context\TestContext
- Ibexa\Behat\API\Context\TrashContext
- Ibexa\Behat\API\Context\UserContext
- Ibexa\Behat\Browser\Context\DebuggingContext
- Ibexa\Behat\Browser\Context\AuthenticationContext
- Ibexa\AdminUi\Behat\BrowserContext\NavigationContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\UDWContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext
- Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext
- Ibexa\AdminUi\Behat\BrowserContext\BookmarkContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext
Expand All @@ -23,11 +29,9 @@ browser:
- Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext
- Ibexa\AdminUi\Behat\BrowserContext\DashboardContext
- Ibexa\AdminUi\Behat\BrowserContext\LanguageContext
- Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\NavigationContext
- Ibexa\AdminUi\Behat\BrowserContext\NotificationContext
- Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext
- Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\RolesContext
- Ibexa\AdminUi\Behat\BrowserContext\SearchContext
- Ibexa\AdminUi\Behat\BrowserContext\SectionsContext
Expand All @@ -41,45 +45,42 @@ browser:

personas:
paths:
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/personas'
- '%paths.base%/vendor/ibexa/admin-ui/features/personas'
contexts:
- Ibexa\Behat\Browser\Context\DebuggingContext
- Ibexa\Behat\Browser\Context\AuthenticationContext
- Ibexa\AdminUi\Behat\BrowserContext\NavigationContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext
- Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\NotificationContext
- Ibexa\AdminUi\Behat\BrowserContext\TrashContext
- Ibexa\AdminUi\Behat\BrowserContext\UDWContext
- Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext

admin-ui-full:
paths:
- '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/'
- '%paths.base%/vendor/ibexa/admin-ui/features/'
contexts:
- EzSystems\Behat\API\Context\ContentContext
- EzSystems\Behat\API\Context\ContentTypeContext
- EzSystems\Behat\API\Context\RoleContext
- EzSystems\Behat\API\Context\TestContext
- EzSystems\Behat\API\Context\TrashContext
- EzSystems\Behat\API\Context\UserContext
- EzSystems\Behat\API\Context\UserContext
- Ibexa\Behat\API\Context\ContentContext
- Ibexa\Behat\API\Context\ContentTypeContext
- Ibexa\Behat\API\Context\RoleContext
- Ibexa\Behat\API\Context\TestContext
- Ibexa\Behat\API\Context\TrashContext
- Ibexa\Behat\API\Context\UserContext
- Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\BookmarkContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentTypeContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext
- Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext
- Ibexa\AdminUi\Behat\BrowserContext\DashboardContext
- Ibexa\AdminUi\Behat\BrowserContext\LanguageContext
- Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\NavigationContext
- Ibexa\AdminUi\Behat\BrowserContext\NotificationContext
- Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext
- Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext
- Ibexa\AdminUi\Behat\BrowserContext\RolesContext
- Ibexa\AdminUi\Behat\BrowserContext\SearchContext
- Ibexa\AdminUi\Behat\BrowserContext\SectionsContext
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* @copyright Copyright (C) eZ Systems AS. All rights reserved.
* @copyright Copyright (C) Ibexa AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/
require_once __DIR__ . '/vendor/autoload.php';
57 changes: 35 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,33 @@
{
"name": "ezsystems/ezplatform-admin-ui",
"name": "ibexa/admin-ui",
"license": "GPL-2.0-only",
"type": "project",
"description": "eZ Platform Admin v2",
"description": "Ibexa Admin Ui",
"replace": {
"ezsystems/ezplatform-admin-ui": "*"
},
"autoload": {
"psr-4": {
"EzSystems\\EzPlatformAdminUiBundle\\": "src/bundle/",
"EzSystems\\EzPlatformAdminUi\\": "src/lib/",
"Ibexa\\AdminUi\\": "src/lib/"
"Ibexa\\AdminUi\\": "src/lib/",
"Ibexa\\Bundle\\AdminUi\\": "src/bundle/",
"Ibexa\\Contracts\\AdminUi\\": "src/contracts/",
"EzSystems\\EzPlatformAdminUiBundle\\": "src/bundle/",
"EzSystems\\EzPlatformAdminUi\\": "src/lib/",
"EzSystems\\EzPlatformEncoreBundle\\": "src/bundle/",
"Ibexa\\Platform\\Bundle\\Assets\\": "src/bundle/",
"Ibexa\\Platform\\Assets\\": "src/lib/"
}
},
"autoload-dev": {
"psr-4": { "EzSystems\\EzPlatformAdminUi\\Tests\\": "src/lib/Tests" }
"psr-4": {
"Ibexa\\Tests\\Bundle\\AdminUi\\": "tests/bundle/",
"Ibexa\\Tests\\AdminUi\\": "tests/lib/",
"EzSystems\\EzPlatformAdminUi\\Tests\\": "tests/lib/",
"Ibexa\\Platform\\Tests\\Assets\\": "tests/lib/"
}
},
"require": {
"php": "^7.3 || ^8.0",
"php": "^7.4 || ^8.0",
"ext-json": "*",
"symfony/http-foundation": "^5.0",
"symfony/security-core": "^5.0",
Expand All @@ -33,13 +46,13 @@
"symfony/asset": "^5.0",
"symfony/yaml": "^5.0",
"jms/translation-bundle": "^1.5",
"ezsystems/ezplatform-kernel": "^1.3.10@dev",
"ezsystems/ezplatform-content-forms": "^1.3@dev",
"ezsystems/ezplatform-design-engine": "^3.0@dev",
"ezsystems/ezplatform-user": "^2.0@dev",
"ezsystems/ezplatform-richtext": "^2.0@dev",
"ezsystems/ezplatform-rest": "^1.0@dev",
"ezsystems/ezplatform-search": "^1.0@dev",
"ibexa/core": "~4.1.6@dev",
"ibexa/content-forms": "~4.1.0@dev",
"ibexa/design-engine": "~4.1.0@dev",
"ibexa/user": "~4.1.0@dev",
"ibexa/fieldtype-richtext": "~4.1.0@dev",
"ibexa/rest": "~4.1.0@dev",
"ibexa/search": "~4.1.0@dev",
"babdev/pagerfanta-bundle": "^2.1",
"knplabs/knp-menu-bundle": "^3.0",
"mck89/peast": "^1.9",
Expand All @@ -49,23 +62,23 @@
"twig/string-extra": "^3.0"
},
"require-dev": {
"ibexa/ci-scripts": "^0.1@dev",
"ezsystems/behatbundle": "^8.3@dev",
"friendsofphp/php-cs-fixer": "^2.16.0",
"ibexa/ci-scripts": "^0.2@dev",
"ibexa/behat": "~4.1.0@dev",
"friendsofphp/php-cs-fixer": "^3.0",
"phpunit/phpunit": "^8.1",
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
"ezsystems/doctrine-dbal-schema": "^1.0@dev",
"ezsystems/ezplatform-code-style": "^1.0",
"ezsystems/ezplatform-http-cache": "^2.3@dev"
"ibexa/doctrine-schema": "~4.1.0@dev",
"ibexa/http-cache": "~4.1.0@dev",
"ibexa/code-style": "^1.0"
},
"scripts": {
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots",
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
"check-cs": "@fix-cs --dry-run",
"test": "phpunit -c phpunit.xml"
},
"extra": {
"branch-alias": {
"dev-master": "2.3.x-dev"
"dev-main": "4.1.x-dev"
}
}
}
4 changes: 3 additions & 1 deletion features/personas/ChangePassword.feature
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ Feature: Verify that an User allowed to change password can change his password
Scenario: I can change my password
Given I open Login page in admin SiteAccess
And I log in as "UserPassword" with password "Passw0rd-42"
When I go to change my password
When I go to user settings
And I switch to "My Account Settings" tab in User Settings
And I click on the change password button
And I change password from "Passw0rd-42" to "Passw0rd-43"
And I click on the edit action bar button "Update"
Then success notification that "Your password has been successfully changed." appears
Expand Down
Loading

0 comments on commit 4122ace

Please sign in to comment.