Skip to content

Commit

Permalink
Merge branch 'master' into qurator-omni
Browse files Browse the repository at this point in the history
* master: (97 commits)
  Remove `<Delay />` component (#4132)
  rewrite SUMMARY (doc reorg) (#4149)
  Tabulator, Admin: UI for modifying tabulator configs (#4135)
  Bump debian from `1b0b790` to `3f9e536` in /lambdas/thumbnail (#4158)
  Bump debian from bullseye-20240904-slim to bullseye-20240926-slim in /lambdas/thumbnail (#4156)
  Bump amazonlinux from 2023.5.20240903.0 to 2023.5.20240916.0 in /catalog (#4151)
  Bump amazonlinux from 2023.5.20240903.0 to 2023.5.20240916.0 in /s3-proxy (#4152)
  Edit file / Edit with config helper (#4147)
  Fix "bad `setState()`" warning (#4150)
  Update dependency webpack to v5.94.0 [SECURITY] (#4125)
  Fix `ui.package_description` example (#4146)
  Bump urllib3 from 1.26.18 to 1.26.19 in /lambdas/s3select (#4140)
  Move bucket settings to a separate page (#4122)
  Bump debian from bullseye-20240812-slim to bullseye-20240904-slim in /lambdas/thumbnail (#4131)
  Bump amazonlinux from 2023.5.20240819.0 to 2023.5.20240903.0 in /catalog (#4133)
  Bump amazonlinux from 2023.5.20240819.0 to 2023.5.20240903.0 in /s3-proxy (#4134)
  Bump certifi from 2023.7.22 to 2024.7.4 in /lambdas/preview (#4130)
  Bump zipp from 3.15.0 to 3.19.1 in /lambdas/preview (#4129)
  Bump cryptography from 42.0.4 to 43.0.1 in /lambdas/indexer (#4128)
  Ignore line-length lint rule for CHANGELOG (#4127)
  ...
  • Loading branch information
nl0 committed Oct 7, 2024
2 parents 0ce8eec + f90917d commit 4f64926
Show file tree
Hide file tree
Showing 148 changed files with 5,871 additions and 1,706 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/js-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,11 @@ jobs:
name: ${{ github.job }}
lint-docs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: docs
env:
NODE_OPTIONS: --max-old-space-size=4096
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: 'catalog/package.json'
- run: npx --package=markdownlint-cli markdownlint --ignore node_modules **/*.md
- run: npx --package=markdownlint-cli markdownlint .
4 changes: 2 additions & 2 deletions .github/workflows/py-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
Expand All @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
Expand Down
12 changes: 12 additions & 0 deletions .markdownlintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Not ready for lint yet
gendocs
lambdas
py-shared
testdocs

# Autogenerated
docs/api-reference

.git
catalog/node_modules
venv
25 changes: 25 additions & 0 deletions api/python/quilt3-admin/queries.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ fragment OperationErrorSelection on OperationError {
name
context
}
fragment SsoConfigSelection on SsoConfig {
text
timestamp
uploader {
...UserSelection
}
}

query rolesList {
roles {
Expand Down Expand Up @@ -187,3 +194,21 @@ mutation usersRemoveRoles($name: String!, $roles: [String!]!, $fallback: String)
}
}
}

query ssoConfigGet {
admin {
ssoConfig {
...SsoConfigSelection
}
}
}

mutation ssoConfigSet($config: String) {
admin {
setSsoConfig(config: $config) {
...SsoConfigSelection
...InvalidInputSelection
...OperationErrorSelection
}
}
}
2 changes: 1 addition & 1 deletion api/python/quilt3-admin/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ autoflake==2.3.1
# via ariadne-codegen
black==24.4.2
# via ariadne-codegen
certifi==2024.6.2
certifi==2024.7.4
# via
# httpcore
# httpx
Expand Down
2 changes: 1 addition & 1 deletion api/python/quilt3/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.0a4
6.0.0
4 changes: 2 additions & 2 deletions api/python/quilt3/admin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

# This wraps code generated by aridne-codegen to provide a more user-friendly API.

from . import roles, users
from . import roles, sso_config, users
from .exceptions import Quilt3AdminError, UserNotFoundError
from .types import ManagedRole, UnmanagedRole, User
from .types import ManagedRole, SSOConfig, UnmanagedRole, User
20 changes: 20 additions & 0 deletions api/python/quilt3/admin/_graphql_client/__init__.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

157 changes: 157 additions & 0 deletions api/python/quilt3/admin/_graphql_client/client.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions api/python/quilt3/admin/_graphql_client/fragments.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions api/python/quilt3/admin/_graphql_client/sso_config_get.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4f64926

Please sign in to comment.