Merge branch 'develop' of https://github.com/shridhar-tl/jira-assistant…

… into package
shridhar-tl · Aug 6, 2023 · 6eed797 · 6eed797
2 parents 515dc6e + 33b5ab2
commit 6eed797
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/src/gadgets/BaseGadget.scss b/src/gadgets/BaseGadget.scss
@@ -105,15 +105,15 @@ div.full-height {
     }
 }
 
-@media screen and (min-width: 992px) {
+@media screen and (min-width: 1200px) {
     div.half-width {
         width: calc(50% - 4px);
     }
 }
 
-@media screen and (max-width: 992px) {
+@media screen and (max-width: 1200px) {
     div.half-width {
-        width: 100%;
+        width: calc(100% - 6px);
     }
 }
 

diff --git a/src/layouts/DefaultLayout/NavSideBar.js b/src/layouts/DefaultLayout/NavSideBar.js
@@ -59,7 +59,7 @@ function NavItem({ menu, pathname }) {
 
     return (
         <span className={`menu${isSelected ? ' selected' : ''}`}>
-            <Link href={menu.url} newTab={menu.external || false}>
+            <Link href={menu.url} newTab={menu.external || false} data-testid={menu.id}>
                 <span className="wrapper">
                     <span className={`icon ${menu.icon}`} />
                     <span className="menu-text">{menu.name}</span>

diff --git a/src/views/dashboard/AddGadget.js b/src/views/dashboard/AddGadget.js
@@ -64,19 +64,22 @@ async function getGadgetList() {
     const { $report } = inject('ReportService');
 
     const reports = await $report.getReportsList();
-    if (reports && reports.length) {
-        const list = reports.map(r => ({
-            id: `${(r.advanced ? "AR" : (r.isNew ? "CR" : "SQ"))}:${r.id}:${r.queryName}`,
-            icon: "fa fa-filter",
-            name: r.queryName,
-            isOld: !(r.isNew || r.advanced),
-            details: (!r.advanced ?
-                `${r.outputCount} columns displayed in table format${r.isNew
-                    ? ' with interactive option to sort and group based on columns.'
-                    : ' (deprecated, not allowed to add to dashboard)'}`
-                : "<no details available>")
-        }));
 
-        return [...GadgetList, ...list];
+    if (!reports?.length) {
+        return GadgetList;
     }
+
+    const list = reports.map(r => ({
+        id: `${(r.advanced ? "AR" : (r.isNew ? "CR" : "SQ"))}:${r.id}:${r.queryName}`,
+        icon: "fa fa-filter",
+        name: r.queryName,
+        isOld: !(r.isNew || r.advanced),
+        details: (!r.advanced ?
+            `${r.outputCount} columns displayed in table format${r.isNew
+                ? ' with interactive option to sort and group based on columns.'
+                : ' (deprecated, not allowed to add to dashboard)'}`
+            : "<no details available>")
+    }));
+
+    return [...GadgetList, ...list];
 }
diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js
@@ -190,8 +190,8 @@ class Dashboard extends PureComponent {
 
         return (
             <>
-                <AddGadget show={showGadgetPanel} onHide={this.hideGadgetDialog} addedGadgets={widgets}
-                    addGadget={this.addGadget} removeGadget={this.removeGadget} />
+                {!this.isQuickView && <AddGadget show={showGadgetPanel} onHide={this.hideGadgetDialog} addedGadgets={widgets}
+                    addGadget={this.addGadget} removeGadget={this.removeGadget} />}
                 <div className="dashboard-container">
                     {!this.isQuickView && <Header {...this.props} config={currentBoard} index={dashboardIndex} userId={this.$session.userId}
                         onShowGadgets={this.onShowGadgets} tabViewChanged={this.tabViewChanged} isQuickView={this.isQuickView} />}