fix: reorganizing enterprise customer django admin

.github/workflows/ci.yml

@@ -22,13 +22,15 @@ jobs:
       RUNJSHINT: true
     steps:
     - uses: actions/checkout@v2
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
     - uses: actions/setup-python@v2
       with:
         python-version: '3.8'
         architecture: x64
     - uses: actions/setup-node@v2
       with:
-        node-version: 16
+        node-version: ${{ env.NODE_VER }}
     - run: pip install -r requirements/ci.txt
     - name: Run tox
       env:

.github/workflows/mysql8-migrations.yml

@@ -57,6 +57,7 @@ jobs:
         pip install --no-binary mysqlclient mysqlclient
         pip uninstall -y xmlsec
         pip install --no-binary xmlsec xmlsec
+        pip install backports.zoneinfo
     - name: Initiate Services
       run: |
         sudo /etc/init.d/mysql start

.github/workflows/publish.yml

@@ -11,14 +11,16 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Setup Nodejs Env
+        run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
       - name: setup python
         uses: actions/setup-python@v2
         with:
           python-version: 3.8
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: ${{ env.NODE_VER }}
       - name: Install requirements
         run: make requirements
       - name: Build package

.github/workflows/upgrade-python-requirements.yml

@@ -13,7 +13,7 @@ jobs:
    call-upgrade-python-requirements-workflow:
     with:
        branch: ${{ github.event.inputs.branch }}
-       team_reviewers: "business-enterprise-team"
+       team_reviewers: "enterprise-titans"
        email_address: enterprise-integrations@edx.org 
        send_success_notification: false
     secrets:

.nvmrc

@@ -1 +1 @@
-16
+18

CHANGELOG.rst

@@ -15,6 +15,26 @@ Change Log
 
 Unreleased
 ----------
+[4.0.3]
+-------
+fix: reorganizing enterprise customer django admin portal
+
+[4.0.2]
+-------
+fix: removing items to delete dependency on the catalog service
+
+[4.0.1]
+--------
+chore: upgrade course_enrollment from audit to verified
+
+[4.0.0]
+--------
+chore: upgrade node from version 16 to version 18
+
+[3.69.1]
+--------
+fix: content metadata exporter sanitizing content to delete
+
 [3.69.0]
 --------
 refactor: Replaced the deprecated `NullBooleanField` with `BooleanField(null=True)`
@@ -55,6 +75,10 @@ fix: fixing name of table used by model fetching method
 --------
 chore: more orphaned content transmission logging
 
+[4.0.0]
+-------
+feat!: upgraded to Node v18, added .nvmrc and updated workflows.
+
 [3.67.0]
 --------
 fix: compare lowered input email address to lowered auth user record email address during bulk enrollment.

Dockerfile

@@ -84,7 +84,7 @@ RUN pip install nodeenv
 # Must be done after Python requirements, since nodeenv is installed
 # via pip.
 # The node environment is already 'activated' because its .../bin was put on $PATH.
-RUN nodeenv /edx/app/nodeenv --node=16.15.1 --prebuilt
+RUN nodeenv /edx/app/nodeenv --node=18.15.0 --prebuilt
 
 RUN mkdir -p /edx/var/log
 

Makefile

@@ -105,7 +105,7 @@ check_pins: $(COMMON_CONSTRAINTS_TXT) ## check that our local copy of edx-platfo
 	python requirements/check_pins.py requirements/test-master.txt $(LOCAL_EDX_PINS)
 
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
-upgrade: check_pins  ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
+upgrade: requirements check_pins  ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/test-master.txt requirements/test-master.in
 	$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/doc.txt requirements/doc.in
 	$(PIP_COMPILE) --no-emit-trusted-host --no-emit-index-url -o requirements/test.txt requirements/test.in

enterprise/__init__.py

@@ -2,6 +2,6 @@
 Your project description goes here.
 """
 
-__version__ = "3.69.0"
+__version__ = "4.0.3"
 
 default_app_config = "enterprise.apps.EnterpriseConfig"

enterprise/admin/__init__.py

@@ -188,6 +188,52 @@ class EnterpriseCustomerAdmin(DjangoObjectActions, SimpleHistoryAdmin):
     list_filter = ('active',)
     ordering = ('name',)
     search_fields = ('name', 'uuid',)
+
+    fieldsets = (
+        ('Enterprise info', {
+            'fields': ('name', 'active', 'slug', 'auth_org_id', 'country')
+        }),
+        ('Subsidy management screens ', {
+            'fields': ('enable_portal_learner_credit_management_screen',
+                       'enable_portal_subscription_management_screen',
+                       'enable_portal_code_management_screen'),
+            'description': ("Select the check boxes below to enable specific subsidy management screens"
+                            "on the organization's administrator portal. If an option is left unchecked,"
+                            "the customer administrator will not see the screen in their portal"
+                            "and will not be able to apply the associated configurations via self-service.")
+        }),
+        ('Subsidy settings', {
+            'fields': ('enable_browse_and_request', 'enable_universal_link'),
+            'description': ('Select the check boxes below to enable specific subsidy management settings'
+                            'for the administrator portal for subscription and codes customers.'
+                            'These should not be selected for customers that only have learner credit.')
+        }),
+        ('Data sharing consent', {
+            'fields': ('enable_data_sharing_consent', 'enforce_data_sharing_consent')
+        }),
+        ('Email and language ', {
+            'fields': ('contact_email', 'reply_to', 'sender_alias', 'default_language', 'hide_labor_market_data')
+        }),
+        ('Reporting', {
+            'fields': ('enable_portal_reporting_config_screen',)
+        }),
+        ('Integration and learning platform settings', {
+            'fields': ('enable_portal_lms_configurations_screen', 'enable_portal_saml_configuration_screen',
+                       'enable_slug_login', 'replace_sensitive_sso_username', 'hide_course_original_price')
+        }),
+        ('Recommended default settings for all enterprise customers', {
+            'fields': ('site', 'customer_type', 'enable_learner_portal',
+                       'enable_integrated_customer_learner_portal_search',
+                       'enable_analytics_screen', 'enable_audit_enrollment',
+                       'enable_audit_data_reporting', 'enable_learner_portal_offers',
+                       'enable_executive_education_2U_fulfillment'),
+            'description': ('The following default settings should be the same for '
+                            'the majority of enterprise customers,'
+                            'and are either rarely used, unlikely to be sold, '
+                            'or unlikely to be changed from the default.')
+        }),
+    )
+
     inlines = [
         EnterpriseCustomerBrandingConfigurationInline,
         EnterpriseCustomerIdentityProviderInline,

enterprise/constants.py

@@ -204,6 +204,10 @@ def json_serialized_course_modes():
     503: 'The server is temporarily unavailable.',
 }
 
+IC_CREATE_ACTION = 'create'
+IC_UPDATE_ACTION = 'update'
+IC_DELETE_ACTION = 'delete'
+
 
 class FulfillmentTypes:
     LICENSE = 'license'