Block content and Blocking Embedded media

.github/workflows/tests-py38.yml

@@ -0,0 +1,75 @@
+name: "CI"
+
+on:
+  [push, pull_request]
+
+jobs:
+
+  server-py-38:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: docker-compose
+        run: docker-compose -f .actions-docker-compose.yml up -d
+
+      - name: cache pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('dev-requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip
+            ${{ runner.os }}-
+
+      - name: pip install
+        run: |
+            python -m pip install --upgrade pip wheel setuptools
+            pip install -r dev-requirements.txt
+
+      - name: flake8
+        run: flake8
+
+      - name: pytest
+        run: pytest --ignore=tests/aap/ --disable-pytest-warnings --cov=newsroom
+
+      - name: behave
+        run: behave --format progress2 --logging-level=ERROR
+
+  client-node-14:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: cache npm
+        uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-npm
+            ${{ runner.os }}-
+
+      - name: npm ci
+        run: npm ci
+
+      - name: lint
+        run: npm run lint
+
+      - name: test
+        run: npm run test
+
+      - name: build
+        run: npm run build

.github/workflows/tests.yml

@@ -5,8 +5,8 @@ on:
 
 jobs:
 
-  server:
-    runs-on: ubuntu-latest
+  server-py-36:
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
@@ -19,6 +19,10 @@ jobs:
       - name: docker-compose
         run: docker-compose -f .actions-docker-compose.yml up -d
 
+      - run: |
+             sudo apt-get update
+             sudo apt-get install pkg-config libxml2-dev libxmlsec1-dev libxmlsec1-openssl
+
       - name: cache pip
         uses: actions/cache@v2
         with:
@@ -42,7 +46,7 @@ jobs:
       - name: behave
         run: behave --format progress2 --logging-level=ERROR
 
-  client:
+  client-node-12:
     runs-on: ubuntu-latest
 
     steps:

assets/companies/actions.js

@@ -116,7 +116,17 @@ export function postCompany() {
 
     };
 }
-
+export function savePermissions(company, permissions) {
+    return function (dispatch) {
+        return server.postWithCsrfToken(`/companies/${company._id}/permissions`, permissions)
+            .then(() => {
+                notify.success(gettext('Company updated successfully'));
+                dispatch(fetchProducts());
+                dispatch(fetchCompanies());
+            })
+            .catch((error) => errorHandler(error, dispatch, setError));
+    };
+}
 
 /**
  * Fetches products
@@ -137,19 +147,6 @@ export function fetchProducts() {
  * Save permissions for a company
  *
  */
-export function savePermissions(company, permissions) {
-    return function (dispatch) {
-        return server.post(`/companies/${company._id}/permissions`, permissions)
-            .then(() => {
-                notify.success(gettext('Company updated successfully'));
-                dispatch(fetchProducts());
-                dispatch(fetchCompanies());
-            })
-            .catch((error) => errorHandler(error, dispatch, setError));
-    };
-}
-
-
 /**
  * Deletes a company
  *