Merge pull request #194 from lehors/hide-more-fields

Hide more fields

Author: lehors

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
-        "drupal/block_exclude_pages": "^2.1",
+        "drupal/block_exclude_pages": "^2.2",
         "drupal/captcha": "^2.0",
         "drupal/cheeseburger_menu": "^5.0@RC",
         "drupal/core-composer-scaffold": "^10.5",

composer.lock

@@ -162,13 +162,8 @@
       },
       "required": [
         "name",
-        "version",
         "license",
-        "date",
-        "architecture",
-        "origin",
         "producer",
-        "contact",
         "components"
       ]
     }

schema/mof_schema.json

@@ -382,6 +382,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type): a
         'type' => 'text_default',
         'label' => 'above',
         'weight' => -90,
+        'region' => 'hidden',
       ])
       ->setDisplayConfigurable('view', TRUE)
       ->setRequired(FALSE);
@@ -400,6 +401,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type): a
         'type' => 'text_default',
         'label' => 'inline',
         'weight' => -80,
+        'region' => 'hidden',
       ])
       ->setDisplayConfigurable('view', TRUE)
       ->setRequired(FALSE);
@@ -430,6 +432,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type): a
         'label' => 'inline',
         'type' => 'string',
         'weight' => -60,
+        'region' => 'hidden',
       ])
       ->setDisplayConfigurable('view', TRUE);
 
@@ -463,6 +466,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type): a
         'label' => 'inline',
         'type' => 'string',
         'weight' => -50,
+        'region' => 'hidden',
       ])
       ->setDisplayConfigurable('view', TRUE);
 
@@ -486,6 +490,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type): a
         'label' => 'inline',
         'type' => 'string',
         'weight' => -40,
+        'region' => 'hidden',
       ])
       ->setDisplayConfigurable('view', TRUE);
 
@@ -505,6 +510,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type): a
         'label' => 'inline',
         'type' => 'string',
         'weight' => -30,
+        'region' => 'hidden',
       ])
       ->setDisplayConfigurable('view', TRUE);
 

web/modules/mof/src/Entity/Model.php

@@ -121,6 +121,12 @@ public function form(array $form, FormStateInterface $form_state): array {
     // The description field is not currently saved in the YAML model file so we may as well hide it away
     // until we decide whether to just get rid of it altogether or add it to the YAML file.
     $form['details']['description']['#access'] = FALSE;
+    // Hide more fields to keep input to the what's really useful and make the form simpler
+    $form['details']['version']['#access'] = FALSE;
+    $form['details']['type']['#access'] = FALSE;
+    $form['details']['architecture']['#access'] = FALSE;
+    $form['details']['treatment']['#access'] = FALSE;
+    $form['details']['origin']['#access'] = FALSE;
 
     // Model licenses to populate fields with a default value.
     $model_licenses = $this->entity->getLicenses() ?? [];

web/modules/mof/src/Form/ModelForm.php

@@ -38,13 +38,8 @@ public function normalize(ModelInterface $model): array {
       ],
       'release' => [
         'name' => $model->label(),
-        'version' => $model->getVersion() ?? '',
         'date' => date('Y-m-d', $model->getChangedTime()),
-        'type' => $model->getType() ?? '',
-        'architecture' => $model->getArchitecture() ?? '',
-        'origin' => $model->getOrigin() ?? '',
         'producer' => $model->getOrganization() ?? '',
-        'contact' => $owner->id() > 1 ? $owner->getEmail() : '',
         'repository' => $model->getRepository() ?? '',
         'huggingface' => $model->getHuggingface() ?? '',
       ],