Merge branch 'main' into feature/add-better-column-control

AllenInstitute · Nov 19, 2024 · 24479b9 · 24479b9
2 parents a7e46d8 + e610a11
commit 24479b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/core/hooks/useOpenWithMenuItems/index.tsx b/packages/core/hooks/useOpenWithMenuItems/index.tsx
@@ -53,7 +53,6 @@ const APPS = (fileDetails?: FileDetail): Apps => ({
             return (
                 <>
                     {defaultRenders.renderItemName(props)}
-                    <span className={styles.secondaryText}>Desktop |</span>
                     <a
                         className={styles.viewLink}
                         href="https://www.allencell.org/pathtrace-rendering.html"
@@ -68,6 +67,7 @@ const APPS = (fileDetails?: FileDetail): Apps => ({
                             <Icon iconName="OpenInNewWindow" />
                         </DefaultButton>
                     </a>
+                    <span className={styles.secondaryText}>| Desktop</span>
                 </>
             );
         },
@@ -138,10 +138,11 @@ const APPS = (fileDetails?: FileDetail): Apps => ({
     } as IContextualMenuItem,
 });
 
-function getPrioritySupportedApps(fileDetails?: FileDetail): IContextualMenuItem[] {
+function getSupportedApps(fileDetails?: FileDetail): IContextualMenuItem[] {
     if (!fileDetails) {
         return [];
     }
+
     const isLikelyLocalFile =
         !fileDetails.path.startsWith("http") && !fileDetails.path.startsWith("s3");
 
@@ -242,7 +243,7 @@ export default (fileDetails?: FileDetail, filters?: FileFilter[]): IContextualMe
         })
         .sort((a, b) => (a.text || "").localeCompare(b.text || ""));
 
-    const supportedApps = [...getPrioritySupportedApps(fileDetails), ...userApps];
+    const supportedApps = [...getSupportedApps(fileDetails), ...userApps];
     // Grab every other known app
     const unsupportedApps = Object.values(APPS(fileDetails))
         .filter((app) => supportedApps.every((item) => item.key !== app.key))

diff --git a/packages/core/hooks/useOpenWithMenuItems/useOpenWithMenuItems.module.css b/packages/core/hooks/useOpenWithMenuItems/useOpenWithMenuItems.module.css
@@ -30,7 +30,6 @@
     color: var(--white);
     font-size: 12px !important;
     opacity: 0.5;
-    padding-left: 10px;
 }
 
 .desktop-menu-item .info-button > span {
@@ -53,3 +52,7 @@
 .desktop-menu-item a {
     padding-left: 0;
 }
+
+.view-link {
+    padding-left: 24px !important;
+}