Skip to content

Commit

Permalink
Merge pull request #3773 from SailingSteve/steveWebAppNov8-232pm
Browse files Browse the repository at this point in the history 
Cordova: Fixed path handling for "Followers" link on OrganizationVoterGuide
  • Loading branch information
@DaleMcGrew
DaleMcGrew authored Nov 10, 2023
2 parents d62f538 + 4b27725 commit 9729628
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 71 deletions.
143 changes: 73 additions & 70 deletions src/js/components/VoterGuide/VoterGuideFollowers.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import VoterStore from '../../stores/VoterStore';
import { renderLog } from '../../common/utils/logging';
import LoadingWheel from '../../common/components/Widgets/LoadingWheel';
import SearchBar from '../Search/SearchBar';
import { PageContentContainer } from '../Style/pageLayoutStyles';
import GuideList from './GuideList';

const DelayedLoad = React.lazy(() => import(/* webpackChunkName: 'DelayedLoad' */ '../../common/components/Widgets/DelayedLoad'));
Expand Down Expand Up @@ -156,78 +157,80 @@ class VoterGuideFollowers extends Component {
}

return (
<Wrapper>
{/* Since VoterGuidePositions, VoterGuideFollowing, and VoterGuideFollowers are in tabs the title seems to use the Helmet values from the last tab */}
<Helmet title={`${organizationName} - We Vote`} />
<div className="card">
<ul className="card-child__list-group">
{((voterGuideFollowersList && voterGuideFollowersList.length > 0) ||
(voterGuideFollowersListFilteredBySearch && voterGuideFollowersListFilteredBySearch.length > 0)) ? (
<TitleWrapper>
{lookingAtSelf ? (
<>
Your Followers
</>
) : (
<>
Followers of
{' '}
{organizationName}
</>
)}
</TitleWrapper>
) : (
<Suspense fallback={<></>}>
<DelayedLoad showLoadingText waitBeforeShow={2000}>
<TitleWrapper>
{lookingAtSelf ? (
<>
No followers can be found.
</>
) : (
<>
No followers of
{' '}
{organizationName}
{' '}
can be found.
</>
)}
</TitleWrapper>
</DelayedLoad>
</Suspense>
<PageContentContainer>
<Wrapper>
{/* Since VoterGuidePositions, VoterGuideFollowing, and VoterGuideFollowers are in tabs the title seems to use the Helmet values from the last tab */}
<Helmet title={`${organizationName} - We Vote`} />
<div className="card">
<ul className="card-child__list-group">
{((voterGuideFollowersList && voterGuideFollowersList.length > 0) ||
(voterGuideFollowersListFilteredBySearch && voterGuideFollowersListFilteredBySearch.length > 0)) ? (
<TitleWrapper>
{lookingAtSelf ? (
<>
Your Followers
</>
) : (
<>
Followers of
{' '}
{organizationName}
</>
)}
</TitleWrapper>
) : (
<Suspense fallback={<></>}>
<DelayedLoad showLoadingText waitBeforeShow={2000}>
<TitleWrapper>
{lookingAtSelf ? (
<>
No followers can be found.
</>
) : (
<>
No followers of
{' '}
{organizationName}
{' '}
can be found.
</>
)}
</TitleWrapper>
</DelayedLoad>
</Suspense>
)}
{/* ********** */}
{/* Search Box */}
{voterGuideFollowersList && voterGuideFollowersList.length > 0 && (
<SearchInputWrapper>
<SearchBar
clearButton
clearFunction={this.clearSearchBarFunction}
placeholder="Search these followers"
searchButton
searchFunction={this.searchFollowers}
searchUpdateDelayTime={200}
/>
</SearchInputWrapper>
)}
{/* ********** */}
{/* Search Box */}
{voterGuideFollowersList && voterGuideFollowersList.length > 0 && (
<SearchInputWrapper>
<SearchBar
clearButton
clearFunction={this.clearSearchBarFunction}
placeholder="Search these followers"
searchButton
searchFunction={this.searchFollowers}
searchUpdateDelayTime={200}
{/* ***************** */}
{/* Results Not Found */}
{(searchTerm && (voterGuideFollowersListFilteredBySearch && voterGuideFollowersListFilteredBySearch.length === 0)) && (
<SearchResultsWrapper>
&quot;
{searchTerm}
&quot; not found
</SearchResultsWrapper>
)}
<span>
<GuideList
incomingVoterGuideList={searchTerm ? voterGuideFollowersListFilteredBySearch : voterGuideFollowersList}
/>
</SearchInputWrapper>
)}
{/* ***************** */}
{/* Results Not Found */}
{(searchTerm && (voterGuideFollowersListFilteredBySearch && voterGuideFollowersListFilteredBySearch.length === 0)) && (
<SearchResultsWrapper>
&quot;
{searchTerm}
&quot; not found
</SearchResultsWrapper>
)}
<span>
<GuideList
incomingVoterGuideList={searchTerm ? voterGuideFollowersListFilteredBySearch : voterGuideFollowersList}
/>
</span>
</ul>
</div>
</Wrapper>
</span>
</ul>
</div>
</Wrapper>
</PageContentContainer>
);
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/js/pages/VoterGuide/OrganizationVoterGuide.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ export default class OrganizationVoterGuide extends Component {

goToVoterGuideDetailsPage (destinationTab) {
const { pathname: editLink, href: editLinkCordova } = window.location;
const editPathCordova = editLinkCordova.replace(/file:\/\/.*?Vote.app\/www\/index.html#\//, '');
const editPathCordova = editLinkCordova.replace(/file:\/\/.*?Vote.app\/www\/index.html#\//, '')
.replace(/app.*?index.html#/, '');
historyPush(`${isWebApp() ? editLink : editPathCordova}/m/${destinationTab}`);
}

Expand Down

0 comments on commit 9729628

Please sign in to comment.