Compare commits
97 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2494ad2b57 | ||
|
|
3b2a2bfa95 | ||
|
|
30b91791e3 | ||
|
|
08592aeec7 | ||
|
|
c1d143ace2 | ||
|
|
54a879aec2 | ||
|
|
b5b37f1d64 | ||
|
|
36be99ace0 | ||
|
|
222bc19bd0 | ||
|
|
3d827e64ea | ||
|
|
8a247abd6a | ||
|
|
a6943fbaeb | ||
|
|
19292cd5b6 | ||
|
|
b6374a5c05 | ||
|
|
f6a4036b49 | ||
|
|
12a845ad33 | ||
|
|
a4a7456726 | ||
|
|
6fdf73fed3 | ||
|
|
32b8079744 | ||
|
|
b9f7fe74c8 | ||
|
|
5a259a76df | ||
|
|
d2ad5ee2a4 | ||
|
|
67fefe814b | ||
|
|
9a5b1fa5e7 | ||
|
|
55f21aeeaa | ||
|
|
fc24e61a1c | ||
|
|
bace8286fd | ||
|
|
665653e9a5 | ||
|
|
0cc2282c44 | ||
|
|
455ffd345c | ||
|
|
dde02a0739 | ||
|
|
81cb72f10b | ||
|
|
e285a91408 | ||
|
|
50142adb85 | ||
|
|
7281804fbd | ||
|
|
b446534992 | ||
|
|
3adc305aec | ||
|
|
65446ce9c3 | ||
|
|
f3637b5624 | ||
|
|
3c1d2152aa | ||
|
|
48b22ea41e | ||
|
|
ed76e40862 | ||
|
|
d5b07cc38f | ||
|
|
b9509bb890 | ||
|
|
c87a1049c8 | ||
|
|
e0c22e781d | ||
|
|
f1605d1f27 | ||
|
|
5d7826c26c | ||
|
|
5d075b0cdc | ||
|
|
1a86685f11 | ||
|
|
e31597509c | ||
|
|
c79c137fd6 | ||
|
|
76f735ed39 | ||
|
|
2298791aeb | ||
|
|
9f48ccc66b | ||
|
|
398479d2e7 | ||
|
|
3d6d815373 | ||
|
|
287bf50a46 | ||
|
|
677e872320 | ||
|
|
d8ecfd6fa3 | ||
|
|
9a6074868b | ||
|
|
077ecf38a4 | ||
|
|
7d6aa276ec | ||
|
|
115e69fad3 | ||
|
|
3e04f76c81 | ||
|
|
83eeb88eab | ||
|
|
a05570ed37 | ||
|
|
058a846978 | ||
|
|
04cd95824e | ||
|
|
678b95f60d | ||
|
|
599f513624 | ||
|
|
e8ce471f6f | ||
|
|
4e727748af | ||
|
|
79c5bbff68 | ||
|
|
a95b600a00 | ||
|
|
464e952a1e | ||
|
|
018ca18a4e | ||
|
|
4b89e7561f | ||
|
|
da08e721c2 | ||
|
|
d037e96a0c | ||
|
|
050dd30d8f | ||
|
|
3dd41030d3 | ||
|
|
27228f093d | ||
|
|
83f3241e26 | ||
|
|
e153aefc13 | ||
|
|
936c8714b7 | ||
|
|
6b18f28933 | ||
|
|
0ce451cfd2 | ||
|
|
42e831a693 | ||
|
|
9af7eaf587 | ||
|
|
3fbbde1044 | ||
|
|
c3f0282be4 | ||
|
|
ceb9c13542 | ||
|
|
7229bff3ff | ||
|
|
0695d4f400 | ||
|
|
de8783c708 | ||
|
|
0e6a272f2b |
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@@ -11,13 +11,13 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Setup Nodejs Env
|
- name: Setup Nodejs Env
|
||||||
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
|
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
|
||||||
- name: Setup Nodejs
|
- name: Setup Nodejs
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: ${{ env.NODE_VER }}
|
node-version: ${{ env.NODE_VER }}
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
|||||||
2
.github/workflows/lockfileversion-check.yml
vendored
2
.github/workflows/lockfileversion-check.yml
vendored
@@ -10,4 +10,4 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
version-check:
|
version-check:
|
||||||
uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
|
uses: openedx/.github/.github/workflows/lockfile-check.yml@master
|
||||||
|
|||||||
5
.github/workflows/release.yml
vendored
5
.github/workflows/release.yml
vendored
@@ -3,19 +3,20 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
- alpha
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
name: Release
|
name: Release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Setup Nodejs Env
|
- name: Setup Nodejs Env
|
||||||
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
|
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
|
||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: ${{ env.NODE_VER }}
|
node-version: ${{ env.NODE_VER }}
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
{
|
{
|
||||||
"branch": "master",
|
"branches": [
|
||||||
|
"master",
|
||||||
|
{name: "alpha", prerelease: true}
|
||||||
|
],
|
||||||
"tagFormat": "v${version}",
|
"tagFormat": "v${version}",
|
||||||
"verifyConditions": [
|
"verifyConditions": [
|
||||||
"@semantic-release/npm",
|
"@semantic-release/npm",
|
||||||
|
|||||||
4
Makefile
4
Makefile
@@ -6,7 +6,7 @@ i18n = ./src/i18n
|
|||||||
transifex_input = $(i18n)/transifex_input.json
|
transifex_input = $(i18n)/transifex_input.json
|
||||||
|
|
||||||
# This directory must match .babelrc .
|
# This directory must match .babelrc .
|
||||||
transifex_temp = ./temp/babel-plugin-react-intl
|
transifex_temp = ./temp/babel-plugin-formatjs
|
||||||
|
|
||||||
build:
|
build:
|
||||||
rm -rf ./dist
|
rm -rf ./dist
|
||||||
@@ -17,7 +17,7 @@ build:
|
|||||||
@rm -rf dist/__mocks__
|
@rm -rf dist/__mocks__
|
||||||
|
|
||||||
requirements:
|
requirements:
|
||||||
npm install
|
npm ci
|
||||||
|
|
||||||
i18n.extract:
|
i18n.extract:
|
||||||
# Pulling display strings from .jsx files into .json files...
|
# Pulling display strings from .jsx files into .json files...
|
||||||
|
|||||||
120
README.rst
120
README.rst
@@ -2,22 +2,42 @@
|
|||||||
frontend-component-header
|
frontend-component-header
|
||||||
#########################
|
#########################
|
||||||
|
|
||||||
|Build Status| |Codecov| |npm_version| |npm_downloads| |license| |semantic-release|
|
|license| |Build Status| |Codecov| |npm_version| |npm_downloads| |semantic-release|
|
||||||
|
|
||||||
********
|
********
|
||||||
Overview
|
Purpose
|
||||||
********
|
********
|
||||||
|
|
||||||
A generic header for Open edX micro-frontend applications.
|
A generic header for Open edX micro-frontend applications.
|
||||||
|
|
||||||
************
|
************
|
||||||
Requirements
|
Getting Started
|
||||||
************
|
************
|
||||||
|
|
||||||
|
Prerequisites
|
||||||
|
=============
|
||||||
|
|
||||||
|
The `devstack`_ is currently recommended as a development environment for your
|
||||||
|
new MFE. If you start it with ``make dev.up.lms`` that should give you
|
||||||
|
everything you need as a companion to this frontend.
|
||||||
|
|
||||||
|
Note that it is also possible to use `Tutor`_ to develop an MFE. You can refer
|
||||||
|
to the `relevant tutor-mfe documentation`_ to get started using it.
|
||||||
|
|
||||||
|
.. _Devstack: https://github.com/openedx/devstack
|
||||||
|
|
||||||
|
.. _Tutor: https://github.com/overhangio/tutor
|
||||||
|
|
||||||
|
.. _relevant tutor-mfe documentation: https://github.com/overhangio/tutor-mfe#mfe-development
|
||||||
|
|
||||||
|
Requirements
|
||||||
|
============
|
||||||
|
|
||||||
This component uses ``@edx/frontend-platform`` services such as i18n, analytics, configuration, and the ``AppContext`` React component, and expects that it has been loaded into a micro-frontend that has been properly initialized via ``@edx/frontend-platform``'s ``initialize`` function. `Please visit the frontend template application to see an example. <https://github.com/openedx/frontend-template-application/blob/master/src/index.jsx>`_
|
This component uses ``@edx/frontend-platform`` services such as i18n, analytics, configuration, and the ``AppContext`` React component, and expects that it has been loaded into a micro-frontend that has been properly initialized via ``@edx/frontend-platform``'s ``initialize`` function. `Please visit the frontend template application to see an example. <https://github.com/openedx/frontend-template-application/blob/master/src/index.jsx>`_
|
||||||
|
|
||||||
|
|
||||||
Environment Variables
|
Environment Variables
|
||||||
=====================
|
====================
|
||||||
|
|
||||||
* ``LMS_BASE_URL`` - The URL of the LMS of your Open edX instance.
|
* ``LMS_BASE_URL`` - The URL of the LMS of your Open edX instance.
|
||||||
* ``LOGOUT_URL`` - The URL of the API endpoint which performs a user logout.
|
* ``LOGOUT_URL`` - The URL of the API endpoint which performs a user logout.
|
||||||
@@ -32,9 +52,8 @@ Environment Variables
|
|||||||
menu items when truthy. This is intended to be used in micro-frontends like
|
menu items when truthy. This is intended to be used in micro-frontends like
|
||||||
frontend-app-authentication in which these menus are considered distractions from the user's task.
|
frontend-app-authentication in which these menus are considered distractions from the user's task.
|
||||||
|
|
||||||
************
|
|
||||||
Installation
|
Installation
|
||||||
************
|
============
|
||||||
|
|
||||||
To install this header into your Open edX micro-frontend, run the following command in your MFE:
|
To install this header into your Open edX micro-frontend, run the following command in your MFE:
|
||||||
|
|
||||||
@@ -42,9 +61,33 @@ To install this header into your Open edX micro-frontend, run the following comm
|
|||||||
|
|
||||||
This will make the component available to be imported into your application.
|
This will make the component available to be imported into your application.
|
||||||
|
|
||||||
*****
|
Cloning and Startup
|
||||||
|
===================
|
||||||
|
|
||||||
|
.. code-block::
|
||||||
|
|
||||||
|
|
||||||
|
1. Clone your new repo:
|
||||||
|
|
||||||
|
``git clone https://github.com/openedx/frontend-component-header.git``
|
||||||
|
|
||||||
|
2. Use node v18.x.
|
||||||
|
|
||||||
|
The current version of the micro-frontend build scripts support node 18.
|
||||||
|
Using other major versions of node *may* work, but this is unsupported. For
|
||||||
|
convenience, this repository includes an .nvmrc file to help in setting the
|
||||||
|
correct node version via `nvm <https://github.com/nvm-sh/nvm>`_.
|
||||||
|
|
||||||
|
3. Install npm dependencies:
|
||||||
|
|
||||||
|
``cd frontend-component-header && npm ci``
|
||||||
|
|
||||||
|
4. Start the dev server:
|
||||||
|
|
||||||
|
``npm start``
|
||||||
|
|
||||||
Usage
|
Usage
|
||||||
*****
|
=====
|
||||||
|
|
||||||
This library has the following exports:
|
This library has the following exports:
|
||||||
|
|
||||||
@@ -58,10 +101,8 @@ Examples
|
|||||||
* `An example of component and messages usage. <https://github.com/openedx/frontend-template-application/blob/3355bb3a96232390e9056f35b06ffa8f105ed7ca/src/index.jsx#L21>`_
|
* `An example of component and messages usage. <https://github.com/openedx/frontend-template-application/blob/3355bb3a96232390e9056f35b06ffa8f105ed7ca/src/index.jsx#L21>`_
|
||||||
* `An example of SCSS file usage. <https://github.com/openedx/frontend-template-application/blob/3cd5485bf387b8c479baf6b02bf59e3061dc3465/src/index.scss#L8>`_
|
* `An example of SCSS file usage. <https://github.com/openedx/frontend-template-application/blob/3cd5485bf387b8c479baf6b02bf59e3061dc3465/src/index.scss#L8>`_
|
||||||
|
|
||||||
|
|
||||||
***********
|
|
||||||
Development
|
Development
|
||||||
***********
|
===========
|
||||||
|
|
||||||
Install dependencies::
|
Install dependencies::
|
||||||
|
|
||||||
@@ -75,6 +116,63 @@ Build a production distribution::
|
|||||||
|
|
||||||
npm run build
|
npm run build
|
||||||
|
|
||||||
|
License
|
||||||
|
=======
|
||||||
|
|
||||||
|
The code in this repository is licensed under the AGPLv3 unless otherwise
|
||||||
|
noted.
|
||||||
|
|
||||||
|
Please see `LICENSE <LICENSE>`_ for details.
|
||||||
|
|
||||||
|
Contributing
|
||||||
|
============
|
||||||
|
|
||||||
|
Contributions are very welcome. Please read `How To Contribute`_ for details.
|
||||||
|
|
||||||
|
.. _How To Contribute: https://openedx.org/r/how-to-contribute
|
||||||
|
|
||||||
|
This project is currently accepting all types of contributions, bug fixes,
|
||||||
|
security fixes, maintenance work, or new features. However, please make sure
|
||||||
|
to have a discussion about your new feature idea with the maintainers prior to
|
||||||
|
beginning development to maximize the chances of your change being accepted.
|
||||||
|
You can start a conversation by creating a new issue on this repo summarizing
|
||||||
|
your idea.
|
||||||
|
|
||||||
|
Getting Help
|
||||||
|
===========
|
||||||
|
|
||||||
|
If you're having trouble, we have discussion forums at
|
||||||
|
https://discuss.openedx.org where you can connect with others in the community.
|
||||||
|
|
||||||
|
Our real-time conversations are on Slack. You can request a `Slack
|
||||||
|
invitation`_, then join our `community Slack workspace`_. Because this is a
|
||||||
|
frontend repository, the best place to discuss it would be in the `#wg-frontend
|
||||||
|
channel`_.
|
||||||
|
|
||||||
|
For anything non-trivial, the best path is to open an issue in this repository
|
||||||
|
with as many details about the issue you are facing as you can provide.
|
||||||
|
|
||||||
|
https://github.com/openedx/frontend-component-header/issues
|
||||||
|
|
||||||
|
For more information about these options, see the `Getting Help`_ page.
|
||||||
|
|
||||||
|
.. _Slack invitation: https://openedx.org/slack
|
||||||
|
.. _community Slack workspace: https://openedx.slack.com/
|
||||||
|
.. _#wg-frontend channel: https://openedx.slack.com/archives/C04BM6YC7A6
|
||||||
|
.. _Getting Help: https://openedx.org/community/connect
|
||||||
|
|
||||||
|
The Open edX Code of Conduct
|
||||||
|
============================
|
||||||
|
|
||||||
|
All community members are expected to follow the `Open edX Code of Conduct`_.
|
||||||
|
|
||||||
|
.. _Open edX Code of Conduct: https://openedx.org/code-of-conduct/
|
||||||
|
|
||||||
|
Reporting Security Issues
|
||||||
|
=========================
|
||||||
|
|
||||||
|
Please do not report security issues in public. Please email security@openedx.org.
|
||||||
|
|
||||||
.. |Build Status| image:: https://api.travis-ci.com/edx/frontend-component-header.svg?branch=master
|
.. |Build Status| image:: https://api.travis-ci.com/edx/frontend-component-header.svg?branch=master
|
||||||
:target: https://travis-ci.com/edx/frontend-component-header
|
:target: https://travis-ci.com/edx/frontend-component-header
|
||||||
.. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-component-header
|
.. |Codecov| image:: https://img.shields.io/codecov/c/github/edx/frontend-component-header
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
const { createConfig } = require('@edx/frontend-build');
|
const { createConfig } = require('@openedx/frontend-build');
|
||||||
|
|
||||||
module.exports = createConfig('babel-preserve-modules');
|
module.exports = createConfig('babel-preserve-modules');
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ import React from 'react';
|
|||||||
import ReactDOM from 'react-dom';
|
import ReactDOM from 'react-dom';
|
||||||
import { initialize, getConfig, subscribe, APP_READY } from '@edx/frontend-platform';
|
import { initialize, getConfig, subscribe, APP_READY } from '@edx/frontend-platform';
|
||||||
import { AppContext, AppProvider } from '@edx/frontend-platform/react';
|
import { AppContext, AppProvider } from '@edx/frontend-platform/react';
|
||||||
// import Header from '@edx/frontend-component-header';
|
import Header from '@edx/frontend-component-header';
|
||||||
import { LearningHeader as Header } from '@edx/frontend-component-header';
|
|
||||||
|
|
||||||
import './index.scss';
|
import './index.scss';
|
||||||
|
import StudioHeader from '../src/studio-header/StudioHeader';
|
||||||
|
|
||||||
subscribe(APP_READY, () => {
|
subscribe(APP_READY, () => {
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
@@ -33,7 +33,35 @@ subscribe(APP_READY, () => {
|
|||||||
}}>
|
}}>
|
||||||
<Header />
|
<Header />
|
||||||
</AppContext.Provider>
|
</AppContext.Provider>
|
||||||
<h5 className="mt-2">Logged in state</h5>
|
<h5 className="mt-2 mb-5">Logged in state</h5>
|
||||||
|
<AppContext.Provider value={{
|
||||||
|
authenticatedUser: {
|
||||||
|
userId: '123abc',
|
||||||
|
username: 'testuser',
|
||||||
|
roles: [],
|
||||||
|
administrator: false,
|
||||||
|
},
|
||||||
|
config: getConfig(),
|
||||||
|
}}>
|
||||||
|
<StudioHeader
|
||||||
|
number="run123"
|
||||||
|
org="testX"
|
||||||
|
title="Course Name"
|
||||||
|
isHiddenMainMenu={false}
|
||||||
|
mainMenuDropdowns={[
|
||||||
|
{
|
||||||
|
id: 'content-dropdown',
|
||||||
|
buttonTitle: 'Content',
|
||||||
|
items: [{
|
||||||
|
href: '#',
|
||||||
|
title: 'Outline',
|
||||||
|
}],
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
outlineLink="#"
|
||||||
|
/>
|
||||||
|
</AppContext.Provider>
|
||||||
|
<h5 className="mt-2">Logged in state for Studio header</h5>
|
||||||
</AppProvider>,
|
</AppProvider>,
|
||||||
document.getElementById('root'),
|
document.getElementById('root'),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
@import "@edx/brand/paragon/fonts";
|
@import "@edx/brand/paragon/fonts";
|
||||||
@import "@edx/brand/paragon/variables";
|
@import "@edx/brand/paragon/variables";
|
||||||
@import "@edx/paragon/scss/core/core";
|
@import "@openedx/paragon/scss/core/core";
|
||||||
@import "@edx/brand/paragon/overrides";
|
@import "@edx/brand/paragon/overrides";
|
||||||
|
|
||||||
@import "@edx/frontend-component-header/index";
|
@import "@edx/frontend-component-header/index";
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const { createConfig } = require('@edx/frontend-build');
|
const { createConfig } = require('@openedx/frontend-build');
|
||||||
|
|
||||||
module.exports = createConfig('jest', {
|
module.exports = createConfig('jest', {
|
||||||
setupFilesAfterEnv: [
|
setupFilesAfterEnv: [
|
||||||
|
|||||||
10956
package-lock.json
generated
10956
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
51
package.json
51
package.json
@@ -8,7 +8,7 @@
|
|||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "make build",
|
"build": "make build",
|
||||||
"i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
|
"i18n_extract": "fedx-scripts formatjs extract",
|
||||||
"lint": "fedx-scripts eslint --ext .js --ext .jsx .",
|
"lint": "fedx-scripts eslint --ext .js --ext .jsx .",
|
||||||
"snapshot": "fedx-scripts jest --updateSnapshot",
|
"snapshot": "fedx-scripts jest --updateSnapshot",
|
||||||
"start": "fedx-scripts webpack-dev-server --progress",
|
"start": "fedx-scripts webpack-dev-server --progress",
|
||||||
@@ -33,50 +33,43 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/openedx/frontend-component-header#readme",
|
"homepage": "https://github.com/openedx/frontend-component-header#readme",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@edx/brand": "npm:@edx/brand-openedx@1.2.0",
|
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
|
||||||
"@edx/browserslist-config": "^1.1.1",
|
"@edx/browserslist-config": "^1.1.1",
|
||||||
"@edx/frontend-build": "12.8.57",
|
"@edx/frontend-platform": "6.2.0",
|
||||||
"@edx/frontend-platform": "4.5.1",
|
|
||||||
"@edx/reactifex": "^2.1.1",
|
"@edx/reactifex": "^2.1.1",
|
||||||
"@testing-library/dom": "9.3.1",
|
"@openedx/frontend-build": "13.0.27",
|
||||||
"@testing-library/jest-dom": "5.16.5",
|
"@openedx/paragon": "22.0.0",
|
||||||
|
"@testing-library/dom": "9.3.4",
|
||||||
|
"@testing-library/jest-dom": "5.17.0",
|
||||||
"@testing-library/react": "10.4.9",
|
"@testing-library/react": "10.4.9",
|
||||||
"enzyme": "3.11.0",
|
|
||||||
"enzyme-adapter-react-16": "1.15.7",
|
|
||||||
"husky": "8.0.3",
|
"husky": "8.0.3",
|
||||||
"jest": "29.5.0",
|
"jest": "29.7.0",
|
||||||
"jest-chain": "1.1.6",
|
"jest-chain": "1.1.6",
|
||||||
"prop-types": "15.8.1",
|
"prop-types": "15.8.1",
|
||||||
"react": "16.14.0",
|
"react": "17.0.2",
|
||||||
"react-dom": "16.14.0",
|
"react-dom": "17.0.2",
|
||||||
"react-redux": "7.2.9",
|
"react-redux": "7.2.9",
|
||||||
"react-test-renderer": "16.14.0",
|
"react-router-dom": "6.21.3",
|
||||||
|
"react-test-renderer": "17.0.2",
|
||||||
"redux": "4.2.1",
|
"redux": "4.2.1",
|
||||||
"redux-saga": "1.2.3"
|
"redux-saga": "1.3.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@edx/paragon": "20.45.0",
|
"@fortawesome/fontawesome-svg-core": "6.5.1",
|
||||||
"@fortawesome/fontawesome-svg-core": "6.3.0",
|
"@fortawesome/free-brands-svg-icons": "6.5.1",
|
||||||
"@fortawesome/free-brands-svg-icons": "6.3.0",
|
"@fortawesome/free-regular-svg-icons": "6.5.1",
|
||||||
"@fortawesome/free-regular-svg-icons": "6.3.0",
|
"@fortawesome/free-solid-svg-icons": "6.5.1",
|
||||||
"@fortawesome/free-solid-svg-icons": "6.3.0",
|
|
||||||
"@fortawesome/react-fontawesome": "^0.2.0",
|
"@fortawesome/react-fontawesome": "^0.2.0",
|
||||||
"@reduxjs/toolkit": "1.9.5",
|
"axios-mock-adapter": "1.22.0",
|
||||||
"axios-mock-adapter": "1.21.5",
|
|
||||||
"babel-polyfill": "6.26.0",
|
"babel-polyfill": "6.26.0",
|
||||||
"classnames": "2.3.2",
|
|
||||||
"lodash": "4.17.21",
|
|
||||||
"react-redux": "7.2.9",
|
|
||||||
"react-responsive": "8.2.0",
|
"react-responsive": "8.2.0",
|
||||||
"react-router-dom": "5.3.4",
|
"react-transition-group": "4.4.5"
|
||||||
"react-transition-group": "4.4.5",
|
|
||||||
"rosie": "2.1.0",
|
|
||||||
"timeago.js": "4.0.2"
|
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@edx/frontend-platform": "^4.0.0",
|
"@edx/frontend-platform": "^7.0.0",
|
||||||
"prop-types": "^15.5.10",
|
"prop-types": "^15.5.10",
|
||||||
"react": "^16.9.0 || ^17.0.0",
|
"react": "^16.9.0 || ^17.0.0",
|
||||||
"react-dom": "^16.9.0 || ^17.0.0"
|
"react-dom": "^16.9.0 || ^17.0.0",
|
||||||
|
"@openedx/paragon": ">= 21.5.7 < 23.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
"automerge": true
|
"automerge": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"matchPackagePatterns": ["@edx"],
|
"matchPackagePatterns": ["@edx", "@openedx"],
|
||||||
"matchUpdateTypes": ["minor", "patch"],
|
"matchUpdateTypes": ["minor", "patch"],
|
||||||
"automerge": true
|
"automerge": true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,38 +2,24 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { IntlProvider } from '@edx/frontend-platform/i18n';
|
import { IntlProvider } from '@edx/frontend-platform/i18n';
|
||||||
import TestRenderer from 'react-test-renderer';
|
import TestRenderer from 'react-test-renderer';
|
||||||
import { AppContext, AppProvider } from '@edx/frontend-platform/react';
|
import { AppContext } from '@edx/frontend-platform/react';
|
||||||
import { Context as ResponsiveContext } from 'react-responsive';
|
import { Context as ResponsiveContext } from 'react-responsive';
|
||||||
import { initializeMockApp } from '@edx/frontend-platform';
|
|
||||||
import store from './store';
|
|
||||||
|
|
||||||
import Header from './index';
|
import Header from './index';
|
||||||
|
|
||||||
const HeaderComponent = ({ width, contextValue }) => (
|
const HeaderComponent = ({ width, contextValue }) => (
|
||||||
<ResponsiveContext.Provider value={width}>
|
<ResponsiveContext.Provider value={width}>
|
||||||
<IntlProvider locale="en" messages={{}}>
|
<IntlProvider locale="en" messages={{}}>
|
||||||
<AppProvider store={store}>
|
<AppContext.Provider
|
||||||
<AppContext.Provider
|
value={contextValue}
|
||||||
value={contextValue}
|
>
|
||||||
>
|
<Header />
|
||||||
<Header />
|
</AppContext.Provider>
|
||||||
</AppContext.Provider>
|
|
||||||
</AppProvider>
|
|
||||||
</IntlProvider>
|
</IntlProvider>
|
||||||
</ResponsiveContext.Provider>
|
</ResponsiveContext.Provider>
|
||||||
);
|
);
|
||||||
|
|
||||||
describe('<Header />', () => {
|
describe('<Header />', () => {
|
||||||
beforeEach(async () => {
|
|
||||||
initializeMockApp({
|
|
||||||
authenticatedUser: {
|
|
||||||
userId: '123abc',
|
|
||||||
username: 'testuser',
|
|
||||||
administrator: false,
|
|
||||||
roles: [],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
|
||||||
it('renders correctly for anonymous desktop', () => {
|
it('renders correctly for anonymous desktop', () => {
|
||||||
const contextValue = {
|
const contextValue = {
|
||||||
authenticatedUser: null,
|
authenticatedUser: null,
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ MenuTrigger.defaultProps = {
|
|||||||
tag: 'div',
|
tag: 'div',
|
||||||
className: null,
|
className: null,
|
||||||
};
|
};
|
||||||
const MenuTriggerType = <MenuTrigger />.type;
|
const MenuTriggerComp = <MenuTrigger />;
|
||||||
|
const MenuTriggerType = MenuTriggerComp.type;
|
||||||
|
|
||||||
const MenuContent = ({ tag, className, ...attributes }) => React.createElement(tag, {
|
const MenuContent = ({ tag, className, ...attributes }) => React.createElement(tag, {
|
||||||
className: ['menu-content', className].join(' '),
|
className: ['menu-content', className].join(' '),
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
import React, { useCallback } from 'react';
|
|
||||||
import { useDispatch } from 'react-redux';
|
|
||||||
import { useIntl } from '@edx/frontend-platform/i18n';
|
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import { Icon } from '@edx/paragon';
|
|
||||||
import { Link } from 'react-router-dom';
|
|
||||||
import * as timeago from 'timeago.js';
|
|
||||||
import { getIconByType } from './utils';
|
|
||||||
import { markNotificationsAsRead } from './data/thunks';
|
|
||||||
import messages from './messages';
|
|
||||||
import timeLocale from '../common/time-locale';
|
|
||||||
|
|
||||||
const NotificationRowItem = ({
|
|
||||||
id, type, contentUrl, content, courseName, createdAt, lastRead,
|
|
||||||
}) => {
|
|
||||||
timeago.register('time-locale', timeLocale);
|
|
||||||
const intl = useIntl();
|
|
||||||
const dispatch = useDispatch();
|
|
||||||
|
|
||||||
const handleMarkAsRead = useCallback(() => {
|
|
||||||
dispatch(markNotificationsAsRead(id));
|
|
||||||
}, [dispatch, id]);
|
|
||||||
|
|
||||||
const { icon: iconComponent, class: iconClass } = getIconByType(type);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Link
|
|
||||||
target="_blank"
|
|
||||||
className="d-flex mb-2 align-items-center text-decoration-none"
|
|
||||||
to={contentUrl}
|
|
||||||
onClick={handleMarkAsRead}
|
|
||||||
>
|
|
||||||
<Icon src={iconComponent} className={`${iconClass} mr-4 notification-icon`} />
|
|
||||||
<div className="d-flex w-100">
|
|
||||||
<div className="d-flex align-items-center w-100">
|
|
||||||
<div className="py-10px w-100 px-0 cursor-pointer">
|
|
||||||
<span
|
|
||||||
className="line-height-24 text-gray-700 mb-2 notification-item-content overflow-hidden content"
|
|
||||||
// eslint-disable-next-line react/no-danger
|
|
||||||
dangerouslySetInnerHTML={{ __html: content }}
|
|
||||||
/>
|
|
||||||
<div className="py-0 d-flex">
|
|
||||||
<span className="font-size-12 text-gray-500 line-height-20">
|
|
||||||
<span>{courseName}</span>
|
|
||||||
<span className="text-light-700 px-1.5">{intl.formatMessage(messages.fullStop)}</span>
|
|
||||||
<span>{timeago.format(createdAt, 'time-locale')}</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{!lastRead && (
|
|
||||||
<div className="d-flex py-1.5 px-1.5 ml-2 cursor-pointer">
|
|
||||||
<span className="bg-brand-500 rounded unread" />
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Link>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
NotificationRowItem.propTypes = {
|
|
||||||
id: PropTypes.string.isRequired,
|
|
||||||
type: PropTypes.string.isRequired,
|
|
||||||
contentUrl: PropTypes.string.isRequired,
|
|
||||||
content: PropTypes.node.isRequired,
|
|
||||||
courseName: PropTypes.string.isRequired,
|
|
||||||
createdAt: PropTypes.string.isRequired,
|
|
||||||
lastRead: PropTypes.string.isRequired,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default React.memo(NotificationRowItem);
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
import React, { useCallback, useMemo } from 'react';
|
|
||||||
import { Button } from '@edx/paragon';
|
|
||||||
import { useDispatch, useSelector } from 'react-redux';
|
|
||||||
import { useIntl } from '@edx/frontend-platform/i18n';
|
|
||||||
import isEmpty from 'lodash/isEmpty';
|
|
||||||
import messages from './messages';
|
|
||||||
import NotificationRowItem from './NotificationRowItem';
|
|
||||||
import { markAllNotificationsAsRead } from './data/thunks';
|
|
||||||
import { selectNotificationsByIds, selectPaginationData, selectSelectedAppName } from './data/selectors';
|
|
||||||
import { splitNotificationsByTime } from './utils';
|
|
||||||
import { updatePaginationRequest } from './data/slice';
|
|
||||||
|
|
||||||
const NotificationSections = () => {
|
|
||||||
const intl = useIntl();
|
|
||||||
const dispatch = useDispatch();
|
|
||||||
const selectedAppName = useSelector(selectSelectedAppName());
|
|
||||||
const notifications = useSelector(selectNotificationsByIds(selectedAppName));
|
|
||||||
const { currentPage, numPages } = useSelector(selectPaginationData());
|
|
||||||
const { today = [], earlier = [] } = useMemo(
|
|
||||||
() => splitNotificationsByTime(notifications),
|
|
||||||
[notifications],
|
|
||||||
);
|
|
||||||
|
|
||||||
const handleMarkAllAsRead = useCallback(() => {
|
|
||||||
dispatch(markAllNotificationsAsRead(selectedAppName));
|
|
||||||
}, [dispatch, selectedAppName]);
|
|
||||||
|
|
||||||
const updatePagination = useCallback(() => {
|
|
||||||
dispatch(updatePaginationRequest());
|
|
||||||
}, [dispatch]);
|
|
||||||
|
|
||||||
const renderNotificationSection = (section, items) => {
|
|
||||||
if (isEmpty(items)) { return null; }
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="pb-2">
|
|
||||||
<div className="d-flex justify-content-between align-items-center py-10px mb-2">
|
|
||||||
<span className="text-gray-500 line-height-10">
|
|
||||||
{section === 'today' && intl.formatMessage(messages.notificationTodayHeading)}
|
|
||||||
{section === 'earlier' && intl.formatMessage(messages.notificationEarlierHeading)}
|
|
||||||
</span>
|
|
||||||
{notifications?.length > 0 && (section === 'earlier' ? today.length === 0 : true) && (
|
|
||||||
<Button
|
|
||||||
variant="link"
|
|
||||||
className="text-info-500 font-size-14 line-height-10 text-decoration-none p-0 border-0"
|
|
||||||
onClick={handleMarkAllAsRead}
|
|
||||||
>
|
|
||||||
{intl.formatMessage(messages.notificationMarkAsRead)}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
{items.map((notification) => (
|
|
||||||
<NotificationRowItem
|
|
||||||
key={notification.id}
|
|
||||||
id={notification.id}
|
|
||||||
type={notification.type}
|
|
||||||
contentUrl={notification.contentUrl}
|
|
||||||
content={notification.content}
|
|
||||||
courseName={notification.courseName}
|
|
||||||
createdAt={notification.createdAt}
|
|
||||||
lastRead={notification.lastRead}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="mt-4 px-4">
|
|
||||||
{renderNotificationSection('today', today)}
|
|
||||||
{renderNotificationSection('earlier', earlier)}
|
|
||||||
{currentPage < numPages && (
|
|
||||||
<Button variant="primary" className="w-100 bg-primary-500" onClick={updatePagination}>
|
|
||||||
{intl.formatMessage(messages.loadMoreNotifications)}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default React.memo(NotificationSections);
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
/* eslint-disable react-hooks/exhaustive-deps */
|
|
||||||
import React, { useCallback, useEffect, useMemo } from 'react';
|
|
||||||
import { useDispatch, useSelector } from 'react-redux';
|
|
||||||
import { Tab, Tabs } from '@edx/paragon';
|
|
||||||
import NotificationSections from './NotificationSections';
|
|
||||||
import { fetchNotificationList, markNotificationsAsSeen } from './data/thunks';
|
|
||||||
import {
|
|
||||||
selectNotificationTabs, selectNotificationTabsCount, selectPaginationData, selectSelectedAppName,
|
|
||||||
} from './data/selectors';
|
|
||||||
import { updateAppNameRequest } from './data/slice';
|
|
||||||
|
|
||||||
const NotificationTabs = () => {
|
|
||||||
const dispatch = useDispatch();
|
|
||||||
const selectedAppName = useSelector(selectSelectedAppName());
|
|
||||||
const notificationUnseenCounts = useSelector(selectNotificationTabsCount());
|
|
||||||
const notificationTabs = useSelector(selectNotificationTabs());
|
|
||||||
const { currentPage } = useSelector(selectPaginationData());
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
dispatch(fetchNotificationList({ appName: selectedAppName, page: currentPage, pageSize: 10 }));
|
|
||||||
if (selectedAppName) { dispatch(markNotificationsAsSeen(selectedAppName)); }
|
|
||||||
}, [currentPage, selectedAppName]);
|
|
||||||
|
|
||||||
const handleActiveTab = useCallback((appName) => {
|
|
||||||
dispatch(updateAppNameRequest({ appName }));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const tabArray = useMemo(() => notificationTabs?.map((appName) => (
|
|
||||||
<Tab
|
|
||||||
key={appName}
|
|
||||||
eventKey={appName}
|
|
||||||
title={appName}
|
|
||||||
notification={notificationUnseenCounts[appName]}
|
|
||||||
tabClassName="pt-0 pb-10px px-2.5 d-flex border-top-0 mb-0 align-items-center line-height-24 text-capitalize"
|
|
||||||
>
|
|
||||||
{appName === selectedAppName && (<NotificationSections />)}
|
|
||||||
</Tab>
|
|
||||||
)), [notificationUnseenCounts, selectedAppName, notificationTabs]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Tabs
|
|
||||||
variant="tabs"
|
|
||||||
defaultActiveKey={selectedAppName}
|
|
||||||
onSelect={handleActiveTab}
|
|
||||||
className="px-2.5 text-primary-500"
|
|
||||||
>
|
|
||||||
{tabArray}
|
|
||||||
</Tabs>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default React.memo(NotificationTabs);
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
import './notifications.factory';
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { Factory } from 'rosie';
|
|
||||||
|
|
||||||
Factory.define('notificationsCount')
|
|
||||||
.attr('count', 45)
|
|
||||||
.attr('countByAppName', {
|
|
||||||
reminders: 10,
|
|
||||||
discussions: 20,
|
|
||||||
grades: 10,
|
|
||||||
authoring: 5,
|
|
||||||
})
|
|
||||||
.attr('showNotificationsTray', true);
|
|
||||||
|
|
||||||
Factory.define('notification')
|
|
||||||
.sequence('id')
|
|
||||||
.attr('type', 'post')
|
|
||||||
.sequence('content', ['id'], (idx, notificationId) => `<p><b>User ${idx}</b> posts <b>Hello and welcome to SC0x
|
|
||||||
${notificationId}!</b></p>`)
|
|
||||||
.attr('course_name', 'Supply Chain Analytics')
|
|
||||||
.sequence('content_url', (idx) => `https://example.com/${idx}`)
|
|
||||||
.attr('last_read', null)
|
|
||||||
.attr('last_seen', null)
|
|
||||||
.sequence('created_at', ['createdDate'], (idx, date) => date);
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
import { getConfig, snakeCaseObject } from '@edx/frontend-platform';
|
|
||||||
import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
|
|
||||||
|
|
||||||
export const getNotificationsCountApiUrl = () => `${getConfig().LMS_BASE_URL}/api/notifications/count/`;
|
|
||||||
export const getNotificationsApiUrl = () => `${getConfig().LMS_BASE_URL}/api/notifications/`;
|
|
||||||
export const markNotificationsSeenApiUrl = (appName) => `${getConfig().LMS_BASE_URL}/api/notifications/mark-notifications-unseen/${appName}/`;
|
|
||||||
export const markNotificationAsReadApiUrl = () => `${getConfig().LMS_BASE_URL}/api/notifications/read/`;
|
|
||||||
|
|
||||||
export async function getNotifications(appName, page, pageSize) {
|
|
||||||
const params = snakeCaseObject({ page, pageSize });
|
|
||||||
const { data } = await getAuthenticatedHttpClient().get(getNotificationsApiUrl(), { params });
|
|
||||||
|
|
||||||
const startIndex = (page - 1) * pageSize;
|
|
||||||
const endIndex = startIndex + pageSize;
|
|
||||||
|
|
||||||
const notifications = data.slice(startIndex, endIndex);
|
|
||||||
return { notifications, numPages: 2, currentPage: page };
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function getNotificationCounts() {
|
|
||||||
const { data } = await getAuthenticatedHttpClient().get(getNotificationsCountApiUrl());
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function markNotificationSeen(appName) {
|
|
||||||
const { data } = await getAuthenticatedHttpClient().put(`${markNotificationsSeenApiUrl(appName)}`);
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function markAllNotificationRead(appName) {
|
|
||||||
const params = snakeCaseObject({ appName });
|
|
||||||
const { data } = await getAuthenticatedHttpClient().put(markNotificationAsReadApiUrl(), { params });
|
|
||||||
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function markNotificationRead(notificationId) {
|
|
||||||
const params = snakeCaseObject({ notificationId });
|
|
||||||
const { data } = await getAuthenticatedHttpClient().put(markNotificationAsReadApiUrl(), { params });
|
|
||||||
|
|
||||||
return { data, id: notificationId };
|
|
||||||
}
|
|
||||||
@@ -1,150 +0,0 @@
|
|||||||
import MockAdapter from 'axios-mock-adapter';
|
|
||||||
import { Factory } from 'rosie';
|
|
||||||
|
|
||||||
import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
|
|
||||||
import { initializeMockApp } from '@edx/frontend-platform/testing';
|
|
||||||
|
|
||||||
import {
|
|
||||||
getNotificationsApiUrl, getNotificationsCountApiUrl, markNotificationAsReadApiUrl, markNotificationsSeenApiUrl,
|
|
||||||
getNotificationCounts, getNotifications, markNotificationSeen, markAllNotificationRead, markNotificationRead,
|
|
||||||
} from './api';
|
|
||||||
|
|
||||||
import './__factories__';
|
|
||||||
|
|
||||||
const notificationCountsApiUrl = getNotificationsCountApiUrl();
|
|
||||||
const notificationsApiUrl = getNotificationsApiUrl();
|
|
||||||
const markedAllNotificationsAsSeenApiUrl = markNotificationsSeenApiUrl('discussions');
|
|
||||||
const markedAllNotificationsAsReadApiUrl = markNotificationAsReadApiUrl();
|
|
||||||
|
|
||||||
let axiosMock = null;
|
|
||||||
|
|
||||||
describe('Notifications API', () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
initializeMockApp({
|
|
||||||
authenticatedUser: {
|
|
||||||
userId: '123abc',
|
|
||||||
username: 'testuser',
|
|
||||||
administrator: false,
|
|
||||||
roles: [],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
axiosMock = new MockAdapter(getAuthenticatedHttpClient());
|
|
||||||
Factory.resetAll();
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
axiosMock.reset();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully get notification counts for different tabs.', async () => {
|
|
||||||
axiosMock.onGet(notificationCountsApiUrl).reply(200, (Factory.build('notificationsCount')));
|
|
||||||
|
|
||||||
const { count, countByAppName } = await getNotificationCounts();
|
|
||||||
|
|
||||||
expect(count).toEqual(45);
|
|
||||||
expect(countByAppName.reminders).toEqual(10);
|
|
||||||
expect(countByAppName.discussions).toEqual(20);
|
|
||||||
expect(countByAppName.grades).toEqual(10);
|
|
||||||
expect(countByAppName.authoring).toEqual(5);
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, message: 'Failed to get notification counts.' },
|
|
||||||
{ statusCode: 403, message: 'Denied to get notification counts.' },
|
|
||||||
])('%s for notification counts API.', async ({ statusCode, message }) => {
|
|
||||||
axiosMock.onGet(notificationCountsApiUrl).reply(statusCode, { message });
|
|
||||||
try {
|
|
||||||
await getNotificationCounts();
|
|
||||||
} catch (error) {
|
|
||||||
expect(error.response.status).toEqual(statusCode);
|
|
||||||
expect(error.response.data.message).toEqual(message);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully get notifications.', async () => {
|
|
||||||
axiosMock.onGet(notificationsApiUrl).reply(
|
|
||||||
200,
|
|
||||||
(Factory.buildList('notification', 2, null, { createdDate: new Date().toISOString() })),
|
|
||||||
);
|
|
||||||
|
|
||||||
const { notifications } = await getNotifications('discussions', 1, 10);
|
|
||||||
|
|
||||||
expect(notifications).toHaveLength(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, message: 'Failed to get notifications.' },
|
|
||||||
{ statusCode: 403, message: 'Denied to get notifications.' },
|
|
||||||
])('%s for notification API.', async ({ statusCode, message }) => {
|
|
||||||
axiosMock.onGet(notificationsApiUrl).reply(statusCode, { message });
|
|
||||||
try {
|
|
||||||
await getNotifications({ page: 1, pageSize: 10 });
|
|
||||||
} catch (error) {
|
|
||||||
expect(error.response.status).toEqual(statusCode);
|
|
||||||
expect(error.response.data.message).toEqual(message);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully marked all notifications as seen for selected app.', async () => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsSeenApiUrl).reply(200, { message: 'Notifications marked seen.' });
|
|
||||||
|
|
||||||
const { message } = await markNotificationSeen('discussions');
|
|
||||||
|
|
||||||
expect(message).toEqual('Notifications marked seen.');
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, message: 'Failed to mark all notifications as seen for selected app.' },
|
|
||||||
{ statusCode: 403, message: 'Denied to mark all notifications as seen for selected app.' },
|
|
||||||
])('%s for notification mark as seen API.', async ({ statusCode, message }) => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsSeenApiUrl).reply(statusCode, { message });
|
|
||||||
try {
|
|
||||||
await markNotificationSeen('discussions');
|
|
||||||
} catch (error) {
|
|
||||||
expect(error.response.status).toEqual(statusCode);
|
|
||||||
expect(error.response.data.message).toEqual(message);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully marked all notifications as read for selected app.', async () => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsReadApiUrl).reply(200, { message: 'Notifications marked read.' });
|
|
||||||
|
|
||||||
const { message } = await markAllNotificationRead('discussions');
|
|
||||||
|
|
||||||
expect(message).toEqual('Notifications marked read.');
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, message: 'Failed to mark all notifications as read for selected app.' },
|
|
||||||
{ statusCode: 403, message: 'Denied to mark all notifications as read for selected app.' },
|
|
||||||
])('%s for notification mark all as read API.', async ({ statusCode, message }) => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsReadApiUrl).reply(statusCode, { message });
|
|
||||||
try {
|
|
||||||
await markAllNotificationRead('discussions');
|
|
||||||
} catch (error) {
|
|
||||||
expect(error.response.status).toEqual(statusCode);
|
|
||||||
expect(error.response.data.message).toEqual(message);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully marked notification as read.', async () => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsReadApiUrl).reply(200, { message: 'Notification marked read.' });
|
|
||||||
|
|
||||||
const { data } = await markNotificationRead(1);
|
|
||||||
|
|
||||||
expect(data.message).toEqual('Notification marked read.');
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, message: 'Failed to mark notification as read.' },
|
|
||||||
{ statusCode: 403, message: 'Denied to mark notification as read.' },
|
|
||||||
])('%s for notification mark as read API.', async ({ statusCode, message }) => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsReadApiUrl).reply(statusCode, { message });
|
|
||||||
try {
|
|
||||||
await markAllNotificationRead(1);
|
|
||||||
} catch (error) {
|
|
||||||
expect(error.response.status).toEqual(statusCode);
|
|
||||||
expect(error.response.data.message).toEqual(message);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
import { breakpoints, useWindowSize } from '@edx/paragon';
|
|
||||||
|
|
||||||
export function useIsOnMediumScreen() {
|
|
||||||
const windowSize = useWindowSize();
|
|
||||||
return breakpoints.large.maxWidth > windowSize.width && windowSize.width >= breakpoints.medium.minWidth;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useIsOnLargeScreen() {
|
|
||||||
const windowSize = useWindowSize();
|
|
||||||
return windowSize.width >= breakpoints.extraLarge.minWidth;
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export * from './slice';
|
|
||||||
@@ -1,134 +0,0 @@
|
|||||||
{
|
|
||||||
"data": [
|
|
||||||
{
|
|
||||||
"id": 1,
|
|
||||||
"type": "post",
|
|
||||||
"content": "<p><b>SCM_Lead</b> posts <b>Hello and welcome to SC0x!</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:46:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 2,
|
|
||||||
"type": "help",
|
|
||||||
"content": "<p><b>MITx_Learner</b> asked <b>What grade does a student need to get in order to pass the course and earn a certificate?</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 3,
|
|
||||||
"type": "post",
|
|
||||||
"content": "<p><b>SCM_Lead</b> posts <b>Hello and welcome to SC0x!</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:46:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 4,
|
|
||||||
"type": "respond",
|
|
||||||
"content": "<p><b>MITx_Learner</b> responded <b>Can't find linear regression in section 3 review</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 5,
|
|
||||||
"type": "comment",
|
|
||||||
"content": "<p><b>MITx_Learner</b> commented on <b>MITx_Expert's</b> response on a post your following <b>Can't find linear regression in section 3 review</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 6,
|
|
||||||
"type": "question",
|
|
||||||
"content": "<p><b>MITx_Learner</b> commented <b>Examples of quadratic equations in supply chains</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 7,
|
|
||||||
"type": "answer",
|
|
||||||
"content": "<p><b>MITx_Expert</b> answered <b>Examples of quadratic equations in supply chains</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-05T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 8,
|
|
||||||
"type": "comment",
|
|
||||||
"content": "<p><b>MITx_Learner</b> commented <b>Examples of quadratic equations in supply chains</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 9,
|
|
||||||
"type": "comment",
|
|
||||||
"content": "<p><b>MITx_Learner</b> commented on <b>MITx_Expert's</b>what grade does a student need to get in order to pass the course and earn a certificate?</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 10,
|
|
||||||
"type": "comment",
|
|
||||||
"content": "<p><b>MITx_Learner</b> commented on your response in <b>Convexity of f(x)=1/x , x>1</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 11,
|
|
||||||
"type": "answer",
|
|
||||||
"content": "<p><b>SCM_Lead’s</b> response has been marked as answer in your post <b>Quiz in section 3 - Please explain the F-Significance value</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 12,
|
|
||||||
"type": "endorsed",
|
|
||||||
"content": "<p>Your response has been endorsed in <b>Quiz in section 3 - Please explain the F-Significance value</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 13,
|
|
||||||
"type": "reported",
|
|
||||||
"content": "<p><b>MITx Learner’s</b> post has been reported <b>“Here are the exam answers. Question 1 - CSA stands for Compliance Safety Ac...”</b></p>",
|
|
||||||
"course_name": "Supply Chain Analytics",
|
|
||||||
"content_url": "",
|
|
||||||
"last_read": null,
|
|
||||||
"last_seen": null,
|
|
||||||
"created_at": "2023-06-01T00:36:11.979531Z"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,164 +0,0 @@
|
|||||||
import MockAdapter from 'axios-mock-adapter';
|
|
||||||
import { Factory } from 'rosie';
|
|
||||||
|
|
||||||
import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
|
|
||||||
import { initializeMockApp } from '@edx/frontend-platform/testing';
|
|
||||||
|
|
||||||
import { initializeStore } from '../../store';
|
|
||||||
import executeThunk from '../../test-utils';
|
|
||||||
import {
|
|
||||||
getNotificationsApiUrl, getNotificationsCountApiUrl, markNotificationAsReadApiUrl, markNotificationsSeenApiUrl,
|
|
||||||
} from './api';
|
|
||||||
import {
|
|
||||||
fetchAppsNotificationCount, fetchNotificationList, markNotificationsAsRead, markAllNotificationsAsRead,
|
|
||||||
resetNotificationState, markNotificationsAsSeen,
|
|
||||||
} from './thunks';
|
|
||||||
|
|
||||||
import './__factories__';
|
|
||||||
|
|
||||||
const notificationCountsApiUrl = getNotificationsCountApiUrl();
|
|
||||||
const notificationsApiUrl = getNotificationsApiUrl();
|
|
||||||
const markedAllNotificationsAsReadApiUrl = markNotificationAsReadApiUrl();
|
|
||||||
const markedAllNotificationsAsSeenApiUrl = markNotificationsSeenApiUrl('discussions');
|
|
||||||
|
|
||||||
let axiosMock;
|
|
||||||
let store;
|
|
||||||
|
|
||||||
describe('Notification Redux', () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
initializeMockApp({
|
|
||||||
authenticatedUser: {
|
|
||||||
userId: '123abc',
|
|
||||||
username: 'testuser',
|
|
||||||
administrator: false,
|
|
||||||
roles: [],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
axiosMock = new MockAdapter(getAuthenticatedHttpClient());
|
|
||||||
Factory.resetAll();
|
|
||||||
store = initializeStore();
|
|
||||||
|
|
||||||
axiosMock.onGet(notificationCountsApiUrl).reply(200, (Factory.build('notificationsCount')));
|
|
||||||
axiosMock.onGet(notificationsApiUrl).reply(
|
|
||||||
200,
|
|
||||||
(Factory.buildList('notification', 2, null, { createdDate: new Date().toISOString() })),
|
|
||||||
);
|
|
||||||
await executeThunk(fetchAppsNotificationCount(), store.dispatch, store.getState);
|
|
||||||
await executeThunk(fetchNotificationList({ page: 1, pageSize: 10 }), store.dispatch, store.getState);
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
axiosMock.reset();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully loaded initial notification states in the redux.', async () => {
|
|
||||||
executeThunk(resetNotificationState(), store.dispatch, store.getState);
|
|
||||||
|
|
||||||
const { notifications } = store.getState();
|
|
||||||
|
|
||||||
expect(notifications.notificationStatus).toEqual('idle');
|
|
||||||
expect(notifications.appName).toEqual('discussions');
|
|
||||||
expect(notifications.appsId).toHaveLength(0);
|
|
||||||
expect(notifications.apps).toEqual({});
|
|
||||||
expect(notifications.notifications).toEqual({});
|
|
||||||
expect(notifications.tabsCount).toEqual({});
|
|
||||||
expect(notifications.showNotificationsTray).toEqual(false);
|
|
||||||
expect(notifications.pagination.count).toEqual(10);
|
|
||||||
expect(notifications.pagination.numPages).toEqual(1);
|
|
||||||
expect(notifications.pagination.currentPage).toEqual(1);
|
|
||||||
expect(notifications.pagination.nextPage).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully loaded notifications list in the redux.', async () => {
|
|
||||||
const { notifications: { notifications } } = store.getState();
|
|
||||||
|
|
||||||
expect(Object.keys(notifications)).toHaveLength(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, status: 'failed' },
|
|
||||||
{ statusCode: 403, status: 'denied' },
|
|
||||||
])('%s to load notifications list in the redux.', async ({ statusCode, status }) => {
|
|
||||||
axiosMock.onGet(notificationsApiUrl).reply(statusCode);
|
|
||||||
await executeThunk(fetchNotificationList({ page: 1, pageSize: 10 }), store.dispatch, store.getState);
|
|
||||||
|
|
||||||
const { notifications: { notificationStatus } } = store.getState();
|
|
||||||
|
|
||||||
expect(notificationStatus).toEqual(status);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully loaded notification counts in the redux.', async () => {
|
|
||||||
const { notifications: { tabsCount } } = store.getState();
|
|
||||||
|
|
||||||
expect(tabsCount.count).toEqual(25);
|
|
||||||
expect(tabsCount.reminders).toEqual(10);
|
|
||||||
expect(tabsCount.discussions).toEqual(0);
|
|
||||||
expect(tabsCount.grades).toEqual(10);
|
|
||||||
expect(tabsCount.authoring).toEqual(5);
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, status: 'failed' },
|
|
||||||
{ statusCode: 403, status: 'denied' },
|
|
||||||
])('%s to load notification counts in the redux.', async ({ statusCode, status }) => {
|
|
||||||
axiosMock.onGet(notificationCountsApiUrl).reply(statusCode);
|
|
||||||
await executeThunk(fetchAppsNotificationCount(), store.dispatch, store.getState);
|
|
||||||
|
|
||||||
const { notifications: { notificationStatus } } = store.getState();
|
|
||||||
|
|
||||||
expect(notificationStatus).toEqual(status);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully marked all notifications as seen for selected app.', async () => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsSeenApiUrl).reply(200);
|
|
||||||
await executeThunk(markNotificationsAsSeen('discussions'), store.dispatch, store.getState);
|
|
||||||
|
|
||||||
expect(store.getState().notifications.notificationStatus).toEqual('successful');
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, status: 'failed' },
|
|
||||||
{ statusCode: 403, status: 'denied' },
|
|
||||||
])('%s to mark all notifications as seen for selected app.', async ({ statusCode, status }) => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsSeenApiUrl).reply(statusCode);
|
|
||||||
await executeThunk(markNotificationsAsSeen('discussions'), store.dispatch, store.getState);
|
|
||||||
|
|
||||||
const { notifications: { notificationStatus } } = store.getState();
|
|
||||||
|
|
||||||
expect(notificationStatus).toEqual(status);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully marked all notifications as read for selected app in the redux.', async () => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsReadApiUrl).reply(200);
|
|
||||||
await executeThunk(markAllNotificationsAsRead('discussions'), store.dispatch, store.getState);
|
|
||||||
|
|
||||||
const { notifications: { notificationStatus, notifications } } = store.getState();
|
|
||||||
const firstNotification = Object.values(notifications)[0];
|
|
||||||
|
|
||||||
expect(notificationStatus).toEqual('successful');
|
|
||||||
expect(firstNotification.lastRead).not.toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Successfully marked notification as read in the redux.', async () => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsReadApiUrl).reply(200);
|
|
||||||
await executeThunk(markNotificationsAsRead(1), store.dispatch, store.getState);
|
|
||||||
|
|
||||||
const { notifications: { notificationStatus, notifications } } = store.getState();
|
|
||||||
const firstNotification = Object.values(notifications)[0];
|
|
||||||
|
|
||||||
expect(notificationStatus).toEqual('successful');
|
|
||||||
expect(firstNotification.lastRead).not.toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it.each([
|
|
||||||
{ statusCode: 404, status: 'failed' },
|
|
||||||
{ statusCode: 403, status: 'denied' },
|
|
||||||
])('%s to marked notification as read in the redux.', async ({ statusCode, status }) => {
|
|
||||||
axiosMock.onPut(markedAllNotificationsAsReadApiUrl).reply(statusCode);
|
|
||||||
await executeThunk(markNotificationsAsRead(1), store.dispatch, store.getState);
|
|
||||||
|
|
||||||
const { notifications: { notificationStatus } } = store.getState();
|
|
||||||
|
|
||||||
expect(notificationStatus).toEqual(status);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,126 +0,0 @@
|
|||||||
import MockAdapter from 'axios-mock-adapter';
|
|
||||||
import { Factory } from 'rosie';
|
|
||||||
|
|
||||||
import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
|
|
||||||
import { initializeMockApp } from '@edx/frontend-platform/testing';
|
|
||||||
|
|
||||||
import { initializeStore } from '../../store';
|
|
||||||
import executeThunk from '../../test-utils';
|
|
||||||
import { getNotificationsApiUrl, getNotificationsCountApiUrl } from './api';
|
|
||||||
import {
|
|
||||||
selectNotifications,
|
|
||||||
selectNotificationsByIds,
|
|
||||||
selectNotificationStatus,
|
|
||||||
selectNotificationTabs,
|
|
||||||
selectNotificationTabsCount,
|
|
||||||
selectPaginationData,
|
|
||||||
selectSelectedAppName,
|
|
||||||
selectSelectedAppNotificationIds,
|
|
||||||
selectShowNotificationTray,
|
|
||||||
} from './selectors';
|
|
||||||
import { fetchAppsNotificationCount, fetchNotificationList } from './thunks';
|
|
||||||
|
|
||||||
import './__factories__';
|
|
||||||
|
|
||||||
const notificationCountsApiUrl = getNotificationsCountApiUrl();
|
|
||||||
const notificationsApiUrl = getNotificationsApiUrl();
|
|
||||||
|
|
||||||
let axiosMock;
|
|
||||||
let store;
|
|
||||||
|
|
||||||
describe('Notification Selectors', () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
initializeMockApp({
|
|
||||||
authenticatedUser: {
|
|
||||||
userId: '123abc',
|
|
||||||
username: 'testuser',
|
|
||||||
administrator: false,
|
|
||||||
roles: [],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
axiosMock = new MockAdapter(getAuthenticatedHttpClient());
|
|
||||||
Factory.resetAll();
|
|
||||||
store = initializeStore();
|
|
||||||
|
|
||||||
axiosMock.onGet(notificationCountsApiUrl).reply(200, (Factory.build('notificationsCount')));
|
|
||||||
axiosMock.onGet(notificationsApiUrl).reply(
|
|
||||||
200,
|
|
||||||
(Factory.buildList('notification', 2, null, { createdDate: new Date().toISOString() })),
|
|
||||||
);
|
|
||||||
await executeThunk(fetchAppsNotificationCount(), store.dispatch, store.getState);
|
|
||||||
await executeThunk(fetchNotificationList({ page: 1, pageSize: 10 }), store.dispatch, store.getState);
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
axiosMock.reset();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return notification status.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const status = selectNotificationStatus()(state);
|
|
||||||
|
|
||||||
expect(status).toEqual('successful');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return notification tabs count.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const tabsCount = selectNotificationTabsCount()(state);
|
|
||||||
|
|
||||||
expect(tabsCount.count).toEqual(25);
|
|
||||||
expect(tabsCount.reminders).toEqual(10);
|
|
||||||
expect(tabsCount.discussions).toEqual(0);
|
|
||||||
expect(tabsCount.grades).toEqual(10);
|
|
||||||
expect(tabsCount.authoring).toEqual(5);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return notification tabs.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const tabs = selectNotificationTabs()(state);
|
|
||||||
|
|
||||||
expect(tabs).toHaveLength(4);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return selected app notification ids.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const notificationIds = selectSelectedAppNotificationIds('discussions')(state);
|
|
||||||
|
|
||||||
expect(notificationIds).toHaveLength(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return show notification tray status.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const showNotificationTrayStatus = selectShowNotificationTray()(state);
|
|
||||||
|
|
||||||
expect(showNotificationTrayStatus).toEqual(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return notifications.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const notifications = selectNotifications()(state);
|
|
||||||
|
|
||||||
expect(Object.keys(notifications)).toHaveLength(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return notifications from Ids.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const notifications = selectNotificationsByIds('discussions')(state);
|
|
||||||
|
|
||||||
expect(notifications).toHaveLength(2);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return selected app name.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const appName = selectSelectedAppName()(state);
|
|
||||||
|
|
||||||
expect(appName).toEqual('discussions');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('Should return pagination data.', async () => {
|
|
||||||
const state = store.getState();
|
|
||||||
const paginationData = selectPaginationData()(state);
|
|
||||||
|
|
||||||
expect(paginationData.count).toEqual(10);
|
|
||||||
expect(paginationData.currentPage).toEqual(1);
|
|
||||||
expect(paginationData.numPages).toEqual(2);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import { createSelector } from '@reduxjs/toolkit';
|
|
||||||
|
|
||||||
export const selectNotificationStatus = () => state => state.notifications.notificationStatus;
|
|
||||||
|
|
||||||
export const selectNotificationTabsCount = () => state => state.notifications.tabsCount;
|
|
||||||
|
|
||||||
export const selectNotificationTabs = () => state => state.notifications.appsId;
|
|
||||||
|
|
||||||
export const selectSelectedAppNotificationIds = (appName) => state => state.notifications.apps[appName] ?? [];
|
|
||||||
|
|
||||||
export const selectShowNotificationTray = () => state => state.notifications.showNotificationsTray;
|
|
||||||
|
|
||||||
export const selectNotifications = () => state => state.notifications.notifications;
|
|
||||||
|
|
||||||
export const selectNotificationsByIds = (appName) => createSelector(
|
|
||||||
selectNotifications(),
|
|
||||||
selectSelectedAppNotificationIds(appName),
|
|
||||||
(notifications, notificationIds) => notificationIds.map((notificationId) => notifications[notificationId]) || [],
|
|
||||||
);
|
|
||||||
|
|
||||||
export const selectSelectedAppName = () => state => state.notifications.appName;
|
|
||||||
|
|
||||||
export const selectPaginationData = () => state => state.notifications.pagination;
|
|
||||||
@@ -1,154 +0,0 @@
|
|||||||
/* eslint-disable no-param-reassign */
|
|
||||||
import { createSlice } from '@reduxjs/toolkit';
|
|
||||||
|
|
||||||
export const RequestStatus = {
|
|
||||||
IDLE: 'idle',
|
|
||||||
LOADING: 'in-progress',
|
|
||||||
LOADED: 'successful',
|
|
||||||
FAILED: 'failed',
|
|
||||||
DENIED: 'denied',
|
|
||||||
};
|
|
||||||
|
|
||||||
const initialState = {
|
|
||||||
notificationStatus: 'idle',
|
|
||||||
appName: 'discussions',
|
|
||||||
appsId: [],
|
|
||||||
apps: {},
|
|
||||||
notifications: {},
|
|
||||||
tabsCount: {},
|
|
||||||
showNotificationsTray: false,
|
|
||||||
pagination: {
|
|
||||||
count: 10,
|
|
||||||
numPages: 1,
|
|
||||||
currentPage: 1,
|
|
||||||
nextPage: null,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
const slice = createSlice({
|
|
||||||
name: 'notifications',
|
|
||||||
initialState,
|
|
||||||
reducers: {
|
|
||||||
fetchNotificationDenied: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.DENIED;
|
|
||||||
},
|
|
||||||
fetchNotificationFailure: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.FAILED;
|
|
||||||
},
|
|
||||||
fetchNotificationRequest: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.LOADING;
|
|
||||||
},
|
|
||||||
fetchNotificationSuccess: (state, { payload }) => {
|
|
||||||
const {
|
|
||||||
newNotificationIds, notificationsKeyValuePair, numPages, currentPage,
|
|
||||||
} = payload;
|
|
||||||
const existingNotificationIds = state.apps[state.appName];
|
|
||||||
|
|
||||||
state.apps[state.appName] = Array.from(new Set([...existingNotificationIds, ...newNotificationIds]));
|
|
||||||
state.notifications = { ...state.notifications, ...notificationsKeyValuePair };
|
|
||||||
state.tabsCount.count -= state.tabsCount[state.appName];
|
|
||||||
state.tabsCount[state.appName] = 0;
|
|
||||||
state.notificationStatus = RequestStatus.LOADED;
|
|
||||||
state.pagination.numPages = numPages;
|
|
||||||
state.pagination.currentPage = currentPage;
|
|
||||||
},
|
|
||||||
fetchNotificationsCountDenied: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.DENIED;
|
|
||||||
},
|
|
||||||
fetchNotificationsCountFailure: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.FAILED;
|
|
||||||
},
|
|
||||||
fetchNotificationsCountRequest: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.LOADING;
|
|
||||||
},
|
|
||||||
fetchNotificationsCountSuccess: (state, { payload }) => {
|
|
||||||
const {
|
|
||||||
countByAppName, appIds, apps, count, showNotificationsTray,
|
|
||||||
} = payload;
|
|
||||||
state.tabsCount = { count, ...countByAppName };
|
|
||||||
state.appsId = appIds;
|
|
||||||
state.apps = apps;
|
|
||||||
state.showNotificationsTray = showNotificationsTray;
|
|
||||||
state.notificationStatus = RequestStatus.LOADED;
|
|
||||||
},
|
|
||||||
markNotificationsAsSeenRequest: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.LOADING;
|
|
||||||
},
|
|
||||||
markNotificationsAsSeenSuccess: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.LOADED;
|
|
||||||
},
|
|
||||||
markNotificationsAsSeenDenied: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.DENIED;
|
|
||||||
},
|
|
||||||
markNotificationsAsSeenFailure: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.FAILED;
|
|
||||||
},
|
|
||||||
markAllNotificationsAsReadRequest: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.LOADING;
|
|
||||||
},
|
|
||||||
markAllNotificationsAsReadSuccess: (state) => {
|
|
||||||
const updatedNotifications = Object.fromEntries(
|
|
||||||
Object.entries(state.notifications).map(([key, notification]) => [
|
|
||||||
key, { ...notification, lastRead: new Date().toISOString() },
|
|
||||||
]),
|
|
||||||
);
|
|
||||||
state.notifications = updatedNotifications;
|
|
||||||
state.notificationStatus = RequestStatus.LOADED;
|
|
||||||
},
|
|
||||||
markAllNotificationsAsReadDenied: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.DENIED;
|
|
||||||
},
|
|
||||||
markAllNotificationsAsReadFailure: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.FAILED;
|
|
||||||
},
|
|
||||||
markNotificationsAsReadRequest: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.LOADING;
|
|
||||||
},
|
|
||||||
markNotificationsAsReadSuccess: (state, { payload }) => {
|
|
||||||
const date = new Date().toISOString();
|
|
||||||
state.notifications[payload.id] = { ...state.notifications[payload.id], lastRead: date };
|
|
||||||
state.notificationStatus = RequestStatus.LOADED;
|
|
||||||
},
|
|
||||||
markNotificationsAsReadDenied: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.DENIED;
|
|
||||||
},
|
|
||||||
markNotificationsAsReadFailure: (state) => {
|
|
||||||
state.notificationStatus = RequestStatus.FAILED;
|
|
||||||
},
|
|
||||||
resetNotificationStateRequest: () => initialState,
|
|
||||||
updateAppNameRequest: (state, { payload }) => {
|
|
||||||
state.appName = payload.appName;
|
|
||||||
state.pagination.currentPage = 1;
|
|
||||||
},
|
|
||||||
updatePaginationRequest: (state) => {
|
|
||||||
state.pagination.currentPage += 1;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export const {
|
|
||||||
fetchNotificationDenied,
|
|
||||||
fetchNotificationFailure,
|
|
||||||
fetchNotificationRequest,
|
|
||||||
fetchNotificationSuccess,
|
|
||||||
fetchNotificationsCountDenied,
|
|
||||||
fetchNotificationsCountFailure,
|
|
||||||
fetchNotificationsCountRequest,
|
|
||||||
fetchNotificationsCountSuccess,
|
|
||||||
markNotificationsAsSeenRequest,
|
|
||||||
markNotificationsAsSeenSuccess,
|
|
||||||
markNotificationsAsSeenFailure,
|
|
||||||
markNotificationsAsSeenDenied,
|
|
||||||
markAllNotificationsAsReadDenied,
|
|
||||||
markAllNotificationsAsReadRequest,
|
|
||||||
markAllNotificationsAsReadSuccess,
|
|
||||||
markAllNotificationsAsReadFailure,
|
|
||||||
markNotificationsAsReadDenied,
|
|
||||||
markNotificationsAsReadRequest,
|
|
||||||
markNotificationsAsReadSuccess,
|
|
||||||
markNotificationsAsReadFailure,
|
|
||||||
resetNotificationStateRequest,
|
|
||||||
updateAppNameRequest,
|
|
||||||
updatePaginationRequest,
|
|
||||||
} = slice.actions;
|
|
||||||
|
|
||||||
export const notificationsReducer = slice.reducer;
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
import { camelCaseObject } from '@edx/frontend-platform';
|
|
||||||
import {
|
|
||||||
fetchNotificationSuccess,
|
|
||||||
fetchNotificationRequest,
|
|
||||||
fetchNotificationFailure,
|
|
||||||
fetchNotificationDenied,
|
|
||||||
fetchNotificationsCountFailure,
|
|
||||||
fetchNotificationsCountRequest,
|
|
||||||
fetchNotificationsCountSuccess,
|
|
||||||
fetchNotificationsCountDenied,
|
|
||||||
markNotificationsAsSeenRequest,
|
|
||||||
markNotificationsAsSeenSuccess,
|
|
||||||
markNotificationsAsSeenFailure,
|
|
||||||
markNotificationsAsSeenDenied,
|
|
||||||
markNotificationsAsReadDenied,
|
|
||||||
resetNotificationStateRequest,
|
|
||||||
markAllNotificationsAsReadRequest,
|
|
||||||
markAllNotificationsAsReadSuccess,
|
|
||||||
markAllNotificationsAsReadFailure,
|
|
||||||
markAllNotificationsAsReadDenied,
|
|
||||||
markNotificationsAsReadRequest,
|
|
||||||
markNotificationsAsReadSuccess,
|
|
||||||
markNotificationsAsReadFailure,
|
|
||||||
} from './slice';
|
|
||||||
import {
|
|
||||||
getNotifications, getNotificationCounts, markNotificationSeen, markAllNotificationRead, markNotificationRead,
|
|
||||||
} from './api';
|
|
||||||
import { getHttpErrorStatus } from '../utils';
|
|
||||||
|
|
||||||
const normalizeNotificationCounts = ({ countByAppName, count, showNotificationsTray }) => {
|
|
||||||
const appIds = Object.keys(countByAppName);
|
|
||||||
const apps = appIds.reduce((acc, appId) => { acc[appId] = []; return acc; }, {});
|
|
||||||
return {
|
|
||||||
countByAppName, appIds, apps, count, showNotificationsTray,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const normalizeNotifications = ({ notifications }) => {
|
|
||||||
const newNotificationIds = notifications.map(notification => notification.id.toString());
|
|
||||||
const notificationsKeyValuePair = notifications.reduce((acc, obj) => { acc[obj.id] = obj; return acc; }, {});
|
|
||||||
return {
|
|
||||||
newNotificationIds, notificationsKeyValuePair,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const fetchNotificationList = ({ appName, page, pageSize }) => (
|
|
||||||
async (dispatch) => {
|
|
||||||
try {
|
|
||||||
dispatch(fetchNotificationRequest({ appName }));
|
|
||||||
const data = await getNotifications(appName, page, pageSize);
|
|
||||||
const normalisedData = normalizeNotifications((camelCaseObject(data)));
|
|
||||||
dispatch(fetchNotificationSuccess({ ...normalisedData, numPages: data.numPages, currentPage: data.currentPage }));
|
|
||||||
} catch (error) {
|
|
||||||
if (getHttpErrorStatus(error) === 403) {
|
|
||||||
dispatch(fetchNotificationDenied(appName));
|
|
||||||
} else {
|
|
||||||
dispatch(fetchNotificationFailure(appName));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
export const fetchAppsNotificationCount = () => (
|
|
||||||
async (dispatch) => {
|
|
||||||
try {
|
|
||||||
dispatch(fetchNotificationsCountRequest());
|
|
||||||
const data = await getNotificationCounts();
|
|
||||||
const normalisedData = normalizeNotificationCounts((camelCaseObject(data)));
|
|
||||||
dispatch(fetchNotificationsCountSuccess({ ...normalisedData }));
|
|
||||||
} catch (error) {
|
|
||||||
if (getHttpErrorStatus(error) === 403) {
|
|
||||||
dispatch(fetchNotificationsCountDenied());
|
|
||||||
} else {
|
|
||||||
dispatch(fetchNotificationsCountFailure());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
export const markAllNotificationsAsRead = (appName) => (
|
|
||||||
async (dispatch) => {
|
|
||||||
try {
|
|
||||||
dispatch(markAllNotificationsAsReadRequest({ appName }));
|
|
||||||
const data = await markAllNotificationRead(appName);
|
|
||||||
dispatch(markAllNotificationsAsReadSuccess(camelCaseObject(data)));
|
|
||||||
} catch (error) {
|
|
||||||
if (getHttpErrorStatus(error) === 403) {
|
|
||||||
dispatch(markAllNotificationsAsReadDenied());
|
|
||||||
} else {
|
|
||||||
dispatch(markAllNotificationsAsReadFailure());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
export const markNotificationsAsRead = (notificationId) => (
|
|
||||||
async (dispatch) => {
|
|
||||||
try {
|
|
||||||
dispatch(markNotificationsAsReadRequest({ notificationId }));
|
|
||||||
const data = await markNotificationRead(notificationId);
|
|
||||||
dispatch(markNotificationsAsReadSuccess(camelCaseObject(data)));
|
|
||||||
} catch (error) {
|
|
||||||
if (getHttpErrorStatus(error) === 403) {
|
|
||||||
dispatch(markNotificationsAsReadDenied());
|
|
||||||
} else {
|
|
||||||
dispatch(markNotificationsAsReadFailure());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
export const markNotificationsAsSeen = (appName) => (
|
|
||||||
async (dispatch) => {
|
|
||||||
try {
|
|
||||||
dispatch(markNotificationsAsSeenRequest({ appName }));
|
|
||||||
const data = await markNotificationSeen(appName);
|
|
||||||
dispatch(markNotificationsAsSeenSuccess(camelCaseObject(data)));
|
|
||||||
} catch (error) {
|
|
||||||
if (getHttpErrorStatus(error) === 403) {
|
|
||||||
dispatch(markNotificationsAsSeenDenied());
|
|
||||||
} else {
|
|
||||||
dispatch(markNotificationsAsSeenFailure());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
export const resetNotificationState = () => (
|
|
||||||
async (dispatch) => { dispatch(resetNotificationStateRequest()); }
|
|
||||||
);
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/* eslint-disable react-hooks/exhaustive-deps */
|
|
||||||
import React, {
|
|
||||||
useCallback, useEffect, useRef, useState,
|
|
||||||
} from 'react';
|
|
||||||
import { useDispatch, useSelector } from 'react-redux';
|
|
||||||
import { useIntl } from '@edx/frontend-platform/i18n';
|
|
||||||
import classNames from 'classnames';
|
|
||||||
import {
|
|
||||||
Badge, Icon, IconButton, OverlayTrigger, Popover,
|
|
||||||
} from '@edx/paragon';
|
|
||||||
import { NotificationsNone, Settings } from '@edx/paragon/icons';
|
|
||||||
import { selectNotificationTabsCount } from './data/selectors';
|
|
||||||
import { resetNotificationState } from './data/thunks';
|
|
||||||
import { useIsOnLargeScreen, useIsOnMediumScreen } from './data/hook';
|
|
||||||
import NotificationTabs from './NotificationTabs';
|
|
||||||
import messages from './messages';
|
|
||||||
|
|
||||||
const Notifications = () => {
|
|
||||||
const intl = useIntl();
|
|
||||||
const dispatch = useDispatch();
|
|
||||||
const popoverRef = useRef(null);
|
|
||||||
const buttonRef = useRef(null);
|
|
||||||
const [enableNotificationTray, setEnableNotificationTray] = useState(false);
|
|
||||||
const notificationCounts = useSelector(selectNotificationTabsCount());
|
|
||||||
const isOnMediumScreen = useIsOnMediumScreen();
|
|
||||||
const isOnLargeScreen = useIsOnLargeScreen();
|
|
||||||
|
|
||||||
const hideNotificationTray = useCallback(() => {
|
|
||||||
setEnableNotificationTray(prevState => !prevState);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleClickOutsideNotificationTray = useCallback((event) => {
|
|
||||||
if (!popoverRef.current?.contains(event.target) && !buttonRef.current?.contains(event.target)) {
|
|
||||||
setEnableNotificationTray(false);
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
document.addEventListener('mousedown', handleClickOutsideNotificationTray);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
document.removeEventListener('mousedown', handleClickOutsideNotificationTray);
|
|
||||||
dispatch(resetNotificationState());
|
|
||||||
};
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<OverlayTrigger
|
|
||||||
trigger="click"
|
|
||||||
key="bottom"
|
|
||||||
placement="bottom"
|
|
||||||
id="notificationTray"
|
|
||||||
show={enableNotificationTray}
|
|
||||||
overlay={(
|
|
||||||
<Popover
|
|
||||||
id="notificationTray"
|
|
||||||
data-testid="notificationTray"
|
|
||||||
className={classNames('overflow-auto rounded-0 border-0', {
|
|
||||||
'w-100': !isOnMediumScreen && !isOnLargeScreen,
|
|
||||||
'medium-screen': isOnMediumScreen,
|
|
||||||
'large-screen': isOnLargeScreen,
|
|
||||||
})}
|
|
||||||
>
|
|
||||||
<div ref={popoverRef}>
|
|
||||||
<Popover.Title as="h2" className="d-flex justify-content-between p-0 m-4 border-0 text-primary-500 font-size-18 line-height-24">
|
|
||||||
{intl.formatMessage(messages.notificationTitle)}
|
|
||||||
<Icon src={Settings} className="icon-size-20" />
|
|
||||||
</Popover.Title>
|
|
||||||
<Popover.Content className="notification-content p-0">
|
|
||||||
<NotificationTabs />
|
|
||||||
</Popover.Content>
|
|
||||||
</div>
|
|
||||||
</Popover>
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<div ref={buttonRef}>
|
|
||||||
<IconButton
|
|
||||||
isActive={enableNotificationTray}
|
|
||||||
alt="notification bell icon"
|
|
||||||
onClick={hideNotificationTray}
|
|
||||||
src={NotificationsNone}
|
|
||||||
iconAs={Icon}
|
|
||||||
variant="light"
|
|
||||||
iconClassNames="text-primary-500"
|
|
||||||
className="ml-4 mr-1 my-3 notification-button"
|
|
||||||
/>
|
|
||||||
{notificationCounts?.count > 0 && (
|
|
||||||
<Badge
|
|
||||||
pill
|
|
||||||
variant="danger"
|
|
||||||
className="font-weight-normal px-1 notification-badge"
|
|
||||||
>
|
|
||||||
{notificationCounts.count}
|
|
||||||
</Badge>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</OverlayTrigger>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Notifications;
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import { defineMessages } from '@edx/frontend-platform/i18n';
|
|
||||||
|
|
||||||
const messages = defineMessages({
|
|
||||||
notificationTitle: {
|
|
||||||
id: 'notification.title',
|
|
||||||
defaultMessage: 'Notifications',
|
|
||||||
description: 'Notifications',
|
|
||||||
},
|
|
||||||
notificationTodayHeading: {
|
|
||||||
id: 'notification.today.heading',
|
|
||||||
defaultMessage: 'Last 24 hours',
|
|
||||||
description: 'Today Notifications',
|
|
||||||
},
|
|
||||||
notificationEarlierHeading: {
|
|
||||||
id: 'notification.earlier.heading',
|
|
||||||
defaultMessage: 'Earlier',
|
|
||||||
description: 'Earlier Notifications',
|
|
||||||
},
|
|
||||||
notificationMarkAsRead: {
|
|
||||||
id: 'notification.mark.as.read',
|
|
||||||
defaultMessage: 'Mark all as read',
|
|
||||||
description: 'Mark all Notifications as read',
|
|
||||||
},
|
|
||||||
fullStop: {
|
|
||||||
id: 'notification.fullStop',
|
|
||||||
defaultMessage: '•',
|
|
||||||
description: 'Fullstop shown to users to indicate who edited a post.',
|
|
||||||
},
|
|
||||||
loadMoreNotifications: {
|
|
||||||
id: 'notification.load.more.notifications',
|
|
||||||
defaultMessage: 'Load more notifications',
|
|
||||||
description: 'Load more button to load more notifications',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export default messages;
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
import {
|
|
||||||
CheckCircle, HelpOutline, QuestionAnswerOutline, Verified, Report, EditOutline, ThumbUpOutline, PostOutline,
|
|
||||||
} from '@edx/paragon/icons';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get HTTP Error status from generic error.
|
|
||||||
* @param error Generic caught error.
|
|
||||||
* @returns {number|null}
|
|
||||||
*/
|
|
||||||
export const getHttpErrorStatus = error => error?.customAttributes?.httpErrorStatus ?? error?.response?.status;
|
|
||||||
|
|
||||||
export const splitNotificationsByTime = (notificationList) => {
|
|
||||||
let splittedData = [];
|
|
||||||
if (notificationList.length > 0) {
|
|
||||||
const currentTime = Date.now();
|
|
||||||
const twentyFourHoursAgo = currentTime - (24 * 60 * 60 * 1000);
|
|
||||||
|
|
||||||
splittedData = notificationList.reduce(
|
|
||||||
(result, notification) => {
|
|
||||||
if (notification) {
|
|
||||||
const objectTime = new Date(notification.createdAt).getTime();
|
|
||||||
if (objectTime >= twentyFourHoursAgo && objectTime <= currentTime) {
|
|
||||||
result.today.push(notification);
|
|
||||||
} else {
|
|
||||||
result.earlier.push(notification);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
},
|
|
||||||
{ today: [], earlier: [] },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const { today, earlier } = splittedData;
|
|
||||||
return { today, earlier };
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getIconByType = (type) => {
|
|
||||||
const iconMap = {
|
|
||||||
post: { icon: PostOutline, class: 'text-primary-500' },
|
|
||||||
help: { icon: HelpOutline, class: 'text-primary-500' },
|
|
||||||
respond: { icon: QuestionAnswerOutline, class: 'text-primary-500' },
|
|
||||||
comment: { icon: QuestionAnswerOutline, class: 'text-primary-500' },
|
|
||||||
question: { icon: QuestionAnswerOutline, class: 'text-primary-500' },
|
|
||||||
answer: { icon: CheckCircle, class: 'text-success' },
|
|
||||||
endorsed: { icon: Verified, class: 'text-primary-500' },
|
|
||||||
reported: { icon: Report, class: 'text-danger-500' },
|
|
||||||
postLiked: { icon: ThumbUpOutline, class: 'text-primary-500' },
|
|
||||||
commentLiked: { icon: ThumbUpOutline, class: 'text-primary-500' },
|
|
||||||
edited: { icon: EditOutline, class: 'text-primary-500' },
|
|
||||||
};
|
|
||||||
return iconMap[type] || { icon: PostOutline, class: 'text-primary-500' };
|
|
||||||
};
|
|
||||||
@@ -1,200 +0,0 @@
|
|||||||
import React, { useContext } from 'react';
|
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
|
||||||
import { AppContext } from '@edx/frontend-platform/react';
|
|
||||||
import {
|
|
||||||
APP_CONFIG_INITIALIZED,
|
|
||||||
ensureConfig,
|
|
||||||
getConfig,
|
|
||||||
mergeConfig,
|
|
||||||
subscribe,
|
|
||||||
} from '@edx/frontend-platform';
|
|
||||||
import { ActionRow } from '@edx/paragon';
|
|
||||||
|
|
||||||
import { Menu, MenuTrigger, MenuContent } from './Menu';
|
|
||||||
import Avatar from './Avatar';
|
|
||||||
import { LinkedLogo, Logo } from './Logo';
|
|
||||||
|
|
||||||
import { CaretIcon } from './Icons';
|
|
||||||
|
|
||||||
import messages from './Header.messages';
|
|
||||||
|
|
||||||
ensureConfig([
|
|
||||||
'STUDIO_BASE_URL',
|
|
||||||
'LOGOUT_URL',
|
|
||||||
'LOGIN_URL',
|
|
||||||
'SITE_NAME',
|
|
||||||
'LOGO_URL',
|
|
||||||
'ORDER_HISTORY_URL',
|
|
||||||
], 'StudioHeader component');
|
|
||||||
|
|
||||||
subscribe(APP_CONFIG_INITIALIZED, () => {
|
|
||||||
mergeConfig({
|
|
||||||
AUTHN_MINIMAL_HEADER: !!process.env.AUTHN_MINIMAL_HEADER,
|
|
||||||
}, 'StudioHeader additional config');
|
|
||||||
});
|
|
||||||
|
|
||||||
class StudioDesktopHeaderBase extends React.Component {
|
|
||||||
constructor(props) { // eslint-disable-line no-useless-constructor
|
|
||||||
super(props);
|
|
||||||
}
|
|
||||||
|
|
||||||
renderUserMenu() {
|
|
||||||
const {
|
|
||||||
userMenu,
|
|
||||||
avatar,
|
|
||||||
username,
|
|
||||||
intl,
|
|
||||||
} = this.props;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Menu transitionClassName="menu-dropdown" transitionTimeout={250}>
|
|
||||||
<MenuTrigger
|
|
||||||
tag="button"
|
|
||||||
aria-label={intl.formatMessage(messages['header.label.account.menu.for'], { username })}
|
|
||||||
className="btn btn-outline-primary d-inline-flex align-items-center pl-2 pr-3"
|
|
||||||
>
|
|
||||||
<Avatar size="1.5em" src={avatar} alt="" className="mr-2" />
|
|
||||||
{username} <CaretIcon role="img" aria-hidden focusable="false" />
|
|
||||||
</MenuTrigger>
|
|
||||||
<MenuContent className="mb-0 dropdown-menu show dropdown-menu-right pin-right shadow py-2">
|
|
||||||
{userMenu.map(({ type, href, content }) => (
|
|
||||||
<a className={`dropdown-${type}`} key={`${type}-${content}`} href={href}>{content}</a>
|
|
||||||
))}
|
|
||||||
</MenuContent>
|
|
||||||
</Menu>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
renderLoggedOutItems() {
|
|
||||||
const { loggedOutItems } = this.props;
|
|
||||||
|
|
||||||
return loggedOutItems.map((item, i, arr) => (
|
|
||||||
<a
|
|
||||||
key={`${item.type}-${item.content}`}
|
|
||||||
className={i < arr.length - 1 ? 'btn mr-2 btn-link' : 'btn mr-2 btn-outline-primary'}
|
|
||||||
href={item.href}
|
|
||||||
>
|
|
||||||
{item.content}
|
|
||||||
</a>
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
|
||||||
const {
|
|
||||||
logo,
|
|
||||||
logoAltText,
|
|
||||||
logoDestination,
|
|
||||||
loggedIn,
|
|
||||||
intl,
|
|
||||||
actionRowContent,
|
|
||||||
} = this.props;
|
|
||||||
const logoProps = { src: logo, alt: logoAltText, href: logoDestination };
|
|
||||||
const logoClasses = getConfig().AUTHN_MINIMAL_HEADER ? 'mw-100' : null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<header className="site-header-desktop">
|
|
||||||
<a className="nav-skip sr-only sr-only-focusable" href="#main">{intl.formatMessage(messages['header.label.skip.nav'])}</a>
|
|
||||||
<div className={`container-fluid ${logoClasses}`}>
|
|
||||||
<div className="nav-container position-relative d-flex align-items-center">
|
|
||||||
{logoDestination === null ? <Logo className="logo" src={logo} alt={logoAltText} /> : <LinkedLogo className="logo" {...logoProps} />}
|
|
||||||
<ActionRow>
|
|
||||||
{actionRowContent}
|
|
||||||
<nav
|
|
||||||
aria-label={intl.formatMessage(messages['header.label.secondary.nav'])}
|
|
||||||
className="nav secondary-menu-container align-items-center ml-auto"
|
|
||||||
>
|
|
||||||
{loggedIn ? this.renderUserMenu() : this.renderLoggedOutItems()}
|
|
||||||
</nav>
|
|
||||||
</ActionRow>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
StudioDesktopHeaderBase.propTypes = {
|
|
||||||
userMenu: PropTypes.arrayOf(PropTypes.shape({
|
|
||||||
type: PropTypes.oneOf(['item', 'menu']),
|
|
||||||
href: PropTypes.string,
|
|
||||||
content: PropTypes.string,
|
|
||||||
})),
|
|
||||||
loggedOutItems: PropTypes.arrayOf(PropTypes.shape({
|
|
||||||
type: PropTypes.oneOf(['item', 'menu']),
|
|
||||||
href: PropTypes.string,
|
|
||||||
content: PropTypes.string,
|
|
||||||
})),
|
|
||||||
logo: PropTypes.string,
|
|
||||||
logoAltText: PropTypes.string,
|
|
||||||
logoDestination: PropTypes.string,
|
|
||||||
avatar: PropTypes.string,
|
|
||||||
username: PropTypes.string,
|
|
||||||
loggedIn: PropTypes.bool,
|
|
||||||
actionRowContent: PropTypes.element,
|
|
||||||
|
|
||||||
// i18n
|
|
||||||
intl: intlShape.isRequired,
|
|
||||||
};
|
|
||||||
|
|
||||||
StudioDesktopHeaderBase.defaultProps = {
|
|
||||||
userMenu: [],
|
|
||||||
loggedOutItems: [],
|
|
||||||
logo: null,
|
|
||||||
logoAltText: null,
|
|
||||||
logoDestination: null,
|
|
||||||
avatar: null,
|
|
||||||
username: null,
|
|
||||||
loggedIn: false,
|
|
||||||
actionRowContent: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
const StudioDesktopHeader = injectIntl(StudioDesktopHeaderBase);
|
|
||||||
|
|
||||||
const StudioHeader = ({ intl, actionRowContent }) => {
|
|
||||||
const { authenticatedUser, config } = useContext(AppContext);
|
|
||||||
|
|
||||||
const userMenu = authenticatedUser === null ? [] : [
|
|
||||||
{
|
|
||||||
type: 'item',
|
|
||||||
href: `${config.STUDIO_BASE_URL}`,
|
|
||||||
content: intl.formatMessage(messages['header.user.menu.studio.home']),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'item',
|
|
||||||
href: `${config.STUDIO_BASE_URL}/maintenance`,
|
|
||||||
content: intl.formatMessage(messages['header.user.menu.studio.maintenance']),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'item',
|
|
||||||
href: config.LOGOUT_URL,
|
|
||||||
content: intl.formatMessage(messages['header.user.menu.logout']),
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
const props = {
|
|
||||||
logo: config.LOGO_URL,
|
|
||||||
logoAltText: config.SITE_NAME,
|
|
||||||
logoDestination: config.STUDIO_BASE_URL,
|
|
||||||
loggedIn: authenticatedUser !== null,
|
|
||||||
username: authenticatedUser !== null ? authenticatedUser.username : null,
|
|
||||||
avatar: authenticatedUser !== null ? authenticatedUser.avatar : null,
|
|
||||||
actionRowContent,
|
|
||||||
userMenu,
|
|
||||||
loggedOutItems: [],
|
|
||||||
};
|
|
||||||
|
|
||||||
return <StudioDesktopHeader {...props} />;
|
|
||||||
};
|
|
||||||
|
|
||||||
StudioHeader.propTypes = {
|
|
||||||
intl: intlShape.isRequired,
|
|
||||||
actionRowContent: PropTypes.element,
|
|
||||||
};
|
|
||||||
|
|
||||||
StudioHeader.defaultProps = {
|
|
||||||
// eslint-disable-next-line react/jsx-no-useless-fragment
|
|
||||||
actionRowContent: <></>,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default injectIntl(StudioHeader);
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
/* eslint-disable react/prop-types */
|
|
||||||
import React, { useMemo } from 'react';
|
|
||||||
import { IntlProvider } from '@edx/frontend-platform/i18n';
|
|
||||||
import TestRenderer from 'react-test-renderer';
|
|
||||||
import { Link } from 'react-router-dom';
|
|
||||||
import { AppContext } from '@edx/frontend-platform/react';
|
|
||||||
import {
|
|
||||||
ActionRow,
|
|
||||||
Button,
|
|
||||||
Dropdown,
|
|
||||||
} from '@edx/paragon';
|
|
||||||
|
|
||||||
import { StudioHeader } from './index';
|
|
||||||
|
|
||||||
const StudioHeaderComponent = ({ contextValue, appMenu = null, mainMenu = [] }) => (
|
|
||||||
<IntlProvider locale="en" messages={{}}>
|
|
||||||
<AppContext.Provider
|
|
||||||
value={contextValue}
|
|
||||||
>
|
|
||||||
<StudioHeader appMenu={appMenu} mainMenu={mainMenu} />
|
|
||||||
</AppContext.Provider>
|
|
||||||
</IntlProvider>
|
|
||||||
);
|
|
||||||
|
|
||||||
const StudioHeaderContext = ({ actionRowContent = null }) => {
|
|
||||||
const headerContextValue = useMemo(() => ({
|
|
||||||
authenticatedUser: {
|
|
||||||
userId: 'abc123',
|
|
||||||
username: 'edX',
|
|
||||||
roles: [],
|
|
||||||
administrator: false,
|
|
||||||
},
|
|
||||||
config: {
|
|
||||||
STUDIO_BASE_URL: process.env.STUDIO_BASE_URL,
|
|
||||||
SITE_NAME: process.env.SITE_NAME,
|
|
||||||
LOGIN_URL: process.env.LOGIN_URL,
|
|
||||||
LOGOUT_URL: process.env.LOGOUT_URL,
|
|
||||||
LOGO_URL: process.env.LOGO_URL,
|
|
||||||
},
|
|
||||||
}), []);
|
|
||||||
return (
|
|
||||||
<IntlProvider locale="en" messages={{}}>
|
|
||||||
<AppContext.Provider
|
|
||||||
value={headerContextValue}
|
|
||||||
>
|
|
||||||
<StudioHeader actionRowContent={actionRowContent} />
|
|
||||||
</AppContext.Provider>
|
|
||||||
</IntlProvider>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
describe('<StudioHeader />', () => {
|
|
||||||
it('renders correctly', () => {
|
|
||||||
const contextValue = {
|
|
||||||
authenticatedUser: {
|
|
||||||
userId: 'abc123',
|
|
||||||
username: 'edX',
|
|
||||||
roles: [],
|
|
||||||
administrator: false,
|
|
||||||
},
|
|
||||||
config: {
|
|
||||||
STUDIO_BASE_URL: process.env.STUDIO_BASE_URL,
|
|
||||||
SITE_NAME: process.env.SITE_NAME,
|
|
||||||
LOGIN_URL: process.env.LOGIN_URL,
|
|
||||||
LOGOUT_URL: process.env.LOGOUT_URL,
|
|
||||||
LOGO_URL: process.env.LOGO_URL,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const component = <StudioHeaderComponent contextValue={contextValue} />;
|
|
||||||
|
|
||||||
const wrapper = TestRenderer.create(component);
|
|
||||||
|
|
||||||
expect(wrapper.toJSON()).toMatchSnapshot();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('renders correctly with optional action row content', () => {
|
|
||||||
const actionRowContent = (
|
|
||||||
<>
|
|
||||||
<Dropdown>
|
|
||||||
<Dropdown.Toggle variant="outline-primary" id="library-header-menu-dropdown">
|
|
||||||
Settings
|
|
||||||
</Dropdown.Toggle>
|
|
||||||
<Dropdown.Menu>
|
|
||||||
<Dropdown.Item as={Link} to="#">Dropdown Item 1</Dropdown.Item>
|
|
||||||
<Dropdown.Item as={Link} to="#">Dropdown Item 2</Dropdown.Item>
|
|
||||||
<Dropdown.Item as={Link} to="#">Dropdown Item 3</Dropdown.Item>
|
|
||||||
</Dropdown.Menu>
|
|
||||||
</Dropdown>
|
|
||||||
<ActionRow.Spacer />
|
|
||||||
<Button
|
|
||||||
variant="tertiary"
|
|
||||||
href="#"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
target="_blank"
|
|
||||||
title="Help Button"
|
|
||||||
>Help
|
|
||||||
</Button>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
|
|
||||||
const component = <StudioHeaderContext actionRowContent={actionRowContent} />;
|
|
||||||
|
|
||||||
const wrapper = TestRenderer.create(component);
|
|
||||||
|
|
||||||
expect(wrapper.toJSON()).toMatchSnapshot();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,226 +0,0 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
|
||||||
|
|
||||||
exports[`<StudioHeader /> renders correctly 1`] = `
|
|
||||||
<header
|
|
||||||
className="site-header-desktop"
|
|
||||||
>
|
|
||||||
<a
|
|
||||||
className="nav-skip sr-only sr-only-focusable"
|
|
||||||
href="#main"
|
|
||||||
>
|
|
||||||
Skip to main content
|
|
||||||
</a>
|
|
||||||
<div
|
|
||||||
className="container-fluid null"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="nav-container position-relative d-flex align-items-center"
|
|
||||||
>
|
|
||||||
<img
|
|
||||||
alt="edX"
|
|
||||||
className="logo"
|
|
||||||
src="https://edx-cdn.org/v3/default/logo.svg"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
className="pgn__action-row"
|
|
||||||
>
|
|
||||||
<nav
|
|
||||||
aria-label="Secondary"
|
|
||||||
className="nav secondary-menu-container align-items-center ml-auto"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="menu null"
|
|
||||||
onKeyDown={[Function]}
|
|
||||||
onMouseEnter={[Function]}
|
|
||||||
onMouseLeave={[Function]}
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
aria-expanded={false}
|
|
||||||
aria-haspopup="menu"
|
|
||||||
aria-label="Account menu for edX"
|
|
||||||
className="menu-trigger btn btn-outline-primary d-inline-flex align-items-center pl-2 pr-3"
|
|
||||||
onClick={[Function]}
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
className="avatar overflow-hidden d-inline-flex rounded-circle mr-2"
|
|
||||||
style={
|
|
||||||
Object {
|
|
||||||
"height": "1.5em",
|
|
||||||
"width": "1.5em",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
aria-hidden={true}
|
|
||||||
focusable="false"
|
|
||||||
height="24px"
|
|
||||||
role="img"
|
|
||||||
style={
|
|
||||||
Object {
|
|
||||||
"height": "1.5em",
|
|
||||||
"width": "1.5em",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
version="1.1"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
width="24px"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M4.10255106,18.1351061 C4.7170266,16.0581859 8.01891846,14.4720277 12,14.4720277 C15.9810815,14.4720277 19.2829734,16.0581859 19.8974489,18.1351061 C21.215206,16.4412566 22,14.3122775 22,12 C22,6.4771525 17.5228475,2 12,2 C6.4771525,2 2,6.4771525 2,12 C2,14.3122775 2.78479405,16.4412566 4.10255106,18.1351061 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z M12,13 C9.790861,13 8,11.209139 8,9 C8,6.790861 9.790861,5 12,5 C14.209139,5 16,6.790861 16,9 C16,11.209139 14.209139,13 12,13 Z"
|
|
||||||
fill="currentColor"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</span>
|
|
||||||
edX
|
|
||||||
|
|
||||||
<svg
|
|
||||||
aria-hidden={true}
|
|
||||||
focusable="false"
|
|
||||||
height="16px"
|
|
||||||
role="img"
|
|
||||||
version="1.1"
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
width="16px"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
|
|
||||||
fill="currentColor"
|
|
||||||
transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
`;
|
|
||||||
|
|
||||||
exports[`<StudioHeader /> renders correctly with optional action row content 1`] = `
|
|
||||||
<header
|
|
||||||
className="site-header-desktop"
|
|
||||||
>
|
|
||||||
<a
|
|
||||||
className="nav-skip sr-only sr-only-focusable"
|
|
||||||
href="#main"
|
|
||||||
>
|
|
||||||
Skip to main content
|
|
||||||
</a>
|
|
||||||
<div
|
|
||||||
className="container-fluid null"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="nav-container position-relative d-flex align-items-center"
|
|
||||||
>
|
|
||||||
<img
|
|
||||||
alt="edX"
|
|
||||||
className="logo"
|
|
||||||
src="https://edx-cdn.org/v3/default/logo.svg"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
className="pgn__action-row"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="pgn__dropdown pgn__dropdown-light dropdown"
|
|
||||||
data-testid="dropdown"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
aria-expanded={false}
|
|
||||||
aria-haspopup={true}
|
|
||||||
className="dropdown-toggle btn btn-outline-primary"
|
|
||||||
disabled={false}
|
|
||||||
id="library-header-menu-dropdown"
|
|
||||||
onClick={[Function]}
|
|
||||||
type="button"
|
|
||||||
>
|
|
||||||
Settings
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<span
|
|
||||||
className="pgn__action-row-spacer"
|
|
||||||
/>
|
|
||||||
<a
|
|
||||||
className="btn btn-tertiary"
|
|
||||||
href="#"
|
|
||||||
onClick={[Function]}
|
|
||||||
onKeyDown={[Function]}
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
role="button"
|
|
||||||
target="_blank"
|
|
||||||
title="Help Button"
|
|
||||||
>
|
|
||||||
Help
|
|
||||||
</a>
|
|
||||||
<nav
|
|
||||||
aria-label="Secondary"
|
|
||||||
className="nav secondary-menu-container align-items-center ml-auto"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="menu null"
|
|
||||||
onKeyDown={[Function]}
|
|
||||||
onMouseEnter={[Function]}
|
|
||||||
onMouseLeave={[Function]}
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
aria-expanded={false}
|
|
||||||
aria-haspopup="menu"
|
|
||||||
aria-label="Account menu for edX"
|
|
||||||
className="menu-trigger btn btn-outline-primary d-inline-flex align-items-center pl-2 pr-3"
|
|
||||||
onClick={[Function]}
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
className="avatar overflow-hidden d-inline-flex rounded-circle mr-2"
|
|
||||||
style={
|
|
||||||
Object {
|
|
||||||
"height": "1.5em",
|
|
||||||
"width": "1.5em",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
aria-hidden={true}
|
|
||||||
focusable="false"
|
|
||||||
height="24px"
|
|
||||||
role="img"
|
|
||||||
style={
|
|
||||||
Object {
|
|
||||||
"height": "1.5em",
|
|
||||||
"width": "1.5em",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
version="1.1"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
width="24px"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M4.10255106,18.1351061 C4.7170266,16.0581859 8.01891846,14.4720277 12,14.4720277 C15.9810815,14.4720277 19.2829734,16.0581859 19.8974489,18.1351061 C21.215206,16.4412566 22,14.3122775 22,12 C22,6.4771525 17.5228475,2 12,2 C6.4771525,2 2,6.4771525 2,12 C2,14.3122775 2.78479405,16.4412566 4.10255106,18.1351061 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z M12,13 C9.790861,13 8,11.209139 8,9 C8,6.790861 9.790861,5 12,5 C14.209139,5 16,6.790861 16,9 C16,11.209139 14.209139,13 12,13 Z"
|
|
||||||
fill="currentColor"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</span>
|
|
||||||
edX
|
|
||||||
|
|
||||||
<svg
|
|
||||||
aria-hidden={true}
|
|
||||||
focusable="false"
|
|
||||||
height="16px"
|
|
||||||
role="img"
|
|
||||||
version="1.1"
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
width="16px"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M7,4 L7,8 L11,8 L11,10 L5,10 L5,4 L7,4 Z"
|
|
||||||
fill="currentColor"
|
|
||||||
transform="translate(8.000000, 7.000000) rotate(-45.000000) translate(-8.000000, -7.000000) "
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
`;
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
export default function timeLocale(number, index) {
|
|
||||||
return [
|
|
||||||
['just now', 'right now'],
|
|
||||||
['%ss', 'in %s seconds'],
|
|
||||||
['1m', 'in 1 minute'],
|
|
||||||
['%sm', 'in %s minutes'],
|
|
||||||
['1h', 'in 1 hour'],
|
|
||||||
['%sh', 'in %s hours'],
|
|
||||||
['1d', 'in 1 day'],
|
|
||||||
['%sd', 'in %s days'],
|
|
||||||
['1w', 'in 1 week'],
|
|
||||||
['%sw', 'in %s weeks'],
|
|
||||||
['4w', 'in 1 month'],
|
|
||||||
[`${number * 4}w`, 'in %s months'],
|
|
||||||
['1y', 'in 1 year'],
|
|
||||||
['%sy', 'in %s years'],
|
|
||||||
][index];
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "التسجيل",
|
|
||||||
"general.signIn.sentenceCase": "تسجيل الدخول",
|
|
||||||
"header.links.courses": "المساقات",
|
"header.links.courses": "المساقات",
|
||||||
"header.links.programs": "البرامج",
|
"header.links.programs": "البرامج",
|
||||||
"header.links.content.search": "اكتشف الجديد",
|
"header.links.content.search": "اكتشف الجديد",
|
||||||
@@ -23,6 +21,8 @@
|
|||||||
"header.label.secondary.nav": "القائمة الثانوية",
|
"header.label.secondary.nav": "القائمة الثانوية",
|
||||||
"header.label.skip.nav": "التخطي إلى المحتوى الرئيسي",
|
"header.label.skip.nav": "التخطي إلى المحتوى الرئيسي",
|
||||||
"header.label.app.nav": "تطبيق",
|
"header.label.app.nav": "تطبيق",
|
||||||
|
"general.register.sentenceCase": "التسجيل",
|
||||||
|
"general.signIn.sentenceCase": "تسجيل الدخول",
|
||||||
"header.menu.dashboard.label": "لوحة المعلومات",
|
"header.menu.dashboard.label": "لوحة المعلومات",
|
||||||
"header.help.label": "المساعدة",
|
"header.help.label": "المساعدة",
|
||||||
"header.menu.profile.label": "الملف الشخصي",
|
"header.menu.profile.label": "الملف الشخصي",
|
||||||
@@ -30,10 +30,7 @@
|
|||||||
"header.menu.orderHistory.label": "سجل الطلبيات",
|
"header.menu.orderHistory.label": "سجل الطلبيات",
|
||||||
"header.navigation.skipNavLink": "التخطي إلى المحتوى الرئيسي",
|
"header.navigation.skipNavLink": "التخطي إلى المحتوى الرئيسي",
|
||||||
"header.menu.signOut.label": "تسجيل الخروج",
|
"header.menu.signOut.label": "تسجيل الخروج",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "صفحة الاستوديو الرئيسية",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.user.menu.maintenance": "الصيانة",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.label.courseOutline": "الرجوع إلى مخطط المساق الكلّي في الاستوديو"
|
||||||
"notification.mark.as.read": "Mark all as read",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,39 +1,36 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Register",
|
"header.links.courses": "Kurse",
|
||||||
"general.signIn.sentenceCase": "Sign in",
|
"header.links.programs": "Programme",
|
||||||
"header.links.courses": "Courses",
|
"header.links.content.search": "",
|
||||||
"header.links.programs": "Programs",
|
"header.links.schools": "",
|
||||||
"header.links.content.search": "Discover New",
|
"header.user.menu.dashboard": "Meine Kurse",
|
||||||
"header.links.schools": "Schools & Partners",
|
"header.user.menu.profile": "",
|
||||||
"header.user.menu.dashboard": "Dashboard",
|
"header.user.menu.account.settings": "Konto",
|
||||||
"header.user.menu.profile": "Profile",
|
"header.user.menu.order.history": "",
|
||||||
"header.user.menu.account.settings": "Account",
|
"header.user.menu.logout": "Abmelden",
|
||||||
"header.user.menu.order.history": "Order History",
|
|
||||||
"header.user.menu.logout": "Logout",
|
|
||||||
"header.user.menu.login": "Login",
|
"header.user.menu.login": "Login",
|
||||||
"header.user.menu.register": "Sign Up",
|
"header.user.menu.register": "",
|
||||||
"header.user.menu.studio.home": "Studio Home",
|
"header.user.menu.studio.home": "",
|
||||||
"header.user.menu.studio.maintenance": "Maintenance",
|
"header.user.menu.studio.maintenance": "",
|
||||||
"header.label.account.nav": "Account",
|
"header.label.account.nav": "Konto",
|
||||||
"header.label.account.menu": "Account Menu",
|
"header.label.account.menu": "",
|
||||||
"header.label.account.menu.for": "Account menu for {username}",
|
"header.label.account.menu.for": "",
|
||||||
"header.label.main.nav": "Main",
|
"header.label.main.nav": "",
|
||||||
"header.label.main.menu": "Main Menu",
|
"header.label.main.menu": "",
|
||||||
"header.label.main.header": "Main",
|
"header.label.main.header": "",
|
||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.secondary.nav": "Sekundarschule",
|
||||||
"header.label.skip.nav": "Skip to main content",
|
"header.label.skip.nav": "Springe zum Hauptthema",
|
||||||
"header.label.app.nav": "App",
|
"header.label.app.nav": "",
|
||||||
"header.menu.dashboard.label": "Dashboard",
|
"general.register.sentenceCase": "",
|
||||||
"header.help.label": "Help",
|
"general.signIn.sentenceCase": "",
|
||||||
"header.menu.profile.label": "Profile",
|
"header.menu.dashboard.label": "Meine Kurse",
|
||||||
"header.menu.account.label": "Account",
|
"header.help.label": "Hilfe",
|
||||||
"header.menu.orderHistory.label": "Order History",
|
"header.menu.profile.label": "",
|
||||||
"header.navigation.skipNavLink": "Skip to main content.",
|
"header.menu.account.label": "Konto",
|
||||||
"header.menu.signOut.label": "Sign Out",
|
"header.menu.orderHistory.label": "",
|
||||||
"notification.title": "Notifications",
|
"header.navigation.skipNavLink": "",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.menu.signOut.label": "Abmelden",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.user.menu.studio": "",
|
||||||
"notification.mark.as.read": "Mark all as read",
|
"header.user.menu.maintenance": "",
|
||||||
"notification.fullStop": "•",
|
"header.label.courseOutline": ""
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Registrarse",
|
|
||||||
"general.signIn.sentenceCase": "Iniciar sesión",
|
|
||||||
"header.links.courses": "Cursos",
|
"header.links.courses": "Cursos",
|
||||||
"header.links.programs": "Programas",
|
"header.links.programs": "Programas",
|
||||||
"header.links.content.search": "Encontrar nuevo",
|
"header.links.content.search": "Encontrar nuevo",
|
||||||
@@ -23,6 +21,8 @@
|
|||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.secondary.nav": "Secondary",
|
||||||
"header.label.skip.nav": "Ir al contenido principal",
|
"header.label.skip.nav": "Ir al contenido principal",
|
||||||
"header.label.app.nav": "Aplicación",
|
"header.label.app.nav": "Aplicación",
|
||||||
|
"general.register.sentenceCase": "Registrarse",
|
||||||
|
"general.signIn.sentenceCase": "Iniciar sesión",
|
||||||
"header.menu.dashboard.label": "Panel de Control",
|
"header.menu.dashboard.label": "Panel de Control",
|
||||||
"header.help.label": "Ayuda",
|
"header.help.label": "Ayuda",
|
||||||
"header.menu.profile.label": "Perfil",
|
"header.menu.profile.label": "Perfil",
|
||||||
@@ -30,10 +30,7 @@
|
|||||||
"header.menu.orderHistory.label": "Historial de órdenes",
|
"header.menu.orderHistory.label": "Historial de órdenes",
|
||||||
"header.navigation.skipNavLink": "Dirígete al contenido principal.",
|
"header.navigation.skipNavLink": "Dirígete al contenido principal.",
|
||||||
"header.menu.signOut.label": "Cerrar sesión",
|
"header.menu.signOut.label": "Cerrar sesión",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "Inicio Studio",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.user.menu.maintenance": "Mantenimiento",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.label.courseOutline": "Volver al esquema del curso en Studio"
|
||||||
"notification.mark.as.read": "Mark all as read",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "S'inscrire",
|
|
||||||
"general.signIn.sentenceCase": "Connectez-vous",
|
|
||||||
"header.links.courses": "Cours",
|
"header.links.courses": "Cours",
|
||||||
"header.links.programs": "Programmes",
|
"header.links.programs": "Programmes",
|
||||||
"header.links.content.search": "Explorer les cours",
|
"header.links.content.search": "Explorer les cours",
|
||||||
@@ -23,6 +21,8 @@
|
|||||||
"header.label.secondary.nav": "Secondaire",
|
"header.label.secondary.nav": "Secondaire",
|
||||||
"header.label.skip.nav": "Passer au contenu principal",
|
"header.label.skip.nav": "Passer au contenu principal",
|
||||||
"header.label.app.nav": "Application",
|
"header.label.app.nav": "Application",
|
||||||
|
"general.register.sentenceCase": "S'inscrire",
|
||||||
|
"general.signIn.sentenceCase": "Connectez-vous",
|
||||||
"header.menu.dashboard.label": "Tableau de bord",
|
"header.menu.dashboard.label": "Tableau de bord",
|
||||||
"header.help.label": "Aide",
|
"header.help.label": "Aide",
|
||||||
"header.menu.profile.label": "Profil",
|
"header.menu.profile.label": "Profil",
|
||||||
@@ -30,10 +30,7 @@
|
|||||||
"header.menu.orderHistory.label": "Historique des commandes",
|
"header.menu.orderHistory.label": "Historique des commandes",
|
||||||
"header.navigation.skipNavLink": "Passer au contenu principal",
|
"header.navigation.skipNavLink": "Passer au contenu principal",
|
||||||
"header.menu.signOut.label": "Se déconnecter",
|
"header.menu.signOut.label": "Se déconnecter",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "Accueil Studio",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.user.menu.maintenance": "Maintenance",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.label.courseOutline": "Retour au plan de cours dans Studio"
|
||||||
"notification.mark.as.read": "Mark all as read",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Inscription",
|
|
||||||
"general.signIn.sentenceCase": "Connexion",
|
|
||||||
"header.links.courses": "Cours",
|
"header.links.courses": "Cours",
|
||||||
"header.links.programs": "Programmes",
|
"header.links.programs": "Programmes",
|
||||||
"header.links.content.search": "Découvrir les nouveautés",
|
"header.links.content.search": "Découvrir les nouveautés",
|
||||||
@@ -23,6 +21,8 @@
|
|||||||
"header.label.secondary.nav": "Secondaire",
|
"header.label.secondary.nav": "Secondaire",
|
||||||
"header.label.skip.nav": "Passer au contenu de cette vue",
|
"header.label.skip.nav": "Passer au contenu de cette vue",
|
||||||
"header.label.app.nav": "Application",
|
"header.label.app.nav": "Application",
|
||||||
|
"general.register.sentenceCase": "Inscription",
|
||||||
|
"general.signIn.sentenceCase": "Connexion",
|
||||||
"header.menu.dashboard.label": "Tableau de bord",
|
"header.menu.dashboard.label": "Tableau de bord",
|
||||||
"header.help.label": "Aide",
|
"header.help.label": "Aide",
|
||||||
"header.menu.profile.label": "Profil",
|
"header.menu.profile.label": "Profil",
|
||||||
@@ -30,10 +30,7 @@
|
|||||||
"header.menu.orderHistory.label": "Historique des commandes",
|
"header.menu.orderHistory.label": "Historique des commandes",
|
||||||
"header.navigation.skipNavLink": "Passer au contenu principal.",
|
"header.navigation.skipNavLink": "Passer au contenu principal.",
|
||||||
"header.menu.signOut.label": "Se déconnecter",
|
"header.menu.signOut.label": "Se déconnecter",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "Accueil Studio",
|
||||||
"notification.today.heading": "Dernières 24 heures",
|
"header.user.menu.maintenance": "Entretien",
|
||||||
"notification.earlier.heading": "Plus tôt",
|
"header.label.courseOutline": "Retour au plan de cours dans Studio"
|
||||||
"notification.mark.as.read": "tout marquer comme lu",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Charger plus de notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,39 +1,36 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Register",
|
"header.links.courses": "पाठ्यक्रम",
|
||||||
"general.signIn.sentenceCase": "Sign in",
|
"header.links.programs": "कार्यक्रमों",
|
||||||
"header.links.courses": "Courses",
|
"header.links.content.search": "नया खोजें",
|
||||||
"header.links.programs": "Programs",
|
"header.links.schools": "स्कूलों और भागीदारों",
|
||||||
"header.links.content.search": "Discover New",
|
"header.user.menu.dashboard": "डैशबोर्ड",
|
||||||
"header.links.schools": "Schools & Partners",
|
"header.user.menu.profile": "प्रोफ़ाइल",
|
||||||
"header.user.menu.dashboard": "Dashboard",
|
"header.user.menu.account.settings": "खाता",
|
||||||
"header.user.menu.profile": "Profile",
|
"header.user.menu.order.history": "ऑर्डर इतिहास",
|
||||||
"header.user.menu.account.settings": "Account",
|
"header.user.menu.logout": "लॉग आउट",
|
||||||
"header.user.menu.order.history": "Order History",
|
"header.user.menu.login": "लॉगिन",
|
||||||
"header.user.menu.logout": "Logout",
|
"header.user.menu.register": "साइन अप",
|
||||||
"header.user.menu.login": "Login",
|
"header.user.menu.studio.home": "स्टूडियो होम",
|
||||||
"header.user.menu.register": "Sign Up",
|
"header.user.menu.studio.maintenance": "अनुरक्षण करना",
|
||||||
"header.user.menu.studio.home": "Studio Home",
|
"header.label.account.nav": "खाता",
|
||||||
"header.user.menu.studio.maintenance": "Maintenance",
|
"header.label.account.menu": "खाता मेनू",
|
||||||
"header.label.account.nav": "Account",
|
"header.label.account.menu.for": "{username} के लिए खाता मेनू",
|
||||||
"header.label.account.menu": "Account Menu",
|
"header.label.main.nav": "मुख्य",
|
||||||
"header.label.account.menu.for": "Account menu for {username}",
|
"header.label.main.menu": "मुख्य मेनू",
|
||||||
"header.label.main.nav": "Main",
|
"header.label.main.header": "मुख्य",
|
||||||
"header.label.main.menu": "Main Menu",
|
"header.label.secondary.nav": "माध्यमिक",
|
||||||
"header.label.main.header": "Main",
|
"header.label.skip.nav": "मुख्य विषयवस्तु में जाएं",
|
||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.app.nav": "ऐप",
|
||||||
"header.label.skip.nav": "Skip to main content",
|
"general.register.sentenceCase": "रजिस्टर करें",
|
||||||
"header.label.app.nav": "App",
|
"general.signIn.sentenceCase": "साइन इन करें",
|
||||||
"header.menu.dashboard.label": "Dashboard",
|
"header.menu.dashboard.label": "डैशबोर्ड",
|
||||||
"header.help.label": "Help",
|
"header.help.label": "मदद",
|
||||||
"header.menu.profile.label": "Profile",
|
"header.menu.profile.label": "प्रोफ़ाइल",
|
||||||
"header.menu.account.label": "Account",
|
"header.menu.account.label": "खाता",
|
||||||
"header.menu.orderHistory.label": "Order History",
|
"header.menu.orderHistory.label": "ऑर्डर इतिहास",
|
||||||
"header.navigation.skipNavLink": "Skip to main content.",
|
"header.navigation.skipNavLink": "मुख्य सामग्री पर जाएँ।",
|
||||||
"header.menu.signOut.label": "Sign Out",
|
"header.menu.signOut.label": "साइन आउट करें",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "स्टूडियो होम",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.user.menu.maintenance": "अनुरक्षण करना",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.label.courseOutline": "स्टूडियो में पाठ्यक्रम की रूपरेखा पर वापस जाएँ"
|
||||||
"notification.mark.as.read": "Mark all as read",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,39 +1,36 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Register",
|
"header.links.courses": "Corsi",
|
||||||
"general.signIn.sentenceCase": "Sign in",
|
"header.links.programs": "",
|
||||||
"header.links.courses": "Courses",
|
"header.links.content.search": "",
|
||||||
"header.links.programs": "Programs",
|
"header.links.schools": "Scuole e Partner",
|
||||||
"header.links.content.search": "Discover New",
|
"header.user.menu.dashboard": "Pannello di controllo",
|
||||||
"header.links.schools": "Schools & Partners",
|
"header.user.menu.profile": "Profilo",
|
||||||
"header.user.menu.dashboard": "Dashboard",
|
|
||||||
"header.user.menu.profile": "Profile",
|
|
||||||
"header.user.menu.account.settings": "Account",
|
"header.user.menu.account.settings": "Account",
|
||||||
"header.user.menu.order.history": "Order History",
|
"header.user.menu.order.history": "Cronologia Ordini",
|
||||||
"header.user.menu.logout": "Logout",
|
"header.user.menu.logout": "",
|
||||||
"header.user.menu.login": "Login",
|
"header.user.menu.login": "",
|
||||||
"header.user.menu.register": "Sign Up",
|
"header.user.menu.register": "Registrazione",
|
||||||
"header.user.menu.studio.home": "Studio Home",
|
"header.user.menu.studio.home": "",
|
||||||
"header.user.menu.studio.maintenance": "Maintenance",
|
"header.user.menu.studio.maintenance": "",
|
||||||
"header.label.account.nav": "Account",
|
"header.label.account.nav": "Account",
|
||||||
"header.label.account.menu": "Account Menu",
|
"header.label.account.menu": "",
|
||||||
"header.label.account.menu.for": "Account menu for {username}",
|
"header.label.account.menu.for": "",
|
||||||
"header.label.main.nav": "Main",
|
"header.label.main.nav": "",
|
||||||
"header.label.main.menu": "Main Menu",
|
"header.label.main.menu": "",
|
||||||
"header.label.main.header": "Main",
|
"header.label.main.header": "",
|
||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.secondary.nav": "",
|
||||||
"header.label.skip.nav": "Skip to main content",
|
"header.label.skip.nav": "Passa al contenuto principale",
|
||||||
"header.label.app.nav": "App",
|
"header.label.app.nav": "",
|
||||||
"header.menu.dashboard.label": "Dashboard",
|
"general.register.sentenceCase": "Registrazione",
|
||||||
"header.help.label": "Help",
|
"general.signIn.sentenceCase": "Accedi",
|
||||||
"header.menu.profile.label": "Profile",
|
"header.menu.dashboard.label": "Pannello di controllo",
|
||||||
|
"header.help.label": "Aiuto",
|
||||||
|
"header.menu.profile.label": "Profilo",
|
||||||
"header.menu.account.label": "Account",
|
"header.menu.account.label": "Account",
|
||||||
"header.menu.orderHistory.label": "Order History",
|
"header.menu.orderHistory.label": "Cronologia Ordini",
|
||||||
"header.navigation.skipNavLink": "Skip to main content.",
|
"header.navigation.skipNavLink": "",
|
||||||
"header.menu.signOut.label": "Sign Out",
|
"header.menu.signOut.label": "Esci",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.user.menu.maintenance": "",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.label.courseOutline": ""
|
||||||
"notification.mark.as.read": "Mark all as read",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,39 +1,36 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Register",
|
"header.links.courses": "",
|
||||||
"general.signIn.sentenceCase": "Sign in",
|
"header.links.programs": "",
|
||||||
"header.links.courses": "Courses",
|
"header.links.content.search": "",
|
||||||
"header.links.programs": "Programs",
|
"header.links.schools": "",
|
||||||
"header.links.content.search": "Discover New",
|
"header.user.menu.dashboard": "",
|
||||||
"header.links.schools": "Schools & Partners",
|
"header.user.menu.profile": "",
|
||||||
"header.user.menu.dashboard": "Dashboard",
|
"header.user.menu.account.settings": "",
|
||||||
"header.user.menu.profile": "Profile",
|
"header.user.menu.order.history": "",
|
||||||
"header.user.menu.account.settings": "Account",
|
"header.user.menu.logout": "",
|
||||||
"header.user.menu.order.history": "Order History",
|
|
||||||
"header.user.menu.logout": "Logout",
|
|
||||||
"header.user.menu.login": "Login",
|
"header.user.menu.login": "Login",
|
||||||
"header.user.menu.register": "Sign Up",
|
"header.user.menu.register": "",
|
||||||
"header.user.menu.studio.home": "Studio Home",
|
"header.user.menu.studio.home": "",
|
||||||
"header.user.menu.studio.maintenance": "Maintenance",
|
"header.user.menu.studio.maintenance": "",
|
||||||
"header.label.account.nav": "Account",
|
"header.label.account.nav": "",
|
||||||
"header.label.account.menu": "Account Menu",
|
"header.label.account.menu": "",
|
||||||
"header.label.account.menu.for": "Account menu for {username}",
|
"header.label.account.menu.for": "",
|
||||||
"header.label.main.nav": "Main",
|
"header.label.main.nav": "",
|
||||||
"header.label.main.menu": "Main Menu",
|
"header.label.main.menu": "",
|
||||||
"header.label.main.header": "Main",
|
"header.label.main.header": "",
|
||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.secondary.nav": "",
|
||||||
"header.label.skip.nav": "Skip to main content",
|
"header.label.skip.nav": "",
|
||||||
"header.label.app.nav": "App",
|
"header.label.app.nav": "",
|
||||||
"header.menu.dashboard.label": "Dashboard",
|
"general.register.sentenceCase": "",
|
||||||
"header.help.label": "Help",
|
"general.signIn.sentenceCase": "",
|
||||||
"header.menu.profile.label": "Profile",
|
"header.menu.dashboard.label": "",
|
||||||
"header.menu.account.label": "Account",
|
"header.help.label": "",
|
||||||
"header.menu.orderHistory.label": "Order History",
|
"header.menu.profile.label": "",
|
||||||
"header.navigation.skipNavLink": "Skip to main content.",
|
"header.menu.account.label": "",
|
||||||
"header.menu.signOut.label": "Sign Out",
|
"header.menu.orderHistory.label": "",
|
||||||
"notification.title": "Notifications",
|
"header.navigation.skipNavLink": "",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.menu.signOut.label": "",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.user.menu.studio": "",
|
||||||
"notification.mark.as.read": "Mark all as read",
|
"header.user.menu.maintenance": "",
|
||||||
"notification.fullStop": "•",
|
"header.label.courseOutline": ""
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,39 +1,36 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Register",
|
"header.links.courses": "Курсы",
|
||||||
"general.signIn.sentenceCase": "Sign in",
|
"header.links.programs": "Программы",
|
||||||
"header.links.courses": "Courses",
|
"header.links.content.search": "Каталог курсов",
|
||||||
"header.links.programs": "Programs",
|
"header.links.schools": "Учебные заведения и партнёры",
|
||||||
"header.links.content.search": "Discover New",
|
"header.user.menu.dashboard": "Панель управления",
|
||||||
"header.links.schools": "Schools & Partners",
|
"header.user.menu.profile": "Профиль",
|
||||||
"header.user.menu.dashboard": "Dashboard",
|
"header.user.menu.account.settings": "Учётная запись",
|
||||||
"header.user.menu.profile": "Profile",
|
"header.user.menu.order.history": "История заказов",
|
||||||
"header.user.menu.account.settings": "Account",
|
"header.user.menu.logout": "Выйти",
|
||||||
"header.user.menu.order.history": "Order History",
|
"header.user.menu.login": "Войти",
|
||||||
"header.user.menu.logout": "Logout",
|
"header.user.menu.register": "Зарегистрироваться",
|
||||||
"header.user.menu.login": "Login",
|
"header.user.menu.studio.home": "Studio Дом",
|
||||||
"header.user.menu.register": "Sign Up",
|
"header.user.menu.studio.maintenance": "Техническое обслуживание",
|
||||||
"header.user.menu.studio.home": "Studio Home",
|
"header.label.account.nav": "Учётная запись",
|
||||||
"header.user.menu.studio.maintenance": "Maintenance",
|
"header.label.account.menu": "Меню учетной записи",
|
||||||
"header.label.account.nav": "Account",
|
"header.label.account.menu.for": "Меню учетной записи для {username}",
|
||||||
"header.label.account.menu": "Account Menu",
|
"header.label.main.nav": "Главный",
|
||||||
"header.label.account.menu.for": "Account menu for {username}",
|
"header.label.main.menu": "Главное меню",
|
||||||
"header.label.main.nav": "Main",
|
"header.label.main.header": "Главный",
|
||||||
"header.label.main.menu": "Main Menu",
|
"header.label.secondary.nav": "Среднее образование",
|
||||||
"header.label.main.header": "Main",
|
"header.label.skip.nav": "Перейти к основному содержимому",
|
||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.app.nav": "Приложение",
|
||||||
"header.label.skip.nav": "Skip to main content",
|
"general.register.sentenceCase": "Регистрация",
|
||||||
"header.label.app.nav": "App",
|
"general.signIn.sentenceCase": "Вход",
|
||||||
"header.menu.dashboard.label": "Dashboard",
|
"header.menu.dashboard.label": "Панель управления",
|
||||||
"header.help.label": "Help",
|
"header.help.label": "Помощь",
|
||||||
"header.menu.profile.label": "Profile",
|
"header.menu.profile.label": "Профиль",
|
||||||
"header.menu.account.label": "Account",
|
"header.menu.account.label": "Учётная запись",
|
||||||
"header.menu.orderHistory.label": "Order History",
|
"header.menu.orderHistory.label": "История заказов",
|
||||||
"header.navigation.skipNavLink": "Skip to main content.",
|
"header.navigation.skipNavLink": "Перейти к контенту",
|
||||||
"header.menu.signOut.label": "Sign Out",
|
"header.menu.signOut.label": "Выйти",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "Studio Дом",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.user.menu.maintenance": "Техническое обслуживание",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.label.courseOutline": ""
|
||||||
"notification.mark.as.read": "Mark all as read",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,39 +1,36 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Register",
|
|
||||||
"general.signIn.sentenceCase": "Увійти",
|
|
||||||
"header.links.courses": "Курси",
|
"header.links.courses": "Курси",
|
||||||
"header.links.programs": "Програми",
|
"header.links.programs": "Програми",
|
||||||
"header.links.content.search": "Discover New",
|
"header.links.content.search": "Відкривайте Нове",
|
||||||
"header.links.schools": "Schools & Partners",
|
"header.links.schools": "Школи та партнери",
|
||||||
"header.user.menu.dashboard": "Dashboard",
|
"header.user.menu.dashboard": "Мої курси",
|
||||||
"header.user.menu.profile": "Profile",
|
"header.user.menu.profile": "Профіль",
|
||||||
"header.user.menu.account.settings": "Account",
|
"header.user.menu.account.settings": "Обліковий запис",
|
||||||
"header.user.menu.order.history": "Order History",
|
"header.user.menu.order.history": "Історія замовлень",
|
||||||
"header.user.menu.logout": "Logout",
|
"header.user.menu.logout": "Вийти",
|
||||||
"header.user.menu.login": "Login",
|
"header.user.menu.login": "Увійти",
|
||||||
"header.user.menu.register": "Sign Up",
|
"header.user.menu.register": "Зареєструватися",
|
||||||
"header.user.menu.studio.home": "Studio Home",
|
"header.user.menu.studio.home": "Головна сторінка в Студії",
|
||||||
"header.user.menu.studio.maintenance": "Maintenance",
|
"header.user.menu.studio.maintenance": "Технічні робити",
|
||||||
"header.label.account.nav": "Account",
|
"header.label.account.nav": "Обліковий запис",
|
||||||
"header.label.account.menu": "Меню облікового запису",
|
"header.label.account.menu": "Меню облікового запису",
|
||||||
"header.label.account.menu.for": "Меню облікового запису для {username}",
|
"header.label.account.menu.for": "Меню облікового запису для {username}",
|
||||||
"header.label.main.nav": "Main",
|
"header.label.main.nav": "Головна",
|
||||||
"header.label.main.menu": "Main Menu",
|
"header.label.main.menu": "Головне меню",
|
||||||
"header.label.main.header": "Main",
|
"header.label.main.header": "Головна",
|
||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.secondary.nav": "Середня",
|
||||||
"header.label.skip.nav": "Перейти до головного змісту",
|
"header.label.skip.nav": "Перейти до головного змісту",
|
||||||
"header.label.app.nav": "App",
|
"header.label.app.nav": "Додаток",
|
||||||
"header.menu.dashboard.label": "Dashboard",
|
"general.register.sentenceCase": "Зареєструватися",
|
||||||
"header.help.label": "Help",
|
"general.signIn.sentenceCase": "Увійти",
|
||||||
"header.menu.profile.label": "Profile",
|
"header.menu.dashboard.label": "Мої курси",
|
||||||
"header.menu.account.label": "Account",
|
"header.help.label": "Допомога",
|
||||||
"header.menu.orderHistory.label": "Order History",
|
"header.menu.profile.label": "Профіль",
|
||||||
|
"header.menu.account.label": "Обліковий запис",
|
||||||
|
"header.menu.orderHistory.label": "Історія замовлень",
|
||||||
"header.navigation.skipNavLink": "Перейти до головного змісту.",
|
"header.navigation.skipNavLink": "Перейти до головного змісту.",
|
||||||
"header.menu.signOut.label": "Sign Out",
|
"header.menu.signOut.label": "Вийти",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "Головна сторінка в Студії",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.user.menu.maintenance": "Технічні робити",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.label.courseOutline": "Повернутися до плану курсу в Studio"
|
||||||
"notification.mark.as.read": "Mark all as read",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,39 +1,36 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Register",
|
"header.links.courses": "课程",
|
||||||
"general.signIn.sentenceCase": "Sign in",
|
"header.links.programs": "项目",
|
||||||
"header.links.courses": "Courses",
|
"header.links.content.search": "马上探索课程",
|
||||||
"header.links.programs": "Programs",
|
"header.links.schools": "学校 & 伙伴",
|
||||||
"header.links.content.search": "Discover New",
|
"header.user.menu.dashboard": "课程面板",
|
||||||
"header.links.schools": "Schools & Partners",
|
"header.user.menu.profile": "个人主页",
|
||||||
"header.user.menu.dashboard": "Dashboard",
|
"header.user.menu.account.settings": "账号",
|
||||||
"header.user.menu.profile": "Profile",
|
"header.user.menu.order.history": "订单记录",
|
||||||
"header.user.menu.account.settings": "Account",
|
"header.user.menu.logout": "退出",
|
||||||
"header.user.menu.order.history": "Order History",
|
"header.user.menu.login": "登录",
|
||||||
"header.user.menu.logout": "Logout",
|
"header.user.menu.register": "注册",
|
||||||
"header.user.menu.login": "Login",
|
"header.user.menu.studio.home": "工作室主页",
|
||||||
"header.user.menu.register": "Sign Up",
|
"header.user.menu.studio.maintenance": "维护",
|
||||||
"header.user.menu.studio.home": "Studio Home",
|
"header.label.account.nav": "账号",
|
||||||
"header.user.menu.studio.maintenance": "Maintenance",
|
"header.label.account.menu": "账户菜单",
|
||||||
"header.label.account.nav": "Account",
|
"header.label.account.menu.for": "{username} 的帐户菜单",
|
||||||
"header.label.account.menu": "Account Menu",
|
"header.label.main.nav": "主要",
|
||||||
"header.label.account.menu.for": "Account menu for {username}",
|
"header.label.main.menu": "主菜单",
|
||||||
"header.label.main.nav": "Main",
|
"header.label.main.header": "主要",
|
||||||
"header.label.main.menu": "Main Menu",
|
"header.label.secondary.nav": "高中",
|
||||||
"header.label.main.header": "Main",
|
"header.label.skip.nav": "跳转到主要内容",
|
||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.app.nav": "",
|
||||||
"header.label.skip.nav": "Skip to main content",
|
"general.register.sentenceCase": "注册",
|
||||||
"header.label.app.nav": "App",
|
"general.signIn.sentenceCase": "登录",
|
||||||
"header.menu.dashboard.label": "Dashboard",
|
"header.menu.dashboard.label": "课程面板",
|
||||||
"header.help.label": "Help",
|
"header.help.label": "帮助",
|
||||||
"header.menu.profile.label": "Profile",
|
"header.menu.profile.label": "个人主页",
|
||||||
"header.menu.account.label": "Account",
|
"header.menu.account.label": "账号",
|
||||||
"header.menu.orderHistory.label": "Order History",
|
"header.menu.orderHistory.label": "订单记录",
|
||||||
"header.navigation.skipNavLink": "Skip to main content.",
|
"header.navigation.skipNavLink": "跳回主頁",
|
||||||
"header.menu.signOut.label": "Sign Out",
|
"header.menu.signOut.label": "注销",
|
||||||
"notification.title": "Notifications",
|
"header.user.menu.studio": "工作室主页",
|
||||||
"notification.today.heading": "Last 24 hours",
|
"header.user.menu.maintenance": "维护",
|
||||||
"notification.earlier.heading": "Earlier",
|
"header.label.courseOutline": "返回 Studio 中的课程大纲"
|
||||||
"notification.mark.as.read": "Mark all as read",
|
|
||||||
"notification.fullStop": "•",
|
|
||||||
"notification.load.more.notifications": "Load more notifications"
|
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import Header from './Header';
|
import Header from './Header';
|
||||||
import LearningHeader from './learning-header/LearningHeader';
|
import LearningHeader from './learning-header/LearningHeader';
|
||||||
import messages from './i18n/index';
|
import messages from './i18n/index';
|
||||||
import StudioHeader from './StudioHeader';
|
import StudioHeader from './studio-header';
|
||||||
|
|
||||||
export { LearningHeader, messages, StudioHeader };
|
export { LearningHeader, messages, StudioHeader };
|
||||||
|
|
||||||
|
|||||||
144
src/index.scss
144
src/index.scss
@@ -1,11 +1,9 @@
|
|||||||
$spacer: 1rem;
|
$spacer: 1rem;
|
||||||
$blue: #007db8;
|
$blue: #007db8;
|
||||||
$white: #fff;
|
$white: #fff;
|
||||||
@import "@edx/brand/paragon/fonts.scss";
|
|
||||||
@import "@edx/brand/paragon/variables.scss";
|
|
||||||
@import "@edx/paragon/scss/core/core.scss";
|
|
||||||
@import "@edx/brand/paragon/overrides.scss";
|
|
||||||
@import './Menu/menu.scss';
|
@import './Menu/menu.scss';
|
||||||
|
@import './studio-header/StudioHeader.scss';
|
||||||
|
|
||||||
.dropdown-item a {
|
.dropdown-item a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
@@ -45,9 +43,9 @@ $white: #fff;
|
|||||||
.user-dropdown {
|
.user-dropdown {
|
||||||
.btn {
|
.btn {
|
||||||
height: 3rem;
|
height: 3rem;
|
||||||
@media (max-width: -1 + map-get($grid-breakpoints, "sm")) {
|
// @media (max-width: -1 + map-get($grid-breakpoints, "sm")) {
|
||||||
padding: 0 0.5rem;
|
// padding: 0 0.5rem;
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -121,135 +119,3 @@ $white: #fff;
|
|||||||
border-radius: $rounded-pill;
|
border-radius: $rounded-pill;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
|
||||||
b {
|
|
||||||
color: #00262B !important;
|
|
||||||
font-weight: 500 !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.font-size-18 {
|
|
||||||
font-size: 18px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.font-size-12 {
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.font-size-14 {
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.py-10px {
|
|
||||||
padding-top: 10px;
|
|
||||||
padding-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pb-10px {
|
|
||||||
padding-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.line-height-24 {
|
|
||||||
line-height: 24px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.line-height-20 {
|
|
||||||
line-height: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.line-height-10 {
|
|
||||||
line-height: 10px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon-size-20 {
|
|
||||||
width: 20px !important;
|
|
||||||
height: 20px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cursor-pointer {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-button {
|
|
||||||
width: 36px;
|
|
||||||
height: 36px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-icon{
|
|
||||||
height: 23.33px !important;
|
|
||||||
width: 23.33px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-badge {
|
|
||||||
position: absolute;
|
|
||||||
margin-top: 18px;
|
|
||||||
margin-left: -21px;
|
|
||||||
border: 2px solid #FFFFFF;
|
|
||||||
font-size: 9px !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.popover {
|
|
||||||
max-height: calc(100% - 68px);
|
|
||||||
min-height: 1220px;
|
|
||||||
filter: none;
|
|
||||||
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15), 0px 2px 8px rgba(0, 0, 0, 0.15);
|
|
||||||
|
|
||||||
&.medium-screen {
|
|
||||||
min-width: 24.313rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.large-screen {
|
|
||||||
min-width: 34.313rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dropdown-toggle::after {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.expandable {
|
|
||||||
position: relative !important;
|
|
||||||
margin-left: 4px;
|
|
||||||
padding: 2px 5px;
|
|
||||||
border-radius: 10rem;
|
|
||||||
font-size: 9px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dropdown-toggle {
|
|
||||||
font-size: 14px;
|
|
||||||
padding-top: 0px !important;
|
|
||||||
padding-bottom: 12px !important;
|
|
||||||
|
|
||||||
div {
|
|
||||||
min-height: 6px !important;
|
|
||||||
min-width: 6px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.dropdown-item {
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification-content {
|
|
||||||
.notification-item-content {
|
|
||||||
display: -webkit-box;
|
|
||||||
-webkit-line-clamp: 2;
|
|
||||||
-webkit-box-orient: vertical;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
|
|
||||||
p {
|
|
||||||
margin-bottom: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
b {
|
|
||||||
color: #00262B;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.unread {
|
|
||||||
height: 10px;
|
|
||||||
width: 10px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import React from 'react';
|
|||||||
import { getConfig } from '@edx/frontend-platform';
|
import { getConfig } from '@edx/frontend-platform';
|
||||||
import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
|
import { getLoginRedirectUrl } from '@edx/frontend-platform/auth';
|
||||||
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
||||||
import { Button } from '@edx/paragon';
|
import { Button } from '@openedx/paragon';
|
||||||
|
|
||||||
import genericMessages from '../generic/messages';
|
import genericMessages from '../generic/messages';
|
||||||
|
|
||||||
|
|||||||
@@ -1,31 +1,15 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||||
import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
|
import { faUserCircle } from '@fortawesome/free-solid-svg-icons';
|
||||||
import { getConfig } from '@edx/frontend-platform';
|
import { getConfig } from '@edx/frontend-platform';
|
||||||
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
||||||
import { Dropdown } from '@edx/paragon';
|
import { Dropdown } from '@openedx/paragon';
|
||||||
import { useSelector, useDispatch } from 'react-redux';
|
|
||||||
import Notifications from '../Notifications';
|
|
||||||
import { selectShowNotificationTray, selectNotificationStatus } from '../Notifications/data/selectors';
|
|
||||||
import { fetchAppsNotificationCount } from '../Notifications/data/thunks';
|
|
||||||
import { RequestStatus } from '../Notifications/data/slice';
|
|
||||||
|
|
||||||
import messages from './messages';
|
import messages from './messages';
|
||||||
|
|
||||||
const AuthenticatedUserDropdown = ({ intl, username }) => {
|
const AuthenticatedUserDropdown = ({ intl, username }) => {
|
||||||
const showNotificationsTray = useSelector(selectShowNotificationTray());
|
|
||||||
const notificationStatus = useSelector(selectNotificationStatus());
|
|
||||||
const dispatch = useDispatch();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (notificationStatus === RequestStatus.IDLE) {
|
|
||||||
dispatch(fetchAppsNotificationCount());
|
|
||||||
}
|
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
||||||
}, [notificationStatus]);
|
|
||||||
|
|
||||||
const dashboardMenuItem = (
|
const dashboardMenuItem = (
|
||||||
<Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>
|
<Dropdown.Item href={`${getConfig().LMS_BASE_URL}/dashboard`}>
|
||||||
{intl.formatMessage(messages.dashboard)}
|
{intl.formatMessage(messages.dashboard)}
|
||||||
@@ -35,7 +19,6 @@ const AuthenticatedUserDropdown = ({ intl, username }) => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<a className="text-gray-700" href={`${getConfig().SUPPORT_URL}`}>{intl.formatMessage(messages.help)}</a>
|
<a className="text-gray-700" href={`${getConfig().SUPPORT_URL}`}>{intl.formatMessage(messages.help)}</a>
|
||||||
{showNotificationsTray && <Notifications />}
|
|
||||||
<Dropdown className="user-dropdown ml-3">
|
<Dropdown className="user-dropdown ml-3">
|
||||||
<Dropdown.Toggle variant="outline-primary">
|
<Dropdown.Toggle variant="outline-primary">
|
||||||
<FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
|
<FontAwesomeIcon icon={faUserCircle} className="d-md-none" size="lg" />
|
||||||
|
|||||||
@@ -2,12 +2,11 @@ import React, { useContext } from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { getConfig } from '@edx/frontend-platform';
|
import { getConfig } from '@edx/frontend-platform';
|
||||||
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
||||||
import { AppContext, AppProvider } from '@edx/frontend-platform/react';
|
import { AppContext } from '@edx/frontend-platform/react';
|
||||||
|
|
||||||
import AnonymousUserMenu from './AnonymousUserMenu';
|
import AnonymousUserMenu from './AnonymousUserMenu';
|
||||||
import AuthenticatedUserDropdown from './AuthenticatedUserDropdown';
|
import AuthenticatedUserDropdown from './AuthenticatedUserDropdown';
|
||||||
import messages from './messages';
|
import messages from './messages';
|
||||||
import store from '../store';
|
|
||||||
|
|
||||||
const LinkedLogo = ({
|
const LinkedLogo = ({
|
||||||
href,
|
href,
|
||||||
@@ -41,26 +40,24 @@ const LearningHeader = ({
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AppProvider store={store}>
|
<header className="learning-header">
|
||||||
<header className="learning-header">
|
<a className="sr-only sr-only-focusable" href="#main-content">{intl.formatMessage(messages.skipNavLink)}</a>
|
||||||
<a className="sr-only sr-only-focusable" href="#main-content">{intl.formatMessage(messages.skipNavLink)}</a>
|
<div className="container-xl py-2 d-flex align-items-center">
|
||||||
<div className="container-xl py-2 d-flex align-items-center">
|
{headerLogo}
|
||||||
{headerLogo}
|
<div className="flex-grow-1 course-title-lockup" style={{ lineHeight: 1 }}>
|
||||||
<div className="flex-grow-1 course-title-lockup" style={{ lineHeight: 1 }}>
|
<span className="d-block small m-0">{courseOrg} {courseNumber}</span>
|
||||||
<span className="d-block small m-0">{courseOrg} {courseNumber}</span>
|
<span className="d-block m-0 font-weight-bold course-title">{courseTitle}</span>
|
||||||
<span className="d-block m-0 font-weight-bold course-title">{courseTitle}</span>
|
|
||||||
</div>
|
|
||||||
{showUserDropdown && authenticatedUser && (
|
|
||||||
<AuthenticatedUserDropdown
|
|
||||||
username={authenticatedUser.username}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{showUserDropdown && !authenticatedUser && (
|
|
||||||
<AnonymousUserMenu />
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</header>
|
{showUserDropdown && authenticatedUser && (
|
||||||
</AppProvider>
|
<AuthenticatedUserDropdown
|
||||||
|
username={authenticatedUser.username}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{showUserDropdown && !authenticatedUser && (
|
||||||
|
<AnonymousUserMenu />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
/* eslint-disable import/no-extraneous-dependencies */
|
/* eslint-disable import/no-extraneous-dependencies */
|
||||||
|
|
||||||
import Enzyme from 'enzyme';
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import Adapter from 'enzyme-adapter-react-16';
|
|
||||||
import '@testing-library/jest-dom';
|
import '@testing-library/jest-dom';
|
||||||
import '@testing-library/jest-dom/extend-expect';
|
import '@testing-library/jest-dom/extend-expect';
|
||||||
import 'babel-polyfill';
|
import 'babel-polyfill';
|
||||||
@@ -17,8 +15,6 @@ import { IntlProvider } from 'react-intl';
|
|||||||
import AppProvider from '@edx/frontend-platform/react/AppProvider';
|
import AppProvider from '@edx/frontend-platform/react/AppProvider';
|
||||||
import appMessages from './i18n';
|
import appMessages from './i18n';
|
||||||
|
|
||||||
Enzyme.configure({ adapter: new Adapter() });
|
|
||||||
|
|
||||||
// These configuration values are usually set in webpack's EnvironmentPlugin however
|
// These configuration values are usually set in webpack's EnvironmentPlugin however
|
||||||
// Jest does not use webpack so we need to set these so for testing
|
// Jest does not use webpack so we need to set these so for testing
|
||||||
process.env.ACCESS_TOKEN_COOKIE_NAME = 'edx-jwt-cookie-header-payload';
|
process.env.ACCESS_TOKEN_COOKIE_NAME = 'edx-jwt-cookie-header-payload';
|
||||||
|
|||||||
16
src/store.js
16
src/store.js
@@ -1,16 +0,0 @@
|
|||||||
import { configureStore } from '@reduxjs/toolkit';
|
|
||||||
|
|
||||||
import { notificationsReducer } from './Notifications/data';
|
|
||||||
|
|
||||||
export function initializeStore(preloadedState = undefined) {
|
|
||||||
return configureStore({
|
|
||||||
reducer: {
|
|
||||||
notifications: notificationsReducer,
|
|
||||||
},
|
|
||||||
preloadedState,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const store = initializeStore();
|
|
||||||
|
|
||||||
export default store;
|
|
||||||
24
src/studio-header/BrandNav.jsx
Normal file
24
src/studio-header/BrandNav.jsx
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
|
||||||
|
const BrandNav = ({
|
||||||
|
studioBaseUrl,
|
||||||
|
logo,
|
||||||
|
logoAltText,
|
||||||
|
}) => (
|
||||||
|
<a href={studioBaseUrl}>
|
||||||
|
<img
|
||||||
|
src={logo}
|
||||||
|
alt={logoAltText}
|
||||||
|
className="d-block logo"
|
||||||
|
/>
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
|
||||||
|
BrandNav.propTypes = {
|
||||||
|
studioBaseUrl: PropTypes.string.isRequired,
|
||||||
|
logo: PropTypes.string.isRequired,
|
||||||
|
logoAltText: PropTypes.string.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default BrandNav;
|
||||||
54
src/studio-header/CourseLockUp.jsx
Normal file
54
src/studio-header/CourseLockUp.jsx
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
||||||
|
import {
|
||||||
|
OverlayTrigger,
|
||||||
|
Tooltip,
|
||||||
|
} from '@openedx/paragon';
|
||||||
|
import messages from './messages';
|
||||||
|
|
||||||
|
const CourseLockUp = ({
|
||||||
|
outlineLink,
|
||||||
|
org,
|
||||||
|
number,
|
||||||
|
title,
|
||||||
|
// injected
|
||||||
|
intl,
|
||||||
|
}) => (
|
||||||
|
<OverlayTrigger
|
||||||
|
placement="bottom"
|
||||||
|
overlay={(
|
||||||
|
<Tooltip id="course-lock-up">
|
||||||
|
{title}
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
className="course-title-lockup mr-2"
|
||||||
|
href={outlineLink}
|
||||||
|
aria-label={intl.formatMessage(messages['header.label.courseOutline'])}
|
||||||
|
data-testid="course-lock-up-block"
|
||||||
|
>
|
||||||
|
<span className="d-block small m-0 text-gray-800" data-testid="course-org-number">{org} {number}</span>
|
||||||
|
<span className="d-block m-0 font-weight-bold text-gray-800" data-testid="course-title">{title}</span>
|
||||||
|
</a>
|
||||||
|
</OverlayTrigger>
|
||||||
|
);
|
||||||
|
|
||||||
|
CourseLockUp.propTypes = {
|
||||||
|
number: PropTypes.string,
|
||||||
|
org: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
outlineLink: PropTypes.string,
|
||||||
|
// injected
|
||||||
|
intl: intlShape.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
CourseLockUp.defaultProps = {
|
||||||
|
number: null,
|
||||||
|
org: null,
|
||||||
|
title: null,
|
||||||
|
outlineLink: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default injectIntl(CourseLockUp);
|
||||||
160
src/studio-header/HeaderBody.jsx
Normal file
160
src/studio-header/HeaderBody.jsx
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import {
|
||||||
|
ActionRow,
|
||||||
|
Button,
|
||||||
|
Container,
|
||||||
|
Nav,
|
||||||
|
Row,
|
||||||
|
} from '@openedx/paragon';
|
||||||
|
import { Close, MenuIcon } from '@openedx/paragon/icons';
|
||||||
|
|
||||||
|
import CourseLockUp from './CourseLockUp';
|
||||||
|
import UserMenu from './UserMenu';
|
||||||
|
import BrandNav from './BrandNav';
|
||||||
|
import NavDropdownMenu from './NavDropdownMenu';
|
||||||
|
|
||||||
|
const HeaderBody = ({
|
||||||
|
logo,
|
||||||
|
logoAltText,
|
||||||
|
number,
|
||||||
|
org,
|
||||||
|
title,
|
||||||
|
username,
|
||||||
|
isAdmin,
|
||||||
|
studioBaseUrl,
|
||||||
|
logoutUrl,
|
||||||
|
authenticatedUserAvatar,
|
||||||
|
isMobile,
|
||||||
|
setModalPopupTarget,
|
||||||
|
toggleModalPopup,
|
||||||
|
isModalPopupOpen,
|
||||||
|
isHiddenMainMenu,
|
||||||
|
mainMenuDropdowns,
|
||||||
|
outlineLink,
|
||||||
|
}) => {
|
||||||
|
const renderBrandNav = (
|
||||||
|
<BrandNav
|
||||||
|
{...{
|
||||||
|
studioBaseUrl,
|
||||||
|
logo,
|
||||||
|
logoAltText,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Container size="xl" className="px-2.5">
|
||||||
|
<ActionRow as="header">
|
||||||
|
{isHiddenMainMenu ? (
|
||||||
|
<Row className="flex-nowrap ml-4">
|
||||||
|
{renderBrandNav}
|
||||||
|
</Row>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
{isMobile ? (
|
||||||
|
<Button
|
||||||
|
ref={setModalPopupTarget}
|
||||||
|
className="d-inline-flex align-items-center"
|
||||||
|
variant="tertiary"
|
||||||
|
onClick={toggleModalPopup}
|
||||||
|
iconBefore={isModalPopupOpen ? Close : MenuIcon}
|
||||||
|
data-testid="mobile-menu-button"
|
||||||
|
>
|
||||||
|
Menu
|
||||||
|
</Button>
|
||||||
|
) : (
|
||||||
|
<div className="w-25">
|
||||||
|
<Row className="m-0 flex-nowrap">
|
||||||
|
{renderBrandNav}
|
||||||
|
<CourseLockUp
|
||||||
|
{...{
|
||||||
|
outlineLink,
|
||||||
|
number,
|
||||||
|
org,
|
||||||
|
title,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Row>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{isMobile ? (
|
||||||
|
<>
|
||||||
|
<ActionRow.Spacer />
|
||||||
|
{renderBrandNav}
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Nav data-testid="desktop-menu" className="ml-2">
|
||||||
|
{mainMenuDropdowns.map(dropdown => {
|
||||||
|
const { id, buttonTitle, items } = dropdown;
|
||||||
|
return (
|
||||||
|
<NavDropdownMenu key={id} {...{ id, buttonTitle, items }} />
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Nav>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
<ActionRow.Spacer />
|
||||||
|
<Nav>
|
||||||
|
<UserMenu
|
||||||
|
{...{
|
||||||
|
username,
|
||||||
|
studioBaseUrl,
|
||||||
|
logoutUrl,
|
||||||
|
authenticatedUserAvatar,
|
||||||
|
isAdmin,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Nav>
|
||||||
|
</ActionRow>
|
||||||
|
</Container>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
HeaderBody.propTypes = {
|
||||||
|
studioBaseUrl: PropTypes.string.isRequired,
|
||||||
|
logoutUrl: PropTypes.string.isRequired,
|
||||||
|
setModalPopupTarget: PropTypes.func,
|
||||||
|
toggleModalPopup: PropTypes.func,
|
||||||
|
isModalPopupOpen: PropTypes.bool,
|
||||||
|
number: PropTypes.string,
|
||||||
|
org: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
logo: PropTypes.string,
|
||||||
|
logoAltText: PropTypes.string,
|
||||||
|
authenticatedUserAvatar: PropTypes.string,
|
||||||
|
username: PropTypes.string,
|
||||||
|
isAdmin: PropTypes.bool,
|
||||||
|
isMobile: PropTypes.bool,
|
||||||
|
isHiddenMainMenu: PropTypes.bool,
|
||||||
|
mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
id: PropTypes.string,
|
||||||
|
buttonTitle: PropTypes.string,
|
||||||
|
items: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
href: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
})),
|
||||||
|
})),
|
||||||
|
outlineLink: PropTypes.string,
|
||||||
|
};
|
||||||
|
|
||||||
|
HeaderBody.defaultProps = {
|
||||||
|
setModalPopupTarget: null,
|
||||||
|
toggleModalPopup: null,
|
||||||
|
isModalPopupOpen: false,
|
||||||
|
logo: null,
|
||||||
|
logoAltText: null,
|
||||||
|
number: '',
|
||||||
|
org: '',
|
||||||
|
title: '',
|
||||||
|
authenticatedUserAvatar: null,
|
||||||
|
username: null,
|
||||||
|
isAdmin: false,
|
||||||
|
isMobile: false,
|
||||||
|
isHiddenMainMenu: false,
|
||||||
|
mainMenuDropdowns: [],
|
||||||
|
outlineLink: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default HeaderBody;
|
||||||
73
src/studio-header/MobileHeader.jsx
Normal file
73
src/studio-header/MobileHeader.jsx
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { useToggle, ModalPopup } from '@openedx/paragon';
|
||||||
|
import HeaderBody from './HeaderBody';
|
||||||
|
import MobileMenu from './MobileMenu';
|
||||||
|
|
||||||
|
const MobileHeader = ({
|
||||||
|
mainMenuDropdowns,
|
||||||
|
...props
|
||||||
|
}) => {
|
||||||
|
const [isOpen, , close, toggle] = useToggle(false);
|
||||||
|
const [target, setTarget] = useState(null);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<HeaderBody
|
||||||
|
{...props}
|
||||||
|
isMobile
|
||||||
|
setModalPopupTarget={setTarget}
|
||||||
|
toggleModalPopup={toggle}
|
||||||
|
isModalPopupOpen={isOpen}
|
||||||
|
/>
|
||||||
|
<ModalPopup
|
||||||
|
hasArrow
|
||||||
|
placement="bottom"
|
||||||
|
positionRef={target}
|
||||||
|
isOpen={isOpen}
|
||||||
|
onClose={close}
|
||||||
|
onEscapeKey={close}
|
||||||
|
className="mobile-menu-container"
|
||||||
|
>
|
||||||
|
<MobileMenu {...{ mainMenuDropdowns }} />
|
||||||
|
</ModalPopup>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
MobileHeader.propTypes = {
|
||||||
|
studioBaseUrl: PropTypes.string.isRequired,
|
||||||
|
logoutUrl: PropTypes.string.isRequired,
|
||||||
|
number: PropTypes.string,
|
||||||
|
org: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
logo: PropTypes.string,
|
||||||
|
logoAltText: PropTypes.string,
|
||||||
|
authenticatedUserAvatar: PropTypes.string,
|
||||||
|
username: PropTypes.string,
|
||||||
|
isAdmin: PropTypes.bool,
|
||||||
|
mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
id: PropTypes.string,
|
||||||
|
buttonTitle: PropTypes.string,
|
||||||
|
items: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
href: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
})),
|
||||||
|
})),
|
||||||
|
outlineLink: PropTypes.string,
|
||||||
|
};
|
||||||
|
|
||||||
|
MobileHeader.defaultProps = {
|
||||||
|
logo: null,
|
||||||
|
logoAltText: null,
|
||||||
|
number: null,
|
||||||
|
org: null,
|
||||||
|
title: null,
|
||||||
|
authenticatedUserAvatar: null,
|
||||||
|
username: null,
|
||||||
|
isAdmin: false,
|
||||||
|
mainMenuDropdowns: [],
|
||||||
|
outlineLink: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MobileHeader;
|
||||||
51
src/studio-header/MobileMenu.jsx
Normal file
51
src/studio-header/MobileMenu.jsx
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { Collapsible } from '@openedx/paragon';
|
||||||
|
|
||||||
|
const MobileMenu = ({
|
||||||
|
mainMenuDropdowns,
|
||||||
|
}) => (
|
||||||
|
<div
|
||||||
|
className="ml-4 p-2 bg-light-100 border border-gray-200 small rounded"
|
||||||
|
data-testid="mobile-menu"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
{mainMenuDropdowns.map(dropdown => {
|
||||||
|
const { id, buttonTitle, items } = dropdown;
|
||||||
|
return (
|
||||||
|
<Collapsible
|
||||||
|
className="border-light-100"
|
||||||
|
title={buttonTitle}
|
||||||
|
key={id}
|
||||||
|
>
|
||||||
|
<ul className="p-0" style={{ listStyleType: 'none' }}>
|
||||||
|
{items.map(item => (
|
||||||
|
<li className="mobile-menu-item">
|
||||||
|
<a href={item.href}>
|
||||||
|
{item.title}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</Collapsible>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
MobileMenu.propTypes = {
|
||||||
|
mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
id: PropTypes.string,
|
||||||
|
buttonTitle: PropTypes.string,
|
||||||
|
items: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
href: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
})),
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
MobileMenu.defaultProps = {
|
||||||
|
mainMenuDropdowns: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MobileMenu;
|
||||||
40
src/studio-header/NavDropdownMenu.jsx
Normal file
40
src/studio-header/NavDropdownMenu.jsx
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import {
|
||||||
|
Dropdown,
|
||||||
|
DropdownButton,
|
||||||
|
} from '@openedx/paragon';
|
||||||
|
|
||||||
|
const NavDropdownMenu = ({
|
||||||
|
id,
|
||||||
|
buttonTitle,
|
||||||
|
items,
|
||||||
|
}) => (
|
||||||
|
<DropdownButton
|
||||||
|
id={id}
|
||||||
|
title={buttonTitle}
|
||||||
|
variant="outline-primary"
|
||||||
|
className="mr-2"
|
||||||
|
>
|
||||||
|
{items.map(item => (
|
||||||
|
<Dropdown.Item
|
||||||
|
key={`${item.title}-dropdown-item`}
|
||||||
|
href={item.href}
|
||||||
|
className="small"
|
||||||
|
>
|
||||||
|
{item.title}
|
||||||
|
</Dropdown.Item>
|
||||||
|
))}
|
||||||
|
</DropdownButton>
|
||||||
|
);
|
||||||
|
|
||||||
|
NavDropdownMenu.propTypes = {
|
||||||
|
id: PropTypes.string.isRequired,
|
||||||
|
buttonTitle: PropTypes.string.isRequired,
|
||||||
|
items: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
href: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
})).isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default NavDropdownMenu;
|
||||||
75
src/studio-header/StudioHeader.jsx
Normal file
75
src/studio-header/StudioHeader.jsx
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
import React, { useContext } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import Responsive from 'react-responsive';
|
||||||
|
import { AppContext } from '@edx/frontend-platform/react';
|
||||||
|
import { ensureConfig } from '@edx/frontend-platform';
|
||||||
|
|
||||||
|
import MobileHeader from './MobileHeader';
|
||||||
|
import HeaderBody from './HeaderBody';
|
||||||
|
|
||||||
|
ensureConfig([
|
||||||
|
'STUDIO_BASE_URL',
|
||||||
|
'SITE_NAME',
|
||||||
|
'LOGOUT_URL',
|
||||||
|
'LOGIN_URL',
|
||||||
|
'LOGO_URL',
|
||||||
|
], 'Studio Header component');
|
||||||
|
|
||||||
|
const StudioHeader = ({
|
||||||
|
number, org, title, isHiddenMainMenu, mainMenuDropdowns, outlineLink,
|
||||||
|
}) => {
|
||||||
|
const { authenticatedUser, config } = useContext(AppContext);
|
||||||
|
const props = {
|
||||||
|
logo: config.LOGO_URL,
|
||||||
|
logoAltText: `Studio ${config.SITE_NAME}`,
|
||||||
|
number,
|
||||||
|
org,
|
||||||
|
title,
|
||||||
|
username: authenticatedUser?.username,
|
||||||
|
isAdmin: authenticatedUser?.administrator,
|
||||||
|
authenticatedUserAvatar: authenticatedUser?.avatar,
|
||||||
|
studioBaseUrl: config.STUDIO_BASE_URL,
|
||||||
|
logoutUrl: config.LOGOUT_URL,
|
||||||
|
isHiddenMainMenu,
|
||||||
|
mainMenuDropdowns,
|
||||||
|
outlineLink,
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="studio-header">
|
||||||
|
<a className="nav-skip sr-only sr-only-focusable" href="#main">Skip to content</a>
|
||||||
|
<Responsive maxWidth={841}>
|
||||||
|
<MobileHeader {...props} />
|
||||||
|
</Responsive>
|
||||||
|
<Responsive minWidth={842}>
|
||||||
|
<HeaderBody {...props} />
|
||||||
|
</Responsive>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
StudioHeader.propTypes = {
|
||||||
|
number: PropTypes.string,
|
||||||
|
org: PropTypes.string,
|
||||||
|
title: PropTypes.string.isRequired,
|
||||||
|
isHiddenMainMenu: PropTypes.bool,
|
||||||
|
mainMenuDropdowns: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
id: PropTypes.string,
|
||||||
|
buttonTitle: PropTypes.string,
|
||||||
|
items: PropTypes.arrayOf(PropTypes.shape({
|
||||||
|
href: PropTypes.string,
|
||||||
|
title: PropTypes.string,
|
||||||
|
})),
|
||||||
|
})),
|
||||||
|
outlineLink: PropTypes.string,
|
||||||
|
};
|
||||||
|
|
||||||
|
StudioHeader.defaultProps = {
|
||||||
|
number: '',
|
||||||
|
org: '',
|
||||||
|
isHiddenMainMenu: false,
|
||||||
|
mainMenuDropdowns: [],
|
||||||
|
outlineLink: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default StudioHeader;
|
||||||
49
src/studio-header/StudioHeader.scss
Normal file
49
src/studio-header/StudioHeader.scss
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
$spacer: 1rem;
|
||||||
|
$white: #FFFFFF;
|
||||||
|
|
||||||
|
.studio-header {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1000;
|
||||||
|
|
||||||
|
height: 3.75rem;
|
||||||
|
box-shadow: 0 1px 0 0 rgb(0 0 0 / .1);
|
||||||
|
background: $white;
|
||||||
|
|
||||||
|
.btn-outline-primary {
|
||||||
|
border-color: $white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo {
|
||||||
|
display: block;
|
||||||
|
box-sizing: content-box;
|
||||||
|
position: relative;
|
||||||
|
top: -.05em;
|
||||||
|
height: 1.75rem;
|
||||||
|
padding: $spacer 0;
|
||||||
|
margin-right: $spacer;
|
||||||
|
|
||||||
|
img {
|
||||||
|
display: block;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.course-title-lockup {
|
||||||
|
@media only screen and (min-width: 769px) {
|
||||||
|
padding: .5rem;
|
||||||
|
padding-right: $spacer;
|
||||||
|
border-right: 1px solid #E5E5E5;
|
||||||
|
width: 70%;
|
||||||
|
}
|
||||||
|
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
span {
|
||||||
|
color: #333333;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
line-height: 1.375rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
197
src/studio-header/StudioHeader.test.jsx
Normal file
197
src/studio-header/StudioHeader.test.jsx
Normal file
@@ -0,0 +1,197 @@
|
|||||||
|
/* eslint-disable react/prop-types */
|
||||||
|
import React, { useMemo } from 'react';
|
||||||
|
import {
|
||||||
|
render,
|
||||||
|
fireEvent,
|
||||||
|
waitFor,
|
||||||
|
} from '@testing-library/react';
|
||||||
|
|
||||||
|
import { AppContext } from '@edx/frontend-platform/react';
|
||||||
|
import { IntlProvider } from '@edx/frontend-platform/i18n';
|
||||||
|
import { Context as ResponsiveContext } from 'react-responsive';
|
||||||
|
|
||||||
|
import StudioHeader from './StudioHeader';
|
||||||
|
import messages from './messages';
|
||||||
|
|
||||||
|
const authenticatedUser = {
|
||||||
|
userId: 3,
|
||||||
|
username: 'abc123',
|
||||||
|
administrator: true,
|
||||||
|
roles: [],
|
||||||
|
avatar: '/imges/test.png',
|
||||||
|
};
|
||||||
|
let currentUser;
|
||||||
|
let screenWidth = 1280;
|
||||||
|
|
||||||
|
const RootWrapper = ({
|
||||||
|
...props
|
||||||
|
}) => {
|
||||||
|
const appContextValue = useMemo(() => ({
|
||||||
|
authenticatedUser: currentUser,
|
||||||
|
config: {
|
||||||
|
LOGOUT_URL: process.env.LOGOUT_URL,
|
||||||
|
LOGO_URL: process.env.LOGO_URL,
|
||||||
|
SITE_NAME: process.env.SITE_NAME,
|
||||||
|
STUDIO_BASE_URL: process.env.STUDIO_BASE_URL,
|
||||||
|
LOGIN_URL: process.env.LOGIN_URL,
|
||||||
|
},
|
||||||
|
}), []);
|
||||||
|
const responsiveContextValue = useMemo(() => ({ width: screenWidth }), []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
// eslint-disable-next-line react/jsx-no-constructed-context-values, react/prop-types
|
||||||
|
<IntlProvider locale="en">
|
||||||
|
<AppContext.Provider value={appContextValue}>
|
||||||
|
<ResponsiveContext.Provider value={responsiveContextValue}>
|
||||||
|
<StudioHeader
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
</ResponsiveContext.Provider>
|
||||||
|
</AppContext.Provider>
|
||||||
|
</IntlProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const props = {
|
||||||
|
number: '123',
|
||||||
|
org: 'Ed',
|
||||||
|
title: 'test',
|
||||||
|
mainMenuDropdowns: [
|
||||||
|
{
|
||||||
|
id: 'testId',
|
||||||
|
buttonTitle: 'test',
|
||||||
|
items: [
|
||||||
|
{
|
||||||
|
title: 'link',
|
||||||
|
href: '#',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
outlineLink: 'tEsTLInK',
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('Header', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.clearAllMocks();
|
||||||
|
currentUser = authenticatedUser;
|
||||||
|
});
|
||||||
|
describe('desktop', () => {
|
||||||
|
it('course lock up should be visible', () => {
|
||||||
|
const { getByTestId } = render(<RootWrapper {...props} />);
|
||||||
|
const courseLockUpBlock = getByTestId('course-lock-up-block');
|
||||||
|
|
||||||
|
expect(courseLockUpBlock).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('mobile menu should not be visible', () => {
|
||||||
|
const { queryByTestId } = render(<RootWrapper {...props} />);
|
||||||
|
const mobileMenuButton = queryByTestId('mobile-menu-button');
|
||||||
|
|
||||||
|
expect(mobileMenuButton).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('desktop menu should be visible', () => {
|
||||||
|
const { getByTestId } = render(<RootWrapper {...props} />);
|
||||||
|
const desktopMenu = getByTestId('desktop-menu');
|
||||||
|
|
||||||
|
expect(desktopMenu).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should render one dropdown', async () => {
|
||||||
|
const { getAllByRole, getByText } = render(<RootWrapper {...props} />);
|
||||||
|
const dropdownMenu = getAllByRole('button')[0];
|
||||||
|
|
||||||
|
expect(dropdownMenu).toBeVisible();
|
||||||
|
|
||||||
|
await waitFor(() => fireEvent.click(dropdownMenu));
|
||||||
|
const dropdownOption = getByText('link');
|
||||||
|
|
||||||
|
expect(dropdownOption).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maintenance should not be in user menu', async () => {
|
||||||
|
currentUser = { ...authenticatedUser, administrator: false };
|
||||||
|
const { getAllByRole, queryByText } = render(<RootWrapper {...props} />);
|
||||||
|
const userMenu = getAllByRole('button')[1];
|
||||||
|
await waitFor(() => fireEvent.click(userMenu));
|
||||||
|
const maintenanceButton = queryByText(messages['header.user.menu.maintenance'].defaultMessage);
|
||||||
|
|
||||||
|
expect(maintenanceButton).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('user menu should use avatar icon', async () => {
|
||||||
|
currentUser = { ...authenticatedUser, avatar: null };
|
||||||
|
const { getByTestId } = render(<RootWrapper {...props} />);
|
||||||
|
const avatarIcon = getByTestId('avatar-icon');
|
||||||
|
|
||||||
|
expect(avatarIcon).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should hide nav items if prop isHiddenMainMenu true', async () => {
|
||||||
|
const initialProps = { ...props, isHiddenMainMenu: true };
|
||||||
|
const { queryByTestId } = render(<RootWrapper {...initialProps} />);
|
||||||
|
const desktopMenu = queryByTestId('desktop-menu');
|
||||||
|
const mobileMenuButton = queryByTestId('mobile-menu-button');
|
||||||
|
|
||||||
|
expect(mobileMenuButton).toBeNull();
|
||||||
|
|
||||||
|
expect(desktopMenu).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('mobile', () => {
|
||||||
|
beforeEach(() => { screenWidth = 500; });
|
||||||
|
it('course lock up should not be visible', async () => {
|
||||||
|
const { queryByTestId } = render(<RootWrapper {...props} />);
|
||||||
|
const courseLockUpBlock = queryByTestId('course-lock-up-block');
|
||||||
|
|
||||||
|
expect(courseLockUpBlock).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('mobile menu should be visible', async () => {
|
||||||
|
const { getByTestId } = render(<RootWrapper {...props} />);
|
||||||
|
const mobileMenuButton = getByTestId('mobile-menu-button');
|
||||||
|
|
||||||
|
expect(mobileMenuButton).toBeVisible();
|
||||||
|
await waitFor(() => fireEvent.click(mobileMenuButton));
|
||||||
|
const mobileMenu = getByTestId('mobile-menu');
|
||||||
|
|
||||||
|
expect(mobileMenu).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('desktop menu should not be visible', () => {
|
||||||
|
const { queryByTestId } = render(<RootWrapper {...props} />);
|
||||||
|
const desktopMenu = queryByTestId('desktop-menu');
|
||||||
|
|
||||||
|
expect(desktopMenu).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maintenance should be in user menu', async () => {
|
||||||
|
const { getAllByRole, getByText } = render(<RootWrapper {...props} />);
|
||||||
|
const userMenu = getAllByRole('button')[1];
|
||||||
|
await waitFor(() => fireEvent.click(userMenu));
|
||||||
|
const maintenanceButton = getByText(messages['header.user.menu.maintenance'].defaultMessage);
|
||||||
|
|
||||||
|
expect(maintenanceButton).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('user menu should use avatar image', async () => {
|
||||||
|
const { getByTestId } = render(<RootWrapper {...props} />);
|
||||||
|
const avatarImage = getByTestId('avatar-image');
|
||||||
|
|
||||||
|
expect(avatarImage).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should hide nav items if prop isHiddenMainMenu true', async () => {
|
||||||
|
const initialProps = { ...props, isHiddenMainMenu: true };
|
||||||
|
const { queryByTestId } = render(<RootWrapper {...initialProps} />);
|
||||||
|
const desktopMenu = queryByTestId('desktop-menu');
|
||||||
|
const mobileMenuButton = queryByTestId('mobile-menu-button');
|
||||||
|
|
||||||
|
expect(mobileMenuButton).toBeNull();
|
||||||
|
|
||||||
|
expect(desktopMenu).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
69
src/studio-header/UserMenu.jsx
Normal file
69
src/studio-header/UserMenu.jsx
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
||||||
|
import {
|
||||||
|
Avatar,
|
||||||
|
} from '@openedx/paragon';
|
||||||
|
import NavDropdownMenu from './NavDropdownMenu';
|
||||||
|
import getUserMenuItems from './utils';
|
||||||
|
|
||||||
|
const UserMenu = ({
|
||||||
|
username,
|
||||||
|
studioBaseUrl,
|
||||||
|
logoutUrl,
|
||||||
|
authenticatedUserAvatar,
|
||||||
|
isMobile,
|
||||||
|
isAdmin,
|
||||||
|
// injected
|
||||||
|
intl,
|
||||||
|
}) => {
|
||||||
|
const avatar = authenticatedUserAvatar ? (
|
||||||
|
<img
|
||||||
|
className="d-block w-100 h-100"
|
||||||
|
src={authenticatedUserAvatar}
|
||||||
|
alt={username}
|
||||||
|
data-testid="avatar-image"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Avatar
|
||||||
|
size="sm"
|
||||||
|
className="mr-2"
|
||||||
|
alt={username}
|
||||||
|
data-testid="avatar-icon"
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
const title = isMobile ? avatar : <>{avatar}{username}</>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<NavDropdownMenu
|
||||||
|
buttonTitle={title}
|
||||||
|
id="user-dropdown-menu"
|
||||||
|
items={getUserMenuItems({
|
||||||
|
studioBaseUrl,
|
||||||
|
logoutUrl,
|
||||||
|
intl,
|
||||||
|
isAdmin,
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
UserMenu.propTypes = {
|
||||||
|
username: PropTypes.string,
|
||||||
|
studioBaseUrl: PropTypes.string.isRequired,
|
||||||
|
logoutUrl: PropTypes.string.isRequired,
|
||||||
|
authenticatedUserAvatar: PropTypes.string,
|
||||||
|
isMobile: PropTypes.bool,
|
||||||
|
isAdmin: PropTypes.bool,
|
||||||
|
// injected
|
||||||
|
intl: intlShape.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
UserMenu.defaultProps = {
|
||||||
|
isMobile: false,
|
||||||
|
isAdmin: false,
|
||||||
|
authenticatedUserAvatar: null,
|
||||||
|
username: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default injectIntl(UserMenu);
|
||||||
3
src/studio-header/index.js
Normal file
3
src/studio-header/index.js
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
import StudioHeader from './StudioHeader';
|
||||||
|
|
||||||
|
export default StudioHeader;
|
||||||
56
src/studio-header/messages.js
Normal file
56
src/studio-header/messages.js
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
import { defineMessages } from '@edx/frontend-platform/i18n';
|
||||||
|
|
||||||
|
const messages = defineMessages({
|
||||||
|
'header.user.menu.studio': {
|
||||||
|
id: 'header.user.menu.studio',
|
||||||
|
defaultMessage: 'Studio Home',
|
||||||
|
description: 'Link to Studio Home',
|
||||||
|
},
|
||||||
|
'header.user.menu.maintenance': {
|
||||||
|
id: 'header.user.menu.maintenance',
|
||||||
|
defaultMessage: 'Maintenance',
|
||||||
|
description: 'Link to the Studio maintenance page',
|
||||||
|
},
|
||||||
|
'header.user.menu.logout': {
|
||||||
|
id: 'header.user.menu.logout',
|
||||||
|
defaultMessage: 'Logout',
|
||||||
|
description: 'Logout link',
|
||||||
|
},
|
||||||
|
'header.label.account.menu': {
|
||||||
|
id: 'header.label.account.menu',
|
||||||
|
defaultMessage: 'Account Menu',
|
||||||
|
description: 'The aria label for the account menu trigger',
|
||||||
|
},
|
||||||
|
'header.label.account.menu.for': {
|
||||||
|
id: 'header.label.account.menu.for',
|
||||||
|
defaultMessage: 'Account menu for {username}',
|
||||||
|
description: 'The aria label for the account menu trigger when the username is displayed in it',
|
||||||
|
},
|
||||||
|
'header.label.main.nav': {
|
||||||
|
id: 'header.label.main.nav',
|
||||||
|
defaultMessage: 'Main',
|
||||||
|
description: 'The aria label for the main menu nav',
|
||||||
|
},
|
||||||
|
'header.label.main.menu': {
|
||||||
|
id: 'header.label.main.menu',
|
||||||
|
defaultMessage: 'Main Menu',
|
||||||
|
description: 'The aria label for the main menu trigger',
|
||||||
|
},
|
||||||
|
'header.label.main.header': {
|
||||||
|
id: 'header.label.main.header',
|
||||||
|
defaultMessage: 'Main',
|
||||||
|
description: 'The aria label for the main header',
|
||||||
|
},
|
||||||
|
'header.label.secondary.nav': {
|
||||||
|
id: 'header.label.secondary.nav',
|
||||||
|
defaultMessage: 'Secondary',
|
||||||
|
description: 'The aria label for the seconary nav',
|
||||||
|
},
|
||||||
|
'header.label.courseOutline': {
|
||||||
|
id: 'header.label.courseOutline',
|
||||||
|
defaultMessage: 'Back to course outline in Studio',
|
||||||
|
description: 'The aria label for the link back to the Studio Course Outline',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export default messages;
|
||||||
36
src/studio-header/utils.js
Normal file
36
src/studio-header/utils.js
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import messages from './messages';
|
||||||
|
|
||||||
|
const getUserMenuItems = ({
|
||||||
|
studioBaseUrl,
|
||||||
|
logoutUrl,
|
||||||
|
intl,
|
||||||
|
isAdmin,
|
||||||
|
}) => {
|
||||||
|
let items = [
|
||||||
|
{
|
||||||
|
href: `${studioBaseUrl}`,
|
||||||
|
title: intl.formatMessage(messages['header.user.menu.studio']),
|
||||||
|
}, {
|
||||||
|
href: `${logoutUrl}`,
|
||||||
|
title: intl.formatMessage(messages['header.user.menu.logout']),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
if (isAdmin) {
|
||||||
|
items = [
|
||||||
|
{
|
||||||
|
href: `${studioBaseUrl}`,
|
||||||
|
title: intl.formatMessage(messages['header.user.menu.studio']),
|
||||||
|
}, {
|
||||||
|
href: `${studioBaseUrl}/maintenance`,
|
||||||
|
title: intl.formatMessage(messages['header.user.menu.maintenance']),
|
||||||
|
}, {
|
||||||
|
href: `${logoutUrl}`,
|
||||||
|
title: intl.formatMessage(messages['header.user.menu.logout']),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return items;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default getUserMenuItems;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
const path = require('path');
|
const path = require('path');
|
||||||
const { createConfig } = require('@edx/frontend-build');
|
const { createConfig } = require('@openedx/frontend-build');
|
||||||
|
|
||||||
module.exports = createConfig('webpack-dev', {
|
module.exports = createConfig('webpack-dev', {
|
||||||
entry: path.resolve(__dirname, 'example'),
|
entry: path.resolve(__dirname, 'example'),
|
||||||
|
|||||||
Reference in New Issue
Block a user