Skip to content

Commit

Permalink
chore: Syncing 2u/project-theseus with master [2023-08-29] (#327)
Browse files Browse the repository at this point in the history
* Update standard workflow files. (#263)

* build: Create a missing workflow file `self-assign-issue.yml`.

The .github/workflows/self-assign-issue.yml workflow is missing or needs an update to stay in
sync with the current standard for this workflow as defined in the
`.github` repo of the `openedx` GitHub org.

* build: Create a missing workflow file `add-remove-label-on-comment.yml`.

The .github/workflows/add-remove-label-on-comment.yml workflow is missing or needs an update to stay in
sync with the current standard for this workflow as defined in the
`.github` repo of the `openedx` GitHub org.

* build: Update a workflow file `add-depr-ticket-to-depr-board.yml`.

The .github/workflows/add-depr-ticket-to-depr-board.yml workflow is missing or needs an update to stay in
sync with the current standard for this workflow as defined in the
`.github` repo of the `openedx` GitHub org.

* chore(i18n): add more languages (#261)

* chore(i18n): add more languages

* chore(i18n): Pylint fixes

* feat: use `atlas` in `make pull_translations` (#278)

Changes
-------
 - Bump frontend-platform to bring `intl-imports.js` script
 - Move all i18n imports into `src/i18n/index.js` so `intl-imports.js` can
   override it with latest translations
 - Add `atlas` into `make pull_translations` when `OPENEDX_ATLAS_PULL`
   environment variable is set.

Refs: [FC-0012 project](https://openedx.atlassian.net/l/cp/XGS0iCcQ) implementing Translation Infrastructure OEP-58.

* feat: upgraded to node v18, added .nvmrc and updated workflows (#274)

* feat: upgraded to node v18, added .nvmrc and updated workflows

* build: update frontrnf-build

* build: upgrade pkgs

* build: update @edx/browserslist-config to the latest

* refactor: update packages

* feat: add subscriptions section to orders page (#289)

* feat: design changes for subscriptions (#276)

* feat: api integration for subscription related changes (#282)

* feat: add manage subscriptions url and update subscription upsell (#288)

* test: add more tests for subscriptions

---------

Co-authored-by: Nawfal Ahmed <111358247+NawfalAhmed@users.noreply.github.com>
Co-authored-by: Nawfal Ahmed <nawfal.ahmed@arbisoft.com>

* fix: fix getting b2c subscriptions flag for stage (#290)

* refactor: update components and utils folder structure

* feat: improve subscription section and add basic alerts

* fix: revert change to container (#292)

* Automate Browserlist DB Update (#221)

* feat: added cron github action to auto update brwoserlist DB periodically

* refactor: used a shared script to update broswerslist DB, create PR and automerge it

* Paragon table deprecation migration to DataTable (#200)

* refactor: changed derecated table component to datatable

* refactor: fixed warning of missing props

* refactor: changed DataTable to DataTable.Table as suggested in code review

* refactor: used DataTable.Table directly to remove count

* fix: fixed pagination styling issue

* fix: fixed snapshot test

* PON-251: Update Existing Error Handling (#294)

* feat: update order history error flows

* refactor: remove unused AsyncActionType, favour saga routines over this

* fix: add sr message to loading, fix order history loading

* test: add more tests for coverage

* feat: update error UX for manage subscriptions (#299)

* chore(i18n): update translations (#301)

Co-authored-by: Jenkins <sre+jenkins@edx.org>

* feat: handle subscription api statuscode flag (#304)

* feat: add translations for subscription state badges (#305)

* fix: fix unmarked translations (#306)

* chore(i18n): update translations

* chore(i18n): update translations (#308)

Co-authored-by: Jenkins <sre+jenkins@edx.org>

* feat: add subscriptions marketing url (#309)

* docs: update readme to reflect recent subscription changes (#312)

* feat: move subscription upsell values behind env (#314)

* feat: use react-testing-library for detailed unit tests (#316)

* feat: use react-testing-library for tests

* feat: update tests for Subscriptions

* feat: update tests for NotFoundPage

* feat: update tests for ManageSubscriptions

* feat: update tests for OrdersandSubscriptions

* chore: added CODEOWNERS file to enable branch protection policy (REV-3441) (#283)

* chore: added CODEOWNERS file to enable branch protection policy

* fix: updated @edx/revenue-squad team tag

* fix: updated @openedx/revenue-squad team tag

* chore: added self check for CODEOWNERS file and updated file path to /src

* feat: disable subscriptions for local (#318)

* Removed subscription section from Readme file (#322)

* fix: removed subscription section and subs screenshot from readme file

* feat: update react & react-dom to v17 (#302)

* feat: update react & react-dom to v17

* build: update edx pkgs

* build: update lock file

---------

Co-authored-by: Feanil Patel <feanil@tcril.org>
Co-authored-by: Yoiber <105317298+Yoiber071@users.noreply.github.com>
Co-authored-by: Omar Al-Ithawi <i@omardo.com>
Co-authored-by: Mashal Malik <107556986+Mashal-m@users.noreply.github.com>
Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com>
Co-authored-by: Nawfal Ahmed <111358247+NawfalAhmed@users.noreply.github.com>
Co-authored-by: Nawfal Ahmed <nawfal.ahmed@arbisoft.com>
Co-authored-by: Muhammad Abdullah Waheed <42172960+abdullahwaheed@users.noreply.github.com>
Co-authored-by: edx-transifex-bot <edx-transifex-bot@users.noreply.github.com>
Co-authored-by: Jenkins <sre+jenkins@edx.org>
Co-authored-by: Muhammad Mattiullah <50130127+MuhammadMattiullah@users.noreply.github.com>
Co-authored-by: Shahroz Ahmad <97090106+ishahroz@users.noreply.github.com>
  • Loading branch information
13 people committed Aug 29, 2023
1 parent f545a5e commit a5c446b
Show file tree
Hide file tree
Showing 85 changed files with 7,125 additions and 30,460 deletions.
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ LMS_BASE_URL=''
CREDENTIALS_BASE_URL=''
COMMERCE_COORDINATOR_BASE_URL=''
ECOMMERCE_BASE_URL=''
SUBSCRIPTIONS_BASE_URL=''
LOGIN_URL=''
LOGOUT_URL=''
CSRF_TOKEN_API_PATH=''
Expand All @@ -20,3 +21,6 @@ LOGO_URL=''
LOGO_TRADEMARK_URL=''
LOGO_WHITE_URL=''
FAVICON_URL=''
ENABLE_B2C_SUBSCRIPTIONS=false
SUBSCRIPTIONS_MARKETING_URL=''
SUBSCRIPTIONS_MINIMUM_PRICE=''
5 changes: 5 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ LMS_BASE_URL=http://localhost:18000
CREDENTIALS_BASE_URL=http://localhost:18150
COMMERCE_COORDINATOR_BASE_URL=http://localhost:8140
ECOMMERCE_BASE_URL=http://localhost:18130
SUBSCRIPTIONS_BASE_URL=http://localhost:18750
LOGIN_URL=http://localhost:18000/login
LOGOUT_URL=http://localhost:18000/login
CSRF_TOKEN_API_PATH=/csrf/api/v1/token
Expand All @@ -21,3 +22,7 @@ LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
ENABLE_B2C_SUBSCRIPTIONS=false
SUBSCRIPTIONS_MARKETING_URL=/program-subscriptions
SUBSCRIPTIONS_MINIMUM_PRICE=$39
SUBSCRIPTIONS_TRIAL_LENGTH=7
5 changes: 5 additions & 0 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ LMS_BASE_URL=http://localhost:18000
CREDENTIALS_BASE_URL=http://localhost:18150
COMMERCE_COORDINATOR_BASE_URL=http://localhost:8140
ECOMMERCE_BASE_URL=http://localhost:18130
SUBSCRIPTIONS_BASE_URL=http://localhost:18750
LOGIN_URL=http://localhost:18000/login
LOGOUT_URL=http://localhost:18000/login
CSRF_TOKEN_API_PATH=/csrf/api/v1/token
Expand All @@ -21,3 +22,7 @@ LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg
FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
ENABLE_B2C_SUBSCRIPTIONS=true
SUBSCRIPTIONS_MARKETING_URL=/program-subscriptions
SUBSCRIPTIONS_MINIMUM_PRICE=$39
SUBSCRIPTIONS_TRIAL_LENGTH=7
2 changes: 1 addition & 1 deletion .github/workflows/add-depr-ticket-to-depr-board.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
secrets:
GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
20 changes: 20 additions & 0 deletions .github/workflows/add-remove-label-on-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This workflow runs when a comment is made on the ticket
# If the comment starts with "label: " it tries to apply
# the label indicated in rest of comment.
# If the comment starts with "remove label: ", it tries
# to remove the indicated label.
# Note: Labels are allowed to have spaces and this script does
# not parse spaces (as often a space is legitimate), so the command
# "label: really long lots of words label" will apply the
# label "really long lots of words label"

name: Allows for the adding and removing of labels via comment

on:
issue_comment:
types: [created]

jobs:
add_remove_labels:
uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master

2 changes: 1 addition & 1 deletion .github/workflows/lockfileversion-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ on:

jobs:
version-check:
uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
16 changes: 6 additions & 10 deletions .github/workflows/node-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,16 @@ on:
jobs:
tests:
runs-on: ubuntu-20.04
strategy:
matrix:
node: [16]

steps:
- name: Checkout
uses: actions/checkout@v2

uses: actions/checkout@v3
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- name: Setup Nodejs
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}

- name: Setup npm
run: npm i -g npm@8.5.x
node-version: ${{ env.NODE_VER }}

- name: Install dependencies
run: npm ci
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/self-assign-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This workflow runs when a comment is made on the ticket
# If the comment starts with "assign me" it assigns the author to the
# ticket (case insensitive)

name: Assign comment author to ticket if they say "assign me"
on:
issue_comment:
types: [created]

jobs:
self_assign_by_comment:
uses: openedx/.github/.github/workflows/self-assign-issue.yml@master
12 changes: 12 additions & 0 deletions .github/workflows/update-browserslist-db.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Update Browserslist DB
on:
schedule:
- cron: '0 0 * * 1'
workflow_dispatch:

jobs:
update-browserslist:
uses: openedx/.github/.github/workflows/update-browserslist-db.yml@master

secrets:
requirements_bot_github_token: ${{ secrets.requirements_bot_github_token }}
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18
6 changes: 6 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Team @openedx/revenue-squad will be the default owners for
# everything in this repo. Unless a later match takes
# precedence, @openedx/revenue-squad will be requested for
# review when someone opens a pull request.
/src @openedx/revenue-squad
CODEOWNERS @openedx/revenue-squad
18 changes: 17 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export TRANSIFEX_RESOURCE = frontend-app-ecommerce
transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"
transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA,it_IT,pt_PT,de_DE"

intl_imports = ./node_modules/.bin/intl-imports.js
transifex_utils = ./node_modules/.bin/transifex-utils.js
i18n = ./src/i18n
transifex_input = $(i18n)/transifex_input.json
Expand Down Expand Up @@ -38,9 +39,24 @@ push_translations:
# Pushing comments to Transifex...
./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh

ifeq ($(OPENEDX_ATLAS_PULL),)
# Pulls translations from Transifex.
pull_translations:
tx pull -f -t --mode reviewed --languages=$(transifex_langs)
else
# Experimental: OEP-58 Pulls translations using atlas
pull_translations:
rm -rf src/i18n/messages
mkdir src/i18n/messages
cd src/i18n/messages \
&& atlas pull --filter=$(transifex_langs) \
translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
translations/frontend-component-header/src/i18n/messages:frontend-component-header \
translations/paragon/src/i18n/messages:paragon \
translations/frontend-app-ecommerce/src/i18n/messages:frontend-app-ecommerce

$(intl_imports) frontend-component-header frontend-component-footer paragon frontend-app-ecommerce
endif

# This target is used by CI.
validate-no-uncommitted-package-lock-changes:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Please tag **@edx/revenue-squad** on any PRs or issues.
Introduction
------------

This is a micro-frontend application responsible for the display of an authenticated user's order history and receipt page.
This is a micro-frontend application responsible for the display of an authenticated user's single purchase order history and subscription history. Additional work has been done and is in-progress to enable receipt pages in this application, currently hosted in ecommerce.

Installation
------------
Expand Down
Binary file modified docs/images/localhost_preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a5c446b

Please sign in to comment.