WIP!!! FEATURE: Filter properties in right sidebar

.circleci/config.yml

@@ -3,34 +3,34 @@ version: 2.1
 aliases:
   - &workspace_root ~/neos-ui-workspace
   - &store_yarn_package_cache
-    key: yarn-cache-v{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
+    key: yarn-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "yarn.lock" }}
     paths:
       - ~/.cache/yarn
 
   - &restore_yarn_package_cache
     keys:
-      - yarn-cache-v{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
+      - yarn-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ checksum "yarn.lock" }}
 
   - &store_app_cache
-    key: full-app-cache-v{{ .Environment.CACHE_VERSION }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}-{{ checksum "Tests/IntegrationTests/TestDistribution/Configuration/Settings.yaml" }}
+    key: full-app-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}-{{ checksum "Tests/IntegrationTests/TestDistribution/Configuration/Settings.yaml" }}
     paths:
       - /home/circleci/app
 
   - &restore_app_cache
     keys:
-      - full-app-cache-v{{ .Environment.CACHE_VERSION }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}-{{ checksum "Tests/IntegrationTests/TestDistribution/Configuration/Settings.yaml" }}
-      - full-app-cache-v{{ .Environment.CACHE_VERSION }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}-
-      - full-app-cache-v{{ .Environment.CACHE_VERSION }}-{{ arch }}-
+      - full-app-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}-{{ checksum "Tests/IntegrationTests/TestDistribution/Configuration/Settings.yaml" }}
+      - full-app-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}-
+      - full-app-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ arch }}-
 
   - &save_composer_cache
-    key: composer-cache-v{{ .Environment.CACHE_VERSION }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}
+    key: composer-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}
     paths:
       - /home/circleci/composer/cache-dir
 
   - &restore_composer_cache
     keys:
-      - composer-cache-v{{ .Environment.CACHE_VERSION }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}
-      - composer-cache-v{{ .Environment.CACHE_VERSION }}-{{ arch }}-
+      - composer-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ arch }}-{{ checksum "Tests/IntegrationTests/TestDistribution/composer.json" }}
+      - composer-cache-v{{ .Environment.CIRCLE_WORKFLOW_ID }}-{{ arch }}-
 
   - &attach_workspace
     at: *workspace_root
@@ -84,6 +84,7 @@ jobs:
   e2e:
     environment:
       FLOW_CONTEXT: Production
+      DB_HOST: 127.0.0.1
     docker:
       - image: cimg/php:8.2-node
       - image: cimg/mariadb:10.6
@@ -113,7 +114,8 @@ jobs:
           ./flow flow:cache:flush
           ./flow flow:cache:warmup
           ./flow doctrine:migrate
-          ./flow user:create --username=admin --password=password --first-name=John --last-name=Doe --roles=Administrator
+          ./flow user:create --username=admin --password=admin --first-name=Admin --last-name=Admington --roles=Administrator
+          ./flow user:create --username=editor --password=editor --first-name=Editor --last-name=McEditworth --roles=Editor
       - run:
           name: Start flow server
           command: /home/circleci/app/flow server:run --port 8081
@@ -150,6 +152,8 @@ jobs:
             cd /home/circleci/app/Packages/Application/Neos.Neos.Ui
             nvm install
             nvm use
+            echo 127.0.0.1 onedimension.localhost | sudo tee -a /etc/hosts
+            echo 127.0.0.1 twodimensions.localhost | sudo tee -a /etc/hosts
             make test-e2e-saucelabs
       - store_artifacts:
           path: /home/circleci/app/Data/Logs
@@ -178,6 +182,20 @@ jobs:
           cd /home/circleci/app/
           bin/phpunit -c Build/BuildEssentials/PhpUnit/UnitTests.xml Packages/Application/Neos.Neos.Ui/Tests/Unit
 
+  php-linting:
+    docker:
+      - image: cimg/php:8.2-node
+    working_directory: *workspace_root
+    steps:
+      - attach_workspace: *attach_workspace
+      - restore_cache: *restore_app_cache
+
+      - run: rm -rf /home/circleci/app/Packages/Application/Neos.Neos.Ui
+      - run: cd /home/circleci/app/Packages/Application && mv ~/neos-ui-workspace Neos.Neos.Ui
+      - run: |
+          cd /home/circleci/app/Packages/Application/Neos.Neos.Ui
+          composer run lint:phpstan
+
 workflows:
   version: 2
   build_and_test:
@@ -199,3 +217,6 @@ workflows:
       - php-unittests:
           requires:
             - build_flow_app
+      - php-linting:
+          requires:
+            - build_flow_app

.editorconfig

@@ -6,7 +6,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{yml,yaml,json}]
+[*.{yml,yaml,json,xlf}]
 indent_size = 2
 
 [*.md]

.eslintrc.js

@@ -30,6 +30,9 @@ module.exports = {
         'default-case': 'off',
         'no-mixed-operators': 'off',
         'no-negated-condition': 'off',
-        'complexity': 'off'
+        'complexity': 'off',
+
+        // This rule would prevent us from implementing meaningful value objects
+        'no-useless-constructor': 'off'
     },
 }

.github/workflows/add-pr-labels.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Maybe remove base branch label

.github/workflows/build_and_test.yml

@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     name: 'Code style'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -26,8 +26,8 @@ jobs:
     runs-on: ubuntu-latest
     name: 'Unit tests'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'

.sauce/config1Dimension.yml → .sauce/config.yml

@@ -18,19 +18,19 @@ testcafe:
 # Controls what files are available in the context of a test run (unless explicitly excluded by .sauceignore).
 rootDir: ./
 suites:
-  - name: "One dimensional Tests in Firefox on Windows"
+  - name: "Tests in Firefox on Windows"
     browserName: "firefox"
     src:
-      - "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js"
+      - "Tests/IntegrationTests/Fixtures/*/*.e2e.js"
     platformName: "Windows 10"
     screenResolution: "1280x1024"
-  - name: "One dimensional Tests in Firefox on MacOS"
-    # todo use chrome here and fix ci https://github.com/neos/neos-ui/issues/3591
-    browserName: "firefox"
-    src:
-      - "Tests/IntegrationTests/Fixtures/1Dimension/*.e2e.js"
-    platformName: "macOS 13"
-    screenResolution: "1440x900"
+  # todo use chrome here and fix ci https://github.com/neos/neos-ui/issues/3591 (but even firefox fails in ci)
+  # - name: "Tests in Firefox on MacOS"
+  #   browserName: "firefox"
+  #   src:
+  #     - "Tests/IntegrationTests/Fixtures/*/*.e2e.js"
+  #   platformName: "macOS 13"
+  #   screenResolution: "1440x900"
 npm:
   dependencies:
     - testcafe-react-selectors
@@ -39,7 +39,7 @@ npm:
 artifacts:
   download:
     match:
-      - neosui-two-dimensional-test-report.json
+      - neosui-test-report.json
       - console.log
       - sauce-test-report.json
     when: always
@@ -49,4 +49,4 @@ artifacts:
 reporters:
   json:
     enabled: true
-    filename: neosui-one-dimensional-test-report.json
+    filename: neosui-test-report.json

Build/Jenkins/release-neos-ui.sh

@@ -41,15 +41,11 @@ nvm use
 # install dependencies and login to npm
 make install
 
-# acutal release process
+# actual release process
 
 # build
 make build-subpackages
 
-# code quality
-make lint
-make test
-
 # publishing
 VERSION=$VERSION make bump-version
 VERSION=$VERSION NPM_TOKEN=$NPM_TOKEN make publish-npm

Build/Jenkins/update-neos-ui-compiled.sh

@@ -48,7 +48,7 @@ cd tmp_compiled_pkg
 git add Resources/Public/
 git commit -m "Compile Neos UI - $GIT_SHA1" || true
 
-if [[ "$GIT_BRANCH" == "origin/7.3" || "$GIT_BRANCH" == "origin/8.0" || "$GIT_BRANCH" == "origin/8.1" || "$GIT_BRANCH" == "origin/8.2" || "$GIT_BRANCH" == "origin/8.3" || "$GIT_BRANCH" == "origin/8.4" ]]; then
+if [[ "$GIT_BRANCH" == "origin/7.3" || "$GIT_BRANCH" == "origin/8.0" || "$GIT_BRANCH" == "origin/8.1" || "$GIT_BRANCH" == "origin/8.2" || "$GIT_BRANCH" == "origin/8.3" || "$GIT_BRANCH" == "origin/8.4" || "$GIT_BRANCH" == "origin/9.0" ]]; then
     echo "Git branch $GIT_BRANCH found, pushing to this branch."
     git push origin HEAD:${GIT_BRANCH#*/}
 fi

Classes/Application/ChangeTargetWorkspace.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Neos.Neos.Ui package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+declare(strict_types=1);
+
+namespace Neos\Neos\Ui\Application;
+
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
+use Neos\Flow\Annotations as Flow;
+
+/**
+ * The application layer level command DTO to communicate the change of the selected target workspace for publication
+ *
+ * @internal for communication within the Neos UI only
+ */
+#[Flow\Proxy(false)]
+final readonly class ChangeTargetWorkspace
+{
+    public function __construct(
+        public ContentRepositoryId $contentRepositoryId,
+        public WorkspaceName $workspaceName,
+        public WorkspaceName $targetWorkspaceName,
+        public NodeAddress $documentNode
+    ) {
+    }
+}

Classes/Application/DiscardAllChanges.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Neos.Neos package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+declare(strict_types=1);
+
+namespace Neos\Neos\Ui\Application;
+
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
+use Neos\Flow\Annotations as Flow;
+
+/**
+ * The application layer level command DTO to communicate discarding of all changes recorded for a workspace
+ *
+ * @internal for communication within the Neos UI only
+ */
+#[Flow\Proxy(false)]
+final readonly class DiscardAllChanges
+{
+    public function __construct(
+        public ContentRepositoryId $contentRepositoryId,
+        public WorkspaceName $workspaceName,
+    ) {
+    }
+
+    /**
+     * @param array<string,string> $values
+     */
+    public static function fromArray(array $values): self
+    {
+        return new self(
+            ContentRepositoryId::fromString($values['contentRepositoryId']),
+            WorkspaceName::fromString($values['workspaceName']),
+        );
+    }
+}