Fixes logins

Couchbase-Ecosystem · May 28, 2024 · 7781ce8 · 7781ce8
1 parent fb092ba
commit 7781ce8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -80,7 +80,7 @@ tasks {
     }
 
     patchPluginXml {
-        sinceBuild.set("233.*")
+        sinceBuild.set("232.10227.8")
         untilBuild.set("246.*")
     }
 

diff --git a/src/main/java/com/couchbase/intellij/tree/iq/CapellaOrganizationList.java b/src/main/java/com/couchbase/intellij/tree/iq/CapellaOrganizationList.java
@@ -25,8 +25,6 @@ public CapellaOrganizationList getOnlyIqEnabledOrgs() {
                         .filter(org -> org.getData() != null)
                         .filter(org -> org.getData().getIq() != null)
                         .filter(org -> org.getData().getIq().isEnabled())
-                        .filter(org -> org.getData().getIq().getOther() != null)
-                        .filter(org -> org.getData().getIq().getOther().getIsTermsAcceptedForOrg())
                         .collect(Collectors.toList())
         );
         return filteredList;

diff --git a/src/main/java/com/couchbase/intellij/tree/iq/IQWindowContent.java b/src/main/java/com/couchbase/intellij/tree/iq/IQWindowContent.java
@@ -143,7 +143,9 @@ public void onOrgSelected(CapellaOrganization organization) {
 
         if (!credentials.checkIqIsEnabled(organization.getId())) {
             Notifications.Bus.notify(new Notification(ChatGptBundle.message("group.id"), "Unable to use this organization", "Capella iQ is not enabled for this organization.", NotificationType.ERROR));
-            onLogout(null);
+            if (chatPanel == null) {
+                onLogout(null);
+            }
             return;
         }
 

diff --git a/src/main/java/com/couchbase/intellij/tree/iq/ui/MessageGroupComponent.java b/src/main/java/com/couchbase/intellij/tree/iq/ui/MessageGroupComponent.java
@@ -39,6 +39,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import static com.couchbase.intellij.workbench.CustomSqlFileEditor.NO_QUERY_CONTEXT_SELECTED;
 
@@ -204,10 +205,11 @@ public void actionPerformed(@NotNull AnActionEvent e) {
     private JPanel createSettingsPanel(CapellaOrganizationList organizationList, ChatPanel.LogoutListener logoutListener) {
         JPanel panel = new NonOpaquePanel(new GridLayout(0, 1));
         JPanel orgPanel = new NonOpaquePanel(new BorderLayout());
+
+
         orgSelector = new ComboBox<>(organizationList.getData().stream()
-                .map(org -> org.getData())
-                .filter(data -> data.getIq() != null && data.getIq().isEnabled())
-                .map(data -> data.getName())
+                .map(CapellaOrganizationList.Entry::getData)
+                .map(CapellaOrganization::getName)
                 .toArray(String[]::new));
 
         orgSelector.setSelectedIndex(organizationList.indexOf(organization));