Upgrade and adapt to new version of libraries in ogre-tools #7241
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
jansav
requested review from
Iku-turso and
ixrock
and removed request for
a team
jansav
commented
Feb 27, 2023
| @@ -262,6 +272,11 @@ describe("cluster-store", () => { | |||
|
|
|||
| describe("pre 3.6.0-beta.1 config with an existing cluster", () => { | |||
| beforeEach(() => { | |||
| di.override(storeMigrationVersionInjectable, () => "3.6.0"); | |||
There was a problem hiding this comment.
override has to happen before inject.
jansav
commented
Feb 27, 2023
Comment on lines
93
to
+95
| di.override(storeMigrationVersionInjectable, () => "10.0.0"); | ||
|
|
||
| userStore = di.inject(userStoreInjectable); |
There was a problem hiding this comment.
override has to happen before inject
jansav
commented
Feb 27, 2023
| @@ -43,7 +43,7 @@ describe("ApiManager", () => { | |||
| di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs"); | |||
| di.override(storesAndApisCanBeCreatedInjectable, () => true); | |||
|
|
|||
| const createCluster = di.inject(createClusterInjectable); | |||
| const createCluster = di.inject(createClusterInjectionToken); | |||
There was a problem hiding this comment.
Reference equality is important here. Previously it worked because the implementation for createClusterInjectionToken in main and renderer had same ID.
jansav
commented
Feb 27, 2023
Comment on lines
+205
to
226
| const someChannelListenerInjectable = getInjectable({ | ||
| id: "some-channel-listener", | ||
|
|
||
| instantiate: () => ({ | ||
| channel: testRequestChannel, | ||
| handler: () => () => "irrelevant", | ||
| }), | ||
|
|
||
| injectionToken: requestChannelListenerInjectionToken, | ||
| }); | ||
|
|
||
| testChannelListenerInMain2Injectable.id += "2"; | ||
| const someOtherChannelListenerInjectable = getInjectable({ | ||
| id: "some-other-channel-listener", | ||
|
|
||
| instantiate: () => ({ | ||
| channel: testRequestChannel, | ||
| handler: () => () => "irrelevant", | ||
| }), | ||
|
|
||
| injectionToken: requestChannelListenerInjectionToken, | ||
| }); | ||
|
|
There was a problem hiding this comment.
Mutating injectable ID is not possible and shouldn't be advertised.
jansav
commented
Feb 27, 2023
Comment on lines
+28
to
+38
| builder.beforeWindowStart((windowDi) => { | ||
| // TODO: remove once ClusterStore can be used without overriding it | ||
| windowDi.override(getClusterByIdInjectable, () => (clusterId) => { | ||
| if (clusterId === cluster.id) { | ||
| return cluster; | ||
| } | ||
|
|
||
| return undefined; | ||
| }); | ||
| }); | ||
|
|
There was a problem hiding this comment.
override has to happen before inject
jansav
commented
Feb 27, 2023
| @@ -830,7 +830,40 @@ exports[`Showing correct entity settings when navigating to non-local cluster en | |||
| > | |||
| Proxy | |||
| </h2> | |||
| <section /> | |||
| <section> | |||
There was a problem hiding this comment.
Notice that previously the snapshot was providing wrong output.
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
jansav
force-pushed
the
chore/injectable-bump
branch
from
bcdfa1c
to
684ac49
Compare
jansav
changed the title
Nokel81
approved these changes
Feb 27, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This version brings back requirement for exact reference for injection tokens and injectables. It also allows future Features not have conflicting IDs for injectables automatically.