Skip to content

Dev merge into Main#134

Merged
sammy-sandhu merged 49 commits intomainfrom
dev
Aug 19, 2025
Merged

Dev merge into Main#134
sammy-sandhu merged 49 commits intomainfrom
dev

Conversation

@sammy-sandhu
Copy link
Contributor

Latest code from the P1 master branch was merged into dev. Now merging dev into main for ADL github migration

schittlur and others added 30 commits July 28, 2023 13:17
made changes to show/hide courses button to match wireframe design
…ourses

Feature/course details derived courses
* adding env for backend connection test

* Removed .env

* adding backend secret to workflow for backend connection test

* adding backend secret to workflow for backend connection test

* adding backend secret to workflow for backend connection test

* environment variables actions testing

* environment variables actions testing

* Cleaning up workflow/Dockerfile

* Cleaning up workflow/Dockerfile
have derived courses link to that course page
schittlur and others added 18 commits April 17, 2024 10:51
updating actions workflow trigger on dev branch
* drop in new xapi code and tests alongside old

* feed course url to share btn

* instrument share button with shared learning resource

* remove xapi instrumentation from view button

* remove xapi instrumentation from course spotlight card

* remove xapi instrumentation from searchresult card

* instrument create saved search modal with saved search statement

* added new instrumentation to save list modal

* added new instrumentation to saved modal course page

* added explored instrumentation to course page

* expanded test for course page

* fix index test

* added search instrumentation to index page

* remove instrumentation from list page

* fix one test in search

* migrated search to new instrumentation

* rip out old instrumentation

* fix header test

* fixed default layout test

* fix final failing test why not

* refactor xAPi mock

* mock specific xapi events and migrate tests

* further refactor

* test expectation of saved

* add negative case too

* update test for index search
* Latest code sync with P1 master

* Adding dev branch for workflow PR run

---------

Co-authored-by: Simeranjeet Sandhu <simeransandhu@deloitte.com>
Copy link
Contributor

@ESC8504 ESC8504 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failed to compile.

./src/mocks/data/aggregations.data.js
3:1 Warning: Assign object to a variable before exporting as module default import/no-anonymous-default-export

./src/mocks/data/course.data.js
3:1 Warning: Assign object to a variable before exporting as module default import/no-anonymous-default-export

./src/mocks/data/search.data.js
5:1 Warning: Assign object to a variable before exporting as module default import/no-anonymous-default-export

./src/mocks/data/uiConfig.data.js
3:1 Warning: Assign object to a variable before exporting as module default import/no-anonymous-default-export

./src/mocks/data/userLists.data.js
3:1 Warning: Assign array to a variable before exporting as module default import/no-anonymous-default-export

./src/components/Header.js
78:49 Warning: Do not use . Use Image from 'next/image' instead. See https://nextjs.org/docs/messages/no-img-element. @next/next/no-img-element

./src/pages/index.js
74:43 Warning: Do not use . Use Image from 'next/image' instead. See https://nextjs.org/docs/messages/no-img-element. @next/next/no-img-element

./src/pages/login.js
94:13 Error: No duplicate props allowed react/jsx-no-duplicate-props
95:13 Error: No duplicate props allowed react/jsx-no-duplicate-props

./src/utils/xapi/xAPIMapper.js
31:1 Warning: Assign instance to a variable before exporting as module default import/no-anonymous-default-export

@sammy-sandhu sammy-sandhu merged commit 37aa2d9 into main Aug 19, 2025
4 checks passed
@sammy-sandhu sammy-sandhu deleted the dev branch August 19, 2025 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants