Skip to content

More backend parsing of endpoint data #5587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
drewvolz wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

More backend parsing of endpoint data #5587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cccf0bb
v/sis/student-work: Remove inner text parsing for job row
drewvolz Nov 16, 2021
da82115
v/streaming: Remove innertext and html parsing for streams row
drewvolz Nov 16, 2021
f89d657
v/sis/student-work/detail.ios: Remove decode calls for detail view
drewvolz Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions source/views/sis/student-work/detail.ios.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import type {JobType} from './types'
import glamorous from 'glamorous-native'
import {ShareButton} from '@frogpond/navigation-buttons'
import {shareJob, createJobFullUrl} from './lib'
import {decode} from '@frogpond/html-lib'

const styles = StyleSheet.create({
lastUpdated: {
Expand Down Expand Up @@ -120,23 +119,23 @@ function JobInformation({job}: {job: JobType}) {
function Description({job}: {job: JobType}) {
return job.description ? (
<Section header="DESCRIPTION">
<SelectableCell text={decode(job.description)} />
<SelectableCell text={job.description} />
</Section>
) : null
}

function Skills({job}: {job: JobType}) {
return job.skills ? (
<Section header="SKILLS">
<SelectableCell text={decode(job.skills)} />
<SelectableCell text={job.skills} />
</Section>
) : null
}

function Comments({job}: {job: JobType}) {
return job.comments ? (
<Section header="COMMENTS">
<SelectableCell text={decode(job.comments)} />
<SelectableCell text={job.comments} />
</Section>
) : null
}
Expand All @@ -152,7 +151,7 @@ function FirstYearAppropriate({job}: {job: JobType}) {
function Timeline({job}: {job: JobType}) {
return job.timeline ? (
<Section header="TIMELINE">
<SelectableCell text={decode(job.timeline)} />
<SelectableCell text={job.timeline} />
</Section>
) : null
}
Expand All @@ -171,7 +170,7 @@ function OpenWebpage({job}: {job: JobType}) {
function HowToApply({job}: {job: JobType}) {
return job.howToApply ? (
<Section header="HOW TO APPLY">
<SelectableCell text={decode(job.howToApply)} />
<SelectableCell text={job.howToApply} />
</Section>
) : null
}
Expand Down
12 changes: 4 additions & 8 deletions source/views/sis/student-work/job-row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as React from 'react'
import {Column, Row} from '@frogpond/layout'
import {ListRow, Detail, Title} from '@frogpond/lists'
import {fastGetTrimmedText} from '@frogpond/html-lib'
import type {JobType} from './types'

type Props = {
Expand All @@ -14,19 +13,16 @@ export class JobRow extends React.PureComponent<Props> {

render() {
let {job} = this.props
let title = fastGetTrimmedText(job.title)
let office = fastGetTrimmedText(job.office)
let hours = fastGetTrimmedText(job.hoursPerWeek)
let ending = hours === 'Full-time' ? '' : 'hrs/week'
let ending = job.hoursPerWeek === 'Full-time' ? '' : 'hrs/week'

return (
<ListRow arrowPosition="top" onPress={this._onPress}>
<Row alignItems="center">
<Column flex={1}>
<Title lines={1}>{title}</Title>
<Detail lines={1}>{office}</Detail>
<Title lines={1}>{job.title}</Title>
<Detail lines={1}>{job.office}</Detail>
<Detail lines={1}>
{hours} {ending}
{job.hoursPerWeek} {ending}
</Detail>
</Column>
</Row>
Expand Down
9 changes: 3 additions & 6 deletions source/views/streaming/streams/row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {StyleSheet, Image} from 'react-native'

import {ListRow, Detail, Title} from '@frogpond/lists'
import {Column, Row} from '@frogpond/layout'
import {innerTextWithSpaces, parseHtml} from '@frogpond/html-lib'
import {trackedOpenUrl} from '@frogpond/open-url'
import moment from 'moment'
import type {StreamType} from './types'
Expand All @@ -17,15 +16,13 @@ const styles = StyleSheet.create({
})

function Name({item}: {item: StreamType}) {
let title = innerTextWithSpaces(parseHtml(item.title))
let {title} = item
return title ? <Title>{title}</Title> : null
}

function Info({item}: {item: StreamType}) {
let detail = innerTextWithSpaces(
parseHtml(item.subtitle || item.performer || ''),
)
return detail ? <Detail>{detail}</Detail> : null
let {subtitle} = item
return subtitle ? <Detail>{subtitle}</Detail> : null
}

function Time({item}: {item: StreamType}) {
Expand Down