Skip to content

Commit

Permalink
Merge branch 'refs/heads/release/1.18' into NU-1890-hide-categories-w…
Browse files Browse the repository at this point in the history
…hen-there-is-only-one-category-available

# Conflicts:
#	docs/Changelog.md
  • Loading branch information
Dzuming committed Nov 21, 2024
2 parents dbfd5d7 + 6ff45eb commit 28de0bd
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: |
bash -c "export NUSSKNACKER_SCALA_VERSION=2.12 && sbt \"benchmarks/test:runMain pl.touk.nussknacker.engine.benchmarks.e2e.FlinkSteamingScenarioBenchmark 10000000\""
- name: Store benchmark results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: benchmark-e2e.csv
path: /tmp/benchmarkResult.csv
2 changes: 1 addition & 1 deletion .github/workflows/benchmark-jmh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Run benchmarks
run: sbt "benchmarks/jmh:run -i 8 -wi 3 -f1 -t1 -rf csv"
- name: Store benchmark results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jmh-result.csv
path: benchmarks/jmh-result.csv
30 changes: 15 additions & 15 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
run: find . -wholename "**/target/**/*" -printf '%P\0' | tar --null -C '.' --files-from=- -czf 'target.tgz'
- name: Store target
if: ${{ env.shouldPerformBackendBuild == 'true' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-target
path: target.tgz
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
shell: bash
run: tar -czf 'fe-dist.tgz' designer/client/dist designer/submodules/dist
- name: Store dist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build-fe-dist
path: fe-dist.tgz
Expand All @@ -185,7 +185,7 @@ jobs:
- uses: coursier/setup-action@v1
with:
jvm: temurin:1.11.0.17
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-target
- name: Untar artifacts
Expand All @@ -205,7 +205,7 @@ jobs:
run: ./ciRunSbt.sh test
- name: Test Report
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: BackendTests-results-${{ matrix.scalaVersion }}
path: '**/test-reports/*.xml'
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
~/.sbt
key: sbt-cache-${{ hashFiles('**/*.sbt') }}
restore-keys: sbt
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-target
- name: Untar artifacts
Expand All @@ -252,7 +252,7 @@ jobs:
run: ./ciRunSbt.sh It/test
- name: Test Report
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: IntegrationTests-results-${{ matrix.scalaVersion }}
path: '**/it-reports/*.xml'
Expand Down Expand Up @@ -286,7 +286,7 @@ jobs:
~/.sbt
key: sbt-cache-${{ hashFiles('**/*.sbt') }}
restore-keys: sbt
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-target
- name: Untar artifacts
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:
docker logs k3d-k3s-default-serverlb
- name: Test Report
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SlowTests-results-${{ matrix.scalaVersion }}
path: '**/test-reports/*.xml'
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
run: (cd designer/client; npm run test:unit)
- name: Test Report
if: ${{ env.shouldPerformFrontendTests == 'true' && (success() || failure()) }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: FrontendTests-results
path: designer/client/junit.xml
Expand Down Expand Up @@ -415,15 +415,15 @@ jobs:
npm ci --no-audit --prefix designer/client
npm ci --no-audit --prefix designer/submodules
rm -rf $npm_config_cache
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ env.shouldBuildImage == 'true' }}
with:
name: build-target
- name: Untar artifacts
if: ${{ env.shouldBuildImage == 'true' }}
shell: bash
run: tar xfz target.tgz
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-fe-dist
- name: Untar fe artifacts
Expand Down Expand Up @@ -470,13 +470,13 @@ jobs:
npx start-server-and-test backend:docker ${{ env.BE_PORT }} start-prod 3000 test:e2e
- name: Test Report
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: CypressTests-results
path: designer/client/cypress-test-results/*.xml
- name: Store test results
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: e2e-test-results
path: |
Expand Down Expand Up @@ -550,13 +550,13 @@ jobs:
~/.sbt
key: sbt-cache-${{ hashFiles('**/*.sbt') }}
restore-keys: sbt
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-target
- name: Untar artifacts
shell: bash
run: tar xfz target.tgz
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: build-fe-dist
- name: Untar fe artifacts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ const parametersPath = (node) => {
export function adjustParameters(node: NodeType, parameterDefinitions: UIParameter[]): AdjustReturn {
const path = parametersPath(node);

if (!path) {
if (!path || !parameterDefinitions) {
return { adjustedNode: node, unusedParameters: [] };
}

const currentNode = cloneDeep(node);
const currentParameters = get(currentNode, path);
//TODO: currently dynamic branch parameters are *not* supported...
const adjustedParameters = parameterDefinitions
?.filter((def) => !def.branchParam)
.filter((def) => !def.branchParam)
.map((def) => {
const currentParam = currentParameters.find((p) => p.name == def.name);
const parameterFromDefinition = {
Expand Down
1 change: 1 addition & 0 deletions docs/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
* [#7193](https://github.com/TouK/nussknacker/pull/7193) Provide tooltips to the scenarios list and scenario details elements
* [#7187](https://github.com/TouK/nussknacker/pull/7187) Fix "Failed to get node validation" when using literal lists that mixes different types of elements
* [#7183](https://github.com/TouK/nussknacker/pull/7183) Hide categories from a scenarios list and more scenario details when only one category is available
* [#7192](https://github.com/TouK/nussknacker/pull/7192) Fix "Failed to get node validation" when opening node details referencing non-existing component

## 1.17

Expand Down

0 comments on commit 28de0bd

Please sign in to comment.