ran pre commit

backend/app/main.py

@@ -26,6 +26,7 @@
     MetadataDefinitionDB,
     MetadataFreezeDB,
 )
+from app.models.project import ProjectDB
 from app.models.thumbnails import ThumbnailDB, ThumbnailDBViewList, ThumbnailFreezeDB
 from app.models.tokens import TokenDB
 from app.models.users import ListenerAPIKeyDB, UserAPIKeyDB, UserDB
@@ -39,7 +40,6 @@
     VisualizationDataDBViewList,
     VisualizationDataFreezeDB,
 )
-from app.models.project import ProjectDB
 from app.routers import (
     authentication,
     authorization,
@@ -56,6 +56,7 @@
     metadata,
     metadata_datasets,
     metadata_files,
+    projects,
     public_datasets,
     public_elasticsearch,
     public_files,
@@ -67,7 +68,6 @@
     thumbnails,
     users,
     visualization,
-    projects,
 )
 
 # setup loggers

backend/app/routers/projects.py

@@ -7,23 +7,16 @@
 import zipfile
 from collections.abc import Iterable, Mapping
 from typing import List, Optional
-from app.models.pages import Paged, _construct_page_metadata, _get_page_query
-
 
 from app import dependencies
 from app.config import settings
-from app.models.users import UserDB, UserOut, UserIn
+from app.keycloak_auth import get_current_user, get_token, get_user
 from app.models.datasets import DatasetDB
 from app.models.files import FileDB
 from app.models.folders import FolderDB
-from app.models.project import (
-    ProjectBase,
-    ProjectDB,
-    ProjectIn,
-    ProjectOut,
-    Member,
-)
-from app.keycloak_auth import get_current_user, get_token, get_user
+from app.models.pages import Paged, _construct_page_metadata, _get_page_query
+from app.models.project import Member, ProjectBase, ProjectDB, ProjectIn, ProjectOut
+from app.models.users import UserDB, UserIn, UserOut
 from beanie import PydanticObjectId
 from beanie.operators import And, Or
 from bson import ObjectId, json_util

backend/app/tests/test_projects.py

@@ -2,10 +2,10 @@
 from app.tests.utils import (
     create_dataset,
     create_group,
+    create_project,
     create_user,
     get_user_token,
     user_alt,
-    create_project,
 )
 from fastapi.testclient import TestClient
 

backend/app/tests/utils.py

@@ -61,7 +61,11 @@
     },
 }
 
-project_example = {"name": "test_project", "description": "This project is a test", "creator": user_example}
+project_example = {
+    "name": "test_project",
+    "description": "This project is a test",
+    "creator": user_example,
+}
 
 extractor_info_v1_example = {
     "@context": "http://clowder.ncsa.illinois.edu/contexts/extractors.jsonld",

docs/docs/admins/backups.md

@@ -1 +1 @@
-# Backups
+# Backups

docs/docs/admins/config.md

@@ -3,4 +3,4 @@
 Each instance of Clowder can be configured at deployment time using the config file. The config file is located
 in `backend/app/config.py`. At run time, environmental variables passed into the container will override the defaults
 in the config file. When using Docker Compose, the environmental variables are set in the `docker-compose.yml` file or
-in `.env` file. In the case of Kubernetes, the environmental variables are set in the `values.yaml` file.
+in `.env` file. In the case of Kubernetes, the environmental variables are set in the `values.yaml` file.

docs/docs/devs/architecture.md

@@ -10,9 +10,9 @@ Lines show interactions between containers over the docker network.
   ![Clowder v2 architecture](../assets/images/architecture.jpg)
   <figcaption>Architecture</figcaption>
 </figure>
-I want to `slkdfjslkdjf` include a 
+I want to `slkdfjslkdjf` include a
 
 - alkdjflskjdf
 - alskdjflksajfd
   - [slkjdf](http://clowder.com)
-  - 
+  -

docs/docs/devs/frontend/lazyloading.md

@@ -1 +1 @@
-# Webpack Lazy Loading
+# Webpack Lazy Loading

docs/docs/devs/precommits.md

@@ -1,2 +1 @@
 # Precommits and Linting
-

docs/docs/users/index.md

@@ -57,4 +57,3 @@ In this case, the administrator of the instance will need to enable the account.
 ## Uploading Data
 
 ## Sharing Data
-

frontend/src/openapi/v2/index.ts

@@ -5,6 +5,8 @@ export { ApiError } from './core/ApiError';
 export { CancelablePromise } from './core/CancelablePromise';
 export { OpenAPI } from './core/OpenAPI';
 
+export type { app__models__groups__Member } from './models/app__models__groups__Member';
+export type { app__models__project__Member } from './models/app__models__project__Member';
 export type { AuthorizationBase } from './models/AuthorizationBase';
 export type { AuthorizationMetadata } from './models/AuthorizationMetadata';
 export type { AuthorizationOut } from './models/AuthorizationOut';
@@ -50,7 +52,6 @@ export type { LicenseIn } from './models/LicenseIn';
 export type { LicenseOption } from './models/LicenseOption';
 export type { LicenseOut } from './models/LicenseOut';
 export type { LocalFileIn } from './models/LocalFileIn';
-export type { Member } from './models/Member';
 export type { MetadataAgent } from './models/MetadataAgent';
 export type { MetadataConfig } from './models/MetadataConfig';
 export type { MetadataDefinitionIn } from './models/MetadataDefinitionIn';
@@ -65,6 +66,8 @@ export type { MetadataRequiredForItems } from './models/MetadataRequiredForItems
 export type { MongoDBRef } from './models/MongoDBRef';
 export type { Paged } from './models/Paged';
 export type { PageMetadata } from './models/PageMetadata';
+export type { ProjectIn } from './models/ProjectIn';
+export type { ProjectOut } from './models/ProjectOut';
 export type { Repository } from './models/Repository';
 export { RoleType } from './models/RoleType';
 export type { SearchCriteria } from './models/SearchCriteria';
@@ -96,6 +99,7 @@ export { LicensesService } from './services/LicensesService';
 export { ListenersService } from './services/ListenersService';
 export { LoginService } from './services/LoginService';
 export { MetadataService } from './services/MetadataService';
+export { ProjectsService } from './services/ProjectsService';
 export { PublicDatasetsService } from './services/PublicDatasetsService';
 export { PublicElasticsearchService } from './services/PublicElasticsearchService';
 export { PublicFilesService } from './services/PublicFilesService';

frontend/src/openapi/v2/models/GroupBase.ts

@@ -2,10 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { Member } from './Member';
+import type { app__models__groups__Member } from './app__models__groups__Member';
 
 export type GroupBase = {
     name: string;
     description?: string;
-    users?: Array<Member>;
+    users?: Array<app__models__groups__Member>;
 }

frontend/src/openapi/v2/models/GroupIn.ts

@@ -2,10 +2,10 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { Member } from './Member';
+import type { app__models__groups__Member } from './app__models__groups__Member';
 
 export type GroupIn = {
     name: string;
     description?: string;
-    users?: Array<Member>;
+    users?: Array<app__models__groups__Member>;
 }

frontend/src/openapi/v2/models/GroupOut.ts

@@ -2,7 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { Member } from './Member';
+import type { app__models__groups__Member } from './app__models__groups__Member';
 
 /**
  * Document Mapping class.
@@ -23,7 +23,7 @@ export type GroupOut = {
     modified?: string;
     name: string;
     description?: string;
-    users?: Array<Member>;
+    users?: Array<app__models__groups__Member>;
     id?: string;
     views?: number;
 }