reduce list of projects for admin resolves #1187 #1238

MontrealSergiy · 2022-05-11T11:59:54Z

this reduces the project lists for admin, which became unwieldy.

@natacha-beck the feature complicates task of setting the prototype tools to a private group, as well as creation of private data providers. Please confirm that you ok with it or need some workaround (e.g. adding admin workgroups, perhaps prioriterization instead of removal)

…ces#1187

natacha-beck · 2022-05-13T18:45:44Z

BrainPortal/app/models/work_group.rb

+    end
+  end
+
+  def pretty_category_name_no_pub(as_user) #:nodoc:


I do not really see the point to have an additional method here, I think we can only keep pretty_category_name and add extra logic in it.

I wanted to have something like Public Shared group, etc that is use 'public' a quantifier to existing group, In this way it is not just adding one Public Group category so adding a new method is justified imho.

BTW it also it's possible to use instead just Public group category then only small corrections to the existing method will be required (probably due to bug in the existing code)

the additional method is removed

natacha-beck · 2022-05-13T18:49:54Z

BrainPortal/app/helpers/select_box_helper.rb

@@ -118,6 +118,22 @@ def group_select(parameter_name = "group_id", options = {}, select_tag_options =
      selected = selector.to_s
    end

+    # for Admin filter out only public, invisible or non_assignable to reduce the clutter
+    if current_user.has_role? :admin_user


When reading the Issue:

Those lists should be trimmed down to remove all private work projects

I think to keep the old groups and then remove only the private work projects will do what we want.
Instead of a long selection with a lot of conditions.

that's was @prioux suggestion keep unassignable groups

as a compromise maybe keep all the nonassignable group, rather than admin related

BrainPortal/app/views/shared/_group_tables.html.erb

…s#1187

…ces#1187

prioux · 2022-08-30T16:08:03Z

Also rebase this one.

MontrealSergiy · 2022-08-31T17:18:21Z

done

natacha-beck · 2022-09-27T13:04:52Z

@MontrealSergiy this PR will close issue number #1187 no ? If it is the case can you update the Development session on this page.

MontrealSergiy · 2022-10-17T19:06:13Z

@MontrealSergiy this PR will close issue number #1187 no ? If it is the case can you update the Development session on this page.

done

prioux · 2023-01-12T16:56:44Z

The new helper group_select does not behave properly.

If a programmer invokes it in a page with an explicit list of groups passed in options, it is not supposed to replace that list with its own list. It's supposed to respect it.

The behavior we want is for the de list of groups to be reduced ONLY when the default list is generated internally.

prioux

See today's comment (2022-01-12)

BrainPortal/app/helpers/select_box_helper.rb

prioux

I made these comments two weeks ago and forgot to 'commit' them

prioux · 2023-02-03T16:28:54Z

BrainPortal/app/models/work_group.rb

-    elsif as_user.present? && (self.creator_id == as_user.id || self.users.first.id == as_user.id)
-      @_pretty_category_name = 'My Work Project'
+  def pretty_category_name(as_user = nil) #:nodoc:
+


Why are you removing the quick 'return cached value' code? It's designed to make the code quicker! It's a standard patern:

def something return @cached_value if @cached_value @cached_value = compute it ... @cached_value end

You removed the final returned value and replaced it with a ugly if else (line 95 in the original code, line 98-102 in your code)

hi, I guess redundant final value is a coding style thing, so I should not touch it.

Early return seems like a bug resulting e.g. in absence of Public type in filter dropdown (see snapshot attached), but I can factor out bugfix into a separate pull request to make think moving, what do you think @prioux

I don't understand. Why would caching the computed value of pretty_category_name cause a bug? It's not something that changes over time, ever.

Just leave the code as it was! Caching at beginning, final returned value at the end.

did you see screen
shot? Plenty of "private" in the table but none in the filter dropdown is strange at the least.

Yes, but that's not related to the pretty_category_name() method. That method computes a value and caches it as an instance variable of the object. That's totally outside the realm of the table filter generator. I suggest you look at other places where @_pretty_category_name might be overriden. As far as pretty_category_name() is involved, it should do exactly like it has always done, + your modifications (but with the caching and final returned value re-added).

actually you are right, the filter is not related, it just uses attribute as is. But for other instances it is related to pretty_category_name() (@_pretty_category_name is being overwritten by self.prepare_pretty_category_names()

I created separate bug issues as it is not directly related to the subject of reducing project list

prioux

See comments

prioux · 2023-04-20T16:55:26Z

BrainPortal/app/models/work_group.rb

-    elsif as_user.present? && (self.creator_id == as_user.id || self.users.first.id == as_user.id)
-      @_pretty_category_name = 'My Work Project'
+  def pretty_category_name(as_user = nil) #:nodoc:
+


Yes, but that's not related to the pretty_category_name() method. That method computes a value and caches it as an instance variable of the object. That's totally outside the realm of the table filter generator. I suggest you look at other places where @_pretty_category_name might be overriden. As far as pretty_category_name() is involved, it should do exactly like it has always done, + your modifications (but with the caching and final returned value re-added).

MontrealSergiy · 2023-04-20T17:03:13Z

in my opinion it is directly related. The method got updated while the 'pre-optimization' have not.

But if you are still in doubt I can factor out bug fix into separate issue, as several different solutions are possible. Removal of short return is simple fix but not necessarily the best

prioux · 2023-04-20T17:50:00Z

BrainPortal/app/models/work_group.rb

+        @_pretty_category_name = "Personal Work Project of #{self.users.first.full_name}"
+      end
+    end
+    # Public is more of quantifier, there could be public shared or public personal projects


Please adjust the code between line 97 and 102

The @_pretty_category_name.present? is always true

There is no need for a else !!!!

Also, based on the logic, you will never re-sinsert " Public " on anything but Invisible Project. You'll never get for instance 'Share Public Work Project' because of the if/elif structure above.

Can I just suggest you set up, early, a string variable that has either "" or "Public " and then you just insert it in the original category names, instead of trying to retrofit the word at the end?

hi so would you like

a) adjust code to enable Share Public Work Project or
b) just simplify new lines a bit
c) return old code

at this moment I will be fine with c) to avoid any perceived blame for the existing production bug shown on snapshot ( I factored it out into a separate issue #1323 we can fix it once agree on the best way to do it)

ignore then the above question I will try add variable .. one min

OK.

I think honestly that the original code required very little changes. It wasn't buggy.

If you see the filter list not behaving the way you expect, the problem is not in this method. Like I said, look for other places where the instance variable is modified.

prioux · 2023-04-20T17:51:06Z

BrainPortal/app/models/work_group.rb

-      @_pretty_category_name = 'Shared Work Project'
-    elsif as_user.present? && (self.creator_id == as_user.id || self.users.first.id == as_user.id)
-      @_pretty_category_name = 'My Work Project'
+    if @_pretty_category_name.blank?


Please remove the if surrounding the code at line 82. It wasn't there in the original and it's useless.

prioux

See comments

prioux · 2023-04-20T18:18:14Z

BrainPortal/app/helpers/select_box_helper.rb

+    if current_user.has_role?(:admin_user) && !options.has_key?(:groups)
+      admin_ids = AdminUser.all.pluck(:id) || []
+      groups   =   groups.select do |g|
+        (   g.is_a?(SystemGroup) ||  # everyone group, to make a private tool public


Reorder the conditions such that the fast conditions are checked first: g.public, g.invisible, etc

When comparing with selected, the part selected.include(g.id.to_s) will wrongly select some group if for instance we selected is the string "12345" and the current group is ID "34". Use Array(selected).include... instead.

Aren't there a better way to generate this list? Isn't this equivalent to

groups = SystemGroup.all.to_a | WorkGroup.where(:creator_id => admin_ids).to_a

(or close to that?)

MontrealSergiy added 4 commits May 9, 2022 13:56

reduce list of projects for admin resolves aces#1187"

b0bc997

add other admin users (mostly for tools setup) fixes aces#1187

b5e7fc6

add misc public categories reduce list of projects for admin resolves a…

bc5dac7

…ces#1187

add back few more projects for admin resolves aces#1187

29bcd5d

MontrealSergiy added the Admin Features or bugs related to administrative features label May 11, 2022

MontrealSergiy requested a review from natacha-beck May 11, 2022 11:59

MontrealSergiy self-assigned this May 11, 2022

natacha-beck reviewed May 14, 2022

View reviewed changes

MontrealSergiy added 3 commits May 30, 2022 10:51

refactor several pretty name methods into one, admin groups fixes ace…

7880426

…s#1187

a refactoring of public group variable of a group table view resolves a…

816df7d

…ces#1187

a refactoring of public group variable of a group table view resolves a…

232d7b7

…ces#1187

Merge branch 'dev' into admingroups

5941bee

MontrealSergiy linked an issue Sep 27, 2022 that may be closed by this pull request

Remove full list of work projects in admin interfaces #1187

Open

prioux requested changes Jan 12, 2023

View reviewed changes

prioux reviewed Jan 12, 2023

View reviewed changes

BrainPortal/app/helpers/select_box_helper.rb Outdated Show resolved Hide resolved

minor fix in group select

809af83

MontrealSergiy force-pushed the admingroups branch from 26df1b5 to 809af83 Compare January 23, 2023 20:41

prioux requested changes Feb 27, 2023

View reviewed changes

MontrealSergiy requested review from prioux and natacha-beck April 17, 2023 19:55

add a redundant return to wg pretty categories

69f24cb

prioux requested changes Apr 20, 2023

View reviewed changes

put back an old buggy pretty category optimization

f35dd41

prioux requested changes Apr 20, 2023

View reviewed changes

reduce list of projects for admin resolves #1187 #1238

Are you sure you want to change the base?

reduce list of projects for admin resolves #1187 #1238

Conversation

MontrealSergiy commented May 11, 2022

Choose a reason for hiding this comment

MontrealSergiy May 14, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

prioux commented Aug 30, 2022

MontrealSergiy commented Aug 31, 2022

natacha-beck commented Sep 27, 2022

MontrealSergiy commented Oct 17, 2022

prioux commented Jan 12, 2023

prioux left a comment

Choose a reason for hiding this comment

prioux left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MontrealSergiy Apr 13, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MontrealSergiy Apr 20, 2023 • edited

Choose a reason for hiding this comment

prioux Apr 20, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

prioux left a comment

Choose a reason for hiding this comment

prioux Apr 20, 2023 • edited

Choose a reason for hiding this comment

MontrealSergiy commented Apr 20, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MontrealSergiy Apr 20, 2023 • edited

Choose a reason for hiding this comment

prioux Apr 20, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

prioux left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MontrealSergiy May 14, 2022 •

edited

MontrealSergiy Apr 13, 2023 •

edited

MontrealSergiy Apr 20, 2023 •

edited

prioux Apr 20, 2023 •

edited

prioux Apr 20, 2023 •

edited

MontrealSergiy commented Apr 20, 2023 •

edited

MontrealSergiy Apr 20, 2023 •

edited

prioux Apr 20, 2023 •

edited