chore(storybook): Use "In-Flight Entertainment" as default mockProject

DSD-DBS · Dec 2, 2024 · 7dad38a · 7dad38a
1 parent f4b33e5
commit 7dad38a
Show file tree

Hide file tree

Showing 24 changed files with 106 additions and 54 deletions.
diff --git a/backend/capellacollab/core/authentication/injectables.py b/backend/capellacollab/core/authentication/injectables.py
@@ -182,7 +182,7 @@ def _is_internal_project_accessible(
         self, project: projects_models.DatabaseProject
     ) -> bool:
         return (
-            project.visibility == projects_models.Visibility.INTERNAL
+            project.visibility == projects_models.ProjectVisibility.INTERNAL
             and self.required_role
             == projects_users_models.ProjectUserRole.USER
             and self.required_permission

diff --git a/backend/capellacollab/core/database/migration.py b/backend/capellacollab/core/database/migration.py
@@ -105,7 +105,7 @@ def initialize_capellambse_test_project(db: orm.Session):
         db=db,
         name="Melody Model Test",
         description="Group of test models of the capellambse Python library",
-        visibility=project_models.Visibility.INTERNAL,
+        visibility=project_models.ProjectVisibility.INTERNAL,
     )
     create_capellambse_test_models(db, project)
     LOGGER.info("Initialized project '%s'", project.name)
@@ -476,7 +476,7 @@ def initialize_coffee_machine_project(db: orm.Session):
         db=db,
         name="Coffee Machine",
         description="Contains the Capella Coffee Machine sample model",
-        visibility=project_models.Visibility.INTERNAL,
+        visibility=project_models.ProjectVisibility.INTERNAL,
     )
     create_coffee_machine_model(db, project)
     LOGGER.info("Initialized project '%s'", project.name)
@@ -521,7 +521,7 @@ def initialize_ife_project(db: orm.Session):
         db=db,
         name="In-Flight Entertainment",
         description="Contains the Capella In-Flight Entertainment System sample model",
-        visibility=project_models.Visibility.INTERNAL,
+        visibility=project_models.ProjectVisibility.INTERNAL,
     )
     create_ife_model(db, project)
     LOGGER.info("Initialized project '%s'", project.name)

diff --git a/backend/capellacollab/projects/crud.py b/backend/capellacollab/projects/crud.py
@@ -24,7 +24,8 @@ def get_internal_projects(
     return (
         db.execute(
             sa.select(models.DatabaseProject).where(
-                models.DatabaseProject.visibility == models.Visibility.INTERNAL
+                models.DatabaseProject.visibility
+                == models.ProjectVisibility.INTERNAL
             )
         )
         .scalars()
@@ -88,7 +89,7 @@ def create_project(
     db: orm.Session,
     name: str,
     description: str = "",
-    visibility: models.Visibility = models.Visibility.PRIVATE,
+    visibility: models.ProjectVisibility = models.ProjectVisibility.PRIVATE,
     type: models.ProjectType = models.ProjectType.GENERAL,
 ) -> models.DatabaseProject:
     project = models.DatabaseProject(

diff --git a/backend/capellacollab/projects/models.py b/backend/capellacollab/projects/models.py
@@ -28,7 +28,7 @@ class UserMetadata(core_pydantic.BaseModel):
     subscribers: int
 
 
-class Visibility(enum.Enum):
+class ProjectVisibility(enum.Enum):
     PRIVATE = "private"
     INTERNAL = "internal"
 
@@ -43,7 +43,7 @@ class Project(core_pydantic.BaseModel):
     name: str
     slug: str
     description: str | None = None
-    visibility: Visibility
+    visibility: ProjectVisibility
     type: ProjectType
     users: UserMetadata
     is_archived: bool
@@ -94,22 +94,22 @@ class SimpleProject(core_pydantic.BaseModel):
     id: int
     name: str
     slug: str
-    visibility: Visibility
+    visibility: ProjectVisibility
     type: ProjectType
 
 
 class PatchProject(core_pydantic.BaseModel):
     name: str | None = None
     description: str | None = None
-    visibility: Visibility | None = None
+    visibility: ProjectVisibility | None = None
     type: ProjectType | None = None
     is_archived: bool | None = None
 
 
 class PostProjectRequest(core_pydantic.BaseModel):
     name: str
     description: str | None = None
-    visibility: Visibility = Visibility.PRIVATE
+    visibility: ProjectVisibility = ProjectVisibility.PRIVATE
     type: ProjectType = ProjectType.GENERAL
 
 
@@ -124,8 +124,8 @@ class DatabaseProject(database.Base):
     slug: orm.Mapped[str] = orm.mapped_column(unique=True, index=True)
 
     description: orm.Mapped[str | None] = orm.mapped_column(default=None)
-    visibility: orm.Mapped[Visibility] = orm.mapped_column(
-        default=Visibility.PRIVATE
+    visibility: orm.Mapped[ProjectVisibility] = orm.mapped_column(
+        default=ProjectVisibility.PRIVATE
     )
     type: orm.Mapped[ProjectType] = orm.mapped_column(
         default=ProjectType.GENERAL

diff --git a/backend/capellacollab/projects/routes.py b/backend/capellacollab/projects/routes.py
@@ -60,7 +60,8 @@ def get_projects(
         projects = [
             association.project
             for association in user.projects
-            if not association.project.visibility == models.Visibility.INTERNAL
+            if not association.project.visibility
+            == models.ProjectVisibility.INTERNAL
         ]
         projects.extend(crud.get_internal_projects(db))
     else:

diff --git a/backend/capellacollab/projects/users/routes.py b/backend/capellacollab/projects/users/routes.py
@@ -46,7 +46,7 @@ def get_project_user_association_or_raise(
     if project_user := crud.get_project_user_association(db, project, user):
         return project_user
 
-    if project.visibility == projects_models.Visibility.INTERNAL:
+    if project.visibility == projects_models.ProjectVisibility.INTERNAL:
         return models.ProjectUser(
             role=models.ProjectUserRole.USER,
             permission=models.ProjectUserPermission.READ,

diff --git a/backend/tests/projects/test_projects_routes.py b/backend/tests/projects/test_projects_routes.py
@@ -79,7 +79,9 @@ def test_get_projects_as_admin(
     executor_name: str,
 ):
     project = projects_crud.create_project(
-        db, "test project", visibility=projects_models.Visibility.PRIVATE
+        db,
+        "test project",
+        visibility=projects_models.ProjectVisibility.PRIVATE,
     )
     users_crud.create_user(
         db, executor_name, executor_name, None, users_models.Role.ADMIN
@@ -102,7 +104,9 @@ def test_get_internal_projects_as_user(
     executor_name: str,
 ):
     project = projects_crud.create_project(
-        db, "test project", visibility=projects_models.Visibility.INTERNAL
+        db,
+        "test project",
+        visibility=projects_models.ProjectVisibility.INTERNAL,
     )
     users_crud.create_user(
         db, executor_name, executor_name, None, users_models.Role.USER
@@ -128,7 +132,9 @@ def test_get_internal_projects_as_user_without_duplicates(
         db, executor_name, executor_name, None, users_models.Role.USER
     )
     project = projects_crud.create_project(
-        db, "test project", visibility=projects_models.Visibility.INTERNAL
+        db,
+        "test project",
+        visibility=projects_models.ProjectVisibility.INTERNAL,
     )
     projects_users_crud.add_user_to_project(
         db,
@@ -217,7 +223,7 @@ def test_update_project_as_admin(
     project = projects_crud.create_project(db, "new project")
 
     assert project.slug == "new-project"
-    assert project.visibility == projects_models.Visibility.PRIVATE
+    assert project.visibility == projects_models.ProjectVisibility.PRIVATE
     assert project.is_archived is False
 
     response = client.patch(

diff --git a/backend/tests/projects/test_projects_users_routes.py b/backend/tests/projects/test_projects_users_routes.py
@@ -119,7 +119,7 @@ def test_current_user_rights_for_internal_project(
         db,
         project,
         projects_models.PatchProject(
-            visibility=projects_models.Visibility.INTERNAL
+            visibility=projects_models.ProjectVisibility.INTERNAL
         ),
     )
     users_crud.create_user(
@@ -145,7 +145,7 @@ def test_no_user_rights_on_internal_permissions(
         db,
         project,
         projects_models.PatchProject(
-            visibility=projects_models.Visibility.PRIVATE
+            visibility=projects_models.ProjectVisibility.PRIVATE
         ),
     )
     users_crud.create_user(

diff --git a/frontend/src/app/openapi/.openapi-generator/FILES b/frontend/src/app/openapi/.openapi-generator/FILES
diff --git a/frontend/src/app/openapi/model/guacamole-connection-method-input.ts b/frontend/src/app/openapi/model/guacamole-connection-method-input.ts
diff --git a/frontend/src/app/openapi/model/guacamole-connection-method-output.ts b/frontend/src/app/openapi/model/guacamole-connection-method-output.ts
diff --git a/frontend/src/app/openapi/model/http-connection-method-input.ts b/frontend/src/app/openapi/model/http-connection-method-input.ts
diff --git a/frontend/src/app/openapi/model/http-connection-method-output.ts b/frontend/src/app/openapi/model/http-connection-method-output.ts
diff --git a/frontend/src/app/openapi/model/models.ts b/frontend/src/app/openapi/model/models.ts
diff --git a/frontend/src/app/openapi/model/patch-project.ts b/frontend/src/app/openapi/model/patch-project.ts
diff --git a/frontend/src/app/openapi/model/post-project-request.ts b/frontend/src/app/openapi/model/post-project-request.ts
diff --git a/frontend/src/app/openapi/model/visibility.ts → ...c/app/openapi/model/project-visibility.ts b/frontend/src/app/openapi/model/visibility.ts → ...c/app/openapi/model/project-visibility.ts
diff --git a/frontend/src/app/openapi/model/project.ts b/frontend/src/app/openapi/model/project.ts
diff --git a/frontend/src/app/openapi/model/simple-project.ts b/frontend/src/app/openapi/model/simple-project.ts