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

… into package

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jira-assistant",
-    "version": "2.59.0",
+    "version": "2.60.0",
     "description": "Help to track & upload work done on a Jira Ticket on timely basis and generate Worklog, Sprint and other custom reports",
     "homepage": "/",
     "author": {
@@ -80,7 +80,7 @@
         "patternomaly": "1.3.2",
         "primeflex": "3.3.1",
         "primeicons": "7.0.0",
-        "primereact": "10.8.5",
+        "primereact": "10.9.1",
         "queue": "7.0.0",
         "react": "18.3.1",
         "react-bootstrap-daterangepicker": "8.0.0",
@@ -98,9 +98,9 @@
         "cross-env": "^7.0.3",
         "eslint": "^9.17.0",
         "eslint-plugin-react-hooks": "^5.1.0",
-        "gh-pages": "^6.2.0",
+        "gh-pages": "^6.3.0",
         "react-app-alias": "^2.2.2",
-        "sass": "^1.83.0",
+        "sass": "^1.83.1",
         "webpack-bundle-analyzer": "^4.10.2"
     },
     "scripts": {

public/edge/manifest.json

@@ -3,7 +3,7 @@
   "minimum_chrome_version": "102",
   "name": "Jira Assistant: Worklog, Sprint report, etc",
   "short_name": "Jira Assist",
-  "version": "2.59",
+  "version": "2.60",
   "description": "Help to track & upload work done on a Jira Ticket on timely basis and generate Worklog, Sprint and other custom reports.",
   "icons": {
     "24": "assets/icon_24.png",

public/firefox/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Jira Assistant: Worklog, Sprint report, etc",
   "short_name": "Jira Assist",
-  "version": "2.59",
+  "version": "2.60",
   "description": "Help to track & upload work done on a Jira Ticket on timely basis and generate Worklog, Sprint and other custom reports.",
   "icons": {
     "24": "/assets/icon_24.png",

public/firefox_selfhost/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Jira Assistant: Worklog, Sprint report, etc",
   "short_name": "Jira Assist",
-  "version": "2.59",
+  "version": "2.60",
   "updateURL": "https://raw.githubusercontent.com/shridhar-tl/jira-assistant/master/release/firefox/update_manifest.json",
   "updateLink": "https://github.com/shridhar-tl/jira-assistant/raw/master/release/firefox/JiraAssist_Latest.xpi",
   "applications": {

public/opera/manifest.json

@@ -3,7 +3,7 @@
   "minimum_chrome_version": "102",
   "name": "Jira Assistant: Worklog, Sprint report, etc",
   "short_name": "Jira Assist",
-  "version": "2.59",
+  "version": "2.60",
   "description": "Help to track & upload work done on a Jira Ticket on timely basis and generate Worklog, Sprint and other custom reports.",
   "icons": {
     "24": "/assets/icon_24.png",

src/_nav.js

@@ -24,14 +24,14 @@ const { dashboards,
     calendar, importWorklog, importIssues, planningPoker,
 
     // Reports
-    worklogReport, worklogReportOld, sprintReport, customReport, estimateVsActual, pivotReport, sayDoRatioReport,
+    worklogReport, sprintReport, customReport, estimateVsActual, pivotReport, sayDoRatioReport,
 
     // Settings
     userGroups, generalSettings, advancedSettings,
 
     // Menu groups
     activitiesGroup = calendar || importWorklog || importIssues || planningPoker,
-    reportsGroup = worklogReport || worklogReportOld || sprintReport || customReport || estimateVsActual,
+    reportsGroup = worklogReport || sayDoRatioReport || sprintReport || customReport || estimateVsActual,
     settingsGroup = userGroups || generalSettings || advancedSettings
 } = config.modules;
 
@@ -111,16 +111,6 @@ const navigation = [
                 url: '/reports/say-do-ratio',
                 icon: 'fa fa-chart-line'
             },
-            worklogReportOld && {
-                name: 'Worklog Report',
-                id: 'R-UD',
-                url: '/reports/userdaywise',
-                icon: 'fa fa-users',
-                badge: {
-                    variant: 'danger',
-                    text: 'DEPR'
-                }
-            },
             sprintReport && {
                 name: 'Sprint Report',
                 id: 'R-SP',

src/components/ScrollableTable.jsx

@@ -118,7 +118,6 @@ export class THead extends PureComponent {
 
     setScrollTop(cells, defTop) {
         const scrollTop = this.context.getScrollTop();
-        console.log('scroll top is ', scrollTop);
         cells.forEach(c => {
             const top = c.offsetTop && scrollTop && c.offsetTop > scrollTop ? c.offsetTop - scrollTop : c.offsetTop;
             c.style.top = `${(top || defTop)}px`;

src/constants/common.js

@@ -9,7 +9,7 @@ export const GoogleOAuth = {
     }
 };
 
-export const AppVersionNo = 2.59;
+export const AppVersionNo = 2.60;
 
 let AnalyticsTrackingId = "G-CJQYE6Q1JQ"; //"UA-108841109-1"; // This is for public tracking id
 

src/customize.js

@@ -12,7 +12,6 @@ const config = {
 
         // Reports
         worklogReport: true,
-        worklogReportOld: true,
         pivotReport: true,
         sayDoRatioReport: true,
         sprintReport: !isPluginBuild,

src/electron/services/ajax-request-service.js

@@ -9,7 +9,7 @@ module.exports = {
                 request.on('response', (response) => {
                     response.on('error', (error) => {
                         clearTimeout(hdl);
-                        console.log('HTTP Error:-', error);
+                        console.error('HTTP Error:-', error);
                         fail({ status: response.statusCode, statusText: response.statusMessage, response: error });
                     });
                     response.on('data', (chunk) => {
@@ -19,7 +19,7 @@ module.exports = {
                         try {
                             chunk = JSON.parse(chunk);
                         } catch (err) {
-                            console.log('Unable to convert to JSON Obj:-', chunk);
+                            console.error('Unable to convert to JSON Obj:-', chunk);
                         }
 
                         if (response.statusCode >= 200 && response.statusCode < 300) {

src/gadgets/WorklogReport/actions.js

@@ -27,7 +27,7 @@ export function groupsChanged(setState) {
 }
 
 export function addWorklog(setState) {
-    const { $session: { CurrentUser: { maxHours } } } = inject('SessionService');
+    const { $session: { CurrentUser: { maxHours }, UserSettings: { startOfDay } } } = inject('SessionService');
     const maxSecsPerDay = (maxHours || 8) * 60 * 60;
 
     return function (user, ticketNo, dateStarted, logged) {
@@ -38,6 +38,9 @@ export function addWorklog(setState) {
 
         if (moment(dateStarted).isSame(moment(), 'day')) {
             dateStarted = new Date();
+        } else if (startOfDay) {
+            dateStarted = new Date(dateStarted);
+            dateStarted.setHours(...startOfDay.split(':'));
         }
 
         setState({ showWorklogPopup: true, worklogItem: { ticketNo, dateStarted, timeSpent } });

src/routes.jsx

@@ -15,7 +15,6 @@ const SayDoRatioReportComponent = config.modules.sayDoRatioReport && React.lazy(
 const CustomReportComponent = config.modules.customReport && React.lazy(() => import('./views/reports/custom-groupable/CustomReport'));
 const EstimateActualComponent = config.modules.estimateVsActual && React.lazy(() => import('./views/reports/estimate-actual/EstimateActualReport'));
 const SprintReportComponent = config.modules.sprintReport && React.lazy(() => import('./views/reports/sprint-report/SprintReport'));
-const WorklogReportComponent = config.modules.worklogReportOld && React.lazy(() => import('./views/reports/worklog-report/WorklogReport'));
 const NewWorklogReportComponent = config.modules.worklogReport && React.lazy(() => import('./views/reports/worklog-report/NewWorklogReport'));
 
 // Settings
@@ -42,10 +41,6 @@ const sessionBasedRoute = [
         path: '/calendar',
         component: CalendarViewComponent
     },
-    WorklogReportComponent && {
-        path: '/reports/userdaywise',
-        component: WorklogReportComponent
-    },
     NewWorklogReportComponent && {
         path: '/reports/worklog',
         component: NewWorklogReportComponent

src/scss/prime.scss

@@ -192,7 +192,8 @@ a.p-menuitem-link {
 ul.p-dropdown-items,
 ul.p-autocomplete-items,
 ul.p-multiselect-items,
-ul.p-contextmenu-root-list {
+ul.p-contextmenu-root-list,
+ul.p-listbox-list {
     padding: 0;
 }
 

src/services/worklog-service.js

@@ -418,7 +418,7 @@ export default class WorklogService extends BaseService {
                 pro = pro.then(() => this.uploadWorklog(worklog, upload));
             }
             return pro.then(() => this.getWLCalendarEntry(worklog));
-        }, (err) => { console.log("error for ticket number", err); return Promise.reject(err); });
+        }, (err) => { console.error("Error for ticket number", err); return Promise.reject(err); });
     }
 
     getWLCalendarEntry(worklog) {

src/views/poker/InfoBox.jsx

@@ -15,15 +15,15 @@ export default InfoBox;
 
 const VoteInfo = connect(function ({ vote: { reveal, average, finalScore } }) {
     return (<div className="est-info">
-        <div className="block">
+        <div className="d-block">
             <span className="label">Final score:</span>
             <span className="value">{reveal ? finalScore : 'N/A'}</span>
         </div>
-        <div className="block">
+        <div className="d-block">
             <span className="label">Average:</span>
             <span className="value">{reveal ? average : 'N/A'}</span>
         </div>
-        <div className="block">
+        <div className="d-block">
             <span className="label">Status:</span>
             <span className="value fa fa-clock" />
         </div>

src/views/reports/pivot-report/editor/controls/Controls.scss

@@ -11,6 +11,7 @@
         .field-config {
             border-top: 1px solid #dee2e6;
             height: 100%;
+            width: 100%;
             display: flex;
             flex-direction: row;
         }

src/views/reports/pivot-report/editor/controls/fields/index.jsx

@@ -40,7 +40,7 @@ function FieldsList({ fields, title }) {
     if (!items?.length) { return null; }
 
     return (<div className="fields-list">
-        <div className="block fw-bold">{title}</div>
+        <div className="d-block fw-bold">{title}</div>
         {items.map((field, i) => (<Draggable key={i}
             className="jira-field"
             itemType="jira-field"

src/views/reports/pivot-report/editor/controls/index.jsx

@@ -42,11 +42,11 @@ function Source({ onDone }) {
         </p>
 
         <label className="fw-bold mt-3">Data source type:</label>
-        <RadioButton className="block"
+        <RadioButton className="d-block"
             value={dataSourceType} defaultValue={1}
             label="Use raw JQL to filter and pull issues list"
             onChange={updateDataSourceType} />
-        <RadioButton className="block"
+        <RadioButton className="d-block"
             value={dataSourceType} defaultValue={2}
             label="Pull issues for select sprints and apply JQL filter"
             onChange={updateDataSourceType} disabled />

src/views/settings/general/MeetingsTab.jsx

@@ -84,8 +84,7 @@ class MeetingsTab extends TabControlBase {
             this.$message.success("Successfully integrated with outlook account.");
             this.props.onChange('hasOutlookCredentials', true); // No need to save this setting. So just update state
         }, (err) => {
-            console.log("Outlook integration failed with error: ");
-            console.error(err);
+            console.error("Outlook integration failed with error:", err);
             this.$message.warning("Unable to integrate with Outlook Calendar!");
         });
     };
@@ -137,7 +136,7 @@ class MeetingsTab extends TabControlBase {
                     This page allows you to integrate your calendar from external sources like Outlook & Google. Worklog will be automatically created
                     for the events in your calendar based on your preferences
                 </p>
-                <div className="block">
+                <div className="d-block">
                     {outlookCalendar !== false && <div className="ui-g ui-fluid">
                         <div><h4>Outlook Calendar</h4></div>
                         <div className="form-label ui-g-12 ui-md-3 ui-lg-3 ui-xl-2">

src/views/settings/general/MenuOptionsTab.jsx

@@ -190,7 +190,7 @@ class MenuOptionsTab extends TabControlBase {
         return (
             <div>
                 <p>This page allows you to set what is displayed when you click on JA icon in your browser</p>
-                <div className="block">
+                <div className="d-block">
                     <div className="ui-g ui-fluid">
                         <div className="form-label ui-g-12 ui-md-3 ui-lg-3 ui-xl-2">
                             <strong>What should happen when clicking on JA icon?</strong>

src/views/settings/general/TimeTrackerTab.jsx

@@ -57,7 +57,7 @@ class GlobalTab extends TabControlBase {
             await executeService('SELF', 'RELOAD', [], this.$message);
         } catch (err) {
             this.$message.error('This settings would work only with JA extension v2.41 or above.', 'Unsupported Settings');
-            console.log(err);
+            console.log("Error reloading settings:", err);
         }
     };