diff --git a/mocks/Revisions/RevisionMocks.ts b/mocks/Revisions/RevisionMocks.ts index f973c925..d1237edd 100644 --- a/mocks/Revisions/RevisionMocks.ts +++ b/mocks/Revisions/RevisionMocks.ts @@ -9,7 +9,8 @@ export const mockRevisions: RevisionModel[] = [ date: testDate, commitMessage: "Added functionality to the website", commitHash: "ab65jg", - selected: false + selected: false, + updateNumber: 1 }, { author: "Pierce Hawthorne", @@ -17,13 +18,15 @@ export const mockRevisions: RevisionModel[] = [ commitMessage: "I want to see what happens when there is a much longer commit message than all of the rest", commitHash: "h4lso6", - selected: false + selected: false, + updateNumber: 2 }, { author: "Annie Edison", date: testDate, commitMessage: "Changed one of the pages", commitHash: "k5ls58", - selected: false + selected: false, + updateNumber: 3 } ]; diff --git a/src/ItemBank/ItemBankContainer.tsx b/src/ItemBank/ItemBankContainer.tsx index 9551c9a3..35d48796 100644 --- a/src/ItemBank/ItemBankContainer.tsx +++ b/src/ItemBank/ItemBankContainer.tsx @@ -131,7 +131,7 @@ export class ItemBankContainer extends React.Component< // Changes allowCalculator from "yes"/"no"/null to bool makeBool(item: AboutItemRevisionModel) { - if (item.AboutItemMetadata.allowCalculator === "Yes") { + if (item.AboutItemMetadata.allowCalculator.toLowerCase() === "yes") { return true; } @@ -146,6 +146,7 @@ export class ItemBankContainer extends React.Component< const prom = this.props.revisionsClient(item); const promiseWrapper = this.subscription.add("revisionsClient", prom); const revisions = await promiseWrapper.promise; + revisions[revisions.length - 1].selected = true; this.onFetchRevisionsSuccess(revisions); return revisions; diff --git a/src/Revisions/Revision.tsx b/src/Revisions/Revision.tsx index 68e6e775..80737a2e 100644 --- a/src/Revisions/Revision.tsx +++ b/src/Revisions/Revision.tsx @@ -12,6 +12,7 @@ export interface RevisionModel { commitMessage: string; commitHash: string; selected: boolean; + updateNumber: number; } export interface RevisionModelProps extends RevisionModel { @@ -23,13 +24,15 @@ export const Revision: React.SFC = props => { const renderHelpText = () => { return (
+ Update {props.updateNumber} +
Commit: {props.commitMessage}
Author: {props.author}
- CommitHash: + CommitHash: {props.commitHash.slice(0, 8)}
); @@ -56,7 +59,7 @@ export const Revision: React.SFC = props => { } onClick={props.onClick} > - {shortCommit(props.commitHash)} + Update {props.updateNumber}
{props.author}-{formatDate(getShortDateFormat(props.date))} diff --git a/src/Revisions/RevisionContainer.tsx b/src/Revisions/RevisionContainer.tsx index dfa8fc51..cfbe56b4 100644 --- a/src/Revisions/RevisionContainer.tsx +++ b/src/Revisions/RevisionContainer.tsx @@ -15,12 +15,13 @@ export class RevisionContainer extends React.Component< } render() { - const revisions = this.props.revisions.map(rev => ( + const revisions = this.props.revisions.map((rev, index) => ( this.props.onRevisionSelect(rev.commitHash)} key={rev.commitHash} + updateNumber={index + 1} /> ));