Skip to content
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.

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

chore: update catalog-info owner #5

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b6823f4
chore: update catalog-info owner
jristau1984 Mar 12, 2024
5b7dcba
Merge pull request #660 from openedx/catalog-info-updates
jristau1984 Mar 15, 2024
cb4c1b7
chore(deps): update dependency react-router-dom to v6.22.3
renovate[bot] Mar 18, 2024
5fc8a6f
fix(deps): update dependency react-intl to v6.6.2
renovate[bot] Mar 18, 2024
97e273e
build: start releasing alpha packages
arbrandes Mar 20, 2024
04bd5bd
chore(deps): update dependency @openedx/frontend-build to v13.0.29
renovate[bot] Mar 25, 2024
dc6d8b9
chore(deps): update dependency core-js to v3.36.1
renovate[bot] Mar 25, 2024
de09872
fix(deps): update dependency react-intl to v6.6.3
renovate[bot] Mar 25, 2024
d05c294
fix(deps): update dependency react-intl to v6.6.5
renovate[bot] Apr 22, 2024
464fd63
chore(deps): update dependency @openedx/frontend-build to v13.1.4
renovate[bot] Apr 22, 2024
6d965c2
chore(deps): update dependency @openedx/paragon to v22.2.2
renovate[bot] Apr 22, 2024
ccb86f2
chore(deps): update dependency core-js to v3.37.0
renovate[bot] Apr 22, 2024
3d9e0b1
build(deps): bump follow-redirects from 1.15.3 to 1.15.6 (#674)
dependabot[bot] Apr 22, 2024
f5934aa
build(deps-dev): bump webpack-dev-middleware from 5.3.3 to 5.3.4 (#676)
dependabot[bot] Apr 22, 2024
19991c9
build(deps-dev): bump express from 4.18.2 to 4.19.2 (#677)
dependabot[bot] Apr 22, 2024
76fe63b
build(deps): bump axios from 0.27.2 to 0.28.0 (#675)
dependabot[bot] Apr 22, 2024
f066ecb
feat: updated jest to v29 & frontend-build major version upgrade (#661)
BilalQamar95 Apr 22, 2024
a05966a
feat: added shepherd js instance
PKulkoRaccoonGang Nov 18, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- master
- alpha

jobs:
release:
Expand Down
5 changes: 4 additions & 1 deletion .releaserc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"branch": "master",
"branches": [
"master",
{name: "alpha", prerelease: true}
],
"tagFormat": "v${version}",
"verifyConditions": [
{
Expand Down
2 changes: 1 addition & 1 deletion catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ metadata:
annotations:
openedx.org/arch-interest-groups: "jmbowman"
spec:
owner: group:fed-bom
owner:
type: 'library'
lifecycle: 'production'
21,284 changes: 8,270 additions & 13,014 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,21 @@
"devDependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/browserslist-config": "1.2.0",
"@openedx/frontend-build": "13.0.28",
"@openedx/paragon": "22.1.1",
"@openedx/frontend-build": "14.0.3",
"@openedx/paragon": "22.2.2",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "^8.0.1",
"axios-mock-adapter": "^1.21.3",
"core-js": "3.36.0",
"core-js": "3.37.0",
"husky": "8.0.3",
"jsdoc": "^4.0.0",
"nodemon": "3.1.0",
"prop-types": "15.8.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-redux": "^8.1.1",
"shepherd.js": "^14.1.0",
"react-router-dom": "^6.6.1",
"redux": "4.2.1",
"regenerator-runtime": "0.14.1"
Expand All @@ -57,7 +58,7 @@
"@cospired/i18n-iso-languages": "4.2.0",
"@formatjs/intl-pluralrules": "4.3.3",
"@formatjs/intl-relativetimeformat": "10.0.1",
"axios": "0.27.2",
"axios": "0.28.0",
"axios-cache-interceptor": "0.10.7",
"form-urlencoded": "4.1.4",
"glob": "7.2.3",
Expand All @@ -71,11 +72,11 @@
"lodash.merge": "4.6.2",
"lodash.snakecase": "4.1.1",
"pubsub-js": "1.9.4",
"react-intl": "6.5.5",
"react-intl": "6.6.5",
"universal-cookie": "4.0.4"
},
"peerDependencies": {
"@openedx/frontend-build": ">= 13.0.15",
"@openedx/frontend-build": ">= 14.0.0",
"@openedx/paragon": ">= 21.5.7 < 23.0.0",
"prop-types": "^15.7.2",
"react": "^16.9.0 || ^17.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/initialize.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ import {
import {
configure as configureAnalytics, SegmentAnalyticsService, identifyAnonymousUser, identifyAuthenticatedUser,
} from './analytics';
import { GoogleAnalyticsLoader } from './scripts';
import { GoogleAnalyticsLoader, ShepherdTour } from './scripts';
import {
getAuthenticatedHttpClient,
configure as configureAuth,
Expand Down Expand Up @@ -290,7 +290,7 @@ export async function initialize({
analyticsService = SegmentAnalyticsService,
authService = AxiosJwtAuthService,
authMiddleware = [],
externalScripts = [GoogleAnalyticsLoader],
externalScripts = [GoogleAnalyticsLoader, ShepherdTour],
requireAuthenticatedUser: requireUser = false,
hydrateAuthenticatedUser: hydrateUser = false,
messages,
Expand Down
44 changes: 44 additions & 0 deletions src/scripts/ShepherdTour.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import Shepherd from 'shepherd.js';
// eslint-disable-next-line import/no-extraneous-dependencies
import 'shepherd.js/dist/css/shepherd.css';

export default class ShepherdTour {
constructor({ config }) {
this.config = config;
this.tour = null;
}

loadScript() {
const currentUrl = window.location.href;
const pageConfig = this.config[currentUrl];

if (!pageConfig || !pageConfig.instruction || !pageConfig.instruction.length) {
return;
}

this.tour = new Shepherd.Tour({
defaultStepOptions: {
classes: 'shepherd-theme-default',
scrollTo: true,
},
});

pageConfig.instruction.forEach((step) => {
const processedButtons = step.buttons.map((button) => ({
text: button.text,
action() {
if (button.action && typeof this[button.action] === 'function') {
this[button.action]();
}
},
}));
this.tour.addStep({
...step,
buttons: processedButtons,
});
});

this.tour.start();
}
}
1 change: 1 addition & 0 deletions src/scripts/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/* eslint-disable import/prefer-default-export */
export { default as GoogleAnalyticsLoader } from './GoogleAnalyticsLoader';
export { default as ShepherdTour } from './ShepherdTour';
5 changes: 3 additions & 2 deletions src/utils.test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { waitFor } from '@testing-library/react';
import {
modifyObjectKeys,
camelCaseObject,
Expand Down Expand Up @@ -164,9 +165,9 @@ describe('ParseURL', () => {
});

it('should return empty object in case of document being undefined', () => {
delete global.document;
global.document = undefined;

expect(parseURL(testURL)).toEqual({});
waitFor(() => { expect(parseURL(testURL)).toEqual({}); });
});
});

Expand Down
Loading