From e9329688b36d48d72b77ad8ad2f79d8d34ec59cb Mon Sep 17 00:00:00 2001
From: Muhammad Ali <muhammad.ali@canonical.com>
Date: Fri, 17 Jan 2025 11:58:04 +0500
Subject: [PATCH 1/3] Select current user as a reporter for jira task when
 calling api/request-changes or api/request-removal

---
 .../components/Navigation/Navigation.tsx      |  3 +-
 .../components/OwnerAndReviewers/Reporter.tsx | 41 +++++++++++++++++++
 .../RequestTaskModal/RequestTaskModal.tsx     | 11 ++++-
 static/client/services/api/constants.ts       |  2 +-
 static/client/services/api/types/pages.ts     |  4 +-
 static/client/store/index.ts                  |  4 +-
 static/client/store/types.ts                  |  4 +-
 webapp/helper.py                              |  7 ++--
 webapp/routes/jira.py                         | 10 +++--
 webapp/schemas.py                             |  4 +-
 10 files changed, 72 insertions(+), 18 deletions(-)
 create mode 100644 static/client/components/OwnerAndReviewers/Reporter.tsx

diff --git a/static/client/components/Navigation/Navigation.tsx b/static/client/components/Navigation/Navigation.tsx
index 139de460..806a86c1 100644
--- a/static/client/components/Navigation/Navigation.tsx
+++ b/static/client/components/Navigation/Navigation.tsx
@@ -9,6 +9,7 @@ import NavigationItems from "./NavigationItems";
 
 import NavigationCollapseToggle from "@/components/Navigation/NavigationCollapseToggle";
 import SiteSelector from "@/components/SiteSelector";
+import type { IUser } from "@/services/api/types/users";
 import { useStore } from "@/store";
 
 const Navigation = (): JSX.Element => {
@@ -17,7 +18,7 @@ const Navigation = (): JSX.Element => {
   const [user, setUser] = useStore((state) => [state.user, state.setUser]);
 
   const logout = useCallback(() => {
-    setUser(null);
+    setUser({} as IUser);
     window.open("/logout", "_self");
   }, [setUser]);
 
diff --git a/static/client/components/OwnerAndReviewers/Reporter.tsx b/static/client/components/OwnerAndReviewers/Reporter.tsx
new file mode 100644
index 00000000..f98ecd2c
--- /dev/null
+++ b/static/client/components/OwnerAndReviewers/Reporter.tsx
@@ -0,0 +1,41 @@
+import { useCallback } from "react";
+
+import CustomSearchAndFilter from "./CustomSearchAndFilter";
+import { useUsersRequest } from "./OwnerAndReviewers.hooks";
+
+import { type IUser } from "@/services/api/types/users";
+import { useStore } from "@/store";
+
+const Reporter = ({ reporter, setReporter }: { reporter: IUser | null; setReporter: Function }): JSX.Element => {
+  const user = useStore((state) => state.user);
+  const { options, setOptions, handleChange } = useUsersRequest();
+
+  const handleRemoveReporter = useCallback(
+    () => () => {
+      setReporter(user);
+    },
+    [setReporter, user],
+  );
+
+  const handleSelectReporter = useCallback(
+    (option: IUser) => {
+      setOptions([]);
+      setReporter(option);
+    },
+    [setOptions, setReporter],
+  );
+
+  return (
+    <CustomSearchAndFilter
+      label="Reporter"
+      onChange={handleChange}
+      onRemove={handleRemoveReporter}
+      onSelect={handleSelectReporter}
+      options={options}
+      placeholder="Select a reporter"
+      selectedOptions={reporter ? [reporter] : []}
+    />
+  );
+};
+
+export default Reporter;
diff --git a/static/client/components/RequestTaskModal/RequestTaskModal.tsx b/static/client/components/RequestTaskModal/RequestTaskModal.tsx
index 1b48d779..77b2f8c0 100644
--- a/static/client/components/RequestTaskModal/RequestTaskModal.tsx
+++ b/static/client/components/RequestTaskModal/RequestTaskModal.tsx
@@ -4,10 +4,12 @@ import { Button, Input, Modal, RadioInput, Spinner, Textarea, Tooltip } from "@c
 
 import type { IRequestTaskModalProps } from "./RequestTaskModal.types";
 
+import Reporter from "@/components/OwnerAndReviewers/Reporter";
 import config from "@/config";
 import { PagesServices } from "@/services/api/services/pages";
 import { ChangeRequestType, PageStatus } from "@/services/api/types/pages";
 import { DatesServices } from "@/services/dates";
+import { useStore } from "@/store";
 
 const RequestTaskModal = ({
   changeType,
@@ -21,6 +23,8 @@ const RequestTaskModal = ({
   const [summary, setSummary] = useState<string>();
   const [descr, setDescr] = useState("");
   const [isLoading, setIsLoading] = useState(false);
+  const user = useStore((state) => state.user);
+  const [reporter, setReporter] = useState(user);
 
   const handleChangeDueDate = useCallback((e: ChangeEvent<HTMLInputElement>) => {
     setDueDate(e.target.value);
@@ -52,7 +56,7 @@ const RequestTaskModal = ({
         PagesServices.requestRemoval({
           due_date: dueDate,
           webpage_id: webpage.id,
-          reporter_id: webpage.owner.id,
+          reporter_struct: reporter,
           description: descr,
         }).then(() => {
           setIsLoading(false);
@@ -67,7 +71,7 @@ const RequestTaskModal = ({
         PagesServices.requestChanges({
           due_date: dueDate,
           webpage_id: webpage.id,
-          reporter_id: webpage.owner.id,
+          reporter_struct: reporter,
           type: changeType,
           summary,
           description: `Copy doc link: ${webpage.copy_doc_link} \n${descr}`,
@@ -176,6 +180,9 @@ const RequestTaskModal = ({
           </div>
         </>
       )}
+      <div className="u-sv3">
+        <Reporter reporter={reporter} setReporter={setReporter} />
+      </div>
       <Input label="Due date" min={DatesServices.getNowStr()} onChange={handleChangeDueDate} required type="date" />
       <Input label="Summary" onChange={handleSummaryChange} type="text" />
       <Textarea label="Description" onChange={handleDescrChange} />
diff --git a/static/client/services/api/constants.ts b/static/client/services/api/constants.ts
index 75d82244..12ff4cd8 100644
--- a/static/client/services/api/constants.ts
+++ b/static/client/services/api/constants.ts
@@ -6,7 +6,7 @@ export const ENDPOINTS = {
   setReviewers: "/api/set-reviewers",
   createNewPage: "/api/create-page",
   requestChanges: "/api/request-changes",
-  requestRemoval: "/api/remove-webpage",
+  requestRemoval: "/api/request-removal",
   currentUser: "/api/current-user",
 };
 
diff --git a/static/client/services/api/types/pages.ts b/static/client/services/api/types/pages.ts
index e82fb835..e42d32e4 100644
--- a/static/client/services/api/types/pages.ts
+++ b/static/client/services/api/types/pages.ts
@@ -57,7 +57,7 @@ export const ChangeRequestType = {
 
 export interface IRequestChanges {
   due_date: string;
-  reporter_id: number;
+  reporter_struct: IUser;
   webpage_id: number;
   type: (typeof ChangeRequestType)[keyof typeof ChangeRequestType];
   summary?: string;
@@ -66,7 +66,7 @@ export interface IRequestChanges {
 
 export interface IRequestRemoval {
   due_date: string;
-  reporter_id: number;
+  reporter_struct: IUser;
   webpage_id: number;
   description: string;
 }
diff --git a/static/client/store/index.ts b/static/client/store/index.ts
index 38c699a7..127182d8 100644
--- a/static/client/store/index.ts
+++ b/static/client/store/index.ts
@@ -3,12 +3,14 @@ import { devtools, persist } from "zustand/middleware";
 
 import type { IStore } from "./types";
 
+import type { IUser } from "@/services/api/types/users";
+
 export const useStore = create<IStore>()(
   devtools(
     persist(
       (set) => ({
         selectedProject: null,
-        user: null,
+        user: {} as IUser,
         setSelectedProject: (s) => set({ selectedProject: s }),
         setUser: (u) => set({ user: u }),
       }),
diff --git a/static/client/store/types.ts b/static/client/store/types.ts
index 9e46abe5..e015a27f 100644
--- a/static/client/store/types.ts
+++ b/static/client/store/types.ts
@@ -3,7 +3,7 @@ import { type IUser } from "@/services/api/types/users";
 
 export interface IStore {
   selectedProject: IPagesResponse["data"] | null;
-  user: IUser | null;
+  user: IUser;
   setSelectedProject: (s: IPagesResponse["data"]) => void;
-  setUser: (u: IUser | null) => void;
+  setUser: (u: IUser) => void;
 }
diff --git a/webapp/helper.py b/webapp/helper.py
index 3dde3ee0..d299d82d 100644
--- a/webapp/helper.py
+++ b/webapp/helper.py
@@ -38,6 +38,7 @@ def create_jira_task(app, body):
 
     # Get the webpage
     webpage_id = body["webpage_id"]
+    reporter_id = get_or_create_user_id(body.get("reporter_struct"))
     webpage = Webpage.query.filter_by(id=webpage_id).first()
     if not webpage:
         raise Exception(f"Webpage with ID {webpage_id} not found")
@@ -57,7 +58,7 @@ def create_jira_task(app, body):
     jira = app.config["JIRA"]
     issue = jira.create_issue(
         due_date=body["due_date"],
-        reporter_id=body["reporter_id"],
+        reporter_id=reporter_id,
         request_type=body["type"],
         description=body["description"],
         summary=summary,
@@ -69,7 +70,7 @@ def create_jira_task(app, body):
         JiraTask,
         jira_id=issue["key"],
         webpage_id=body["webpage_id"],
-        user_id=body["reporter_id"],
+        user_id=reporter_id,
         summary=summary,
     )
 
@@ -162,7 +163,7 @@ def convert_webpage_to_dict(webpage, owner, project):
     else:
         jira_tasks_list = []
 
-     # Serialize product fields
+    # Serialize product fields
     if webpage_products:
         webpage_products_list = []
         for product in webpage_products:
diff --git a/webapp/routes/jira.py b/webapp/routes/jira.py
index cb50e42e..493a2703 100644
--- a/webapp/routes/jira.py
+++ b/webapp/routes/jira.py
@@ -78,7 +78,7 @@ def get_jira_tasks(webpage_id: int):
         return jsonify({"error": "Failed to fetch Jira tasks"}), 500
 
 
-@jira_blueprint.route("/remove-webpage", methods=["POST"])
+@jira_blueprint.route("/request-removal", methods=["POST"])
 @validate()
 @login_required
 def remove_webpage(body: RemoveWebpageModel):
@@ -110,6 +110,9 @@ def remove_webpage(body: RemoveWebpageModel):
     webpage = Webpage.query.filter(Webpage.id == webpage_id).one_or_none()
     if webpage is None:
         return jsonify({"error": "webpage not found"}), 404
+
+    reporter_id = get_or_create_user_id(body.reporter_struct)
+
     if webpage.status == WebpageStatus.NEW:
         try:
             jira_tasks = JiraTask.query.filter_by(webpage_id=webpage_id).all()
@@ -151,8 +154,7 @@ def remove_webpage(body: RemoveWebpageModel):
 
     if webpage.status == WebpageStatus.AVAILABLE:
         if not (
-            body.reporter_id
-            and User.query.filter_by(id=body.reporter_id).one_or_none()
+            reporter_id and User.query.filter_by(id=reporter_id).one_or_none()
         ):
             return (
                 jsonify({"error": "provided parameters are incorrect"}),
@@ -161,7 +163,7 @@ def remove_webpage(body: RemoveWebpageModel):
         task_details = {
             "webpage_id": webpage_id,
             "due_date": body.due_date,
-            "reporter_id": body.reporter_id,
+            "reporter_struct": body.reporter_struct,
             "description": body.description,
             "type": None,
             "summary": f"Remove {webpage.name} webpage from code repository",
diff --git a/webapp/schemas.py b/webapp/schemas.py
index 040d2e63..37d4ab4f 100644
--- a/webapp/schemas.py
+++ b/webapp/schemas.py
@@ -21,7 +21,7 @@ def wrapper(*args, **kwargs):
 
 class ChangesRequestModel(BaseModel):
     due_date: str
-    reporter_id: int
+    reporter_struct: object
     webpage_id: int
     type: int
     description: str
@@ -31,7 +31,7 @@ class ChangesRequestModel(BaseModel):
 class RemoveWebpageModel(BaseModel):
     webpage_id: int
     due_date: str = ""
-    reporter_id: int = None
+    reporter_struct: object = {}
     description: str = ""
 
     @field_validator("due_date")

From 6df8339ae6c76cdc786912d6df791fc2a00c84dc Mon Sep 17 00:00:00 2001
From: Muhammad Ali <muhammad.ali@canonical.com>
Date: Fri, 17 Jan 2025 19:33:16 +0500
Subject: [PATCH 2/3] Addressed code review comments

---
 .../components/OwnerAndReviewers/OwnerAndReviewers.types.ts  | 5 +++++
 static/client/components/OwnerAndReviewers/Reporter.tsx      | 3 ++-
 .../client/components/RequestTaskModal/RequestTaskModal.tsx  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/static/client/components/OwnerAndReviewers/OwnerAndReviewers.types.ts b/static/client/components/OwnerAndReviewers/OwnerAndReviewers.types.ts
index 179fcee0..4bcb426b 100644
--- a/static/client/components/OwnerAndReviewers/OwnerAndReviewers.types.ts
+++ b/static/client/components/OwnerAndReviewers/OwnerAndReviewers.types.ts
@@ -24,3 +24,8 @@ export interface IUseUsersRequest {
   setOptions: Dispatch<SetStateAction<IUser[]>>;
   handleChange: (event: ChangeEvent<HTMLInputElement>) => void;
 }
+
+export interface IReporterProps {
+  reporter: IUser | null;
+  setReporter: React.Dispatch<React.SetStateAction<IUser>>;
+}
diff --git a/static/client/components/OwnerAndReviewers/Reporter.tsx b/static/client/components/OwnerAndReviewers/Reporter.tsx
index f98ecd2c..cefda835 100644
--- a/static/client/components/OwnerAndReviewers/Reporter.tsx
+++ b/static/client/components/OwnerAndReviewers/Reporter.tsx
@@ -2,11 +2,12 @@ import { useCallback } from "react";
 
 import CustomSearchAndFilter from "./CustomSearchAndFilter";
 import { useUsersRequest } from "./OwnerAndReviewers.hooks";
+import type { IReporterProps } from "./OwnerAndReviewers.types";
 
 import { type IUser } from "@/services/api/types/users";
 import { useStore } from "@/store";
 
-const Reporter = ({ reporter, setReporter }: { reporter: IUser | null; setReporter: Function }): JSX.Element => {
+const Reporter = ({ reporter, setReporter }: IReporterProps): JSX.Element => {
   const user = useStore((state) => state.user);
   const { options, setOptions, handleChange } = useUsersRequest();
 
diff --git a/static/client/components/RequestTaskModal/RequestTaskModal.tsx b/static/client/components/RequestTaskModal/RequestTaskModal.tsx
index 77b2f8c0..5110a514 100644
--- a/static/client/components/RequestTaskModal/RequestTaskModal.tsx
+++ b/static/client/components/RequestTaskModal/RequestTaskModal.tsx
@@ -82,7 +82,7 @@ const RequestTaskModal = ({
         });
       }
     }
-  }, [changeType, dueDate, summary, descr, webpage, onClose]);
+  }, [dueDate, webpage.id, webpage.status, webpage.copy_doc_link, changeType, reporter, descr, onClose, summary]);
 
   const title = useMemo(() => {
     switch (changeType) {

From ab41150c20b61031ca59e695361b97e800d76d9b Mon Sep 17 00:00:00 2001
From: Akbar <kz.akbar@gmail.com>
Date: Fri, 17 Jan 2025 20:40:34 +0500
Subject: [PATCH 3/3] fix bugs related to requesting jira tasks and redirecting
 to a new webpage view

---
 .env                                          | 2 +-
 static/client/pages/NewWebpage/NewWebpage.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 51d74b4a..d8a8b5c6 100644
--- a/.env
+++ b/.env
@@ -14,6 +14,6 @@ JIRA_LABELS=sites_BAU
 JIRA_COPY_UPDATES_EPIC=KAN-1
 GOOGLE_CREDENTIALS=googlecreds
 GOOGLE_DRIVE_FOLDER_ID=googlecreds
-COPYD0C_TEMPLATE_ID=googlecreds
+COPYDOC_TEMPLATE_ID=googlecreds
 GOOGLE_PRIVATE_KEY=base64encodedprivatekey
 GOOGLE_PRIVATE_KEY_ID=privatekeyid
diff --git a/static/client/pages/NewWebpage/NewWebpage.tsx b/static/client/pages/NewWebpage/NewWebpage.tsx
index 5d214e9c..3228ba3b 100644
--- a/static/client/pages/NewWebpage/NewWebpage.tsx
+++ b/static/client/pages/NewWebpage/NewWebpage.tsx
@@ -86,7 +86,7 @@ const NewWebpage = (): JSX.Element => {
         if (isNewPageExist) {
           // TODO: there is a max depth React error on this line, needs more investigation
           setSelectedProject(project);
-          window.location.href = `/webpage/${project.name}${location}/${titleValue}`;
+          window.location.href = `/app/webpage/${project.name}${location}/${titleValue}`;
         }
       }
     }