chore: provide new form modifier, remove type from item properties

actions/class.Tests.php

@@ -32,6 +32,7 @@
 use oat\tao\model\controller\SignedFormInstance;
 use oat\tao\model\resources\Service\ClassDeleter;
 use oat\tao\model\routing\AnnotationReader\security;
+use oat\taoTests\models\Form\Modifier\FormModifierProxy;
 use oat\taoTests\models\Translation\Form\Modifier\TranslationFormModifierProxy;
 use tao_helpers_form_FormContainer as FormContainer;
 use oat\generis\model\resource\Service\ResourceDeleter;
@@ -116,6 +117,7 @@ public function editTest()
                         ],
                     ],
                     FormContainer::FORM_MODIFIERS => [
+                        FormModifierProxy::class,
                         TranslationFormModifierProxy::class,
                     ],
                 ]

manifest.php

@@ -32,6 +32,7 @@
 use oat\tao\model\accessControl\func\AccessRule;
 use oat\tao\model\user\TaoRoles;
 use oat\taoTests\models\Copier\CopierServiceProvider;
+use oat\taoTests\models\Form\ServiceProvider\FormServiceProvider;
 use oat\taoTests\models\Translation\ServiceProvider\TranslationServiceProvider;
 use oat\taoTests\models\user\TaoTestsRoles;
 use oat\taoTests\scripts\install\RegisterFrontendPaths;
@@ -134,5 +135,6 @@
     'containerServiceProviders' => [
         CopierServiceProvider::class,
         TranslationServiceProvider::class,
+        FormServiceProvider::class,
     ],
 ];

models/classes/Form/Modifier/FormModifierProxy.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2024 (original work) Open Assessment Technologies SA.
+ */
+
+declare(strict_types=1);
+
+namespace oat\taoTests\models\Form\Modifier;
+
+use oat\tao\model\form\Modifier\AbstractFormModifier;
+
+final class FormModifierProxy extends AbstractFormModifier
+{
+}

models/classes/Form/ServiceProvider/FormServiceProvider.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2024 (original work) Open Assessment Technologies SA.
+ */
+
+declare(strict_types=1);
+
+namespace oat\taoTests\models\Form\ServiceProvider;
+
+use oat\generis\model\DependencyInjection\ContainerServiceProviderInterface;
+use oat\tao\model\form\Modifier\UniqueIdFormModifier;
+use oat\taoTests\models\Form\Modifier\FormModifierProxy;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+class FormServiceProvider implements ContainerServiceProviderInterface
+{
+    public function __invoke(ContainerConfigurator $configurator): void
+    {
+        $services = $configurator->services();
+
+        $services
+            ->set(FormModifierProxy::class, FormModifierProxy::class)
+            ->public();
+
+        $services
+            ->get(FormModifierProxy::class)
+            ->call(
+                'addModifier',
+                [
+                    service(UniqueIdFormModifier::class),
+                ]
+            );
+    }
+}

models/classes/Translation/Form/Modifier/TranslationFormModifier.php

@@ -22,6 +22,7 @@
 
 namespace oat\taoTests\models\Translation\Form\Modifier;
 
+use oat\generis\model\data\Ontology;
 use oat\tao\model\featureFlag\FeatureFlagCheckerInterface;
 use oat\tao\model\form\Modifier\AbstractFormModifier;
 use oat\tao\model\TaoOntology;
@@ -32,10 +33,12 @@
 class TranslationFormModifier extends AbstractFormModifier
 {
     private FeatureFlagCheckerInterface $featureFlagChecker;
+    private Ontology $ontology;
 
-    public function __construct(FeatureFlagCheckerInterface $featureFlagChecker)
+    public function __construct(FeatureFlagCheckerInterface $featureFlagChecker, Ontology $ontology)
     {
         $this->featureFlagChecker = $featureFlagChecker;
+        $this->ontology = $ontology;
     }
 
     public function modify(Form $form, array $options = []): void
@@ -44,11 +47,15 @@ public function modify(Form $form, array $options = []): void
             $form->removeElement(tao_helpers_Uri::encode(TaoTestOntology::PROPERTY_TRANSLATION_COMPLETION));
         }
 
-        $translationTypeValue = $form->getValue(tao_helpers_Uri::encode(TaoOntology::PROPERTY_TRANSLATION_TYPE));
+        $instance = $this->ontology->getResource($form->getValue('uri'));
+
+        $translationType = $instance->getOnePropertyValue(
+            $this->ontology->getProperty(TaoOntology::PROPERTY_TRANSLATION_TYPE)
+        );
 
         if (
-            empty($translationTypeValue)
-            || $translationTypeValue === TaoOntology::PROPERTY_VALUE_TRANSLATION_TYPE_ORIGINAL
+            empty($translationType)
+            || $translationType->getUri() === TaoOntology::PROPERTY_VALUE_TRANSLATION_TYPE_ORIGINAL
         ) {
             $form->removeElement(tao_helpers_Uri::encode(TaoTestOntology::PROPERTY_TRANSLATION_COMPLETION));
         }

models/classes/Translation/ServiceProvider/TranslationServiceProvider.php

@@ -63,6 +63,7 @@ public function __invoke(ContainerConfigurator $configurator): void
             ->set(TranslationFormModifier::class, TranslationFormModifier::class)
             ->args([
                 service(FeatureFlagChecker::class),
+                service(Ontology::SERVICE_ID),
             ]);
 
         $services

models/ontology/taotest.rdf

@@ -117,9 +117,6 @@
   <rdf:Description rdf:about="http://www.tao.lu/Ontologies/TAO.rdf#Language">
     <rdfs:domain rdf:resource="http://www.tao.lu/Ontologies/TAOTest.rdf#Test"/>
   </rdf:Description>
-  <rdf:Description rdf:about="http://www.tao.lu/Ontologies/TAO.rdf#TranslationType">
-    <rdfs:domain rdf:resource="http://www.tao.lu/Ontologies/TAOTest.rdf#Test"/>
-  </rdf:Description>
   <rdf:Description rdf:about="http://www.tao.lu/Ontologies/TAO.rdf#TranslationStatus">
     <rdfs:domain rdf:resource="http://www.tao.lu/Ontologies/TAOTest.rdf#Test"/>
   </rdf:Description>
@@ -133,7 +130,7 @@
     <rdfs:label xml:lang="en-US"><![CDATA[Translation Completion]]></rdfs:label>
     <rdfs:comment xml:lang="en-US"><![CDATA[Translation Completion]]></rdfs:comment>
     <rdfs:range rdf:resource="http://www.tao.lu/Ontologies/TAOTest.rdf#TranslationCompletionStatuses"/>
-    <widget:widget rdf:resource="http://www.tao.lu/datatypes/WidgetDefinitions.rdf#ComboBox"/>
+    <widget:widget rdf:resource="http://www.tao.lu/datatypes/WidgetDefinitions.rdf#Readonly"/>
     <tao:TAOGUIOrder><![CDATA[2005]]></tao:TAOGUIOrder>
   </rdf:Description>
 </rdf:RDF>