Merge pull request #1529 from UUDigitalHumanitieslab/feature/angular-17

Feature/angular 17
CentreForDigitalHumanities · Jun 11, 2024 · 9d2b530 · 9d2b530
2 parents fe073d3 + 85e8793
commit 9d2b530
Show file tree

Hide file tree

Showing 40 changed files with 3,490 additions and 3,288 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16
+18.17.1
diff --git a/backend/corpora/dutchannualreports/dutchannualreports.py b/backend/corpora/dutchannualreports/dutchannualreports.py
@@ -72,7 +72,7 @@ def sources(self, start=min_date, end=max_date):
                 full_path = op.join(directory, filename)
                 file_path = op.join(rel_dir, filename)
                 image_path = op.join(
-                    rel_dir, name + '.' + self.scan_image_type)
+                    rel_dir, name + '.pdf')
                 if extension != '.xml':
                     logger.debug(self.non_xml_msg.format(full_path))
                     continue

diff --git a/backend/corpora/dutchnewspapers/dutchnewspapers_public.py b/backend/corpora/dutchnewspapers/dutchnewspapers_public.py
@@ -74,7 +74,7 @@ def sources(self, start=min_date, end=max_date):
                                 self.definition_pattern.search(filename)), None)
             if not definition_file:
                 continue
-            meta_dict = self.metadata_from_xml(definition_file, tags=[
+            meta_dict = self._metadata_from_xml(definition_file, tags=[
                     "title",
                     "date",
                     "publisher",

diff --git a/backend/corpora/ecco/ecco.py b/backend/corpora/ecco/ecco.py
@@ -91,7 +91,7 @@ def sources(self, start=min_date, end=max_date):
                             'Volume'
                         ]
 
-                        meta_dict = self.metadata_from_xml(
+                        meta_dict = self._metadata_from_xml(
                             full_path, tags=meta_tags)
                         meta_dict['id'] = record_id
                         meta_dict['category'] = category

diff --git a/backend/media/image_processing.py b/backend/media/image_processing.py
@@ -47,7 +47,7 @@ def retrieve_pdf(path):
     '''
     Retrieve the pdf as a file object.
     '''
-    pdf = PdfReader(path, 'rb')
+    pdf = PdfReader(path)
 
     return pdf
 

diff --git a/frontend/.browserslistrc b/frontend/.browserslistrc
@@ -2,11 +2,16 @@
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
 
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-> 0.5%
-last 2 versions
+defaults
+last 2 Chrome versions
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
 Firefox ESR
-not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
@@ -1,69 +1,60 @@
 {
-  "root": true,
-  "ignorePatterns": [
-    "projects/**/*"
-  ],
-  "overrides": [
-    {
-      "files": [
-        "*.ts"
-      ],
-      "parserOptions": {
-        "project": ["tsconfig.json"],
-        "createDefaultProgram": true
-      },
-      "extends": [
-        "plugin:@angular-eslint/ng-cli-compat",
-        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
-      "rules": {
-          "@angular-eslint/no-output-on-prefix": "off",
-          "@angular-eslint/component-selector": [
-              "error",
-              {
-                  "type": ["element", "attribute"],
-                  "prefix": "ia",
-                  "style": "kebab-case"
-              }
-          ],
-          "@angular-eslint/directive-selector": [
-              "error",
-              {
-                  "prefix": "ia"
-              }
-          ],
-          "@typescript-eslint/member-ordering": "warn",
-          "@typescript-eslint/naming-convention": [
-              "warn",
-              {
-                  "selector": "objectLiteralProperty",
-                  "format": ["camelCase", "snake_case", "PascalCase"],
-                  "leadingUnderscore": "allow"
-              }
-          ],
-          "@typescript-eslint/consistent-type-definitions": "error",
-          "@typescript-eslint/dot-notation": "off",
-          "id-blacklist": "off",
-          "no-underscore-dangle": "off",
-          "quotes": [
-              "warn",
-              "single",
-              {
-                  "avoidEscape": true,
-                  "allowTemplateLiterals": true
-              }
-          ]
-      }
-    },
-    {
-      "files": [
-        "*.html"
-      ],
-      "extends": [
-        "plugin:@angular-eslint/template/recommended"
-      ],
-      "rules": {}
-    }
-  ]
+    "root": true,
+    "ignorePatterns": ["projects/**/*"],
+    "plugins": ["@angular-eslint", "@typescript-eslint"],
+    "overrides": [
+        {
+            "files": ["*.ts"],
+            "parserOptions": {
+                "project": ["tsconfig.json"],
+                "createDefaultProgram": true
+            },
+            "extends": [
+                "plugin:@angular-eslint/template/process-inline-templates"
+            ],
+            "rules": {
+                "@angular-eslint/no-output-on-prefix": "off",
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": ["element", "attribute"],
+                        "prefix": "ia",
+                        "style": "kebab-case"
+                    }
+                ],
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "prefix": "ia"
+                    }
+                ],
+                "@typescript-eslint/member-ordering": "warn",
+                "@typescript-eslint/naming-convention": [
+                    "warn",
+                    {
+                        "selector": "objectLiteralProperty",
+                        "format": ["camelCase", "snake_case", "PascalCase"],
+                        "leadingUnderscore": "allow"
+                    }
+                ],
+                "@typescript-eslint/consistent-type-definitions": "error",
+                "@typescript-eslint/dot-notation": "off",
+                "id-blacklist": "off",
+                "no-underscore-dangle": "off",
+                "quotes": [
+                    "warn",
+                    "single",
+                    {
+                        "avoidEscape": true,
+                        "allowTemplateLiterals": true
+                    }
+                ]
+            }
+        },
+        {
+            "files": ["*.html"],
+            "extends": ["plugin:@angular-eslint/template/recommended"],
+            "rules": {}
+        }
+    ]
 }
diff --git a/frontend/angular.json b/frontend/angular.json
@@ -31,77 +31,82 @@
                   "buildOptimizer": false,
                   "sourceMap": true,
                   "optimization": false,
-                  "namedChunks": true
+                  "namedChunks": true,
+                  "allowedCommonJsDependencies": [
+                      "lodash",
+                      "moment",
+                      "ng2-pdf-viewer",
+                      "iv-viewer",
+                      "smoothscroll-polyfill",
+                      "file-saver",
+                      "pdfjs-dist"
+                  ]
               },
               "configurations": {
-                "production": {
-                    "optimization": true,
-                    "outputHashing": "all",
-                    "sourceMap": false,
-                    "namedChunks": false,
-                    "aot": true,
-                    "extractLicenses": true,
-                    "vendorChunk": false,
-                    "buildOptimizer": true,
-                    "fileReplacements": [
-                        {
-                            "replace": "src/environments/environment.ts",
-                            "with": "src/environments/environment.prod.ts"
-                        }
-                    ]
-                },
-                "git": {
-                    "optimization": true,
-                    "outputHashing": "all",
-                    "sourceMap": false,
-                    "namedChunks": false,
-                    "aot": true,
-                    "extractLicenses": true,
-                    "vendorChunk": false,
-                    "buildOptimizer": true,
-                    "fileReplacements": [
-                        {
-                            "replace": "src/environments/environment.ts",
-                            "with": "src/environments/environment.git.ts"
-                        }
-                    ]
-                }
-            },
+                  "production": {
+                      "optimization": true,
+                      "outputHashing": "all",
+                      "sourceMap": false,
+                      "namedChunks": false,
+                      "aot": true,
+                      "extractLicenses": true,
+                      "vendorChunk": false,
+                      "buildOptimizer": true,
+                      "fileReplacements": [
+                          {
+                              "replace": "src/environments/environment.ts",
+                              "with": "src/environments/environment.prod.ts"
+                          }
+                      ]
+                  },
+                  "git": {
+                      "optimization": true,
+                      "outputHashing": "all",
+                      "sourceMap": false,
+                      "namedChunks": false,
+                      "aot": true,
+                      "extractLicenses": true,
+                      "vendorChunk": false,
+                      "buildOptimizer": true,
+                      "fileReplacements": [
+                          {
+                              "replace": "src/environments/environment.ts",
+                              "with": "src/environments/environment.git.ts"
+                          }
+                      ]
+                  }
+              },
               "defaultConfiguration": ""
           },
           "serve": {
               "builder": "@angular-devkit/build-angular:dev-server",
-            "options": {},
+              "options": {},
               "configurations": {
-                "production": {
-                "browserTarget": "frontend:build:production"
-            },
-            "development": {
-                "browserTarget": "frontend:build"
-            }
-            },
-            "defaultConfiguration": "development"
+                  "production": {
+                    "buildTarget": "frontend:build:production"
+                  },
+                  "development": {
+                    "buildTarget": "frontend:build"
+                  }
+              },
+              "defaultConfiguration": "development"
           },
           "extract-i18n": {
               "builder": "@angular-devkit/build-angular:extract-i18n",
               "options": {
-                  "browserTarget": "frontend:build"
+                "buildTarget": "frontend:build"
               }
           },
           "test": {
               "builder": "@angular-devkit/build-angular:karma",
               "options": {
                   "main": "src/test.ts",
-                  "karmaConfig": "./karma.conf.js",
                   "polyfills": "src/polyfills.ts",
                   "tsConfig": "src/tsconfig.spec.json",
-                  "scripts": [],
-                  "styles": [
-                      "node_modules/primeicons/primeicons.css",
-                      "node_modules/primeng/resources/primeng.css",
-                      "src/styles.scss"
-                  ],
-                  "assets": ["src/assets"]
+                  "karmaConfig": "karma.conf.js",
+                  "assets": ["src/favicon.ico", "src/assets"],
+                  "styles": ["src/styles.scss"],
+                  "scripts": []
               }
           },
           "lint": {
@@ -113,7 +118,6 @@
       }
     }
   },
-  "defaultProject": "frontend",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "ia",
@@ -124,6 +128,7 @@
     }
   },
   "cli": {
-    "defaultCollection": "@angular-eslint/schematics"
+      "schematicCollections": ["@angular-eslint/schematics"],
+      "analytics": false
   }
 }