Skip to content

Commit

Permalink
Remove user announcement and tour message (on study page)
Browse files Browse the repository at this point in the history
  • Loading branch information
alisman committed Sep 6, 2019
1 parent cd62c6f commit 10772d8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 25 deletions.
24 changes: 11 additions & 13 deletions src/pages/studyView/StudyViewPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ import AppConfig from "appConfig";
import SocialAuthButton from "../../shared/components/SocialAuthButton";
import {ServerConfigHelpers} from "../../config/config";
import { getStudyViewTabId } from './StudyViewUtils';
import InfoBeacon from "shared/components/infoBeacon/InfoBeacon";
import {WrappedTour} from "shared/components/wrappedTour/WrappedTour";

export interface IStudyViewPageProps {
routing: any;
Expand Down Expand Up @@ -163,17 +161,17 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
get groupsButton() {
return (
<>
<If condition={!isWebdriver()}>
<InfoBeacon
top={-15}
right={45}
interaction={'mouseover'}
color={'green'}
id={'groupComparison1'}
>
<WrappedTour/>
</InfoBeacon>
</If>
{/*<If condition={!isWebdriver()}>*/}
{/* <InfoBeacon*/}
{/* top={-15}*/}
{/* right={45}*/}
{/* interaction={'mouseover'}*/}
{/* color={'green'}*/}
{/* id={'groupComparison1'}*/}
{/* >*/}
{/* <WrappedTour/>*/}
{/* </InfoBeacon>*/}
{/*</If>*/}
<DefaultTooltip
visible={this.showGroupsTooltip}
trigger={["click"]}
Expand Down
19 changes: 7 additions & 12 deletions src/shared/components/userMessager/UserMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {isWebdriver} from "shared/lib/tracking";

export interface IUserMessage {
dateStart?:number;
title:string;
dateEnd:number;
content:string;
id:string;
Expand All @@ -22,23 +21,19 @@ function makeMessageKey(id:string){
return `portalMessageKey-${id}`;
}

const MESSAGE_DATA_TEST: IUserMessage[] = [
{
dateEnd:100000000000000,
content: `<strong>Announcing the new Group Comparison feature</strong>: Compare clinical and genomic features of user-defined groups of samples/patients. <a class='btn btn-primary' href="/tutorials#group-comparison" target="_blank">View Tutorial</a>`,
id:'3.0-intro',
title:'Announcing the Group Comparison feature of cBioPortal 3.0!'
}
const MESSAGE_DATA: IUserMessage[] = [
// {
// dateEnd:100000000000000,
// content: `<p>Some markup and message here</p>`,
// id:'some very unique ID here, e.g. 3.0-intro',
// }
];


@observer
export default class UserMessager extends React.Component<{ dataUrl?:string }, {}> {

messageData = remoteData<IUserMessage[]>(async ()=>{
//const data = await request(this.props.dataUrl);
return Promise.resolve(MESSAGE_DATA_TEST);

return Promise.resolve(MESSAGE_DATA);
});

@observable dismissed = false;
Expand Down

0 comments on commit 10772d8

Please sign in to comment.