Merge branch 'master' into feature-inspection-dialog-dismissal-AD-571

sk33wiff · sk33wiff · commit 5f3fdaac71aa · 2026-01-20T09:00:00.000+10:00
diff --git a/src/data/actions/learningResourceActions.js b/src/data/actions/learningResourceActions.js
@@ -124,7 +124,7 @@ export function loadCourseReadingListsSuggestions(keyword) {
                 }
 
                 const matchingCourseCodeFirst = a => {
-                    if (!!keyword && a?.name?.toUpperCase().substring(0, keyword.length) === keyword.toUpperCase()) {
+                    if (!!keyword && a?.name?.toUpperCase().substring(0, keyword.length) === keyword?.toUpperCase()) {
                         return 1;
                     }
                     const firstFourCharacters = keyword?.toUpperCase().substring(0, 4);
diff --git a/src/data/mock/index.js b/src/data/mock/index.js
@@ -63,7 +63,7 @@ import dlor_series_view from './data/records/dlor/dlor_series_view';
 import dlor_series_view_nodescription from './data/records/dlor/dlor_series_view_nodescription';
 import { dlor_demographics_report } from './data/dlorDemographics';
 import { dlor_favourites_report } from './data/dlorFavourites';
-import  dlor_statistics  from './data/records/dlor/dlor_statistics';
+import dlor_statistics from './data/records/dlor/dlor_statistics';
 import { drupalArticles } from './data/drupalArticles';
 import {
     journalSearchFavourites,
@@ -1031,7 +1031,7 @@ mock.onGet('exams/course/FREN1010/summary')
                 ...examSearch_DENT80,
                 papers: [
                     ...examSearch_DENT80.papers.filter(course =>
-                        course.some(s => s.some(p => p.courseCode.toLowerCase() === 'dent1050')),
+                        course.some(s => s.some(p => p?.courseCode?.toUpperCase() === 'DENT1050')),
                     ),
                 ],
             },
diff --git a/src/helpers/general.js b/src/helpers/general.js
@@ -264,3 +264,12 @@ export const StyledTertiaryButton = styled(Button)(({ theme }) => ({
         display: 'none',
     },
 }));
+
+// gets the File Type of a url eg PDF, as uppercase
+export const standardisedExtension = url => {
+    if (!url || !(typeof url === 'string' || url instanceof String)) {
+        return '';
+    }
+    const dotPosition = url?.lastIndexOf('.');
+    return dotPosition > -1 ? url.substring(dotPosition + 1).toUpperCase() : '';
+};
diff --git a/src/helpers/general.test.js b/src/helpers/general.test.js
@@ -7,6 +7,7 @@ import {
     stripHtml,
     unescapeString,
     standardText,
+    standardisedExtension,
 } from './general';
 
 describe('general helpers', () => {
@@ -106,4 +107,14 @@ describe('general helpers', () => {
             lineHeight: '1.6',
         });
     });
+
+    it('extracts extension', () => {
+        expect(standardisedExtension('http://example.com/something.jpg')).toEqual('JPG');
+        expect(standardisedExtension('.jpg')).toEqual('JPG'); // first char
+        expect(standardisedExtension('http://example.com/something.')).toEqual(''); // last char
+        expect(standardisedExtension('no_dot_at_all')).toEqual(''); // not a url
+        expect(standardisedExtension(null)).toEqual(''); // invalid url
+        expect(standardisedExtension(1)).toEqual(''); // invalid url
+        expect(standardisedExtension(false)).toEqual(''); // invalid url
+    });
 });
diff --git a/src/modules/HomePage/publicComponents/UtilityBar/Locations.js b/src/modules/HomePage/publicComponents/UtilityBar/Locations.js
@@ -287,10 +287,11 @@ export const ariaLabelForLocation = location => {
         locationType = 'operating hours today';
     }
 
+    const libraryNameTemp = String(libraryName);
+    const firstChar = libraryNameTemp?.charAt(0);
+    const otherChar = libraryNameTemp?.slice(1);
     const capitaliseLibraryName =
-        String(libraryName)
-            .charAt(0)
-            .toUpperCase() + String(libraryName).slice(1);
+        libraryNameTemp.length > 0 ? firstChar.toUpperCase() + otherChar : /* istanbul ignore next */ '';
     let response = `${capitaliseLibraryName} ${locationType} is open ${openingHours}.`;
 
     const busynessLabels = {
diff --git a/src/modules/Pages/Admin/Alerts/List/AlertSplitButton.js b/src/modules/Pages/Admin/Alerts/List/AlertSplitButton.js
@@ -63,8 +63,8 @@ export const AlertSplitButton = ({
                     <ButtonGroup variant="contained" color="primary" ref={anchorRef} aria-label="split button">
                         <StyledPrimaryButton
                             children={mainButtonLabel}
-                            data-testid={`alert-list-item-${mainButtonLabel.toLowerCase()}-${alertId}`}
-                            id={`alert-list-item-${mainButtonLabel.toLowerCase()}-${alertId}`}
+                            data-testid={`alert-list-item-${mainButtonLabel?.toLowerCase()}-${alertId}`}
+                            id={`alert-list-item-${mainButtonLabel?.toLowerCase()}-${alertId}`}
                             onClick={() =>
                                 mainButtonLabel === 'Edit' ? navigateToEditForm(alertId) : navigateToView(alertId)
                             }
diff --git a/src/modules/Pages/Admin/Alerts/List/AlertsListAsTable.js b/src/modules/Pages/Admin/Alerts/List/AlertsListAsTable.js
@@ -139,7 +139,7 @@ export const AlertsListAsTable = ({
         setPage(0);
     };
 
-    const tableType = headertag.replace(' alerts', '').toLowerCase();
+    const tableType = headertag?.replace(' alerts', '').toLowerCase();
 
     const headerCountIndicator = '[N] alert[s]'.replace('[N]', rows.length).replace('[s]', rows.length > 1 ? 's' : '');
 
diff --git a/src/modules/Pages/Admin/TestTag/SharedComponents/AssetTypeSelector/AssetTypeSelector.js b/src/modules/Pages/Admin/TestTag/SharedComponents/AssetTypeSelector/AssetTypeSelector.js
@@ -112,7 +112,7 @@ const AssetTypeSelector = ({
                     const filtered = filterOptions(options, params);
                     canAddNew &&
                         filtered.push({
-                            asset_type_name: locale.addNewLabel.toUpperCase(),
+                            asset_type_name: locale?.addNewLabel?.toUpperCase(),
                             asset_type_id: ADD_NEW_ID,
                         });
 
diff --git a/src/modules/Pages/Admin/TestTag/SharedComponents/TestTagHeader/TestTagHeader.js b/src/modules/Pages/Admin/TestTag/SharedComponents/TestTagHeader/TestTagHeader.js
@@ -64,7 +64,7 @@ const TestTagHeader = (
                         Dashboard
                     </Link>
                     {breadcrumbs.map((breadcrumb, index) => {
-                        const normalisedTitle = breadcrumb.title.replace(/ /g, '-').toLowerCase();
+                        const normalisedTitle = breadcrumb?.title?.replace(/ /g, '-').toLowerCase();
                         return breadcrumb.link ? (
                             <Link
                                 color="inherit"
diff --git a/src/modules/Pages/Admin/TestTag/helpers/helpers.js b/src/modules/Pages/Admin/TestTag/helpers/helpers.js
@@ -1,5 +1,5 @@
 export const capitaliseLeadingChar = text =>
-    text.toLowerCase().replace(/(^\w{1})|(\s+\w{1})/g, match => match.toUpperCase());
+    text?.toLowerCase().replace(/(^\w{1})|(\s+\w{1})/g, match => match?.toUpperCase());
 
 export const isEmptyStr = str =>
     str === null || str === undefined || (typeof str === 'string' && !!!str.trim()) || typeof str !== 'string';
diff --git a/src/modules/Pages/LearningResources/panels/PastExamPapers.js b/src/modules/Pages/LearningResources/panels/PastExamPapers.js
@@ -12,7 +12,7 @@ import Typography from '@mui/material/Typography';
 import QuestionMarkIcon from '@mui/icons-material/QuestionMark';
 
 import { styled } from '@mui/material/styles';
-import { linkToDrupal } from 'helpers/general';
+import { standardisedExtension, linkToDrupal } from 'helpers/general';
 
 const StyledItem = styled(Grid)(() => ({
     borderTop: '1px solid #e8e8e8',
@@ -45,26 +45,22 @@ const StyledBodyText = styled(Typography)(() => ({
 export const PastExamPapers = ({ examList, examListLoading, examListError, headingLevel }) => {
     const subject = !!examList && examList.coursecode;
 
-    const _extractExtension = url => {
-        return url.substring(url.lastIndexOf('.') + 1).toUpperCase();
-    };
-
     const listOfExams = !!examList && !!examList.list && examList.list.length > 0 ? examList.list : false;
 
     const numberExcessExams =
         !!examList && !!examList.remainingCount && examList.remainingCount > 0 ? examList.remainingCount : 0;
 
     const examTotalCount = listOfExams.length + numberExcessExams;
 
-    const examAriaLabel = paper => `past exam paper for ${paper.period} format ${_extractExtension(paper.url)}`;
+    const examAriaLabel = paper => `past exam paper for ${paper.period} format ${standardisedExtension(paper.url)}`;
 
     const itemCountLabel = _pluralise('item', examTotalCount);
     const examPaperTitle = `Past exam papers ${
         !examListError && !examListLoading && examTotalCount > 0 ? `(${examTotalCount} ${itemCountLabel})` : ''
     }`;
 
     const showLinkToPaper = (paper, index) => {
-        const sampleIndicator = paper.paperType.toLowerCase().includes('sample') ? '(Sample)' : '';
+        const sampleIndicator = paper?.paperType?.toLowerCase().includes('sample') ? '(Sample)' : '';
         return (
             <a
                 aria-label={examAriaLabel(paper)}
@@ -75,7 +71,7 @@ export const PastExamPapers = ({ examList, examListLoading, examListError, headi
                 key={`exam-${index}`}
             >
                 <span>
-                    {paper.period} ({_extractExtension(paper.url)}) {sampleIndicator}
+                    {paper.period} ({standardisedExtension(paper.url)}) {sampleIndicator}
                 </span>
             </a>
         );
diff --git a/src/modules/Pages/LearningResources/panels/ReadingLists.js b/src/modules/Pages/LearningResources/panels/ReadingLists.js
@@ -44,9 +44,8 @@ const StyledBodyText = styled(Typography)(() => ({
     lineHeight: 1.6,
 }));
 const ReadingLists = ({ courseCode, headingLevel, readingList, readingListLoading, readingListError }) => {
-    const talisSubjectUrl = courseCode => {
-        return 'https://uq.rl.talis.com/courses/[coursecode].html'.replace('[coursecode]', courseCode.toLowerCase());
-    };
+    const talisUrlPattern = 'https://uq.rl.talis.com/courses/[coursecode].html';
+    const talisSubjectUrl = courseCode => talisUrlPattern.replace('[coursecode]', courseCode?.toLowerCase());
 
     const listOfReadingLists =
         !!readingList && !!readingList.reading_lists && readingList.reading_lists.length > 0
diff --git a/src/modules/Pages/PastExamPaperList/PastExamPaperList.js b/src/modules/Pages/PastExamPaperList/PastExamPaperList.js
@@ -81,7 +81,7 @@ export const PastExamPaperList = ({ actions, examSearchListError, examSearchList
         !!examSearchList && !!examSearchList.minYear && !!examSearchList.maxYear && !!courseHint
             ? `Past Exam Papers from ${examSearchList.minYear} to ${
                   examSearchList.maxYear
-              } for "${courseHint.toUpperCase()}"`
+              } for "${courseHint?.toUpperCase()}"`
             : /* istanbul ignore next */ 'Past Exam Papers by Subject';
 
     useTitle(`${listTitle} - Library - The University of Queensland`);
@@ -98,6 +98,7 @@ export const PastExamPaperList = ({ actions, examSearchListError, examSearchList
         if (result.papers && Array.isArray(result.papers)) {
             result.papers = result.papers
                 .map(courseGroup => {
+                    const isSampleExamPaper = exam => exam?.examType?.toUpperCase() === 'SAMPLE';
                     return courseGroup.filter(examGroup => {
                         // children are always arrays atm, but provide for the alternative
                         /* istanbul ignore else */
@@ -107,17 +108,15 @@ export const PastExamPaperList = ({ actions, examSearchListError, examSearchList
                                 return false;
                             }
 
-                            const hasSample = examGroup.some(
-                                exam => exam.examType && exam.examType.toUpperCase() === 'SAMPLE',
-                            );
+                            const hasSample = examGroup.some(exam => isSampleExamPaper(exam));
                             return displayType === 'sample' ? hasSample : !hasSample;
                         } else {
                             const hasFile = examGroup.paperUrl && examGroup.paperUrl.trim().length > 0;
                             if (!hasFile) {
                                 return false;
                             }
 
-                            const hasSample = examGroup.examType && examGroup.examType.toUpperCase() === 'SAMPLE';
+                            const hasSample = examGroup.some(exam => isSampleExamPaper(exam));
                             return displayType === 'sample' ? hasSample : !hasSample;
                         }
                     });
diff --git a/src/modules/Pages/PastExamPaperSearch/PastExamPaperSearch.js b/src/modules/Pages/PastExamPaperSearch/PastExamPaperSearch.js
@@ -118,11 +118,14 @@ export const PastExamPaperSearch = ({
         [actions, searchTerm],
     );
 
+    const getFirstNCharactersUppercase = (string, numChars) => string?.toUpperCase().substring(0, numChars);
+
     const addKeywordAsOption = (options, params) => {
-        const filtered = filter(options, params);
+        const truncatedSearchTerm = getFirstNCharactersUppercase(params?.inputValue, MAX_LENGTH_COURSE_CODE);
+        const subjectPrefix = options.length > 0 ? options[0].name?.toUpperCase() : /* istanbul ignore next */ '';
 
-        const truncatedSearchTerm = params.inputValue.toUpperCase().substring(0, MAX_LENGTH_COURSE_CODE);
-        if (filtered.length > 0 && params.inputValue !== '' && options[0].name.toUpperCase() !== truncatedSearchTerm) {
+        const filtered = filter(options, params);
+        if (filtered.length > 0 && params.inputValue !== '' && subjectPrefix !== truncatedSearchTerm) {
             filtered.unshift({
                 name: truncatedSearchTerm,
                 course_title: `View all exam papers for ${truncatedSearchTerm}`,
@@ -132,7 +135,7 @@ export const PastExamPaperSearch = ({
     };
 
     const gotoSearchResultPage = (event, value) => {
-        const searchUrl = `/exams/course/${value.name.toUpperCase()}`;
+        const searchUrl = `/exams/course/${value?.name?.toUpperCase()}`;
         navigate(searchUrl);
     };
 
diff --git a/src/modules/Pages/PastExamPaperSearch/pastExamPapers.helpers.js b/src/modules/Pages/PastExamPaperSearch/pastExamPapers.helpers.js
@@ -37,6 +37,7 @@ export const UserInstructions = () => {
 export const noResultsFoundBlock = searchTerm => {
     const capitalisedSearchTerm =
         !!searchTerm && searchTerm.trim().length > 0 ? ` "${searchTerm.trim().toUpperCase()}"` : '';
+    // if a search term is supplied, display it, but if there isn't one make the message reasonable
     return (
         <div>
             <StyledBodyText>We have not found any past exams for this course{capitalisedSearchTerm}.</StyledBodyText>
diff --git a/src/modules/SharedComponents/Toolbox/StandardCard/components/StandardCard.js b/src/modules/SharedComponents/Toolbox/StandardCard/components/StandardCard.js
@@ -106,7 +106,7 @@ export class StandardCard extends Component {
             : `standard-card${
                   typeof title === 'string'
                       ? `-${title
-                            .replace(/ /g, '-')
+                            ?.replace(/ /g, '-')
                             .replace(/"/g, "'")
                             .toLowerCase()}`
                       : /* istanbul ignore next */ ''

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ export function loadCourseReadingListsSuggestions(keyword) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`const matchingCourseCodeFirst = a => {`
`127`		`- if (!!keyword && a?.name?.toUpperCase().substring(0, keyword.length) === keyword.toUpperCase()) {`
	`127`	`+ if (!!keyword && a?.name?.toUpperCase().substring(0, keyword.length) === keyword?.toUpperCase()) {`
`128`	`128`	`return 1;`
`129`	`129`	`}`
`130`	`130`	`const firstFourCharacters = keyword?.toUpperCase().substring(0, 4);`