@edx/frontend-plugin-advertisements 1.9.0 → 1.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -10,18 +10,26 @@ var _auth = require("@edx/frontend-platform/auth");
|
|
|
10
10
|
async function fetchCourseId(courseRunId) {
|
|
11
11
|
const discoveryApiUrl = (0, _frontendPlatform.getConfig)().DISCOVERY_API_BASE_URL;
|
|
12
12
|
const courseRunsUrl = new URL(`${discoveryApiUrl}/api/v1/course_runs/${courseRunId}`);
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
try {
|
|
14
|
+
const {
|
|
15
|
+
data
|
|
16
|
+
} = await (0, _auth.getAuthenticatedHttpClient)().get(courseRunsUrl.href);
|
|
17
|
+
return data.course;
|
|
18
|
+
} catch (error) {
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
17
21
|
}
|
|
18
22
|
async function fetchOrg(courseRunId) {
|
|
19
23
|
const courseId = await fetchCourseId(courseRunId);
|
|
20
24
|
const discoveryApiUrl = (0, _frontendPlatform.getConfig)().DISCOVERY_API_BASE_URL;
|
|
21
25
|
const coursesUrl = new URL(`${discoveryApiUrl}/api/v1/courses/${courseId}`);
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
+
try {
|
|
27
|
+
const {
|
|
28
|
+
data
|
|
29
|
+
} = await (0, _auth.getAuthenticatedHttpClient)().get(coursesUrl.href);
|
|
30
|
+
return data.owners[0]; // only retrieve first org related to course
|
|
31
|
+
} catch (error) {
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
26
34
|
}
|
|
27
35
|
//# sourceMappingURL=discovery_api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discovery_api.js","names":["_frontendPlatform","require","_auth","fetchCourseId","courseRunId","discoveryApiUrl","getConfig","DISCOVERY_API_BASE_URL","courseRunsUrl","URL","data","getAuthenticatedHttpClient","get","href","course","fetchOrg","courseId","coursesUrl","owners"],"sources":["../../src/data/discovery_api.js"],"sourcesContent":["import { getConfig } from '@edx/frontend-platform';\nimport { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';\n\nexport async function fetchCourseId(courseRunId) {\n const discoveryApiUrl = getConfig().DISCOVERY_API_BASE_URL;\n const courseRunsUrl = new URL(`${discoveryApiUrl}/api/v1/course_runs/${courseRunId}`);\n const { data } = await getAuthenticatedHttpClient().get(courseRunsUrl.href);\n
|
|
1
|
+
{"version":3,"file":"discovery_api.js","names":["_frontendPlatform","require","_auth","fetchCourseId","courseRunId","discoveryApiUrl","getConfig","DISCOVERY_API_BASE_URL","courseRunsUrl","URL","data","getAuthenticatedHttpClient","get","href","course","error","fetchOrg","courseId","coursesUrl","owners"],"sources":["../../src/data/discovery_api.js"],"sourcesContent":["import { getConfig } from '@edx/frontend-platform';\nimport { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';\n\nexport async function fetchCourseId(courseRunId) {\n const discoveryApiUrl = getConfig().DISCOVERY_API_BASE_URL;\n const courseRunsUrl = new URL(`${discoveryApiUrl}/api/v1/course_runs/${courseRunId}`);\n try {\n const { data } = await getAuthenticatedHttpClient().get(courseRunsUrl.href);\n return data.course;\n } catch (error) {\n return null;\n }\n}\n\nexport async function fetchOrg(courseRunId) {\n const courseId = await fetchCourseId(courseRunId);\n const discoveryApiUrl = getConfig().DISCOVERY_API_BASE_URL;\n const coursesUrl = new URL(`${discoveryApiUrl}/api/v1/courses/${courseId}`);\n try {\n const { data } = await getAuthenticatedHttpClient().get(coursesUrl.href);\n return data.owners[0]; // only retrieve first org related to course\n } catch (error) {\n return null;\n }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AAEO,eAAeE,aAAaA,CAACC,WAAW,EAAE;EAC/C,MAAMC,eAAe,GAAG,IAAAC,2BAAS,EAAC,CAAC,CAACC,sBAAsB;EAC1D,MAAMC,aAAa,GAAG,IAAIC,GAAG,CAAE,GAAEJ,eAAgB,uBAAsBD,WAAY,EAAC,CAAC;EACrF,IAAI;IACF,MAAM;MAAEM;IAAK,CAAC,GAAG,MAAM,IAAAC,gCAA0B,EAAC,CAAC,CAACC,GAAG,CAACJ,aAAa,CAACK,IAAI,CAAC;IAC3E,OAAOH,IAAI,CAACI,MAAM;EACpB,CAAC,CAAC,OAAOC,KAAK,EAAE;IACd,OAAO,IAAI;EACb;AACF;AAEO,eAAeC,QAAQA,CAACZ,WAAW,EAAE;EAC1C,MAAMa,QAAQ,GAAG,MAAMd,aAAa,CAACC,WAAW,CAAC;EACjD,MAAMC,eAAe,GAAG,IAAAC,2BAAS,EAAC,CAAC,CAACC,sBAAsB;EAC1D,MAAMW,UAAU,GAAG,IAAIT,GAAG,CAAE,GAAEJ,eAAgB,mBAAkBY,QAAS,EAAC,CAAC;EAC3E,IAAI;IACF,MAAM;MAAEP;IAAK,CAAC,GAAG,MAAM,IAAAC,gCAA0B,EAAC,CAAC,CAACC,GAAG,CAACM,UAAU,CAACL,IAAI,CAAC;IACxE,OAAOH,IAAI,CAACS,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;EACzB,CAAC,CAAC,OAAOJ,KAAK,EAAE;IACd,OAAO,IAAI;EACb;AACF","ignoreList":[]}
|
|
@@ -18,35 +18,44 @@ const PartnerBranding = _ref => {
|
|
|
18
18
|
} = _ref;
|
|
19
19
|
const [imageURL, setImageURL] = (0, _react.useState)('');
|
|
20
20
|
const [orgName, setOrgName] = (0, _react.useState)('');
|
|
21
|
+
const [loading, setLoading] = (0, _react.useState)(true);
|
|
21
22
|
(0, _react.useEffect)(() => {
|
|
22
23
|
async function fetchData() {
|
|
23
24
|
const orgData = await (0, _discovery_api.fetchOrg)(courseRunId);
|
|
24
|
-
setImageURL(orgData
|
|
25
|
-
setOrgName(orgData
|
|
25
|
+
setImageURL(orgData?.logo_image_url);
|
|
26
|
+
setOrgName(orgData?.name);
|
|
27
|
+
setLoading(false);
|
|
26
28
|
}
|
|
27
29
|
fetchData();
|
|
30
|
+
setLoading(true);
|
|
28
31
|
}, [courseRunId]);
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
32
|
+
if (loading) {
|
|
33
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
34
|
+
"data-testid": "img-skeleton",
|
|
35
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_paragon.Skeleton, {
|
|
36
|
+
width: 200,
|
|
37
|
+
height: 100,
|
|
38
|
+
style: {
|
|
39
|
+
marginTop: '20px',
|
|
40
|
+
marginLeft: '20px'
|
|
41
|
+
}
|
|
42
|
+
})
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
if (imageURL) {
|
|
46
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
|
|
47
|
+
src: imageURL,
|
|
48
|
+
alt: `${orgName} logo`,
|
|
49
|
+
className: "border-light-400 border",
|
|
44
50
|
style: {
|
|
51
|
+
width: '40%',
|
|
45
52
|
marginTop: '20px',
|
|
46
|
-
marginLeft: '20px'
|
|
53
|
+
marginLeft: '20px',
|
|
54
|
+
padding: '5px'
|
|
47
55
|
}
|
|
48
|
-
})
|
|
49
|
-
}
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
return null; // no image available
|
|
50
59
|
};
|
|
51
60
|
PartnerBranding.propTypes = {
|
|
52
61
|
courseRunId: _propTypes.default.string.isRequired
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PartnerBranding.js","names":["_react","_interopRequireWildcard","require","_propTypes","_interopRequireDefault","_paragon","_discovery_api","_jsxRuntime","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","PartnerBranding","_ref","courseRunId","imageURL","setImageURL","useState","orgName","setOrgName","useEffect","fetchData","orgData","fetchOrg","logo_image_url","name","jsx","
|
|
1
|
+
{"version":3,"file":"PartnerBranding.js","names":["_react","_interopRequireWildcard","require","_propTypes","_interopRequireDefault","_paragon","_discovery_api","_jsxRuntime","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","PartnerBranding","_ref","courseRunId","imageURL","setImageURL","useState","orgName","setOrgName","loading","setLoading","useEffect","fetchData","orgData","fetchOrg","logo_image_url","name","jsx","children","Skeleton","width","height","style","marginTop","marginLeft","src","alt","className","padding","propTypes","PropTypes","string","isRequired","_default","exports"],"sources":["../../../src/upgrade-notification/partner-branding/PartnerBranding.jsx"],"sourcesContent":["import React, { useEffect, useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { Skeleton } from '@openedx/paragon';\n\nimport { fetchOrg } from '../../data/discovery_api';\n\nconst PartnerBranding = ({ courseRunId }) => {\n const [imageURL, setImageURL] = useState('');\n const [orgName, setOrgName] = useState('');\n const [loading, setLoading] = useState(true);\n\n useEffect(() => {\n async function fetchData() {\n const orgData = await fetchOrg(courseRunId);\n setImageURL(orgData?.logo_image_url);\n setOrgName(orgData?.name);\n setLoading(false);\n }\n fetchData();\n setLoading(true);\n }, [courseRunId]);\n\n if (loading) {\n return (\n <div data-testid=\"img-skeleton\">\n <Skeleton\n width={200}\n height={100}\n style={{\n marginTop: '20px',\n marginLeft: '20px',\n }}\n />\n </div>\n );\n }\n if (imageURL) {\n return (\n <img\n src={imageURL}\n alt={`${orgName} logo`}\n className=\"border-light-400 border\"\n style={{\n width: '40%',\n marginTop: '20px',\n marginLeft: '20px',\n padding: '5px',\n }}\n />\n );\n }\n return null; // no image available\n};\n\nPartnerBranding.propTypes = {\n courseRunId: PropTypes.string.isRequired,\n};\n\nexport default PartnerBranding;\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@edx/frontend-plugin-advertisements",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.11.0",
|
|
4
4
|
"description": "Frontend plugin for edX in course advertisements",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"semantic-release": "^21.0.7"
|
|
55
55
|
},
|
|
56
56
|
"peerDependencies": {
|
|
57
|
-
"@edx/brand": "npm:@
|
|
57
|
+
"@edx/brand": "npm:@edx/brand-edx.org@^2.1.2",
|
|
58
58
|
"@edx/frontend-platform": "^7.1.2",
|
|
59
59
|
"@fortawesome/fontawesome-svg-core": "1.3.0",
|
|
60
60
|
"@fortawesome/free-brands-svg-icons": "5.15.4",
|