Skip to content

Commit

Permalink
remove code for old apis card display (#597)
Browse files Browse the repository at this point in the history
  • Loading branch information
geoffreyaldebert authored Nov 18, 2024
1 parent e776552 commit b5e7049
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 242 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Current (in progress)

- Display correct business documentation url link [#595](https://github.com/datagouv/udata-front/pull/595)
- Remove old display from api.gouv.fr in datasets pages [#597](https://github.com/datagouv/udata-front/pull/597)
- Change link to reuses search page instead of datasets search page in dataservice search page [#599](https://github.com/datagouv/udata-front/pull/599)

## 6.0.1 (2024-11-13)
Expand Down
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ def get_requirements():
'udata.harvesters': [
'maaf = udata_front.harvesters.maaf:MaafBackend',
],
'udata.tasks': [
'front = udata_front.tasks',
],
},
license='LGPL',
zip_safe=False,
Expand Down
11 changes: 0 additions & 11 deletions udata_front/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,3 @@

__version__ = '6.0.2.dev'
__description__ = 'udata customizations for data.gouv.fr'

APIGOUVFR_EXTRAS_KEY = 'apigouvfr:apis'
APIGOUVFR_EXPECTED_FIELDS = [
'title',
'tagline',
'path',
'slug',
'owner',
'openness',
'logo',
]
4 changes: 0 additions & 4 deletions udata_front/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
PAGES_GH_REPO_NAME = 'etalab/datagouvfr-pages'
PAGES_REPO_BRANCH = 'master'

# api.gouv.fr
APIGOUVFR_URL = 'https://api.gouv.fr/api/v1/apis'
APIGOUVFR_ALLOW_OPENNESS = ['open', 'semi_open']

# catalogue.data.gouv.fr
CATALOG_URL = 'https://catalogue.data.gouv.fr/'

Expand Down
63 changes: 0 additions & 63 deletions udata_front/tasks.py

This file was deleted.

39 changes: 0 additions & 39 deletions udata_front/tests/test_tasks.py

This file was deleted.

19 changes: 0 additions & 19 deletions udata_front/tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from udata.tests.helpers import assert200, assert404, assert_redirects, assert_equal_dates
from udata.frontend.markdown import md

from udata_front import APIGOUVFR_EXTRAS_KEY
from udata_front.models import SPD, TERRITORY_DATASETS
from udata_front.tests import GouvFrSettings

Expand Down Expand Up @@ -72,24 +71,6 @@ def test_render_dataset_page(self, client):
response = client.get(url_for('datasets.show', dataset=dataset))
assert200(response)

def test_render_dataset_w_api(self, client):
'''It should render the dataset page'''
dataset = DatasetFactory()
dataset.extras[APIGOUVFR_EXTRAS_KEY] = [{
'title': 'une API',
'tagline': 'tagline',
'path': '/path',
'slug': 'slug',
'owner': 'owner',
'openness': 'open',
'logo': '/logo.png',
}]
dataset.save()

response = client.get(url_for('datasets.show', dataset=dataset))
assert200(response)
assert 'une API' in response.data.decode('utf8')

def test_render_organization_page(self, client):
'''It should render the organization page'''
org = OrganizationFactory()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,38 +93,6 @@ const meta = {
}
}
}
],
"apigouvfr:apis": [
{
"title": "API Conventions collectives",
"tagline": "Retrouvez les conventions collectives d'une entreprise \u00e0 partir de son num\u00e9ro SIRET",
"path": "/les-api/api-conventions-collectives",
"slug": "api-conventions-collectives",
"openness": "open",
"owner": "Minist\u00e8re du Travail, de l'Emploi et de l'Insertion",
"owner_acronym": "MTEI",
"logo": "/images/api-logo/logo-mtei.png"
},
{
"title": "API Recherche d\u2019entreprises",
"tagline": "Rechercher une entreprise fran\u00e7aise, par sa d\u00e9nomination, ou son adresse",
"path": "/les-api/api-recherche-entreprises",
"slug": "api-recherche-entreprises",
"openness": "open",
"owner": "Direction Interminist\u00e9rielle du Num\u00e9rique",
"owner_acronym": "DINUM",
"logo": "/images/api-logo/dinum.png"
},
{
"title": "API Sirene",
"tagline": "Acc\u00e9der aux informations concernant les entreprises et les \u00e9tablissements immatricul\u00e9s au r\u00e9pertoire interadministratif Sirene de l'Insee",
"path": "/les-api/sirene_v3",
"slug": "sirene_v3",
"openness": "semi_open",
"owner": "Institut national de la statistique et des \u00e9tudes \u00e9conomiques",
"owner_acronym": "Insee",
"logo": "/images/api-logo/Logo_Insee.svg"
}
]
},
"metrics": {
Expand Down Expand Up @@ -475,18 +443,6 @@ const meta = {
"frequency": "quarterly",
"frequency_date": "2019-04-08T20:00:00+00:00",
"extras": {
"apigouvfr:apis": [
{
"title": "API Recherche d\u2019entreprises",
"tagline": "Rechercher une entreprise fran\u00e7aise, par sa d\u00e9nomination, ou son adresse",
"path": "/les-api/api-recherche-entreprises",
"slug": "api-recherche-entreprises",
"openness": "open",
"owner": "Direction Interminist\u00e9rielle du Num\u00e9rique",
"owner_acronym": "DINUM",
"logo": "/images/api-logo/dinum.png"
}
],
"recommendations": [
{
"id": "53699924a3a729239d205175",
Expand Down Expand Up @@ -849,28 +805,6 @@ const meta = {
],
"recommendations:sources": [
"edito"
],
"apigouvfr:apis": [
{
"title": "API Annuaire de l\u2019administration et des services publics",
"tagline": "Consultez les donn\u00e9es publiques de l\u2019annuaire de l\u2019administration \u2013 Service-public.fr.",
"path": "/les-api/api-annuaire-administration-services-publics",
"slug": "api-annuaire-administration-services-publics",
"openness": "open",
"owner": "Direction de l'information l\u00e9gale et administrative",
"owner_acronym": "DILA",
"logo": "/images/api-logo/dila.png"
},
{
"title": "Annuaire des \u00e9tablissements publics de l'administration",
"tagline": "L\u2019API qui r\u00e9f\u00e9rence les guichets publics locaux",
"path": "/les-api/api_etablissements_publics",
"slug": "api_etablissements_publics",
"openness": "open",
"owner": "Direction Interminist\u00e9rielle du Num\u00e9rique",
"owner_acronym": "DINUM",
"logo": "/images/api-logo/dinum.png"
}
]
},
"metrics": {
Expand Down Expand Up @@ -1402,18 +1336,6 @@ const meta = {
}
],
"transport:url": "https://transport.data.gouv.fr/datasets/base-adresse-nationale",
"apigouvfr:apis": [
{
"title": "API Adresse (Base Adresse Nationale - BAN)",
"tagline": "Interrogez la Base Adresse Nationale, base de donn\u00e9es de l\u2019int\u00e9gralit\u00e9 des adresses du territoire fran\u00e7ais",
"path": "/les-api/base-adresse-nationale",
"slug": "base-adresse-nationale",
"openness": "open",
"owner": "Direction Interminist\u00e9rielle du Num\u00e9rique",
"owner_acronym": "DINUM",
"logo": "/images/api-logo/dinum.png"
}
],
"recommendations:sources": [
"edito",
"matomo"
Expand Down Expand Up @@ -3445,18 +3367,6 @@ const sampleResults = JSON.stringify([
"frequency": "punctual",
"frequency_date": null,
"extras": {
"apigouvfr:apis": [
{
"title": "API Bulletin officiel des annonces des marchés publics (BOAMP)",
"tagline": "Rechercher et consulter les annonces du Bulletin Officiel des Annonces de Marchés Publics",
"path": "/les-api/api-annonces-marches-publics-boamp",
"slug": "api-annonces-marches-publics-boamp",
"openness": "open",
"owner": "Direction de l'information légale et administrative",
"owner_acronym": "DILA",
"logo": "/images/api-logo/dila.png"
}
]
},
"metrics": {
"discussions": 33,
Expand Down
13 changes: 0 additions & 13 deletions udata_front/views/gouvfr.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
from udata.models import Reuse, Dataset
from udata.i18n import I18nBlueprint

from udata_front import APIGOUVFR_EXTRAS_KEY

log = logging.getLogger(__name__)

blueprint = I18nBlueprint('gouvfr', __name__,
Expand Down Expand Up @@ -135,17 +133,6 @@ def suivi():
abort(404)


def has_apis(ctx):
dataset = ctx['dataset']
return dataset.extras.get(APIGOUVFR_EXTRAS_KEY, [])


@template_hook('dataset.display.after-files', when=has_apis)
def dataset_apis(ctx):
dataset = ctx['dataset']
return theme.render('dataset-apis.html', apis=dataset.extras.get(APIGOUVFR_EXTRAS_KEY))


@template_hook('oauth_authorize_theme_content')
def oauth_authorize_theme_content(ctx):
grant = ctx['grant']
Expand Down

0 comments on commit b5e7049

Please sign in to comment.