0001-build-check-config.json-validity-during-build-38354.patch

Frédéric Péters, 10 décembre 2019 14:47

Voir les différences: en ligne côte à côte

Subject: [PATCH] build: check config.json validity during build (#38354)

 create_themes_json.py                      | 36 ++++++++++++++++++++++
 static/alpes-maritimes-2018/config.json    |  4 +--
 static/bouches-du-rhone/config.json        |  2 +-
 static/entrouvert/config.json              |  2 +-
 static/grenoble-metropole-2019/config.json |  2 +-
 static/quimper/config.json                 |  2 +-
 static/toulouse-metropole/config.json      |  2 +-
 7 files changed, 43 insertions(+), 7 deletions(-)

     import argparse
     import json
     import os
     import re
     import sys
     import xml.etree.ElementTree as ET
     parser = argparse.ArgumentParser()
-...
     args = parser.parse_args()
     # get themes
     errors = False
     themes = []
     for dirname in sorted(os.listdir('static')):
         config = os.path.join('static', dirname, 'config.json')
-...
         if args.overlay:
             theme['module'] = 'publik-base'
             theme['overlay'] = args.overlay
         # validation checks
         theme_color = theme['variables'].get('theme_color')
         if theme_color and not re.match(r'#[0-9a-fA-F]{6}$', theme_color):
             print('E: invalid theme color for %s (%s)' % (dirname, theme_color), file=sys.stderr)
             errors = True
         if theme.get('settings'):
             for settings_app in theme['settings']:
                 if settings_app not in ('authentic2', 'combo', 'fargo', 'wcs'):
                     print('E: unknown application key for %s (%s)' % (dirname, settings_app), file=sys.stderr)
                     errors = True
                     continue
                 if settings_app == 'combo':
                     for settings_key in theme['settings'][settings_app].keys():
                         if settings_key not in (
                              'COMBO_ASSET_SLOTS.update',
                              'COMBO_MAP_ATTRIBUTION',
                              'COMBO_MAP_DEFAULT_POSITION',
                              'COMBO_MAP_MAX_BOUNDS',
                              'COMBO_MAP_TILE_URLTEMPLATE',
                              'COMBO_PUBLIC_TEMPLATES.update',
                              'JSON_CELL_TYPES.update',
                              'PWA_NOTIFICATION_BADGE_URL',
                              'PWA_NOTIFICATION_ICON_URL',
                              'WCS_CATEGORY_ASSET_SLOTS',
                              'WCS_FORM_ASSET_SLOTS',
                              ):
                             print('E: unknown settings key for %s (%s)' % (dirname, settings_key), file=sys.stderr)
                             errors = True
         themes.append(theme)
     if errors:
         sys.exit(1)
     # get parameters
     parameters = {'primary-color': {'type': 'color'}}
     if os.path.exists('help/fr/misc-scss.page'):

       "label": "Alpes-Maritimes 2018",
       "settings": {
           "combo": {
               "COMBO_ASSET_SLOTS": {
               "COMBO_ASSET_SLOTS.update": {
                   "social:dossiers:autonomie": {
                       "label": "Pictogramme dossier autonomie"
                   },
-...
                       "label": "Pictogramme dossier handicap"
+                  }
               },
               "JSON_CELL_TYPES": {
               "JSON_CELL_TYPES.update": {
                   "desappairage": {
                       "form": [
+                        {

       },
       "settings": {
           "combo": {
               "JSON_CELL_TYPES": {
               "JSON_CELL_TYPES.update": {
                   "cd13_liste_des_dossiers": {
                       "cache_duration": 10,
                       "name": "Liste des dossiers",

       },
       "settings": {
         "combo": {
           "JSON_CELL_TYPES": {
           "JSON_CELL_TYPES.update": {
             "references": {
               "name": "References",
               "url": "https://gestion.entrouvert.org/api/references/",

                   "corner1": {"lat": "45.2307", "lng": "5.6640"},
                   "corner2": {"lat": "45.1179", "lng": "5.7980"}
               },
               "JSON_CELL_TYPES": {
               "JSON_CELL_TYPES.update": {
                   "user": {
                       "cache_duration": 60,
                       "name": "Cellule usager",

           },
           "COMBO_MAP_TILE_URLTEMPLATE": "https://tiles.entrouvert.org/hdm/{z}/{x}/{y}.png",
           "COMBO_MAP_ATTRIBUTION": "&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a>",
           "JSON_CELL_TYPES": {
           "JSON_CELL_TYPES.update": {
             "parkings": {
               "url": "https://places-parkings.quimper-communaute.bzh/WebServiceInfosGeolocFront.asmx/GetGeoJsonListDysplayItemByType?type=parkings",
               "name": "Parkings",

       },
       "settings": {
         "combo": {
           "JSON_CELL_TYPES": {
           "JSON_CELL_TYPES.update": {
             "communes-toulouse": {
               "url": "https://data.toulouse-metropole.fr/api/records/1.0/search/?dataset=communes-de-toulouse-metropole&sort=ville&rows=100",
               "name": "Communes de Toulouse",
+    -

Projet

Général

Profil

Produits Entr'ouvert » Intégrations graphiques Publik

0001-build-check-config.json-validity-during-build-38354.patch