Opened 14 months ago

Closed 9 months ago

#25392 closed defect (fixed)

Adapt Relay Search integration to Metrics' project standards

Reported by: iwakeh Owned by: metrics-team
Priority: Medium Milestone:
Component: Metrics/Website Version:
Severity: Normal Keywords:
Cc: metrics-team Actual Points:
Parent ID: Points:
Reviewer: karsten Sponsor:

Description (last modified by iwakeh)

Depending on the decision Metrics Team reaches:

In case Relay Search is merged into metrics-web

This would require to add RS code to the appropriate places in metrics-web.
(see comment:5 for a first draft branch)

In case Relay Search stays separate

RelaySearch integration needs some tuning and streamlining:
First steps

  1. Move from src/main/resources/web/rs into src/submods/relaysearch
  2. Only include fonts once into the war file (currently these are duplicated)
  3. Avoid including readme files and scripts that are not needed for the running web application into the war file.
  4. Separate preparation steps inside RelaySearch from building the war.
  5. Create an Ant task that prepares RelaySearch for war file inclusion and adds the needed files to the war file.

More tasks should be added as comments.

Child Tickets

TicketStatusOwnerSummaryComponent
#25745closedmetrics-teamSort out style.css differencesMetrics/Website
#25747closedmetrics-teamCheck completeness of RS integrationMetrics/Website

Change History (16)

comment:1 Changed 14 months ago by iwakeh

Owner: changed from metrics-team to iwakeh
Status: newaccepted

comment:2 Changed 14 months ago by iwakeh

See also #25393.

comment:3 Changed 13 months ago by iwakeh

A while ago we decided at the team meeting that RS will be integrated, i.e., merged into metrics-web, so the submodule will be obsolete then.

comment:4 Changed 13 months ago by iwakeh

For integrating rs into mw I started with rs commit b6e6c3235806c9d1521dbc2c08cecee626466928.

Last edited 13 months ago by iwakeh (previous) (diff)

comment:5 Changed 13 months ago by iwakeh

Please use this branch for all further work on RS into Metrics-web integration.

comment:6 Changed 13 months ago by iwakeh

Owner: changed from iwakeh to metrics-team
Status: acceptedassigned

If possible treat these ticket's children with highest priority and when implementing further RS functionality also make sure it ends up in the merge branch.

The completeness of the merge branch regarding RS needs to checked.

Re-assigning this to metrics-team now.

comment:7 Changed 13 months ago by iwakeh

Status: assignedneeds_review

comment:8 Changed 13 months ago by irl

Probably not this week, but I will review the changes in comment:4 as soon as I can. The plan in the description looks great though.

comment:9 Changed 13 months ago by iwakeh

Status: needs_reviewneeds_information

This ticket's description doesn't reflect the decision to finally merge RS into metrics-web, it rather describes the adaption of RS as separate sub-module. The above steps are not necessary for the tight integration, they only make sense, if RS stays separate.

It seems the discussion should be re-opened here?

Setting to needs_information.

This is a topic for the Aberdeen meeting.

comment:10 Changed 13 months ago by iwakeh

Description: modified (diff)

comment:11 Changed 10 months ago by irl

Status: needs_informationneeds_review

Please review my task/25392 branch.

commit	714ae2df3d54608eadab5420035c3210e685c2f0

Integrate RelaySearch (Fixes: #25392)

This is using commit b6e6c3235806c9d1521dbc2c08cecee626466928 of atlas.git.

 * Removes submodule for RS.
 * Move two license files to basedirectory; these should be merged.
 * Move atlas.css into css folder
 * Fonts in both were identical
 * Changes all findable paths to the new setting
 * js libs were simply copied; these should be sorted out more
 * Merged rs/img and rs/images folder into images

Thanks to iwakeh for the bulk of the work in this commit.

comment:12 Changed 10 months ago by karsten

Reviewer: karsten

I'll take a look today.

comment:13 Changed 10 months ago by karsten

Status: needs_reviewneeds_revision

Okay, this went faster than it looked on first sight. I found two minor things:

  • Those .class files in bin/ should probably not be in the repository. Can you remove them in a fixup commit that I can squash into 714ae2d?
  • There are now unused files in src/main/resources/web/images/, like atlas.png and atlas.xcf. Would you want to look out for other unused images and remove those, too, possibly in a separate (non-fixup) commit?

I can merge and deploy later today.

comment:14 in reply to:  13 Changed 10 months ago by irl

Status: needs_revisionneeds_review

Replying to karsten:

Okay, this went faster than it looked on first sight. I found two minor things:

  • Those .class files in bin/ should probably not be in the repository. Can you remove them in a fixup commit that I can squash into 714ae2d?

Looks like these were added by Eclipse while I wasn't looking. Fixed.

  • There are now unused files in src/main/resources/web/images/, like atlas.png and atlas.xcf. Would you want to look out for other unused images and remove those, too, possibly in a separate (non-fixup) commit?

Fixed this too. There are probably other things to tidy up, but would be smaller patches. Once this is merged, it would be easier to make more localised patches to address individual things and queue those up.

I can merge and deploy later today.

Awesome. (:

comment:15 Changed 10 months ago by karsten

Status: needs_reviewnew

Changes look good! Merged and deployed. Not closing yet, because I'm not sure if you want to do more. Thanks!

comment:16 Changed 9 months ago by irl

Resolution: fixed
Status: newclosed

I think other things can be new tickets if we come across them.

Note: See TracTickets for help on using tickets.