Replace common services with imports from origin-web-common #1308
Conversation
| }) | ||
|
|
||
| /* A WebSocket factory for kubernetesContainerTerminal */ | ||
| .factory("ContainerWebSocket", function(API_CFG, $ws) { |
There was a problem hiding this comment.
We should remove this from origin-web-common and keep it here since it's specific to container terminal.
| 'use strict'; | ||
|
|
||
| /* A WebSocket factory for kubernetesContainerTerminal */ | ||
| angular.module('openshiftCommon') |
There was a problem hiding this comment.
think this module name needs to get switched back to the main console one
|
Thanks @jwforres , updated. |
|
@jeff-phillips-18 Should we remove the |
|
Yes, thanks @spadgett . I will do that now. |
|
Pulled the branch down, it looks like you need to add |
|
If they aren't already we probably need to get the spec tests running in the origin-web-common repo. Travis is probably sufficient for now. Otherwise this all LGTM now, everything seems to be working ok. |
|
I was able to move the spec tests that existed for the (now) common services running in the origin-web-common repo. |
|
Yeah i think my question was whether we actually have Travis running on that repo, but we can take that discussion to another thread i think. @jeff-phillips-18 can you squash your commits? |
jeff-phillips-18
force-pushed
the
catalog-integration
branch
from
35704cc to
fb4543c
Compare
|
Squished em. |
app/scripts/app.js
Outdated
| @@ -514,120 +501,3 @@ angular | |||
| } | |||
| }); | |||
|
|
|||
| hawtioPluginLoader.addModule('openshiftConsole'); | |||
There was a problem hiding this comment.
Missed this earlier, I'm actually surprised you were able to remove this. How is the openshiftConsole module getting registered with hawtioPluginLoader now?
jeff-phillips-18
force-pushed
the
catalog-integration
branch
from
fb4543c to
a409339
Compare
|
Hmmm.... Odd that it still loaded. Well, it's back now. |
|
nope thanks @jeff-phillips-18 ! [merge] |
|
looks like Travis and Jenkins are both failing on verify-dist, @jeff-phillips-18 can you re-run grunt build |
jeff-phillips-18
force-pushed
the
catalog-integration
branch
from
a409339 to
2307065
Compare
|
looks like Travis is having a partial outage right now so I can't see in the logs why it just failed, will try jenkins [test] |
jeff-phillips-18
force-pushed
the
catalog-integration
branch
from
2307065 to
bbedd2d
Compare
|
Evaluated for origin web console test up to bbedd2d |
|
[merge] |
|
Evaluated for origin web console merge up to bbedd2d |
|
Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1133/) (Base Commit: d5e1aba) |
|
Origin Web Console Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1132/) (Base Commit: d5e1aba) |
This removes the common services from Web Console and imports them from origin-web-common.
Functionality remains the same just a relocation to make the services available outside of web console.