Skip to content
Merged
6 changes: 3 additions & 3 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:
with:
ruby-version: '3.0'
bundler-cache: true
## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV

## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
## /home/runner/runners/2.301.1/externals/node12/bin/node: --openssl-legacy-provider is not allowed in NODE_OPTIONS

# Install Node
- uses: actions/setup-node@v3
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,4 @@ For more detailed explanation, please refer to this video : https://www.youtube.

- Added scss files to EditorConfig
- Change csv file name for statistics from 'Completed' to 'Created'
- Added error message and updated saving message for plan writing session to improve user experience
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,6 @@ GEM
no_proxy_fix (0.1.2)
nokogiri (1.14.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.14.3-x86_64-linux)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
Expand Down Expand Up @@ -524,7 +522,6 @@ GEM

PLATFORMS
arm64-darwin-21
x86_64-linux

DEPENDENCIES
activerecord_json_validator
Expand Down
20 changes: 18 additions & 2 deletions app/views/answers/_status.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,24 @@
<!--
Partial for handling the answer status (e.g. saving, error-saving, data-status)
-->
<span class="label label-info status" style="display:none;" data-status="saving"><%= _('Saving...') %></span>
<span class="label label-warning status" style="display: none;" data-status="error-saving"></span>
<%
helpdesk_email = Rails.configuration.x.organisation.helpdesk_email
email_subject = _('Plan writing error related to %{tool_name}') %{ :tool_name => tool_name }
%>
<span class="label label-warning status" style="display:none;" data-status="saving">
<%= _("Saving...Please do not refresh or go to another page!") %>
<br><br>
<%= sanitize(_("If you stuck on this message, please save your plan to a separate file and contact us at %{helpdesk_email} .") % {
Copy link
Copy Markdown
Contributor

@briri briri Nov 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think "If you are stuck on this message" might be confusing since it doesn't let them know what is supposed to happen (e.g. how long is 'stuck'?).

Suggest we change the messaging (maybe ask the PMs)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think "If you are stuck on this message" might be confusing since it doesn't let them know what is supposed to happen (e.g. how long is 'stuck'?).

Suggest we change the messaging (maybe ask the PMs)

How about "If this message doesn't disappear in 1 minute?" @mariapraetzellis how do you feel?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mariapraetzellis @dsisu : one more UI message suggestion is needed. For anyone sticking on the 'Saving...' message because of a system problem, we need them to remember not to fresh the page and to contact the helpdesk immediately.

Instead of saying If you are stuck on this message, please save your plan to a separate file and contact us at %{helpdesk_email} , any suggestions you have?

helpdesk_email: mail_to(helpdesk_email, helpdesk_email,subject: email_subject)
}) %>
</span>
<span class="label label-danger status" style="display: none;" data-status="error-saving">
<%= sanitize(_("Sorry, we had trouble saving your data. Please contact us at %{helpdesk_email} .") % {
helpdesk_email: mail_to(helpdesk_email, helpdesk_email,subject: email_subject)
}) %>
<br><br>
<%= _("Save your plan content to a separate file now. You will LOSE them after refreshing or closing this page.") %>
</span>
<% if answer.answered? %>
<span class="label label-info status" data-status="saved-at">
<%= _('Answered')%> <time class="timeago" datetime="<%= answer.updated_at.iso8601 %>"></time>
Expand Down