Reorganize template dropdown menu and refactor TemplateOptionsController

[momo3404]

Fixes #1196 .

Changes proposed in this PR:

• Change the ordering of templates in the template dropdown menu from alphabetical to all organizational templates first, followed by the Alliance Simplified Template, Alliance Template, and all remaining templates.
• Simplified template loading logic by removing explicit Template.default handling.
• Template.latest_customizable.where(org_id: funder.id) and Template.published.publicly_visible.where(org_id: funder.id, customization_of: nil) now fetch the default template as well
• Removed manual insertion and filtering of the default template; sort_templates() now determines ordering.

[aaronskiba]

The ordering seems to be off in the dropdown when I select Digital Research Alliance of Canada as the Organisation.

[aaronskiba]

Why are you using template.customization_of.nil??

[momo3404]

It seemed to fix this bug that occurs with some orgs (like McMaster for example) where the order would be Alliance Simplified Template -> Org templates -> Alliance Template

[aaronskiba]

I think this query result might reveal a bit:

Non-Alliance orgs may have their own customisation of the "Alliance Simplified Template". If an org does have that customisation, then it will be included in org_templates. And further, I'm thinking the .uniq execution at the end would remove the alliance_template = templates.find { |t| t.title == 'Alliance Template' } duplicate.

[aaronskiba]

@CeriMacMillan, what to do in the following scenario?

An org has customised the Alliance Simplified Template (Funding Application Stage) template but the title remains identical. Should this be grouped with the org templates? Or should it be grouped below that in the (Alliance Simplified Template (Funding Application Stage) / Alliance Template) section?

Maybe that same question can be asked of any org customisation of an Alliance template the retains the exact same title.

[CeriMacMillan]

@aaronskiba That's a really good question, I would lean towards putting it with the org templates as they have taken the time to add local content/context. Maybe they can come after any or templates named as 'org template' but before the Alliance templates.

Can double check this with @closenma though to be sure.

[closenma]

I agree, if it has customization then let's count it at organizational and sort it above the other Alliance templates.

[momo3404]

The ordering seems to be off in the dropdown when I select Digital Research Alliance of Canada as the Organisation.

I'm guessing that's because the Alliance templates get included in org_templates. Just to confirm, the order you're seeing is Alliance Template -> Two other Alliance templates -> Alliance Simplified Template?

[aaronskiba]

The ordering seems to be off in the dropdown when I select Digital Research Alliance of Canada as the Organisation.

I'm guessing that's because the Alliance templates get included in org_templates. Just to confirm, the order you're seeing is Alliance Template -> Two other Alliance templates -> Alliance Simplified Template?

That's right. Basically, Alliance Template, and then all of the others in alphabetical order.

[aaronskiba]

This snippet mutates @templates by removing default/customization and then prepending it:

      @templates.select! { |t| t.id != Template.default.id && t.id != customization.id }
      # We want the default template to appear at the beggining of the list
      @templates.unshift(customization)
    end

That snippet was used for the prior ordering of the templates. Since sort_templates is now fully responsible for the ordering, maybe we should address/remove the old ordering code.

[momo3404]

This snippet mutates @templates by removing default/customization and then prepending it:

      @templates.select! { |t| t.id != Template.default.id && t.id != customization.id }
      # We want the default template to appear at the beggining of the list
      @templates.unshift(customization)
    end

That snippet was used for the prior ordering of the templates. Since sort_templates is now fully responsible for the ordering, maybe we should address/remove the old ordering code.

I think that code might still be necessary. I tried removing it, but with that change the Alliance Template now never shows up in the dropdown.

I also am not sure how much we should meddle with the existing code, since it seems there's a lot going on with customizations and default templates.

[aaronskiba]

This snippet mutates @templates by removing default/customization and then prepending it:

      @templates.select! { |t| t.id != Template.default.id && t.id != customization.id }
      # We want the default template to appear at the beggining of the list
      @templates.unshift(customization)
    end

That snippet was used for the prior ordering of the templates. Since sort_templates is now fully responsible for the ordering, maybe we should address/remove the old ordering code.

I think that code might still be necessary. I tried removing it, but with that change the Alliance Template now never shows up in the dropdown.

I also am not sure how much we should meddle with the existing code, since it seems there's a lot going on with customizations and default templates.

Yes, this controller is looking pretty fragile. I might take a shot at that change though, just to help a bit with future maintainability.

[aaronskiba]

Looks good. Sorting looks in order and I'm liking the simpler handling of the default template throughout this controller now.