GitHub top bar to reflect folder name like GDrive

Author: sumomomomomo

src/commons/controlBar/ControlBarGoogleDriveButtons.tsx

@@ -17,7 +17,7 @@ type Props = {
   isFolderModeEnabled: boolean;
   loggedInAs?: string;
   accessToken?: string;
-  currentObject?: PersistenceFile;
+  currPersistenceFile?: PersistenceFile;
   isDirty?: boolean;
   onClickOpen?: () => any;
   onClickSave?: () => any;
@@ -30,14 +30,14 @@ type Props = {
 
 export const ControlBarGoogleDriveButtons: React.FC<Props> = props => {
   const { isMobileBreakpoint } = useResponsive();
-  const state: PersistenceState = props.currentObject
+  const state: PersistenceState = props.currPersistenceFile
     ? props.isDirty
       ? 'DIRTY'
       : 'SAVED'
     : 'INACTIVE';
   const mainButton = (
     <ControlButton
-      label={(props.currentObject && props.currentObject.name) || 'Google Drive'}
+      label={(props.currPersistenceFile && props.currPersistenceFile.name) || 'Google Drive'}
       icon={IconNames.CLOUD}
       options={{ intent: stateToIntent[state] }}
       //isDisabled={props.isFolderModeEnabled}

src/commons/controlBar/github/ControlBarGitHubButtons.tsx

@@ -7,9 +7,11 @@ import { useResponsive } from 'src/commons/utils/Hooks';
 
 import { GitHubSaveInfo } from '../../../features/github/GitHubTypes';
 import ControlButton from '../../ControlButton';
+import { PersistenceFile } from 'src/features/persistence/PersistenceTypes';
 
 type Props = {
   isFolderModeEnabled: boolean;
+  currPersistenceFile?: PersistenceFile;
   loggedInAs?: Octokit;
   githubSaveInfo: GitHubSaveInfo;
   isDirty: boolean;
@@ -31,14 +33,13 @@ export const ControlBarGitHubButtons: React.FC<Props> = props => {
   const { isMobileBreakpoint } = useResponsive();
 
   const filePath = props.githubSaveInfo.filePath || '';
-  const fileName = (filePath.split('\\').pop() || '').split('/').pop() || '';
 
   const isLoggedIn = props.loggedInAs !== undefined;
   const shouldDisableButtons = !isLoggedIn;
   const hasFilePath = filePath !== '';
   const hasOpenFile = isLoggedIn && hasFilePath;
 
-  const mainButtonDisplayText = hasOpenFile ? fileName : 'GitHub';
+  const mainButtonDisplayText = (props.currPersistenceFile && props.currPersistenceFile.name) || 'GitHub';
   let mainButtonIntent: Intent = Intent.NONE;
   if (hasOpenFile) {
     mainButtonIntent = props.isDirty ? Intent.WARNING : Intent.PRIMARY;

src/pages/playground/Playground.tsx

@@ -603,7 +603,7 @@ const Playground: React.FC<PlaygroundProps> = props => {
     return (
       <ControlBarGoogleDriveButtons
         isFolderModeEnabled={isFolderModeEnabled}
-        currentObject={persistenceFile}
+        currPersistenceFile={persistenceFile}
         loggedInAs={persistenceUser}
         isDirty={persistenceIsDirty}
         accessToken={googleAccessToken}
@@ -637,6 +637,7 @@ const Playground: React.FC<PlaygroundProps> = props => {
       <ControlBarGitHubButtons
         key="github"
         isFolderModeEnabled={isFolderModeEnabled}
+        currPersistenceFile={persistenceFile}
         loggedInAs={githubOctokitObject.octokit}
         githubSaveInfo={githubSaveInfo}
         isDirty={githubPersistenceIsDirty}