Commit 2414b28a authored by FulcrandG's avatar FulcrandG
Browse files

Fixing getting linked issues as the label filter was not working

parent 2114226d

docs/css/extra.css

+3 −27
Original line number Diff line number Diff line
@@ -244,34 +244,10 @@ button.md-button-center:hover { 
    cursor: pointer;

}



div#issues_buttons span#linked_issues {

    display: inline;

}



div#issues_buttons:hover span#linked_issues {

    display: none;

}



div#issues_buttons span#linked_issues_hover {

    display: inline;

}



div#issues_buttons:hover span#linked_issues_hover {

.linked_issues:hover span {

    display: none;

}



div#issues_buttons span#create_issue {

    display: inline;

}



div#issues_buttons:hover span#create_issue {

    display: none;

}



div#issues_buttons span#create_issue_hover {

    display: inline;

}



div#issues_buttons:hover span#create_issue_hover {

    display: none;

.linked_issues:hover:before {

    content: attr(data-hover);

}
 
 No newline at end of file

tools/builder/builder.py

+9 −22
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ MKDOCS_PLACEHOLDER_FILE = "placeholder.md" 
JOB_CHANGELOG_DIR = "versions"

JOB_DESCRIPTION_FILE = "README.md"

JOB_METADATA_FILE = "job.yml"

ISSUES_LIMIT = 3

ISSUES_LIMIT = 5



# Requests variables

# Requests variable

GITLAB_BASE_URL = "https://gitlab.com/"

GITLAB_API_URL = "https://gitlab.com/api/v4/"

R2DEVOPS_URL = "https://jobs.r2devops.io/"
@@ -128,25 +128,12 @@ def get_linked_issues(job_name, opened=True): 
        'PRIVATE-TOKEN': JOB_TOKEN

    }

    base_url = f"{GITLAB_API_URL}/projects/{quote(PROJECT_NAME, safe='')}/issues"

    url = f"{base_url}?labels={JOBS_SCOPE_LABEL}{job_name}"

    if opened:

        payload = {

            "label": f"{JOBS_SCOPE_LABEL}{job_name}",

            "state": "opened"

        }

    else:

        payload = {

            "label": f"{JOBS_SCOPE_LABEL}{job_name}"

        }

    url = f"{base_url}?{urlencode(payload)}"

        url += "&state=opened"

    r = requests.get(url, headers=headers)



    ##

    from pprint import pprint

    pprint(r.json())

    ##



    for issue in r.json():

        if f"{JOBS_SCOPE_LABEL}{job_name}" in issue['labels']:

        linked_issues.append({

            "name": issue['title'],

            "url": issue['web_url'],

tools/builder/templates/job_documentation.md.j2

+9 −9
Original line number Diff line number Diff line 
{{ readme }}



{% if linked_issues %}



---



## Linked Issues



  {% for issue in linked_issues[:linked_issues_limit] %}
@@ -10,14 +12,12 @@ 
- And more...

  {% endif %}



<div id="issues_buttons">

  <a href="{{linked_issues_url}}" class="md-button border-radius-10 md-button-center">

    <span id="linked_issues">See all issues</span><span id="linked_issues_hover">🔎</span>

<a href="{{linked_issues_url}}" class="md-button border-radius-10 md-button-center" class="linked_issues" data-hover="🔎">

  <span>See all issues</span>

</a>

<a href="{{create_issue_url}}" class="md-button border-radius-10 md-button-center">

    <span id="create_issue">Create an issue</span><span id="create_issue_hover">➕</span>

  <span id="create_issue">Create an issue</span>

</a>

</div>

{% endif %}



---