feat: add PR raise

AirWalk-Digital · Jan 3, 2024 · 4d51339 · 4d51339
1 parent d3eb35f
commit 4d51339
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/components/appbar/ControlBar.jsx b/components/appbar/ControlBar.jsx
@@ -130,6 +130,7 @@ export function ControlBar({
           const url = new URL(window.location.href);
           const params = new URLSearchParams(url.search);
           params.set("branch", newBranch.name);
+          params.set("edit", "true");
           url.search = params.toString();
           window.location.href = url.toString();
         }

diff --git a/components/appbar/ControlBarComponent.jsx b/components/appbar/ControlBarComponent.jsx
@@ -11,16 +11,16 @@ import {
   Stack,
   Autocomplete,
   Button,
-  Snackbar
+  Snackbar,
 } from "@mui/material";
 import PrintIcon from "@mui/icons-material/Print";
 import SlideshowIcon from "@mui/icons-material/Slideshow";
 import AddCircleIcon from "@mui/icons-material/AddCircle";
 // import { useSelector, useDispatch } from 'react-redux'
 // import { setBranch } from '@/lib/redux/reducers/branchSlice'
 import ApprovalIcon from "@mui/icons-material/Approval";
-import MuiAlert from '@mui/material/Alert';
-import CircularProgress from '@mui/material/CircularProgress';
+import MuiAlert from "@mui/material/Alert";
+import CircularProgress from "@mui/material/CircularProgress";
 
 export function ControlBarComponent({
   open,
@@ -48,7 +48,8 @@ export function ControlBarComponent({
   console.log("ControlBarComponent:collection: ", collection);
   console.log("ControlBarComponent:editMode: ", editMode);
   const [isLoading, setIsLoading] = useState(false);
-  const [showError, setShowError] = useState('');
+  const [showError, setShowError] = useState("");
+  const [showPRSuccess, setShowPRSuccess] = useState(false);
 
   useEffect(() => {
     if (context.branch != collection.branch) {
@@ -135,6 +136,7 @@ export function ControlBarComponent({
       try {
         // Replace this with your actual function
         await handlePR();
+        setShowPRSuccess(true);
       } catch (error) {
         setShowError(error.message);
       } finally {
@@ -228,7 +230,9 @@ export function ControlBarComponent({
                   </IconButton>
                 }
                 label=""
-              />
+              /></>)}
+         {editMode && changeBranch && collection && (
+        <>    
               <Button
                 variant="outlined"
                 onClick={handlePRClick}
@@ -241,17 +245,31 @@ export function ControlBarComponent({
               <Snackbar
                 open={showError}
                 autoHideDuration={6000}
-                onClose={() => setShowError('')}
+                onClose={() => setShowError("")}
               >
                 <MuiAlert
-                  onClose={() => setShowError('')}
+                  onClose={() => setShowError("")}
                   severity="error"
                   elevation={6}
                   variant="filled"
                 >
                   An error occurred while processing your request: {showError}
                 </MuiAlert>
               </Snackbar>
+              <Snackbar
+                open={showPRSuccess}
+                autoHideDuration={6000}
+                onClose={() => setShowPRSuccess(false)}
+              >
+                <MuiAlert
+                  onClose={() => setShowPRSuccess(false)}
+                  severity="success"
+                  elevation={6}
+                  variant="filled"
+                >
+                  PR successfully created
+                </MuiAlert>
+              </Snackbar>
             </>
           )}
         </div>

diff --git a/components/layouts/ContentPage.jsx b/components/layouts/ContentPage.jsx
@@ -196,6 +196,7 @@ export function ContentPage({
       console.error("ContentPage:onSave:error: ", error);
       throw new Error(`Error saving file: ${error.message}`);
     }
+    handleContentChange(context.file);
     // const currentState = store.getState();
     // const reduxCollection = currentState.branch[collection];
     // console.log("Editor:context: ", context);

diff --git a/stories/AppBar.stories.js b/stories/AppBar.stories.js
@@ -1,4 +1,4 @@
-import { TopBar } from '@/components/appbar';
+import { TopBar } from '@/components/appbar/TopBar';
 
 // More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export
 export default {

diff --git a/stories/NewBranchDialog.stories.js b/stories/NewBranchDialog.stories.js
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import Button from "@mui/material/Button";
-import { NewBranchDialog } from "@/components/appbar";
+import { NewBranchDialog } from "@/components/appbar/NewBranchDialog";
 import { ControlBarComponent as ControlBar } from "@/components/appbar/ControlBarComponent";
 import { toSnakeCase } from '@/lib/utils/stringUtils';
 // More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export

diff --git a/stories/NewContentDialog.stories.js b/stories/NewContentDialog.stories.js
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import Button from "@mui/material/Button";
-import { NewContentDialog } from "@/components/appbar";
+import { NewContentDialog } from "@/components/appbar/NewContentDialog";
 import { ControlBarComponent as ControlBar } from "@/components/appbar/ControlBarComponent";
 import { toSnakeCase } from '@/lib/utils/stringUtils';
 // More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export