Skip to content

Commit

Permalink
Merge pull request #102 from lalithkota/15.0-develop
Browse files Browse the repository at this point in the history
Added list_auth_providers method from portal auth
  • Loading branch information
shibu-narayanan authored Apr 3, 2024
2 parents 2f24f33 + fb272f9 commit dba88c6
Show file tree
Hide file tree
Showing 29 changed files with 234 additions and 361 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/build.yml

This file was deleted.

9 changes: 3 additions & 6 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@ name: pre-commit

on:
pull_request:
branches:
- "15.0*"
push:
branches:
- "15.0"
- "15.0-ocabot-*"

jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
Expand Down
51 changes: 38 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@ on:
pull_request:
branches:
- "15.0*"
- "17.0*"
push:
branches:
- "15.0*"
- "15.0-ocabot-*"
- "17.0*"
env:
OCA_GIT_USER_NAME: openg2p
OCA_GIT_USER_EMAIL: [email protected]
jobs:
unreleased-deps:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
Expand All @@ -29,32 +30,55 @@ jobs:
fi
fi
done
matrix_prep:
runs-on: ubuntu-22.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- id: set-matrix
run: |
BRANCH_NAME=$(echo ${{ github.base_ref || github.ref }} | sed -e 's,.*/\(.*\),\1,')
if [[ $BRANCH_NAME = 15.0* ]] ; then
matrix='{"include": [{
"container": "ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest",
"makepot": "true",
"name": "test with Odoo 15"
},{
"container": "ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest",
"name": "test with OCB 15"
}]}'
elif [[ $BRANCH_NAME = 17.0* ]] ; then
matrix='{"include": [{
"container": "ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest",
"makepot": "true",
"name": "test with Odoo 17"
},{
"container": "ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest",
"name": "test with OCB 17"
}]}'
fi
echo "matrix=$matrix" | tr -d '\n' >> $GITHUB_OUTPUT
test:
runs-on: ubuntu-latest
needs: matrix_prep
runs-on: ubuntu-22.04
container: ${{ matrix.container }}
name: ${{ matrix.name }}
permissions:
contents: write
strategy:
fail-fast: false
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest
name: test with OCB
matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}}
services:
postgres:
image: postgres:9.6
image: postgres:12.0
env:
POSTGRES_USER: odoo
POSTGRES_PASSWORD: odoo
POSTGRES_DB: odoo
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
Expand All @@ -69,6 +93,7 @@ jobs:
run: oca_init_test_database
- name: Run tests
run: oca_run_tests
- uses: codecov/codecov-action@v1
- name: Update .pot files
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'openg2p' }}
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ repos:
rev: 22.3.0
hooks:
- id: black
args:
- --line-length=110
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.4.1
hooks:
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@

<!-- /!\ Non OCA Context : Set here the badge of your runbot / runboat instance. -->
[![Pre-commit Status](https://github.com/OpenG2P/openg2p-self-service-portal/actions/workflows/pre-commit.yml/badge.svg?branch=15.0-develop)](https://github.com/OpenG2P/openg2p-self-service-portal/actions/workflows/pre-commit.yml?query=branch%3A15.0-develop)
[![Build Status](https://github.com/OpenG2P/openg2p-self-service-portal/actions/workflows/test.yml/badge.svg?branch=15.0-develop)](https://github.com/OpenG2P/openg2p-self-service-portal/actions/workflows/test.yml?query=branch%3A15.0-develop)
[![codecov](https://codecov.io/gh/OpenG2P/openg2p-self-service-portal/branch/15.0-develop/graph/badge.svg)](https://codecov.io/gh/OpenG2P/openg2p-self-service-portal)
<!-- /!\ Non OCA Context : Set here the badge of your translation instance. -->

<!-- /!\ do not modify above this line -->

# OpenG2P Self Service Portal

Beneficiary facing self service portal. Refer to [OpenG2P Docs](https://docs.openg2p.org/v/1.1).
Beneficiary facing self service portal. Refer to [OpenG2P Docs](https://docs.openg2p.org).

<!-- /!\ do not modify below this line -->

Expand Down
7 changes: 0 additions & 7 deletions g2p_self_service_portal/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
"views/g2p_self_service_aboutus.xml",
"views/g2p_self_service_otherpage.xml",
"views/g2p_self_service_contactus.xml",
# TODO: The 'auth_oidc' module was removed; a replacement is needed in the code
# "views/auth_oauth_provider.xml",
"views/g2p_self_service_form_page_template.xml",
"views/program_view.xml",
"views/g2p_self_service_signup.xml",
Expand All @@ -41,18 +39,13 @@
"wizard/g2p_self_service_program_view_wizard.xml",
],
"assets": {
"web.assets_backend": [],
"web.assets_qweb": [
# "views/g2p_self_service_portal.doughnut_chart.xml",
],
"web.assets_frontend": [
"g2p_self_service_portal/static/src/js/self_service_form_action.js",
# # "g2p_self_service_portal/static/src/js/self_service_pie_chart.js",
# "g2p_self_service_portal/static/src/js/self_service_search_sort.js",
# "g2p_self_service_portal/static/src/js/self_service_search_sort_all.js",
# "g2p_self_service_portal/static/src/js/self_service_welcome_alert.js"
],
"web.assets_common": [],
},
"demo": [],
"images": [],
Expand Down
Loading

0 comments on commit dba88c6

Please sign in to comment.