Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/shridhar-tl/jira-assistant…
Browse files Browse the repository at this point in the history 
… into package
  • Loading branch information
@shridhar-tl
shridhar-tl committed Sep 5, 2023
2 parents 2dd9de9 + c24375f commit 3cc3f5e
Show file tree
Hide file tree
Showing 13 changed files with 221 additions and 134 deletions.
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
}
},
"dependencies": {
"@forge/api": "^2.18.4",
"@forge/api": "^2.18.5",
"@forge/bridge": "^2.6.0",
"@forge/resolver": "^1.5.14",
"@forge/resolver": "^1.5.15",
"@fortawesome/fontawesome-free": "6.4.2",
"@fullcalendar/core": "6.1.8",
"@fullcalendar/daygrid": "6.1.8",
Expand All @@ -69,7 +69,7 @@
"dexie": "3.2.4",
"espree": "9.6.1",
"exceljs": "4.3.0",
"firebase": "10.3.0",
"firebase": "10.3.1",
"jquery": "3.7.1",
"jsd-report": "0.1.11",
"jspdf": "2.5.1",
Expand Down Expand Up @@ -102,7 +102,7 @@
"gh-pages": "^6.0.0",
"react-app-alias": "^2.2.2",
"sass": "^1.66.1",
"webpack-bundle-analyzer": "^4.9.0"
"webpack-bundle-analyzer": "^4.9.1"
},
"scripts": {
"start": "cross-env REACT_APP_BUILD_MODE=WEB craco start",
Expand Down
2 changes: 1 addition & 1 deletion public/chrome/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"https://*.atlassian.net/*"
]
},
"options_page": "/index.html#/options",
"options_page": "index.html#/options",
"background": {
"service_worker": "/static/js/background.js"
},
Expand Down
25 changes: 11 additions & 14 deletions src/gadgets/WorklogGadget/WorklogReportInfo.js
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import React, { PureComponent } from 'react';
import React from 'react';

class WorklogReportInfo extends PureComponent {
render() {
return (<div className="pad-15">
<h2>DEPRECATED</h2>
<ul>
<li>This Old worklog report is depricated. Please use new worklog report</li>
<li>This report would be removed over time after New Worklog report is stable</li>
<li>No new enhancments / bug fixes would be provided in this report</li>
<li>If you face any issue with new Worklog report, please report that issue so that it is resolved before this report is removed</li>
</ul>
</div>
);
}
function WorklogReportInfo() {
return (<div className="pad-15">
<h2>DEPRECATED</h2>
<ul>
<li>The old Worklog report is deprecated. Please switch to the new Worklog report.</li>
<li>This report will be phased out gradually once the new Worklog report is stable.</li>
<li>No new enhancements or bug fixes will be provided for this report.</li>
<li>If you encounter any issues with the new Worklog report, please report them for resolution before the old report is removed.</li>
</ul>
</div>);
}

export default WorklogReportInfo;
91 changes: 50 additions & 41 deletions src/gadgets/WorklogReport/WorklogReportInfo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,58 @@ import React from 'react';

function WorklogReportInfo() {
return (<div className="pad-15">
<strong>How to use:</strong>
<ul>
<li>
By default this page lets you to generate worklog report based on the selected date range.
</li>
<li>If you want to generate the report based on one or more sprints,
click on ( <i className="fa fa-cogs"></i>) icon to change the settings of the report.
</li>
<li>Click on ( <i className="fa fa-cogs"></i>) icon to change multiple other settings of the report
like formatting of display, add additional columns, setting threshold date to filter worklogs, JQL to filter data, etc..
</li>
<li>
Choose a date or sprint for which you would like to view the report or click the refresh
( <i className="fa fa-refresh"></i> ) icon to load the report if date or sprint is already selected.
</li>
<li>You can choose the list of users by clicking the ( <i className="fa fa-users"></i> ) icon.</li>
<li>
Click on Settings <i className="fa fa-arrow-right"></i> User groups from left hand menu to add users
permanently to a group and use it in future.
</li>
<li>
Time zone settings - Configure the time zone of each user & group properly
while adding in group and select appropriate option in settings as well.
</li>
<li>
You have additional settings affecting this report in Settings <i className="fa fa-arrow-right"></i>
General menu in left hand side.
</li>
</ul>
<p>
<strong>Note:</strong> Any changes you make to the group or the users under the group in this page will
not get saved and is only for this session.
</p>
<div>
<strong>What is new?</strong>
<section>
<h2>How to Use</h2>
<ul>
<li>Viewing report based on sprint as an alternate option instead of date range selection</li>
<li>Option to eliminate or identify the worklogs created after the threshold date</li>
<li>Options to pull the report without specifying the user group</li>
<li>Options to pull all worklog based on selected project</li>
<li>Automatically group the users & worklog based on project, epic or issue type when worklog is pulled based on date range</li>
<li>
By default, this page allows you to generate a worklog report based on the selected date range.
</li>
<li>
To generate a report based on one or more sprints, click the
<i className="fa fa-cogs"></i> icon to customize report settings.
</li>
<li>
Click the <i className="fa fa-cogs"></i> icon to access advanced report settings,
including display formatting, additional columns, worklog filtering by threshold date,
JQL data filtering, and more.
</li>
<li>
Choose a date or sprint to view the report, or click the refresh
<i className="fa fa-refresh"></i> icon to reload the report if a date or sprint is already selected.
</li>
<li>
Manage user lists by clicking the <i className="fa fa-users"></i> icon.
</li>
<li>
Access Settings <i className="fa fa-arrow-right"></i> User Groups in the left-hand menu
to create and manage user groups for future use.
</li>
<li>
Configure time zone settings for each user and group when adding them to a group.
Select the appropriate options in settings as well.
</li>
<li>
Additional settings for this report can be found in Settings <i className="fa fa-arrow-right"></i>
General in the left-hand menu.
</li>
</ul>
</div>
<p>
<strong>Note:</strong> Any changes made to the group or users under the group on this page
will not be saved and are only applicable for this session.
</p>
</section>
<section>
<h2>What's New</h2>
<ul>
<li>Alternate option to view the report based on sprints instead of date range selection.</li>
<li>Option to filter or identify worklogs created after the threshold date.</li>
<li>Ability to generate a report without specifying a user group.</li>
<li>Option to pull all worklogs based on a selected project.</li>
<li>Automatic grouping of users and worklogs by project, epic, or issue type when pulling worklogs
based on a date range.
</li>
</ul>
</section>
</div>
);
}
Expand Down
98 changes: 84 additions & 14 deletions src/gadgets/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,88 @@ import TicketWiseWorklog from './TicketWiseWorklog';
export { GadgetActionType, Calendar, DateWiseWorklog, WorklogGadget, WorklogReport, WorklogBarChartGadget, MyBookmarks, MyOpenTickets, MyReports, PendingWorklog, TicketWiseWorklog, StatusWiseTimeSpentGadget };

export const GadgetList = [
{ id: 'myOpenTickets', icon: 'fa-eye', name: 'My Open Tickets', details: 'By default contains list of unresolved issues assigned to you. From Advanced settings page, you can customize the JQL used to pull issues list from Jira.' },
{ id: 'myBookmarks', icon: 'fa-bookmark', name: 'Bookmarks', details: 'Contains list of bookmarked issues. You can manage bookmarks from within the gadget. Bookmark list is global to all the dashboard.' },
{ id: 'dateWiseWorklog', icon: 'fa-list-alt', name: 'Logged Work - [Daywise]', details: 'Displays list of worklog\'s added by you grouped by date. You can control the date range from within the gadget.' },
{ id: 'worklogBarChart', icon: 'fa-bar-chart', name: 'Worklog Bar Chart', details: 'Worklogs added by current user is represented as a stacked bar chart. You can control the date range from within the gadget' },
{ id: 'teamWorklogReport', icon: 'fa-bar-chart', name: 'Team Daywise Worklog', details: 'Worklogs represented for individual users on daily basis as table. You can configure the users list and date range from within the gadget.' },
{ id: 'pendingWorklog', icon: 'fa-clock', name: 'Worklog - [Pending Upload]', details: 'Worklogs add by you from Jira Assist, which is yet to be uploaded to Jira is listed in this gadget. You can review and choose to edit or upload to Jira from within this gadget' },
{ id: 'ticketWiseWorklog', icon: 'fa-list-alt', name: 'Logged Work - [Ticketwise]', details: 'Displays list of worklog\'s added by you grouped by individual issue. You can control the date range from within the gadget.' },
{ id: 'myFilters', icon: 'fa-filter', name: 'My Reports', details: 'Displays the list of custom & advanced report built / imported by you. You can edit or delete the reports from within this gadget.' },
{ id: 'agendaDay', icon: 'fa-calendar', name: 'Current day calendar', details: 'Display calendar for current date with worklog and meetings' },
{ id: 'agendaWeek', icon: 'fa-calendar', name: 'Current week calendar', details: 'Display calendar for current week with worklog and meetings' },
{ id: 'listDay', icon: 'fa-calendar', name: 'Current day worklog List', details: 'Display calendar as list view for current date with worklog and meetings' },
{ id: 'listWeek', icon: 'fa-calendar', name: 'Current week worklog list', details: 'Display calendar as list view for current week with worklog and meetings' },
{ id: 'listMonth', icon: 'fa-calendar', name: 'Current month worklog list', details: 'Display calendar as list view for current month with worklog and meetings' },
{ id: 'sWiseTSpent', icon: 'fa-list-alt', name: 'Status Wise Time Spent', details: 'Provides summary of time spent on each ticket on individual status' }
{
"id": "myOpenTickets",
"icon": "fa-eye",
"name": "My Open Tickets",
"details": "This gadget contains a list of unresolved issues assigned to you by default. You can further customize the list by configuring the Jira Query Language (JQL) from the Advanced Settings page."
},
{
"id": "myBookmarks",
"icon": "fa-bookmark",
"name": "Bookmarks",
"details": "The Bookmarks gadget holds a list of bookmarked issues. You can manage your bookmarks directly from this gadget, and please note that the bookmark list is shared across all dashboards."
},
{
"id": "dateWiseWorklog",
"icon": "fa-list-alt",
"name": "Logged Work - [Daywise]",
"details": "This gadget displays a list of your worklogs grouped by date. You have control over the date range, which can be adjusted within the gadget."
},
{
"id": "worklogBarChart",
"icon": "fa-bar-chart",
"name": "Worklog Bar Chart",
"details": "In this gadget, worklogs added by the current user are represented as a stacked bar chart. You can customize the date range directly within the gadget."
},
{
"id": "teamWorklogReport",
"icon": "fa-bar-chart",
"name": "Team Daywise Worklog",
"details": "This gadget presents worklogs for individual users on a daily basis in a table format. You can configure both the user list and date range from within the gadget."
},
{
"id": "pendingWorklog",
"icon": "fa-clock",
"name": "Worklog - [Pending Upload]",
"details": "Worklogs added by you in Jira Assistant that are awaiting upload to Jira are listed in this gadget. You can review, edit, or choose to upload them to Jira directly from this gadget."
},
{
"id": "ticketWiseWorklog",
"icon": "fa-list-alt",
"name": "Logged Work - [Ticketwise]",
"details": "This gadget provides a list of worklogs added by you, grouped by individual issues. You have the flexibility to adjust the date range within the gadget."
},
{
"id": "myFilters",
"icon": "fa-filter",
"name": "My Reports",
"details": "In the My Reports gadget, you will find a list of custom and advanced reports that you have built or imported. You can edit or delete these reports directly from this gadget."
},
{
"id": "agendaDay",
"icon": "fa-calendar",
"name": "Current Day Calendar",
"details": "This gadget displays a calendar for the current date, showing worklogs and meetings for the day."
},
{
"id": "agendaWeek",
"icon": "fa-calendar",
"name": "Current Week Calendar",
"details": "In this gadget, you can view a calendar for the current week, featuring worklogs and meetings."
},
{
"id": "listDay",
"icon": "fa-calendar",
"name": "Current Day Worklog List",
"details": "The Current Day Worklog List gadget provides a list view of your calendar for the current date, including worklogs and meetings."
},
{
"id": "listWeek",
"icon": "fa-calendar",
"name": "Current Week Worklog List",
"details": "This gadget offers a list view of your calendar for the current week, showing worklogs and meetings."
},
{
"id": "listMonth",
"icon": "fa-calendar",
"name": "Current Month Worklog List",
"details": "View your calendar as a list for the current month, including worklogs and meetings, in the Current Month Worklog List gadget."
},
{
"id": "sWiseTSpent",
"icon": "fa-list-alt",
"name": "Status Wise Time Spent",
"details": "The Status Wise Time Spent gadget provides a summary of time spent on each ticket, organized by individual status."
}
];
2 changes: 1 addition & 1 deletion src/scss/prime.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ a.p-menuitem-link {
.p-tabview-nav-link {
display: inline-block;

i.fa {
.fa {
margin-right: 8px;
}
}
Expand Down
35 changes: 19 additions & 16 deletions src/views/contribute/Contribute.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,36 +42,39 @@ function Contribute() {
<div>
<h2>Why Jira Assistant is free?</h2>
<p>
The motive of building Jira Assist is to help people who are spending lots of time in Jira to get some simple
things done or spend lots of money in buying a similar software and paying a lump sum for its subscription every year.
The goal behind creating Jira Assistant is to assist individuals who spend significant time in Jira, making routine tasks simpler,
without the need to invest in expensive software or yearly subscriptions.
</p>
</div>
<div>
<h4>Do you think Jira Assistant saved you some time and helped you to get things easier?</h4>
<p>Then it is right time to donate us and get an even better working tool which can save even more of your precious time.</p>
<h4>Has Jira Assistant saved you time and streamlined tasks?</h4>
<p>
If Jira Assistant has made your tasks easier and saved you time, consider making a donation to
access an even more advanced tool that can further optimize your workflow.
</p>
</div>
<div>
<h4>How would my donation be helpful?</h4>
<h4>How Will Your Donation Help Us?</h4>
<p>
We need to spend lots of time and effort in building this tool, testing it and keep it updated with changes
in Jira and browser's API. A one time donation of a small amount like $20 or $30
would encourage us in putting more effort in building an even better working tool for you.
Building and testing Jira Assistant has required significant time and effort. We are committed to keeping it up-to-date
with changes in Jira, browser APIs, browser updates, and more. Your one-time donation, whether it's $20 or $30,
will motivate us to continue enhancing this tool for your benefit.
</p>
<p>
Though we would like to get compensated for the effort we put into development, we are not interested in making
it a paid tool and force our users to pay for it, or integrate a 3rd party Ad's in the tool and get compensated
by annoying our users.
While we value the effort put into development, we believe in keeping Jira Assistant free and without
third-party ads that could inconvenience users. Your contribution ensures that Jira Assistant remains
ad-free, updated, and accessible to all users.
</p>
<p>
So to have your Jira Assistant always free, Ad free and keep it updated, make a one time contribution of your
wish and help yourself and others in building a better working tool for ever.
By making a one-time contribution, you're not only investing in your own productivity but also
supporting others in accessing an ever-improving tool. Help us maintain Jira Assistant as a valuable resource for everyone.
</p>
</div>
<div>
<h4>I am not interested to donate. I want to hide this button.</h4>
<h4>I'm not interested in donating</h4>
<p>
If you don't want this button to be visible any more then we provide you with an option to hide it forever.
Please navigate to Settings -&gt; General and you will see an option to hide it from header.
If you prefer not to see this button anymore, we offer an option to hide it permanently.
Please go to Settings → General, where you'll find an option to remove it from the header.
</p>
</div>
</div>
Expand Down
Loading

0 comments on commit 3cc3f5e

Please sign in to comment.