Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IJMP-1630 Added initial processing of the global Zowe team conf file #186

Merged
merged 1 commit into from
Jul 2, 2024

Conversation

ktsytsen
Copy link
Contributor

No description provided.

@ktsytsen ktsytsen force-pushed the feature/IJMP-1630-global-conf branch from 67252d1 to da4515b Compare June 25, 2024 16:05
@@ -57,21 +67,42 @@ class UpdateZoweConfigAction : DumbAwareAction() {
return
}
val vFile = e.getData(CommonDataKeys.VIRTUAL_FILE)
if (vFile?.path != "${project.basePath}/$ZOWE_CONFIG_NAME") {
var type = ZoweConfigType.GLOBAL
if (vFile?.path != ZoweConfigServiceImpl.getZoweConfigLocation(
Copy link
Contributor

Choose a reason for hiding this comment

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

if (
vFile?.path != ZoweConfigServiceImpl.getZoweConfigLocation(project, ZoweConfigType.LOCAL)
&& vFile?.path != ZoweConfigServiceImpl.getZoweConfigLocation(project, ZoweConfigType.GLOBAL)
)

Copy link
Contributor

Choose a reason for hiding this comment

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

  • better to use val zoweLocalConfigLocation and val zoweGlobalConfigLocation outside both actionPerformed and update functions

@@ -40,11 +41,20 @@ class UpdateZoweConfigAction : DumbAwareAction() {
e.presentation.isEnabledAndVisible = false
return
}

var type = ZoweConfigType.GLOBAL
if (e.getData(CommonDataKeys.VIRTUAL_FILE)?.path == ZoweConfigServiceImpl.getZoweConfigLocation(
Copy link
Contributor

Choose a reason for hiding this comment

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

val zoweLocalConfigLocation = ZoweConfigServiceImpl.getZoweConfigLocation(project, ZoweConfigType.LOCAL)
if (e.getData(CommonDataKeys.VIRTUAL_FILE)?.path == zoweConfigLocalLocation)

e.presentation.isEnabledAndVisible = false
return
}
if (vFile.path == ZoweConfigServiceImpl.getZoweConfigLocation(project, ZoweConfigType.LOCAL))
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

@ktsytsen ktsytsen force-pushed the feature/IJMP-1630-global-conf branch from da4515b to f617525 Compare June 25, 2024 16:46
@ktsytsen ktsytsen force-pushed the feature/IJMP-1630-global-conf branch 2 times, most recently from 5d02bea to 769c1e7 Compare June 26, 2024 12:27
@ktsytsen ktsytsen force-pushed the feature/IJMP-1630-global-conf branch from 769c1e7 to 788e502 Compare June 27, 2024 21:23
@KUGDev KUGDev merged commit ebd6998 into release/v2.0.0-231 Jul 2, 2024
4 of 5 checks passed
@KUGDev KUGDev deleted the feature/IJMP-1630-global-conf branch July 2, 2024 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants