From 2321d6c03b9bb91ffd2506f39d08a0b202ae69a9 Mon Sep 17 00:00:00 2001
From: Jin Jun Oh <joh@w245.local>
Date: Thu, 8 Feb 2024 11:04:11 -0800
Subject: [PATCH 1/4] PORTALS-2905: include changes effecting SWC by renaming
 to setShowPlots

---
 .../client/jsinterop/QueryWrapperPlotNavProps.java   |  4 ++--
 src/main/main.iml                                    | 11 +++++++++++
 src/test/test.iml                                    | 12 ++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 src/main/main.iml
 create mode 100644 src/test/test.iml

diff --git a/src/main/java/org/sagebionetworks/web/client/jsinterop/QueryWrapperPlotNavProps.java b/src/main/java/org/sagebionetworks/web/client/jsinterop/QueryWrapperPlotNavProps.java
index 48bb1362f8..9598af8151 100644
--- a/src/main/java/org/sagebionetworks/web/client/jsinterop/QueryWrapperPlotNavProps.java
+++ b/src/main/java/org/sagebionetworks/web/client/jsinterop/QueryWrapperPlotNavProps.java
@@ -53,7 +53,7 @@ public interface OnViewSharingSettingsHandler {
   SynapseTableProps tableConfiguration;
 
   @JsNullable
-  boolean defaultShowFacetVisualization;
+  boolean defaultShowPlots;
 
   boolean showLastUpdatedOn;
 
@@ -79,7 +79,7 @@ public static QueryWrapperPlotNavProps create(
     props.downloadCartPageUrl = "#!DownloadCart:0";
     props.showLastUpdatedOn = false;
     // SWC-6138 - hide charts by default
-    props.defaultShowFacetVisualization = false;
+    props.defaultShowPlots = false;
     return props;
   }
 }
diff --git a/src/main/main.iml b/src/main/main.iml
new file mode 100644
index 0000000000..e5b7b16de3
--- /dev/null
+++ b/src/main/main.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
diff --git a/src/test/test.iml b/src/test/test.iml
new file mode 100644
index 0000000000..255f1b0f48
--- /dev/null
+++ b/src/test/test.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="main" />
+  </component>
+</module>

From fcfc2fd1f6a1a021a853724a6bab318bd3d489f6 Mon Sep 17 00:00:00 2001
From: Jin Jun Oh <joh@w245.local>
Date: Thu, 8 Feb 2024 13:51:31 -0800
Subject: [PATCH 2/4] PORTALS-2905: remove .iml files

---
 src/main/main.iml | 11 -----------
 src/test/test.iml | 12 ------------
 2 files changed, 23 deletions(-)
 delete mode 100644 src/main/main.iml
 delete mode 100644 src/test/test.iml

diff --git a/src/main/main.iml b/src/main/main.iml
deleted file mode 100644
index e5b7b16de3..0000000000
--- a/src/main/main.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/src/test/test.iml b/src/test/test.iml
deleted file mode 100644
index 255f1b0f48..0000000000
--- a/src/test/test.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="main" />
-  </component>
-</module>

From 4a9f0f3d3ed75587544ddb42a9d5e86f5abfe71b Mon Sep 17 00:00:00 2001
From: Jin Jun Oh <joh@w245.local>
Date: Thu, 8 Feb 2024 13:53:57 -0800
Subject: [PATCH 3/4] PORTALS-2905: update .gitignore to exclude .iml files

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 98522c6d2f..0dfd929b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@ extras/
 /.sass-cache/
 .idea/*
 
+src/main/main.iml
+src/test/test.iml
+
 # We use a maven plugin to download node and required modules.
 # Since these are retrieved at build-time, no need to commit.
 node/*

From 238851c4ab53f24fc15f1c5e40f087903617ec14 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Mon, 12 Feb 2024 14:24:11 -0500
Subject: [PATCH 4/4] SWC-6689 - fix annotation styling for project pane

---
 .../annotation/AnnotationsRendererWidgetViewImpl.ui.xml      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/org/sagebionetworks/web/client/widget/entity/annotation/AnnotationsRendererWidgetViewImpl.ui.xml b/src/main/resources/org/sagebionetworks/web/client/widget/entity/annotation/AnnotationsRendererWidgetViewImpl.ui.xml
index ebab59f928..a7562b57b7 100644
--- a/src/main/resources/org/sagebionetworks/web/client/widget/entity/annotation/AnnotationsRendererWidgetViewImpl.ui.xml
+++ b/src/main/resources/org/sagebionetworks/web/client/widget/entity/annotation/AnnotationsRendererWidgetViewImpl.ui.xml
@@ -6,7 +6,10 @@
   xmlns:t="urn:import:org.sagebionetworks.web.client.view.bootstrap.table"
 >
   <g:HTMLPanel>
-    <t:Table ui:field="table" styleName="table table-striped table-condensed">
+    <t:Table
+      ui:field="table"
+      styleName="table table-striped table-condensed whiteBackground"
+    >
       <!-- <t:THead> <t:TableRow> <t:TableHeader> <b.html:Text>Key</b.html:Text> 
 				</t:TableHeader> <t:TableHeader> <b.html:Text>Value</b.html:Text> </t:TableHeader> 
 				</t:TableRow> </t:THead> -->