Wiki Inline-Commenting #1438 #1593

aspriya · 2017-08-30T10:26:11Z

Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks!

all tests pass -- rake test:all
code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes)
pull request is descriptively named with #number reference back to original issue

Picking up from where #1571 left off.

jywarren · 2017-08-30T15:22:27Z

What's the error here? Can you copy it in? @ananyo2012 I wonder if danger is responding to test failures but not errors? Or if an error happens early enough maybe danger doesn't even run? If the latter is the case there's not much we can do, but good to know.

…

On Aug 30, 2017 6:26 AM, "Ashan Priyadarshana" ***@***.***> wrote: Make sure these boxes are checked before your pull request is ready to be reviewed and merged. Thanks! - all tests pass -- rake test:all - code is in uniquely-named feature branch, and has been rebased on top of latest master (especially if you've been asked to make additional changes) - pull request is descriptively named with #number reference back to original issue Please be sure you've reviewed our contribution guidelines at https://publiclab.org/wiki/contributing-to-public-lab-software We have a loose schedule of reviewing and pulling in changes every Tuesday and Friday, and publishing changes on Fridays. Please alert developers on ***@***.*** when your request is ready or if you need assistance. Thanks! ------------------------------ You can view, comment on, or merge this pull request online at: #1593 Commit Summary - undo Gemfile.lock - add a reference column of string type to comments table - add a inline comment button and function for that - Build an inline form for commenting - make the inline comment form toggle when comment button is clicked - make the inline comment form submittable - show previous inine-comments when inline comment button is clicked - lively show currently entered inline-comment - decorate inline comments to show commented user and time - update related reference column records when a subsection is edited - add tests to check inline-comment functionality File Changes - *M* app/assets/javascripts/application.js <https://github.com/publiclab/plots2/pull/1593/files#diff-0> (2) - *A* app/assets/javascripts/buildSectionCommentForm.js <https://github.com/publiclab/plots2/pull/1593/files#diff-1> (70) - *A* app/assets/javascripts/showInlineComment.js <https://github.com/publiclab/plots2/pull/1593/files#diff-2> (36) - *M* app/assets/javascripts/wikis.js <https://github.com/publiclab/plots2/pull/1593/files#diff-3> (35) - *M* app/controllers/comment_controller.rb <https://github.com/publiclab/plots2/pull/1593/files#diff-4> (42) - *M* app/controllers/wiki_controller.rb <https://github.com/publiclab/plots2/pull/1593/files#diff-5> (1) - *M* app/models/comment.rb <https://github.com/publiclab/plots2/pull/1593/files#diff-6> (2) - *M* app/models/node.rb <https://github.com/publiclab/plots2/pull/1593/files#diff-7> (8) - *A* app/views/comment/create_inline_comment.js.erb <https://github.com/publiclab/plots2/pull/1593/files#diff-8> (3) - *M* app/views/wiki/show.html.erb <https://github.com/publiclab/plots2/pull/1593/files#diff-9> (2) - *A* db/migrate/20170808083618_add_reference_to_comments.rb <https://github.com/publiclab/plots2/pull/1593/files#diff-10> (5) - *M* db/schema.rb.example <https://github.com/publiclab/plots2/pull/1593/files#diff-11> (3) - *M* test/functional/comment_controller_test.rb <https://github.com/publiclab/plots2/pull/1593/files#diff-12> (12) Patch Links: - https://github.com/publiclab/plots2/pull/1593.patch - https://github.com/publiclab/plots2/pull/1593.diff — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#1593>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ03uOeHBcdfX4UHgGUl1StGO-ClLks5sdTjDgaJpZM4PHLZt> .

PublicLabBot · 2017-08-30T16:38:40Z

	1 Warning
⚠️	New migrations added. Please update `schema.rb.example` by overwriting it with a copy of the up-to-date `db/schema.rb`.

	2 Messages
📖	@aspriya Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution!
📖	This pull request doesn’t link to a issue number. Please refer to the issue it fixes (if any) in the body of your PR, in the format: `Fixes #123`.

Generated by 🚫 Danger

jywarren · 2017-08-30T17:46:45Z

Ooh, cool - but see the warning about new schema file!

jywarren · 2017-08-31T17:27:22Z

I wanted to note that I think /all/ rich wiki updating is a bit slow. We'll look into this, but I believe we should:

monitor unstable for performance (@icarito)
add a "spinner" icon as with the Post button on /post (this also happens in regular comments, i think) so people know it's doing something
fix the schema file as advised by Dangerbot above

then let's test one more time -- i'd like to work a bit more on how the comments are displayed too; perhaps we can show 3 comments by the comment icons, instead of the full display shown in your screenshot:

Then that full display could be toggled to show.

jywarren · 2017-08-31T17:32:06Z

app/assets/javascripts/wikis.js

@@ -15,7 +14,8 @@ function setupWiki(node_id, title, raw, logged_in) {
      preProcessor: preProcessMarkdown,
      postProcessor: postProcessContent,
      extraButtons: {
-        "fa-question": questionForm
+        "fa-question": questionForm,
+        "fa-comment": setupCommentFunction


Can we make this:

<% if params[:inlineCommenting] %>"fa-comment": setupCommentFunction<% end %>

? That way we can test this more on production without committing to it just yet. And we can publish the general Rich Wikis inline features without also having to publish inline commenting which may take a little longer?

Hi, @aspriya - i think if you can add this flag we can merge and see how this is working. Thanks!

jywarren · 2017-08-31T17:32:57Z

db/schema.rb.example

@@ -49,6 +49,7 @@ ActiveRecord::Schema.define(:version => 20170824172336) do
    t.string  "mail",      :limit => 64
    t.string  "homepage"
    t.integer "aid",                             :default => 0,  :null => false
+    t.string  "reference"


Here I believe you have to update the timestamp at the top of the file to match the latest migration version -- that may be what's stopping you!

Oh thanx. Corrected this

icarito · 2017-08-31T19:17:21Z

A note that not the whole site seems slow on unstable.publiclab.org - I see no reason for slowness in the logs. I will continue to investigate.

…

On 31/08/17 12:27, Jeffrey Warren wrote: I wanted to note that I think /all/ rich wiki updating is a bit slow. We'll look into this, but I believe we should: * monitor unstable for performance ***@***.*** <https://github.com/icarito>) * add a "spinner" icon as with the Post button on |/post| (this also happens in regular comments, i think) so people know it's doing *something* * fix the schema file as advised by Dangerbot above then let's test one more time -- i'd like to work a bit more on how the comments are displayed too; perhaps we can show |3 comments| by the comment icons, instead of the full display shown in your screenshot: image <https://user-images.githubusercontent.com/13878973/29861863-653006e2-8d88-11e7-985d-44ca7419c3e1.png> Then that full display could be toggled to show. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1593 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAMMS01sfGquFWDRcSx4JeTedoI9MqQsks5sduz7gaJpZM4PHLZt>.

jywarren · 2017-09-08T22:01:20Z

I made the "hidden" flag in javascript so this will only work when this is at the end of the URL: ?inlineComments=true

Now all that's left is:

add a "spinner" icon as with the Post button on /post (this also happens in regular comments, i think) so people know it's doing something

Very close!

jywarren · 2017-09-26T23:55:50Z

Hi, @aspriya - what do you think about these changes? Hope you're well!

ryzokuken · 2018-01-26T18:08:07Z

@jywarren @aspriya hasn't replied to this thread for a very long time. Is this mergeable, or should we close this for now?

jywarren · 2018-01-26T21:09:18Z

do you want to download the code and try it out? I worried there were things we overlooked in this and it needed a bit more work.

…

On Fri, Jan 26, 2018 at 1:08 PM, Ujjwal Sharma ***@***.***> wrote: @jywarren <https://github.com/jywarren> @aspriya <https://github.com/aspriya> hasn't replied to this thread for a very long time. Is this mergeable, or should we close this for now? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1593 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ8PZcwLRaiiMHme05kV0i65bsSHeks5tOhSHgaJpZM4PHLZt> .

ryzokuken · 2018-01-27T07:16:20Z

@jywarren I could definitely give this a try!

SidharthBansal · 2018-12-07T08:40:40Z

As the person is inactive for more than a month, I am closing the PR. In case you want to push changes please feel free to open a new PR OR reopen this PR and add additional changes to it.
Thanks for contributing on Public Lab

Ashan and others added 10 commits August 30, 2017 15:59

undo Gemfile.lock

55d586b

add a reference column of string type to comments table

d7fdd0c

add a inline comment button and function for that

8108ef7

Build an inline form for commenting

fb3b5f2

make the inline comment form toggle when comment button is clicked

6f78a57

make the inline comment form submittable

166f3c5

show previous inine-comments when inline comment button is clicked

dbb56a4

lively show currently entered inline-comment

03783df

decorate inline comments to show commented user and time

021c113

update related reference column records when a subsection is edited

09b3a90

aspriya force-pushed the add_a_reference_collumn_for_comments branch 2 times, most recently from dd4a2b2 to 7450e1b Compare August 30, 2017 14:01

aspriya force-pushed the add_a_reference_collumn_for_comments branch from 7450e1b to cbfff1d Compare August 30, 2017 16:26

jywarren reviewed Aug 31, 2017

View reviewed changes

add test to check inline-commenting functionality

443108d

aspriya force-pushed the add_a_reference_collumn_for_comments branch from cbfff1d to 443108d Compare September 1, 2017 13:57

Update wikis.js

d6807cb

SidharthBansal closed this Dec 7, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wiki Inline-Commenting #1438 #1593

Wiki Inline-Commenting #1438 #1593

aspriya commented Aug 30, 2017 •

edited by jywarren

jywarren commented Aug 30, 2017 via email

PublicLabBot commented Aug 30, 2017 •

edited

jywarren commented Aug 30, 2017

jywarren commented Aug 31, 2017 •

edited

jywarren Aug 31, 2017

jywarren Sep 5, 2017

jywarren Aug 31, 2017

aspriya Sep 1, 2017

icarito commented Aug 31, 2017 via email

jywarren commented Sep 8, 2017

jywarren commented Sep 26, 2017

ryzokuken commented Jan 26, 2018

jywarren commented Jan 26, 2018 via email

ryzokuken commented Jan 27, 2018

SidharthBansal commented Dec 7, 2018

Wiki Inline-Commenting #1438 #1593

Wiki Inline-Commenting #1438 #1593

Conversation

aspriya commented Aug 30, 2017 • edited by jywarren

jywarren commented Aug 30, 2017 via email

PublicLabBot commented Aug 30, 2017 • edited

jywarren commented Aug 30, 2017

jywarren commented Aug 31, 2017 • edited

jywarren Aug 31, 2017

Choose a reason for hiding this comment

jywarren Sep 5, 2017

Choose a reason for hiding this comment

jywarren Aug 31, 2017

Choose a reason for hiding this comment

aspriya Sep 1, 2017

Choose a reason for hiding this comment

icarito commented Aug 31, 2017 via email

jywarren commented Sep 8, 2017

jywarren commented Sep 26, 2017

ryzokuken commented Jan 26, 2018

jywarren commented Jan 26, 2018 via email

ryzokuken commented Jan 27, 2018

SidharthBansal commented Dec 7, 2018

aspriya commented Aug 30, 2017 •

edited by jywarren

PublicLabBot commented Aug 30, 2017 •

edited

jywarren commented Aug 31, 2017 •

edited