Feature/2881 url shortener #2358

philipkcl · 2024-03-05T13:46:45Z

[2881] Make our own short URLs

Please don't delete any sections when completing this PR template; instead enter N/A for checkboxes or sections which are not applicable, unless otherwise stated below

See #

https://github.com/DOAJ/doajPM/issues/2881

Describe the scope/purpose of the PR here in as much detail as you like

Categorisation

This PR...

Basic PR Checklist

Instructions for developers:

For each checklist item, if it is N/A to your PR check the N/A box
For each item that you have done and confirmed for yourself, check Developer box (including if you have checked the N/A box)

Instructions for reviewers:

For each checklist item that has been confirmed by the Developer, check the Reviewer box if you agree
For multiple reviewers, feel free to add your own checkbox with your github username next to it if that helps with review tracking

Code Style

No deprecated methods are used
- N/A
- Developer
- Reviewer
No magic strings/numbers - all strings are in constants or messages files
- N/A
- Developer
- Reviewer
ES queries are wrapped in a Query object rather than inlined in the code
- N/A
- Developer
- Reviewer
Where possible our common library functions have been used (e.g. dates manipulated via dates)
- N/A
- Developer
- Reviewer
Cleaned up commented out code, etc
- N/A
- Developer
- Reviewer
Urls are constructed with url_for not hard-coded
- N/A
- Developer
- Reviewer

Testing

Unit tests have been added/modified
- N/A
- Developer
- Reviewer
Functional tests have been added/modified
- N/A
- Developer
- Reviewer
Code has been run manually in development, and functional tests followed locally
- N/A
- Developer
- Reviewer
Have CSS/style changes been implemented? If they are of a global scope (e.g. on base HTML elements) have the downstream impacts of the change in other areas of the system been considered?
- N/A
- Developer
- Reviewer

Documentation

FeatureMap annotations have been added
- N/A
- Developer
- Reviewer
Documentation updates - if needed - have been identified and prepared for inclusion into main documentation (e.g. added and highlighted/commented as appropriate to this PR)
- N/A
- Developer
- Reviewer
Core model documentation has been added to if needed: https://docs.google.com/spreadsheets/d/1lun2S9vwGbyfy3WjIjgXBm05D-3wWDZ4bp8xiIYfImM/edit
- N/A
- Developer
- Reviewer
Events and consumers documentation has been added if needed: https://docs.google.com/spreadsheets/d/1oIeG5vg-blm2MZCE-7YhwulUlSz6TOUeY8jAftdP9JE/edit
- N/A
- Developer
- Reviewer
The docs for this branch have been generated and pushed to the doc site (see docs/README.md for details)
- N/A
- Developer
- Reviewer

Release Readiness

If needed, migration has been created and tested locally
- N/A
- Developer
- Reviewer
Release sheet has been created, and completed as far as is possible https://docs.google.com/spreadsheets/d/1Bqx23J1MwXzjrmAygbqlU3YHxN1Wf7zkkRv14eTVLZQ/edit
- N/A
- Developer
- Reviewer
There has been a recent merge up from develop (or other base branch). List the dates of the merges up from develop below
- 2024-03-04

Testing

List the Functional Tests that must be run to confirm this feature

...
...

Deployment

What deployment considerations are there? (delete any sections you don't need)

new Goals Urlshort should be added to plausible

Configuration changes

What configuration changes are included in this PR, and do we need to set specific values for production

Scripts

What scripts need to be run from the PR (e.g. if this is a report generating feature), and when (once, regularly, etc).

Migrations

What migrations need to be run to deploy this

Monitoring

What additional monitoring is required of the application as a result of this feature

New Infrastructure

What new infrastructure does this PR require (e.g. new services that need to run on the back-end).

Continuous Integration

What CI changes are required for this

philipkcl · 2024-03-06T14:07:57Z

new Goals Urlshort should be added to plausible
edges library updated for generate url shorten

richard-jones

Some structural changes, and a question about why a change to the core of edges, and a request to roll that back and submit it as a PR

doajtest/unit/test_lib_urlshort.py

richard-jones · 2024-03-18T16:22:05Z

portality/lib/urlshort.py

From a code organisation perspective, I'd like this to be a ShortURLService in portality.bll rather than in portality.lib and to follow the usual service pattern

move it to portality.bll should be fine.
About usual service pattern,

portality.bll.doaj.shortUrlService() should already resolve circle import problem, class a less flexible and complex than simple module file.

what is the benefit to make service as a class ?

There are a couple of reasons it's a class: one is just style preference, the other is that services can then be instantiated with arguments if needed, to enable alternative behaviours in different contexts (e.g. testing).

richard-jones · 2024-03-18T16:29:30Z

portality/static/vendor/edges

I'm unsure what's happening here, is this just an update to the latest edges develop branch? I can see at least one commit from a username I don't recognise in the edges develop branch, that needs to be rolled back and submitted as PR at least, because I don't see how a change to the URL shortener that DOAJ uses requires a core edges change (it shouldn't).

yes, I just update develop branch because I don't know the procedure of update submodule . That user name was my default name.

Reason of changing edges is because generateShortUrl only passing query to url shortener handler , logic of the value that showing in textbox and value that used to generate shortened url are different. That easy to making mismatch in what the user see and what actually generated.

here is edges PR

Feature/2881 url shortener CottageLabs/edges#18

richard-jones

Some architectural changes still

portality/app.py

portality/bll/doaj.py

richard-jones · 2024-04-18T14:18:30Z

portality/bll/services/urlshort.py

This file should be structured the same as the other services, for code style consistency

class have a lot of problem because it is stateful which mean high coupling, to make a program more simple I prefer not using class except the design need it.
functions in urlshort are no relation and independence each other.

about code style consistency, if you check javascript files, some components are start defined with class now instead of transitional function. If you read python build-in library, every module implemented in different style but build-in library still maintain very well.

So, Sorry but I will not update it if no other reason.

portality/bll/services/urlshort.py

richard-jones · 2024-04-18T14:26:12Z

portality/static/js/doaj.fieldrender.edges.js

@@ -1371,7 +1370,7 @@ $.extend(true, doaj, {
            this.toggleShorten = function(element) {
                if (!this.component.shortUrl) {
                    var callback = edges.objClosure(this, "updateShortUrl");
-                    this.component.generateShortUrl(callback);
+                    this.component.generateShortUrl(this.component.edge.fullUrl(), callback);


I've had a look at the downstream change to edges that this introduces, and we can't accept it. It changes the URL shortening approach, which will have downstream consequences for other users/projects. I'm not sure why you need to put this fullUrl cal here, edges can figure out the full url and ensure that there are no unwanted elements, so we should just leave this as it was.

richard-jones · 2024-04-18T14:27:34Z

portality/static/vendor/edges

We won't merge this change on edges, as noted above: it could cause problems for other users of the library, and takes away edges ability to control the URL. It's not a generic url shortener, it's specifically for creating short versions of edges urls, which means that internally it knows better how to generate them.

…007_remove_the_seal

…007_remove_the_seal # Conflicts: # doajtest/unit/application_processors/test_maned_journal_review.py # portality/forms/application_forms.py # portality/forms/application_processors.py # portality/static/js/doaj.fieldrender.edges.js # portality/templates-v2/public/layouts/toc.html

… in the data models, and remove the orcid and open citations elements. Also updates all the related tests, plus fixes some tests that appear broken in devleop

…rtener

richard-jones

In an attempt to fix some unrelated broken tests I have merged develop and also issue 4007. This has not completely resolved the issue, and makes this dependent on merging the seal code now

philipkcl added 14 commits March 4, 2024 11:47

move wait_unit

a586a21

move wait_unit

626c3f8

add urlshort

475d1a3

apply urlshort in frontend

6312f51

cleanup old url shortener

21ffdb5

add doc How to setup for dev with Plausible

3f411b5

add setup_dev_log

0581a02

commit edges

58b4fd2

add plausible for urlshort

eaba321

add more test cases

6909692

add note

b818da0

update edges

90b00d4

fix docs

50f995f

doc format

8068d94

philipkcl assigned richard-jones and Steven-Eardley and unassigned richard-jones and Steven-Eardley Mar 6, 2024

philipkcl requested review from richard-jones and Steven-Eardley March 6, 2024 13:14

philipkcl added 4 commits March 18, 2024 12:52

merge develop 240318

0a5d5cc

fix names wait_until

b60d6de

add url limit

3e4e3f3

limit by domain instead of paths

6d271ff

richard-jones requested changes Mar 18, 2024

View reviewed changes

philipkcl added 4 commits March 18, 2024 22:51

fix wait_until

194c8e1

fix some testcases

ff699dd

fix wait_until

7b173f7

avoid selenium test fail on circleci

1447101

philipkcl added 3 commits March 19, 2024 13:28

move urlshort to services

e3cf981

change generateShortUrl interface

085697a

change branch 2881_url_shortener

e9be06d

philipkcl requested a review from richard-jones March 20, 2024 10:53

richard-jones requested changes Apr 18, 2024

View reviewed changes

philipkcl added 5 commits April 19, 2024 13:52

add DEBUG_DEV_LOG

37163cf

remove lock and add URLSHORT_ALIAS_LENGTH

6b4d005

rename n_retry

91fbf53

reverse for old version edges urlshort interface

ed3eb06

merge develop 240503

6f42055

philipkcl requested a review from richard-jones May 3, 2024 12:40

RK206 and others added 15 commits February 12, 2025 10:03

Removed seal in some files

47817a0

Merge branch 'develop' of https://github.com/DOAJ/doaj into feature/4…

864c53c

…007_remove_the_seal

Removed seal

871ba00

Migration script to remove seal from indexed records

b5bcaa3

Removed requested metadata

e9c1b8d

merge changes from develop

925a90a

merge up from develop

1ca07dc

reinstate the oa statement, plagiarism url, and embedded licence link…

a6991ad

… in the data models, and remove the orcid and open citations elements. Also updates all the related tests, plus fixes some tests that appear broken in devleop

update a few remaining test references

6e31ccb

merge up from develop

4d77264

refactor short url generator

af772be

Merge branch 'develop' into feature/2881_url_shortener

dc84f21

Merge branch 'feature/4007_remove_the_seal' into feature/2881_url_sho…

60beaaf

…rtener

fix some test issues

d954a58

richard-jones reviewed Mar 31, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/2881 url shortener #2358

Feature/2881 url shortener #2358

philipkcl commented Mar 5, 2024 •

edited by richard-jones

Loading

philipkcl commented Mar 6, 2024

richard-jones left a comment

richard-jones Mar 18, 2024

philipkcl Mar 19, 2024 •

edited

Loading

richard-jones Apr 19, 2024

richard-jones Mar 18, 2024

philipkcl Mar 20, 2024

philipkcl Mar 20, 2024

richard-jones left a comment

richard-jones Apr 18, 2024

philipkcl Apr 19, 2024 •

edited

Loading

richard-jones Apr 18, 2024

richard-jones Apr 18, 2024

richard-jones left a comment

Feature/2881 url shortener #2358

Are you sure you want to change the base?

Feature/2881 url shortener #2358

Conversation

philipkcl commented Mar 5, 2024 • edited by richard-jones Loading

[2881] Make our own short URLs

Categorisation

Basic PR Checklist

Code Style

Testing

Documentation

Release Readiness

Testing

Deployment

Configuration changes

Scripts

Migrations

Monitoring

New Infrastructure

Continuous Integration

philipkcl commented Mar 6, 2024

richard-jones left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

philipkcl Mar 19, 2024 • edited Loading

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

richard-jones left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

philipkcl Apr 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

richard-jones left a comment

Choose a reason for hiding this comment

philipkcl commented Mar 5, 2024 •

edited by richard-jones

Loading

philipkcl Mar 19, 2024 •

edited

Loading

philipkcl Apr 19, 2024 •

edited

Loading