changes

Author: marcoacierno

.gitignore

@@ -135,3 +135,5 @@ badge-service/badges.zip
 backend/custom_admin/src/types.ts
 backend/schema.graphql
 backend/__pypackages__/
+backend/custom_admin/.astro/
+backend/custom_admin/core.*

backend/api/schema.py

@@ -26,6 +26,8 @@
 from .association_membership.mutation import AssociationMembershipMutation
 from .cms.schema import CMSQuery
 from .sponsors.schema import SponsorsMutation
+from .visa.queries import VisaQuery
+from .visa.mutations import VisaMutation
 
 
 @strawberry.type
@@ -44,6 +46,7 @@ class Query(
     BadgeScannerQuery,
     UserQuery,
     CMSQuery,
+    VisaQuery,
 ):
     pass
 
@@ -64,6 +67,7 @@ class Mutation(
     UsersMutations,
     AssociationMembershipMutation,
     SponsorsMutation,
+    VisaMutation,
 ):
     pass
 

backend/api/visa/mutations.py

@@ -0,0 +1,55 @@
+import json
+from api.context import Context
+from custom_admin.audit import create_change_admin_log_entry
+from visa.models import InvitationLetterDocument as InvitationLetterDocumentModel
+from api.visa.permissions import CanEditInvitationLetterDocument
+from strawberry.tools import create_type
+from api.visa.types import InvitationLetterDocument
+import strawberry
+
+
+@strawberry.input
+class UpdateInvitationLetterDocumentPageInput:
+    id: strawberry.ID
+    title: str
+    content: str
+
+
+@strawberry.input
+class UpdateInvitationLetterDocumentStructureInput:
+    header: str
+    footer: str
+    pages: list[UpdateInvitationLetterDocumentPageInput]
+
+    def to_json(self) -> str:
+        return json.dumps(self.to_dict())
+
+
+@strawberry.input
+class UpdateInvitationLetterDocumentInput:
+    id: strawberry.ID
+    dynamic_document: UpdateInvitationLetterDocumentStructureInput
+
+
+@strawberry.field(permission_classes=[CanEditInvitationLetterDocument])
+def update_invitation_letter_document(
+    info: strawberry.Info[Context], input: UpdateInvitationLetterDocumentInput
+) -> InvitationLetterDocument:
+    invitation_letter_document = InvitationLetterDocumentModel.objects.get(id=input.id)
+    invitation_letter_document.dynamic_document = strawberry.asdict(
+        input.dynamic_document
+    )
+    invitation_letter_document.save(update_fields=["dynamic_document"])
+
+    create_change_admin_log_entry(
+        info.context.request.user,
+        invitation_letter_document,
+        change_message="Invitation letter document updated",
+    )
+    return InvitationLetterDocument.from_model(invitation_letter_document)
+
+
+VisaMutation = create_type(
+    "VisaMutation",
+    (update_invitation_letter_document,),
+)

backend/api/visa/permissions.py

@@ -0,0 +1,38 @@
+from api.permissions import IsStaffPermission
+from visa.models import InvitationLetterDocument
+
+
+class CanViewInvitationLetterDocument(IsStaffPermission):
+    message = "Cannot view invitation letter document"
+
+    def has_permission(self, source, info, **kwargs):
+        if not super().has_permission(source, info, **kwargs):
+            return False
+
+        self.invitation_letter_document = self.get_invitation_letter_document(kwargs)
+        user = info.context.request.user
+        return user.has_perm(
+            "visa.view_invitationletterdocument", self.invitation_letter_document
+        )
+
+    def get_invitation_letter_document(self, kwargs):
+        if input := kwargs.get("input", None):
+            id = input.id
+        else:
+            id = kwargs.get("id")
+
+        return InvitationLetterDocument.objects.filter(id=id).first()
+
+
+class CanEditInvitationLetterDocument(CanViewInvitationLetterDocument):
+    message = "Cannot view invitation letter document"
+
+    def has_permission(self, source, info, **kwargs):
+        if not super().has_permission(source, info, **kwargs):
+            return False
+
+        invitation_letter_document = self.invitation_letter_document
+        user = info.context.request.user
+        return user.has_perm(
+            "visa.change_invitationletterdocument", invitation_letter_document
+        )

backend/api/visa/queries.py

@@ -0,0 +1,17 @@
+from api.visa.permissions import CanViewInvitationLetterDocument
+from visa.models import InvitationLetterDocument as InvitationLetterDocumentModel
+from api.visa.types import InvitationLetterDocument
+import strawberry
+from strawberry.tools import create_type
+
+
+@strawberry.field(permission_classes=[CanViewInvitationLetterDocument])
+def invitation_letter_document(id: strawberry.ID) -> InvitationLetterDocument | None:
+    invitation_letter_document = InvitationLetterDocumentModel.objects.get(id=id)
+    return InvitationLetterDocument.from_model(invitation_letter_document)
+
+
+VisaQuery = create_type(
+    "VisaQuery",
+    (invitation_letter_document,),
+)

backend/api/visa/types.py

@@ -0,0 +1,49 @@
+import strawberry
+
+
+@strawberry.type
+class InvitationLetterDocumentPage:
+    id: strawberry.ID
+    title: str
+    content: str
+
+    @classmethod
+    def from_object(cls, obj: dict):
+        return cls(
+            id=obj.get("id"),
+            title=obj.get("title"),
+            content=obj.get("content"),
+        )
+
+
+@strawberry.type
+class InvitationLetterDocumentStructure:
+    header: str
+    footer: str
+    pages: list[InvitationLetterDocumentPage]
+
+    @classmethod
+    def from_object(cls, obj: dict):
+        return cls(
+            header=obj.get("header", ""),
+            footer=obj.get("footer", ""),
+            pages=[
+                InvitationLetterDocumentPage.from_object(page)
+                for page in obj.get("pages", [])
+            ],
+        )
+
+
+@strawberry.type
+class InvitationLetterDocument:
+    id: strawberry.ID
+    dynamic_document: InvitationLetterDocumentStructure
+
+    @classmethod
+    def from_model(cls, instance):
+        return cls(
+            id=instance.id,
+            dynamic_document=InvitationLetterDocumentStructure.from_object(
+                instance.dynamic_document or {}
+            ),
+        )

backend/custom_admin/package.json

@@ -15,30 +15,45 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@apollo/client": "^3.9.0",
-    "@astrojs/react": "^3.0.9",
-    "@astrojs/tailwind": "^5.1.0",
-    "@types/react": "^18.2.48",
-    "@types/react-dom": "^18.2.18",
-    "astro": "^4.2.7",
-    "clsx": "^2.1.0",
-    "graphql": "^16.8.1",
-    "react": "^18.2.0",
+    "@apollo/client": "^3.12.3",
+    "@astrojs/react": "^4.1.0",
+    "@astrojs/tailwind": "^5.1.3",
+    "@radix-ui/react-alert-dialog": "^1.1.4",
+    "@radix-ui/react-dialog": "^1.1.3",
+    "@radix-ui/react-tabs": "^1.1.2",
+    "@radix-ui/react-toolbar": "^1.1.1",
+    "@radix-ui/themes": "^3.1.6",
+    "@tiptap/extension-color": "^2.10.3",
+    "@tiptap/extension-list-item": "^2.10.3",
+    "@tiptap/extension-text-align": "^2.10.3",
+    "@tiptap/extension-text-style": "^2.10.3",
+    "@tiptap/pm": "^2.10.3",
+    "@tiptap/react": "^2.10.3",
+    "@tiptap/starter-kit": "^2.10.3",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.2",
+    "astro": "^5.0.5",
+    "clsx": "^2.1.1",
+    "fabric": "^6.5.3",
+    "graphql": "^16.10.0",
+    "lucide-react": "^0.468.0",
+    "pdfjs-dist": "^4.9.155",
+    "react": "^19.0.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
-    "react-dom": "^18.2.0",
-    "tailwindcss": "^3.4.1"
+    "react-dom": "^19.0.0",
+    "tailwindcss": "^3.4.16"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.0",
+    "@graphql-codegen/cli": "^5.0.3",
     "@graphql-codegen/near-operation-file-preset": "^3.0.0",
-    "@graphql-codegen/typescript-operations": "^4.0.1",
-    "@graphql-codegen/typescript-react-apollo": "^4.1.0",
-    "@parcel/watcher": "^2.4.0",
-    "concurrently": "^8.2.2",
+    "@graphql-codegen/typescript-operations": "^4.4.0",
+    "@graphql-codegen/typescript-react-apollo": "^4.3.2",
+    "@parcel/watcher": "^2.5.0",
+    "concurrently": "^9.1.0",
     "http-proxy": "^1.18.1",
-    "nodemon": "^3.0.3",
-    "prettier": "^3.2.4",
-    "ws": "^8.17.1"
+    "nodemon": "^3.1.9",
+    "prettier": "^3.4.2",
+    "ws": "^8.18.0"
   }
 }