Skip to content

Commit

Permalink
chore: Update packages (including Angular 19)
Browse files Browse the repository at this point in the history
Update all packages. The Angular 19 migration removes standalone from all components. The prettier
update changes some of the markdown formatting.
  • Loading branch information
zusorio committed Dec 2, 2024
1 parent eda22af commit 35e35d4
Show file tree
Hide file tree
Showing 139 changed files with 4,051 additions and 3,336 deletions.
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ repos:
types_or: [ts, css, html, markdown]
exclude: '^frontend/src/app/openapi'
additional_dependencies:
- 'prettier@3.3.3'
- 'prettier-plugin-tailwindcss@^0.6.8'
- 'prettier@3.4.1'
- 'prettier-plugin-tailwindcss@^0.6.9'
- '@trivago/prettier-plugin-sort-imports@^4.3.0'
- 'tailwindcss@^3.4.15'
- 'prettier-plugin-classnames@^0.7.4'
Expand Down Expand Up @@ -179,14 +179,14 @@ repos:
hooks:
- id: eslint
additional_dependencies:
- 'eslint@^9.15.0'
- '@eslint/js@^9.15.0'
- 'angular-eslint@18.4.0'
- 'eslint@^9.16.0'
- '@eslint/js@^9.16.0'
- 'angular-eslint@19.0.0'
- 'eslint-config-prettier@^9.1.0'
- 'typescript-eslint@8.15.0'
- 'typescript-eslint@8.16.0'
- 'eslint-plugin-unused-imports@^4.1.4'
- 'eslint-plugin-tailwindcss@^3.17.5'
- '[email protected].0'
- '[email protected].1'
- 'tailwindcss@^3.4.15'
args:
[
Expand Down
14 changes: 7 additions & 7 deletions docs/docs/admin/ci-templates/gitlab/image-builder.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ running for main the tag would be `:main`). All characters matching the regex
You have to add the following environment variables on repository level. Make
sure to enable the "Expand variable reference" flag.

- `PRIVATE_GPG_PATH`: Path to the private GPG key used to decrypt the
`secret.docker.json` file (More about this file [below](#docker-sops-file))
- Variables specifying how to name each image:
- `FRONTEND_IMAGE_NAME` (defaults to `capella/collab/frontend`)
- `BACKEND_IMAGE_NAME` (default to `capella/collab/backend`)
- `DOCS_IMAGE_NAME` (defaults to `capella/collab/docs`)
- `GUACAMOLE_IMAGE_NAME` (defaults to `capella/collab/guacamole`)
- `PRIVATE_GPG_PATH`: Path to the private GPG key used to decrypt the
`secret.docker.json` file (More about this file [below](#docker-sops-file))
- Variables specifying how to name each image:
- `FRONTEND_IMAGE_NAME` (defaults to `capella/collab/frontend`)
- `BACKEND_IMAGE_NAME` (default to `capella/collab/backend`)
- `DOCS_IMAGE_NAME` (defaults to `capella/collab/docs`)
- `GUACAMOLE_IMAGE_NAME` (defaults to `capella/collab/guacamole`)

This is the (minimal) configuration. For more advanced configuration options,
please refer to the
Expand Down
10 changes: 5 additions & 5 deletions docs/docs/admin/ci-templates/gitlab/k8s-deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ include:
You have to add the following environment variables on repository level. Make
sure to enable the "Expand variable reference" flag.
- `PRIVATE_GPG_PATH`: Path to the private GPG key used to decrypt the
`secret.k8s.json` files.
- `GRAFANA_HELM_CHART`: (Optional) - This variable is used to set the URL for
the Grafana Helm chart. It is useful if your deployment environment has
limited access, so you can specify a URL that is accessible for you.
- `PRIVATE_GPG_PATH`: Path to the private GPG key used to decrypt the
`secret.k8s.json` files.
- `GRAFANA_HELM_CHART`: (Optional) - This variable is used to set the URL for
the Grafana Helm chart. It is useful if your deployment environment has
limited access, so you can specify a URL that is accessible for you.

## SOPS configuration

Expand Down
12 changes: 6 additions & 6 deletions docs/docs/admin/configure-for-your-org.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ for learning about any potential issues users may be facing.

There are several different types of feedback prompt:

- After a session: Prompt the user for feedback after they have manually
terminated a session.
- On the session card: Show a feedback button on the session card.
- In the footer: Show a feedback button in the footer.
- Interval: Prompt the user for feedback after a certain number of hours have
passed since the last prompt.
- After a session: Prompt the user for feedback after they have manually
terminated a session.
- On the session card: Show a feedback button on the session card.
- In the footer: Show a feedback button in the footer.
- Interval: Prompt the user for feedback after a certain number of hours have
passed since the last prompt.

```yaml
feedback:
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/admin/getting_started/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ Collaboration Manager.

More advanced features include:

- Read-only models from Git
- Connect to a Team4Capella server (commercial product)
- Manage users and user access
- Read-only models from Git
- Connect to a Team4Capella server (commercial product)
- Manage users and user access
40 changes: 20 additions & 20 deletions docs/docs/admin/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,24 +109,24 @@ of memory.
The Collaboration Manager requires two different namespaces. For security and
overview reasons, they are separated:

- Capella Collaboration Manager control namespace: In this namespace, we run
the core application. It has full control over the sessions namespace and
consists of the following services:

- Frontend
- Backend
- Documentation
- Guacamole
- Prometheus
- Grafana (Loki), can be disabled in the `values.yaml`

- Sessions namespace. The namespace is controlled by the control namespace
and you won't need to touch it. In the session namespace, the following
services run:
- Storage for persistent workspaces
- Storage for Jupyter file-shares
- Pipeline jobs for TeamForCapella to Git synchronization
- Session containers (Capella, Papyrus, Jupyter, pure::variants)
- Capella Collaboration Manager control namespace: In this namespace, we run
the core application. It has full control over the sessions namespace and
consists of the following services:

- Frontend
- Backend
- Documentation
- Guacamole
- Prometheus
- Grafana (Loki), can be disabled in the `values.yaml`

- Sessions namespace. The namespace is controlled by the control namespace and
you won't need to touch it. In the session namespace, the following services
run:
- Storage for persistent workspaces
- Storage for Jupyter file-shares
- Pipeline jobs for TeamForCapella to Git synchronization
- Session containers (Capella, Papyrus, Jupyter, pure::variants)

---

Expand Down Expand Up @@ -264,8 +264,8 @@ If a value is false, check the backend logs for more information.
Capella Docker images documentation (Only the preparation section is
needed):
- [`capella/base`](https://dsd-dbs.github.io/capella-dockerimages/capella/base/#preparation)
- [`t4c/client/base`](https://dsd-dbs.github.io/capella-dockerimages/capella/t4c/base/#preparation)
- [`capella/base`](https://dsd-dbs.github.io/capella-dockerimages/capella/base/#preparation)
- [`t4c/client/base`](https://dsd-dbs.github.io/capella-dockerimages/capella/t4c/base/#preparation)
1. Set the following environment variables:
Expand Down
20 changes: 10 additions & 10 deletions docs/docs/admin/monitoring/logging/explorer.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@ tool, version, etc.

You can query logs of different components by selecting the following labels:

- **Management portal logs**: If you want to query the logs of the management
portal, make use of the `deployment` label to select a component of the
management portal.
- **Session logs**: If you want to query the logs of a specific session, you
can use the `username` label to select the user, and the `session_type`
label to select the session type. You can also use the `tool` and `version`
labels to further specify the session.
- **Pipeline logs**: If you want to query the logs of a pipeline, you can use
the `pipeline_run_id` label to select the pipeline run. The pipeline run
identifiers are listed in the pipeline run overview of a pipeline.
- **Management portal logs**: If you want to query the logs of the management
portal, make use of the `deployment` label to select a component of the
management portal.
- **Session logs**: If you want to query the logs of a specific session, you
can use the `username` label to select the user, and the `session_type` label
to select the session type. You can also use the `tool` and `version` labels
to further specify the session.
- **Pipeline logs**: If you want to query the logs of a pipeline, you can use
the `pipeline_run_id` label to select the pipeline run. The pipeline run
identifiers are listed in the pipeline run overview of a pipeline.

Here is an example filter how to select all sessions for version 7.0.0.

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/admin/settings/model-sources/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ Models are matched with instances with a longest prefix match of the URL.

Let's construct a short example. We have two Git instances:

- Instance one with the URL `https://git.example.com/`
- Instance two with the URL `https://git.example.com/test`
- Instance one with the URL `https://git.example.com/`
- Instance two with the URL `https://git.example.com/test`

A model with the path `https://git.example.com/test/test2.git` is now
associated with instance two. A model with the path
Expand Down
31 changes: 15 additions & 16 deletions docs/docs/admin/settings/model-sources/t4c.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,27 @@ You can see all existing license servers (if any). To add a new license server,
click on the "Add a license server" card. You have to enter the following
information:

- **Name**: Any name to identify the license server
- **License Server API**: The URL of the license server API
- **License Key**: License key of your license server
- **Name**: Any name to identify the license server
- **License Server API**: The URL of the license server API
- **License Key**: License key of your license server

## Define a T4C Instance

You can see all existing instances (if any). To add a new instance, click on
the "Add an instance" card. You have to enter the following information:

- **Name**: Any name to identify the instance
- **Capella version**: Capella version that corresponds to the instance
- **License Server**: Select the license server that should be used for this
instance
- **Protocol**: Protocol that should be used to communicate between capella
sessions and the T4C server
- **Host**: Hostname of the T4C server
- **Port**, **CDO Port**, and **HTTP Port** Corresponding ports of your
server
- **REST API**: REST API URL of the T4C server
- **Username**: Username with access to the REST API, required for
communication with the REST API
- **Password**: Password corresponding to username
- **Name**: Any name to identify the instance
- **Capella version**: Capella version that corresponds to the instance
- **License Server**: Select the license server that should be used for this
instance
- **Protocol**: Protocol that should be used to communicate between capella
sessions and the T4C server
- **Host**: Hostname of the T4C server
- **Port**, **CDO Port**, and **HTTP Port** Corresponding ports of your server
- **REST API**: REST API URL of the T4C server
- **Username**: Username with access to the REST API, required for
communication with the REST API
- **Password**: Password corresponding to username

## Archive a T4C Instance

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/admin/settings/tools/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ can be used as a web-based tool.

Tools can be found in various places on the platform:

- Models in projects are always assigned to a specific tool.
- Sessions are always started for a specific tool.
- Models in projects are always assigned to a specific tool.
- Sessions are always started for a specific tool.

Each tool has different versions and natures, which can be configured
individually. Since different versions can be enabled in parallel, it helps to
Expand Down
28 changes: 14 additions & 14 deletions docs/docs/admin/tools/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
To add a tool to the Collaboration Manager, it must fulfill the following
requirements:

- The tool must run in a single Docker container (no sidecar containers).
- The Docker container has to run with a non-root user.
- The Docker image has to be deployed to a Docker registry, which is
accessible from the Collaboration Manager server environment.
- The tool must be exposed via RDP or HTTP/HTTPS.
- If the tool is exposed via RDP, it must accept basic authentication. For
HTTP-based tools, authentication is handled automatically via
pre-authentication.
- The container must expose a `/metrics` endpoint with an `idletime_minutes`
gauge metric in the OpenMetrics format, which returns the time in minutes
since the last user interaction. The metric is used to determine if the
session is idle and can be terminated.
- If you want to capture session logs and make them accessible via Grafana
Loki, they have to be written to disk (stdout/stderr are not persisted).
- The tool must run in a single Docker container (no sidecar containers).
- The Docker container has to run with a non-root user.
- The Docker image has to be deployed to a Docker registry, which is accessible
from the Collaboration Manager server environment.
- The tool must be exposed via RDP or HTTP/HTTPS.
- If the tool is exposed via RDP, it must accept basic authentication. For
HTTP-based tools, authentication is handled automatically via
pre-authentication.
- The container must expose a `/metrics` endpoint with an `idletime_minutes`
gauge metric in the OpenMetrics format, which returns the time in minutes
since the last user interaction. The metric is used to determine if the
session is idle and can be terminated.
- If you want to capture session logs and make them accessible via Grafana
Loki, they have to be written to disk (stdout/stderr are not persisted).

## YAML Configuration

Expand Down
12 changes: 6 additions & 6 deletions docs/docs/api/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ to automate tasks such as creating and managing projects, sessions, and users.

Please use these links to access the API documentation:

- [:octicons-link-external-16: SwaggerUI](swagger.md) (Interactive SwaggerUI
documentation)
- [:octicons-link-external-16: ReDoc](redoc.md) (Interactive ReDoc
documentation)
- [:octicons-link-external-16: OpenAPI Specification, formerly Swagger Specification](openapi.md)
(JSON)
- [:octicons-link-external-16: SwaggerUI](swagger.md) (Interactive SwaggerUI
documentation)
- [:octicons-link-external-16: ReDoc](redoc.md) (Interactive ReDoc
documentation)
- [:octicons-link-external-16: OpenAPI Specification, formerly Swagger Specification](openapi.md)
(JSON)

## Authentication

Expand Down
Loading

0 comments on commit 35e35d4

Please sign in to comment.