Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Pf upgrade followup #9728

Merged
merged 9 commits into from
Sep 22, 2021
Merged

Conversation

seanforyou23
Copy link
Member

This PR aligns dependency usage among several submodules. We previously had a somewhat hacky way of importing patternfly styles, and to be honest I'm not sure I ever fully understood why that was necessary. My guess is that there were stylesheet load order issues coming from us having several submodules which all had different versions of patternfly being used. Anyway, I've managed to make all the versions aligned now and was able to get rid of all those individual stylesheet layers for a single import of @patternfly/react-core/dist/styles/base.css which is how it should be.

@rh-uxd/integration-* pkgs are no longer under active development, so we've ripped those bits out of @syndesis/syndesis and @syndesis/ui - we're no longer getting duplicate styles from this module.

Overall things are looking pretty darn good! Please let me know if you see any issues or have any questions about these changes.

Screen Shot 2021-08-04 at 3 41 20 PM

steps toward resolving ENTESB-14379 / #8707
remove @rh-uxd/* pkg (it is archived)
remove cross console navigation
further alignment of patternfly dependency versions
update usage of labels for integration status
shuffle yarn workspace hoist configurations

remove @rh-uxd pkg (it is archived)
further alignment of patternfly dependency versions
update usage of labels for integration status
shuffle yarn workspace hoist configurations
[cleanup] remove unnecessary hoist configs, aliasing, dependencies, comments, and types
[cleanup] bump atlasmap/atlasmap version
@seanforyou23 seanforyou23 added the group/ui User interface SPA, talking to the REST backend label Sep 16, 2021
@gashcrumb
Copy link
Contributor

I suspect the QE checks fail because this PR only bumps the UI. @igarashitm wonder, would it be easier to try and apply the updates on the Java side on this PR? Or is there an easier way to tackle this?

Copy link
Member

@zregvart zregvart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we no longer need the bits implemented in #8561?

@igarashitm
Copy link
Member

igarashitm commented Sep 17, 2021

apply the updates on the Java side on this PR

I sent a PR to @seanforyou23 's branch
seanforyou23#1

@gashcrumb
Copy link
Contributor

Thanks @igarashitm!

I built the branch here locally and had a look at the "import-edit-integration" integration there on staging and indeed the AtlasMap UI doesn't load up properly there, let's see how the QE checks do once the AtlasMap backend is in sync.

chore: Update to AtlasMap 2.3.0-M.3 for backend
@gashcrumb
Copy link
Contributor

Looks like we had an API change @igarashitm

Error:  Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.1:compile (default-compile) on project server-endpoint: Compilation failure
Error:  /home/runner/work/syndesis/syndesis/app/server/endpoint/src/main/java/io/syndesis/server/endpoint/v1/handler/atlas/SyndesisJavaService.java:[19,26] error: cannot find symbol
Error:    symbol:   class MavenClasspathResponse
Error:    location: package io.atlasmap.java.v2
Error:  -> [Help 1]

Also @seanforyou23 is having a look to be sure the CSS is being applied correctly on AtlasMap, he may have some questions there.

@seanforyou23
Copy link
Member Author

Ah, the base styles for atlasmap were not being imported. After adding it everything seems to have snapped right back in place.. win! If we can get the atlasmap stylesheet published to dist like the other packages it would make for a cleaner import path. In the mean time I'm just importing it from node_modules which I suppose it fine for now. Let me know if you find anything else!

Screen Shot 2021-09-17 at 5 04 08 PM

@igarashitm
Copy link
Member

ugh right, maven classpath request has been removed - removed it and trying to build but then I hit "unused dependency" error in verifier, trying to see what's wrong.

@igarashitm
Copy link
Member

@seanforyou23 OK this should fix the backend build error - seanforyou23#2

seanforyou23 and others added 2 commits September 20, 2021 08:46
fix: AtlasMap maven classpath request endpoint has been removed
@igarashitm
Copy link
Member

@seanforyou23 one more chore, unused dependency in POM I couldn't find in local build - seanforyou23#3

@gashcrumb
Copy link
Contributor

@mkralik3 wonder is there an outage? Seems the PR checks are stuck.

@mkralik3
Copy link
Contributor

@gashcrumb I will try to rerun it.

@mkralik3
Copy link
Contributor

retest this please

1 similar comment
@gashcrumb
Copy link
Contributor

retest this please

@mkralik3
Copy link
Contributor

We can ignore that 1 failed test because the latest Syndesis upstream contains updated AtlasMap and probably some selector was changed so UI test suite needs an update too. I will do it after verified the last prod build which contains the older AtlasMap.

@gashcrumb
Copy link
Contributor

Ok thanks @mkralik3!

Copy link
Contributor

@gashcrumb gashcrumb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@zregvart zregvart merged commit cb96f46 into syndesisio:1.13.x Sep 22, 2021
@zregvart
Copy link
Member

Merged, let's get this in and polish if/as needed.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
group/ui User interface SPA, talking to the REST backend size/XXL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants