Drupal 11 migration - dwsim_flowsheet module

modules/custom/DWSIM_lab_migration_module/lab_migration.info.yml

@@ -1,6 +1,6 @@
-name: 'DWSIM  Lab Migration'
+name: 'DWSIM Lab Migration'
 description: 'IIT Bombay Lab Migration project'
 package: IITB
-core_version_requirement: ^8 || ^9 || ^10
+core_version_requirement: ^10 || ^11
 type: module
 dependencies: {  }

modules/custom/DWSIM_lab_migration_module/lab_migration.install

@@ -27,15 +27,15 @@
 //  */
 function lab_migration_uninstall()
   {
-    // Remove tables.
-    drupal_uninstall_schema('lab_migration');
     // Remove variables
-    \Drupal::config('lab_migration.settings')->clear('lab_migration_emails')->save();
-    \Drupal::config('lab_migration.settings')->clear('lab_migration_from_email')->save();
-    \Drupal::config('lab_migration.settings')->clear('lab_migration_source_extensions')->save();
-    \Drupal::config('lab_migration.settings')->clear('lab_migration_dependency_extensions')->save();
-    \Drupal::config('lab_migration.settings')->clear('lab_migration_result_extensions')->save();
-    \Drupal::config('lab_migration.settings')->clear('lab_migration_xcos_extensions')->save();
+    \Drupal::configFactory()->getEditable('lab_migration.settings')
+      ->clear('lab_migration_emails')
+      ->clear('lab_migration_from_email')
+      ->clear('lab_migration_source_extensions')
+      ->clear('lab_migration_dependency_extensions')
+      ->clear('lab_migration_result_extensions')
+      ->clear('lab_migration_xcos_extensions')
+      ->save();
   }
 /**
  * Implementation of hook_schema().

modules/custom/DWSIM_lab_migration_module/lab_migration.module

@@ -567,39 +567,24 @@ case 'solution_uploaded':
   /* Site name */
   $site_name = \Drupal::config('system.site')->get('name');
 
-  /* Headers */
+  /* Headers — normalise Cc/Bcc to prevent str_getcsv() fatal error */
   $headers = $params['solution_uploaded']['headers'] ?? [];
-
-  /* Prevent str_getcsv() fatal error */
   if (isset($headers['Cc']) && is_array($headers['Cc'])) {
     $headers['Cc'] = implode(',', $headers['Cc']);
   }
   if (isset($headers['Bcc']) && is_array($headers['Bcc'])) {
     $headers['Bcc'] = implode(',', $headers['Bcc']);
   }
+  $message['headers'] = $headers;
 
-$message['headers'] = $headers;
-
-  $message['subject'] = t('[@site] Your Lab migration solution proposal has been received', [
+  /* Subject */
+  $message['subject'] = t('[@site] You have uploaded Lab migration solution', [
     '@site' => $site_name,
   ]);
 
-/* VERY IMPORTANT: clear default body */
-
-$$user_data = User::load($params['solution_uploaded']['user_id']);
-
-$site_name = \Drupal::config('system.site')->get('name');
-
-$message['headers'] = $params['solution_uploaded']['headers'];
-
-$message['subject'] = t('[@site] You have uploaded Lab migration solution', [
-  '@site' => $site_name,
-]);
-
-// IMPORTANT: Reset body to avoid duplicated templates
-$message['body'] = [];
-
-$message['body'][] = t(
+  /* Body */
+  $message['body'] = [];
+  $message['body'][] = t(
 "Dear @name,
 
 You have uploaded the following solution:
@@ -615,15 +600,15 @@ Best Wishes,
 
 @site Team
 FOSSEE, IIT Bombay",
-[
-  '@site'   => $site_name,
-  '@name'        => $proposal_data->solution_provider_name,
-  '@experiment' => $experiment_data->title,
-  '@solution_no'=> $solution_data->code_number,
-  '@caption'    => $solution_data->caption,
-]);
+  [
+    '@site'        => $site_name,
+    '@name'        => $proposal_data->solution_provider_name,
+    '@experiment'  => $experiment_data->title,
+    '@solution_no' => $solution_data->code_number,
+    '@caption'     => $solution_data->caption,
+  ]);
 
-break;
+  break;
 
 case 'solution_proposal_received':
 
@@ -682,7 +667,7 @@ Dear @provider,
 We have received your proposal for providing solution for lab migration with the following details:
 
 List of experiments:
-!experiments
+@experiments
 
 Full Name: @fullname
 Email: @email
@@ -699,14 +684,14 @@ Best Wishes,
 
 @site Team
 FOSSEE, IIT Bombay', [
-    '@site'  => $site_name,
-    '@provider'  => $proposal_data->solution_provider_name,
+    '@site'        => $site_name,
+    '@provider'    => $proposal_data->solution_provider_name,
     '@experiments' => $experiment_list,
-    '@fullname'  => $proposal_data->solution_provider_name_title . ' ' . $proposal_data->solution_provider_name,
-    '@email'     => $user_data?->getEmail() ?? '',
-    '@phone'     => $proposal_data->solution_provider_contact_ph,
-    '@department'=> $proposal_data->department,
-    '@university'=> $proposal_data->solution_provider_university,
+    '@fullname'    => $proposal_data->solution_provider_name_title . ' ' . $proposal_data->solution_provider_name,
+    '@email'       => $user_data?->getEmail() ?? '',
+    '@phone'       => $proposal_data->solution_provider_contact_ph,
+    '@department'  => $proposal_data->department,
+    '@university'  => $proposal_data->solution_provider_university,
   ]);
 
   break;

modules/custom/DWSIM_lab_migration_module/lab_migration.routing.yml

@@ -65,10 +65,11 @@ lab_migration.proposal_approval_form:
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.solution_proposal_approval_form:
-  path: /lab-migration/manage-proposal/solution-proposal-approve
+  path: /lab-migration/manage-proposal/solution-proposal-approve/{proposal_id}
   defaults:
     _title: 'Approve Solution Proposal'
     _form: \Drupal\lab_migration\Form\LabMigrationSolutionProposalApprovalForm
+    proposal_id: 0
   requirements:
     _permission: 'lab migration manage proposal'
 lab_migration.proposal_edit_form:
@@ -125,17 +126,19 @@ lab_migration.bulk_approval_form:
   requirements:
     _permission: 'lab migration bulk manage code'
 lab_migration.bulk_upload_code_form:
-  path: /lab-migration/code-approval/upload
+  path: /lab-migration/code-approval/upload/{proposal_id}
   defaults:
     _title: 'Upload Code'
     _form: \Drupal\lab_migration\Form\LabMigrationBulkUploadCodeForm
+    proposal_id: 0
   requirements:
     _permission: 'lab migration bulk manage code'
 lab_migration.lab_notes_form:
-  path: /lab-migration/code-approval/notes
+  path: /lab-migration/code-approval/notes/{proposal_id}
   defaults:
     _title: 'Notes for Reviewers'
     _form: \Drupal\lab_migration\Form\LabMigrationLabNotesForm
+    proposal_id: 0
   requirements:
     _permission: 'lab migration bulk manage code'
 lab_migration.list_experiments:

modules/custom/DWSIM_lab_migration_module/lab_migration.services.yml

@@ -1,13 +1,18 @@
-
 services:
   lab_migration_global:
     class: '\Drupal\lab_migration\Services\LabMigrationGlobalfunction'
+    arguments:
+      - '@database'
+      - '@messenger'
+      - '@current_user'
+      - '@module_handler'
+      - '@file_system'
+      - '@lab_migration.mail_service'
 
-  lab_migration_email:
-    class:  '\Drupal\lab_migration\Services\LabMigrationEmailFunction'
-
-  lab_migration.form.lab_migration_proposal_approval:
-    class: Drupal\lab_migration\Form\LabMigrationProposalApprovalForm
-    arguments: ['@plugin.manager.mail']
+  lab_migration.mail_service:
+    class: '\Drupal\lab_migration\Services\MailService'
+    arguments: ['@plugin.manager.mail', '@logger.factory', '@config.factory', '@language_manager']
 
-
+  lab_migration.ajax_helper:
+    class: '\Drupal\lab_migration\Services\AjaxHelper'
+    arguments: ['@renderer']