Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Apply prettier layout globally #1323

Merged
merged 1 commit into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
version: 2
updates:
# Backend
- package-ecosystem: "pip"
directory: "/backend"
- package-ecosystem: 'pip'
directory: '/backend'
schedule:
interval: "weekly"
interval: 'weekly'
# Frontend
- package-ecosystem: "npm"
directory: "/frontend"
- package-ecosystem: 'npm'
directory: '/frontend'
schedule:
interval: "weekly"
interval: 'weekly'
groups:
angular:
patterns:
- "@angular*"
- '@angular*'
update-types:
- "major"
- "minor"
- "patch"
- 'major'
- 'minor'
- 'patch'
# Capella Dockerimages
- package-ecosystem: "gitsubmodule"
directory: "/"
- package-ecosystem: 'gitsubmodule'
directory: '/'
schedule:
interval: "daily"
interval: 'daily'
# Github Actions
- package-ecosystem: "github-actions"
directory: "/"
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: "daily"
interval: 'daily'
59 changes: 29 additions & 30 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
name: 'CodeQL'

on:
push:
branches: [ main ]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
branches: [main]
schedule:
- cron: '24 12 * * 3'

Expand All @@ -35,41 +35,40 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
language: ['javascript', 'python']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ name: lint

on:
push:
branches: ["**"]
tags: ["v*.*.*"]
branches: ['**']
tags: ['v*.*.*']
pull_request:
branches: [ main ]
branches: [main]

jobs:
helm-chart:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
with:
cache: pip
cache-dependency-path: ./backend/pyproject.toml
python-version: "3.11"
python-version: '3.11'
- name: Install pre-commit
run: |-
python -m pip install pre-commit
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ name: push

on:
push:
branches: ["**"]
tags: ["v*.*.*"]
branches: ['**']
tags: ['v*.*.*']
pull_request:
branches: [main]

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ name: tests

on:
push:
branches: ["**"]
tags: ["v*.*.*"]
branches: ['**']
tags: ['v*.*.*']
pull_request:
branches: [main]

Expand All @@ -23,7 +23,7 @@ jobs:
with:
cache: pip
cache-dependency-path: ./backend/pyproject.toml
python-version: "3.11"
python-version: '3.11'
- name: Install dependencies
run: |
pip install -e "./backend[dev]"
Expand Down
12 changes: 6 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ staging:
- when: manual
variables:
TARGET: staging
REVISION: "$CI_COMMIT_REF_NAME"
DOCKER_BUILD_ARGS: "" # Enable Docker build cache
REVISION: '$CI_COMMIT_REF_NAME'
DOCKER_BUILD_ARGS: '' # Enable Docker build cache
trigger:
project: "$DEPLOYMENT_GITLAB_REPOSITORY"
project: '$DEPLOYMENT_GITLAB_REPOSITORY'
strategy: depend

production:
rules:
# For tags, build for the production environment
- if: "$CI_COMMIT_TAG != null"
- if: '$CI_COMMIT_TAG != null'
variables:
TARGET: production
REVISION: "$CI_COMMIT_REF_NAME"
REVISION: '$CI_COMMIT_REF_NAME'
trigger:
project: "$DEPLOYMENT_GITLAB_REPOSITORY"
project: '$DEPLOYMENT_GITLAB_REPOSITORY'
strategy: depend
2 changes: 1 addition & 1 deletion docs/.prettierrc.yaml → .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: Copyright DB InfraGO AG and contributors
# SPDX-License-Identifier: Apache-2.0

trailingComma: "es5"
trailingComma: 'es5'
tabWidth: 2
semi: false
singleQuote: true
Expand Down
14 changes: 8 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ Thanks for your interest in our project. Contributions are always welcome!
We are committed to fostering a welcoming, respectful, and harassment-free
environment. Be kind!

If you have questions, ideas or want to report a bug, feel free to [open an
issue](/../../issues). Or go ahead and [open a pull request](/../../pulls) to contribute
code. In order to reduce the burden on our maintainers, please make sure that
your code follows our style guidelines.
If you have questions, ideas or want to report a bug, feel free to
[open an issue](/../../issues). Or go ahead and
[open a pull request](/../../pulls) to contribute code. In order to reduce the
burden on our maintainers, please make sure that your code follows our style
guidelines.

We provide a developer documentation. There you will also find information
on how to set up a local environment: [Developer Documentation](https://dsd-dbs.github.io/capella-collab-manager/development/)
We provide a developer documentation. There you will also find information on
how to set up a local environment:
[Developer Documentation](https://dsd-dbs.github.io/capella-collab-manager/development/)
12 changes: 6 additions & 6 deletions backend/capellacollab/config/config_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ properties:
host:
type: string
port:
type: ["number", "string"]
type: ['number', 'string']
scheme:
type: string
wildcardHost:
Expand Down Expand Up @@ -177,21 +177,21 @@ properties:
tokenIssuance:
type:
- string
- "null"
- 'null'
authorization:
type:
- string
- "null"
- 'null'
wellKnown:
type:
- string
- "null"
- 'null'
audience:
type: string
scopes:
type:
- array
- "null"
- 'null'
items:
type: string
enum:
Expand All @@ -208,7 +208,7 @@ properties:
secret:
type:
- string
- "null"
- 'null'
redirectURI:
type: string
jwt:
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,10 @@ const routes: Routes = [
},
{
path: 'tool/:toolID',
data: { breadcrumb: 'Tools', redirect: '/settings/core/tools' },
data: {
breadcrumb: 'Tools',
redirect: '/settings/core/tools',
},
children: [
{
path: '',
Expand Down
Loading