Skip to content

Commit

Permalink
Merge branch 'master' into fix/pydantic-2-order-by
Browse files Browse the repository at this point in the history
  • Loading branch information
@pcrespov
pcrespov authored Nov 26, 2024
2 parents 80f1b46 + 1f18a84 commit b534b66
Show file tree
Hide file tree
Showing 48 changed files with 1,299 additions and 1,169 deletions.
78 changes: 39 additions & 39 deletions .github/workflows/ci-testing-deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/webserver.bash test_with_db 01
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -399,7 +399,7 @@ jobs:
run: ./ci/github/unit-testing/webserver.bash install
- name: test
run: ./ci/github/unit-testing/webserver.bash test_with_db 02
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -444,7 +444,7 @@ jobs:
run: ./ci/github/unit-testing/webserver.bash install
- name: test
run: ./ci/github/unit-testing/webserver.bash test_with_db 03
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -489,7 +489,7 @@ jobs:
run: ./ci/github/unit-testing/webserver.bash install
- name: test
run: ./ci/github/unit-testing/webserver.bash test_with_db 04
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -537,7 +537,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/storage.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -587,7 +587,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/agent.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -632,7 +632,7 @@ jobs:
run: ./ci/github/unit-testing/api.bash install
- name: test
run: ./ci/github/unit-testing/api.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -683,7 +683,7 @@ jobs:
- name: OAS backwards compatibility check
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/api-server.bash openapi-diff
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -731,7 +731,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/autoscaling.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -785,7 +785,7 @@ jobs:
with:
name: ${{ github.job }}_docker_logs
path: ./services/catalog/test_failures
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -844,7 +844,7 @@ jobs:
source .venv/bin/activate && \
pushd services/clusters-keeper && \
make test-ci-unit
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -898,7 +898,7 @@ jobs:
with:
name: ${{ github.job }}_docker_logs
path: ./services/datcore-adapter/test_failures
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -952,7 +952,7 @@ jobs:
with:
name: ${{ github.job }}_docker_logs
path: ./services/director/test_failures
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1006,7 +1006,7 @@ jobs:
with:
name: ${{ github.job }}_docker_logs
path: ./services/director-v2/test_failures
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1054,7 +1054,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/aws-library.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1102,7 +1102,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/dask-task-models-library.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1150,7 +1150,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/dask-sidecar.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1208,7 +1208,7 @@ jobs:
source .venv/bin/activate && \
pushd services/osparc-gateway-server && \
make test-ci-unit
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1256,7 +1256,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/payments.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1304,7 +1304,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/dynamic-scheduler.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1362,7 +1362,7 @@ jobs:
source .venv/bin/activate && \
pushd services/resource-usage-tracker && \
make test-ci-unit
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1410,7 +1410,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/dynamic-sidecar.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1469,7 +1469,7 @@ jobs:
source .venv/bin/activate && \
pushd services/efs-guardian && \
make test-ci-unit
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1552,7 +1552,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/postgres-database.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1600,7 +1600,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/invitations.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1648,7 +1648,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/service-integration.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1696,7 +1696,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/service-library.bash test_all
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1744,7 +1744,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/settings-library.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1791,7 +1791,7 @@ jobs:
run: ./ci/github/unit-testing/models-library.bash typecheck
- name: test
run: ./ci/github/unit-testing/models-library.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1839,7 +1839,7 @@ jobs:
run: ./ci/github/unit-testing/common-library.bash typecheck
- name: test
run: ./ci/github/unit-testing/common-library.bash test
- uses: codecov/codecov-action@v4.5.0
- uses: codecov/codecov-action@v5.0.7
with:
flags: unittests #optional

Expand Down Expand Up @@ -1882,7 +1882,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/notifications-library.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -1932,7 +1932,7 @@ jobs:
- name: test
if: ${{ !cancelled() }}
run: ./ci/github/unit-testing/simcore-sdk.bash test
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -2048,7 +2048,7 @@ jobs:
- name: cleanup
if: ${{ !cancelled() }}
run: ./ci/github/integration-testing/webserver.bash clean_up
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -2111,7 +2111,7 @@ jobs:
- name: cleanup
if: ${{ !cancelled() }}
run: ./ci/github/integration-testing/webserver.bash clean_up
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -2174,7 +2174,7 @@ jobs:
- name: cleanup
if: ${{ !cancelled() }}
run: ./ci/github/integration-testing/director-v2.bash clean_up
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -2246,7 +2246,7 @@ jobs:
- name: cleanup
if: ${{ !cancelled() }}
run: ./ci/github/integration-testing/director-v2.bash clean_up
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -2311,7 +2311,7 @@ jobs:
- name: cleanup
if: ${{ !cancelled() }}
run: ./ci/github/integration-testing/dynamic-sidecar.bash clean_up
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -2389,7 +2389,7 @@ jobs:
run: |
pushd services/osparc-gateway-server && \
make down
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down Expand Up @@ -2452,7 +2452,7 @@ jobs:
- name: cleanup
if: ${{ !cancelled() }}
run: ./ci/github/integration-testing/simcore-sdk.bash clean_up
- uses: codecov/[email protected].2
- uses: codecov/[email protected].7
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down
9 changes: 0 additions & 9 deletions services/static-webserver/client/source/class/osparc/auth/Data.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@ qx.Class.define("osparc.auth.Data", {
check: "Number"
},

/**
* org IDs
*/
orgIds: {
init: [],
nullable: false,
check: "Array"
},

/**
* Basic authentification with a token
*/
Expand Down
5 changes: 0 additions & 5 deletions services/static-webserver/client/source/class/osparc/auth/Manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,6 @@ qx.Class.define("osparc.auth.Manager", {
role: profile.role.toLowerCase()
});
this.updateProfile(profile);
if ("organizations" in profile["groups"]) {
const orgIds = [];
profile["groups"]["organizations"].forEach(org => orgIds.push(org["gid"]));
authData.setOrgIds(orgIds);
}
const role = profile.role.toLowerCase();
osparc.data.Permissions.getInstance().setRole(role);

Expand Down
Loading

0 comments on commit b534b66

Please sign in to comment.