Skip to content

fix: cherry-pick history tab throws runtime error for multi-source Applications to release-4.18 #291

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

Merged
keithchong merged 1 commit into from
Sep 2, 2026
Merged

fix: cherry-pick history tab throws runtime error for multi-source Applications to release-4.18 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 52 additions & 48 deletions src/gitops/components/application/History/History.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ const HistoryList: React.FC<HistoryListProps> = ({ history, obj }) => {
);
};

const renderRepoUrl = (repoURL?: string) => {
if (!repoURL) {
return '-';
}
if (repoURL.startsWith('oci://')) {
return repoURL;
}
return <ExternalLink href={repoURL}>{repoUrl(repoURL)}</ExternalLink>;
};

const useRowsDV = (history: ApplicationHistory[], app: ApplicationKind): DataViewTr[] => {
const rows: DataViewTr[] = [];

Expand All @@ -121,61 +131,55 @@ const useRowsDV = (history: ApplicationHistory[], app: ApplicationKind): DataVie
? 'Automated'
: '' + (initBy.username ? initBy.username : '-');

const isOci = obj.source?.repoURL?.startsWith('oci://');
let revisionValue = <>-</>;
let revisionValue: React.ReactNode = '-';
if (obj.revision) {
const source = obj.source;
revisionValue = (
<>
<Revision
revision={obj.revision || ''}
repoURL={obj.source.repoURL || ''}
helm={obj.source.helm ? true : false}
revision={obj.revision}
repoURL={source?.repoURL || ''}
helm={Boolean(source?.helm)}
/>
{!isOci ? (
<span style={{ marginLeft: '5px' }}>
{'('}
<ExternalLink href={obj.source.repoURL}>{repoUrl(obj.source.repoURL)}</ExternalLink>
{')'}
</span>
) : (
<span style={{ marginLeft: '5px' }}>
{'('}
{obj.source.repoURL}
{')'}
</span>
)}
<span style={{ marginLeft: '5px' }}>
{'('}
{renderRepoUrl(source?.repoURL)}
{')'}
</span>
</>
);
} else if (obj.revisions?.length) {
const historySources = obj.sources?.length ? obj.sources : app.spec?.sources;
revisionValue = (
<>
{obj.revisions.map((revision, index) => {
const source = historySources?.[index];
return (
<React.Fragment key={`${obj.id ?? 'history'}-${index}-${revision}`}>
<Revision
revision={revision || ''}
repoURL={source?.repoURL || ''}
helm={Boolean(source?.helm && source?.chart)}
/>
<span style={{ marginLeft: '10px' }}>
{'('}
{renderRepoUrl(source?.repoURL)}
{')'}
</span>
<span
style={{
display: 'inline-block',
width: '100%',
borderBottom: '1px solid darkgray',
marginBottom: '2px',
}}
/>
<br />
</React.Fragment>
);
})}
</>
);
} else if (obj.revisions && app.spec.sources) {
const rv: React.ReactNode[] = [];
obj.revisions?.forEach((revision, index) => {
rv.push(
<>
<Revision
revision={revision || ''}
repoURL={app.spec.sources[index].repoURL || ''}
helm={app.spec.sources[index].helm && app.spec.sources[index].chart ? true : false}
/>
<span style={{ marginLeft: '10px' }}>{'('}</span>
<>
<ExternalLink href={app.spec.sources[index].repoURL}>
{repoUrl(app.spec.sources[index].repoURL)}
</ExternalLink>
{')'}
</>
<span
style={{
display: 'inline-block',
width: '100%',
borderBottom: '1px solid darkgray',
marginBottom: '2px',
}}
/>
<br />
</>,
);
});
revisionValue = <>{rv}</>;
}
rows.push([
{
Expand Down
3 changes: 2 additions & 1 deletion src/gitops/models/ApplicationModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ export type ApplicationHistory = {
deployedAt?: string;
revision?: string;
revisions?: string[];
source: ApplicationSource;
source?: ApplicationSource;
sources?: ApplicationSource[];
};

export type Resource = {
Expand Down
Loading