From dd67020e7421e8d523bb063049d207368a4e40bd Mon Sep 17 00:00:00 2001
From: Maximiliano Osorio <maxiosorio@gmail.com>
Date: Mon, 20 May 2024 15:47:15 -0400
Subject: [PATCH] fix: improve headers (#37)

---
 .../Apps/AppDetail/_Layout/Layout.tsx         |  8 +-------
 src/tapis-app/Apps/_Layout/Layout.tsx         |  2 +-
 .../components/apps/AppDetail/AppDetail.tsx   |  4 ++++
 .../apps/AppListing/CookbookListing.tsx       | 17 ++++++++++++++++-
 .../apps/AppNotesEdit/AppNotesEdit.tsx        | 19 +++----------------
 src/utils/resloveBasePath.ts                  |  2 +-
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/tapis-app/Apps/AppDetail/_Layout/Layout.tsx b/src/tapis-app/Apps/AppDetail/_Layout/Layout.tsx
index 2dc1f49..abc749d 100644
--- a/src/tapis-app/Apps/AppDetail/_Layout/Layout.tsx
+++ b/src/tapis-app/Apps/AppDetail/_Layout/Layout.tsx
@@ -8,19 +8,13 @@ const Layout: React.FC<{ appId: string; appVersion: string }> = ({
   appId,
   appVersion,
 }) => {
-  const header = (
-    <LayoutHeader type={'sub-header'}>
-      {appId} - {appVersion}
-    </LayoutHeader>
-  );
-
   const body = (
     <div style={{ flex: 1 }}>
       <AppDetail appId={appId} appVersion={appVersion} />
     </div>
   );
 
-  return <PageLayout top={header} right={body} />;
+  return <PageLayout right={body} />;
 };
 
 export default React.memo(Layout);
diff --git a/src/tapis-app/Apps/_Layout/Layout.tsx b/src/tapis-app/Apps/_Layout/Layout.tsx
index cbcf378..04197c8 100644
--- a/src/tapis-app/Apps/_Layout/Layout.tsx
+++ b/src/tapis-app/Apps/_Layout/Layout.tsx
@@ -30,7 +30,7 @@ const Layout: React.FC = () => {
 
   return (
     <AppsProvider>
-      <PageLayout top={header} right={body} />;
+      <PageLayout top={header} right={body} />
     </AppsProvider>
   );
 };
diff --git a/src/tapis-ui/components/apps/AppDetail/AppDetail.tsx b/src/tapis-ui/components/apps/AppDetail/AppDetail.tsx
index 9c4b489..8784886 100644
--- a/src/tapis-ui/components/apps/AppDetail/AppDetail.tsx
+++ b/src/tapis-ui/components/apps/AppDetail/AppDetail.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { QueryWrapper } from 'tapis-ui/_wrappers';
 import { useDetail as useAppDetail } from 'tapis-hooks/apps';
 import Markdown from 'react-markdown';
+import { LayoutHeader } from 'tapis-ui/_common';
 
 type AppDetailProps = {
   appId: string;
@@ -21,6 +22,9 @@ const AppDetail: React.FC<AppDetailProps> = ({ appId, appVersion }) => {
   const notes = app?.notes as AppDetailNotes;
   return (
     <QueryWrapper isLoading={isLoading} error={error}>
+      <LayoutHeader type={'sub-header'}>
+        {notes && notes.label ? notes.label : appId} - {appVersion}
+      </LayoutHeader>
       {notes && notes.helpTextMarkdown ? (
         <Viewer text={notes.helpTextMarkdown} />
       ) : (
diff --git a/src/tapis-ui/components/apps/AppListing/CookbookListing.tsx b/src/tapis-ui/components/apps/AppListing/CookbookListing.tsx
index 055aa36..395f4eb 100644
--- a/src/tapis-ui/components/apps/AppListing/CookbookListing.tsx
+++ b/src/tapis-ui/components/apps/AppListing/CookbookListing.tsx
@@ -13,6 +13,7 @@ import { faSquare } from '@fortawesome/free-regular-svg-icons';
 import styles from './CookbookListing.module.scss';
 import { formatDateTimeFromValue } from 'utils/timeFormat';
 import { Link } from 'react-router-dom';
+import { useTapisConfig } from 'tapis-hooks';
 
 export type OnSelectCallback = (apps: Array<Apps.TapisApp>) => any;
 export type OnNavigateCallback = (app: Apps.TapisApp) => any;
@@ -244,7 +245,21 @@ const AppListing: React.FC<AppListingProps> = ({
 }) => {
   const { isLoading, error, data } = useList();
 
-  const apps: Array<Apps.TapisApp> = data?.result ?? [];
+  const { claims } = useTapisConfig();
+  const username = claims['tapis/username'];
+
+  // sort the apps by the owner
+  const apps = data?.result
+    ? data?.result.sort((a, b) => {
+        if (a.owner === username) {
+          return -1;
+        }
+        if (b.owner === username) {
+          return 1;
+        }
+        return 0;
+      })
+    : [];
 
   const selectedAppDict: SelectAppDictType = React.useMemo(() => {
     const result: SelectAppDictType = {};
diff --git a/src/tapis-ui/components/apps/AppNotesEdit/AppNotesEdit.tsx b/src/tapis-ui/components/apps/AppNotesEdit/AppNotesEdit.tsx
index 0507f3a..f88f0db 100644
--- a/src/tapis-ui/components/apps/AppNotesEdit/AppNotesEdit.tsx
+++ b/src/tapis-ui/components/apps/AppNotesEdit/AppNotesEdit.tsx
@@ -28,19 +28,6 @@ async function convertMarkdownToHtml(doc: string) {
   return String(file);
 }
 
-type AppDetailNotes = {
-  icon: string;
-  label: string;
-  helpUrl: string;
-  category: string;
-  helpText: string;
-  helpTextHtml: string;
-  helpTextMarkdown: string;
-  queueFilter: string[];
-  isInteractive: boolean;
-  hideNodeCountAndCoresPerNode: boolean;
-};
-
 type AppEditorProps = {
   app: Apps.TapisApp;
 };
@@ -51,7 +38,7 @@ const AppEditor = ({ app }: AppEditorProps) => {
   const { submit, isLoading, error, isSuccess, reset } = usePatch();
   const notes = app.notes as AppDetailNotes;
 
-  const initText = notes.helpTextMarkdown;
+  const initText = notes.helpTextMarkdown || notes.helpText;
   const [text, setText] = React.useState(initText);
 
   const editorTab = (
@@ -96,8 +83,8 @@ const AppEditor = ({ app }: AppEditorProps) => {
               icon="save"
               disabled={!hasPermissions}
               onClick={async () => {
-                const helpText = await convertMarkdownToHtml(text);
-                const helpTextHtml = helpText;
+                const helpTextHtml = await convertMarkdownToHtml(text);
+                const helpText = helpTextHtml;
                 const helpTextMarkdown = text;
                 submit({
                   appId: app.id as string,
diff --git a/src/utils/resloveBasePath.ts b/src/utils/resloveBasePath.ts
index 093a9a3..5ce1d0b 100644
--- a/src/utils/resloveBasePath.ts
+++ b/src/utils/resloveBasePath.ts
@@ -5,7 +5,7 @@ export const resolveBasePath = () => {
   // .replace(/^https:\/\/ui\./, 'https://');
   // Direct request from local dev env to dev.develop
   if (/127\.0\.0\.1|localhost|0\.0\.0\.0/.test(baseUrl)) {
-    return 'https://tacc.tapis.io';
+    return 'https://portals.tapis.io';
   }
   return 'https://portals.tapis.io';
 };