fix: branding data merge

[olexii4]

What does this PR do?

This PR fixes the branding data merge.

cherry-pick of #1297 to the 7.95.x branch

Screenshot/screencast of this PR

This PR was tested with branding from Dev Spaces 3.18.0 (file devspaces-dashboard/tree/packages/dashboard-frontend/assets/branding/product.json?h=devspaces-3.18-rhel-9)

See the test result on screenshot below

What issues does this PR fix or reference?

fixes https://issues.redhat.com/browse/CRW-7935

[che-bot]

Click here to review and test in web IDE:

[github-actions]

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1298

kubectl patch command

kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1298", name: che-dashboard}]}}]"

[dmytro-ndp]

@olexii4 : it looks like startWorkspaceFromGit property is not needed anymore in 7.95.x.
Could you please check and remove it?

[olexii4]

@olexii4 : it looks like startWorkspaceFromGit property is not needed anymore in 7.95.x. Could you please check and remove it?

Thanks. I have removed it.

[github-actions]

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1298

kubectl patch command

kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1298", name: che-dashboard}]}}]"

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: akurinnoy, olexii4

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[devspacesbuild]

Build 3.18 :: dashboard_3.18/10: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: sync-to-downstream_3.18/353: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: get-sources-rhpkg-container-build_3.18/361: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: push-latest-container-to-quay_3.18/41: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: get-sources-rhpkg-container-build_3.18/361:

dashboard : 3.18 :: Build 66449170 : quay.io/devspaces/dashboard-rhel9:3.18-8
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.18/41 triggered

[devspacesbuild]

Build 3.18 :: update-digests_3.18/360: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: dashboard_3.18/10:

Upstream sync done; /DS_CI/sync-to-downstream_3.18/353 triggered

[devspacesbuild]

Build 3.18 :: operator-bundle_3.18/299: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: sync-to-downstream_3.18/354: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: get-sources-rhpkg-container-build_3.18/362: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: push-latest-container-to-quay_3.18/42: Console, Changes, Git Data

[devstudio-release]

Build 3.18 :: copyIIBsToQuay/2900: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: get-sources-rhpkg-container-build_3.18/362:

devspaces-operator-bundle : 3.18 :: Build 66449863 : quay.io/devspaces/devspaces-operator-bundle:3.18-32
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.18/42 triggered;

Bundle CSV related images:
- quay.io/devspaces-tech-preview/idea-rhel9:
- quay.io/devspaces/code-rhel9:3.18-6
- quay.io/devspaces/configbump-rhel9:3.18-1
- quay.io/devspaces/dashboard-rhel9:3.18-8
- quay.io/devspaces/devspaces-rhel9-operator:3.18-2
- quay.io/devspaces/pluginregistry-rhel9:3.18-5
- quay.io/devspaces/server-rhel9:3.18-1
- quay.io/devspaces/traefik-rhel9:3.18-1
- quay.io/devspaces/udi-rhel9:3.18-1
= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.14.0-202501150635.p0.gb8b8259.assembly.stream.el8
= registry.redhat.io/openshift4/ose-oauth-proxy:v4.14.0-202501021509.p0.ga4a2f27.assembly.stream.el8
= registry.redhat.io/rhscl/mongodb-36-rhel7:1-50
= registry.redhat.io/ubi8/ubi-minimal:8.8-1072.1697626218

[devspacesbuild]

Build 3.18 :: sync-to-downstream_3.18/354:

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.18/362 triggered; /job/DS_CI/job/dsc_3.18 triggered;

[devspacesbuild]

Build 3.18 :: operator-bundle_3.18/299:

Upstream sync done; /DS_CI/sync-to-downstream_3.18/354 triggered

[devspacesbuild]

Build 3.18 :: update-digests_3.18/360:

Detected new images: rebuild operator-bundle
* dashboard; /DS_CI/operator-bundle_3.18/299 triggered

[devspacesbuild]

Build 3.18 :: dsc_3.18/12: Console, Changes, Git Data

[devspacesbuild]

Build 3.18 :: dsc_3.18/12:

3.18.0-CI