This is an automated email from the ASF dual-hosted git repository.
yasithdev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airavata-portals.git
The following commit(s) were added to refs/heads/main by this push:
new 7ee3f163c refactor: drop server-removed fields from portal clients
(#221)
7ee3f163c is described below
commit 7ee3f163c2902bdec78f0790e8ba1660020e500f
Author: Yasith Jayawardana <[email protected]>
AuthorDate: Sat Jun 13 16:16:58 2026 -0400
refactor: drop server-removed fields from portal clients (#221)
Mirrors the server-side data-layer cleanup. Drops the removed
process_workflows field and ProcessWorkflow model, the research-resource
status/StatusEnum, and the grid-cert-legacy user_dn/generate_cert fields from
the Django API JS models and the research-portal TypeScript interfaces, and
strips the same fields from the legacy PHP gateway's Thrift models and
experiment form/controller. No behavior change: these are all fields the server
no longer exposes.
---
.../django_airavata_api/js/models/ProcessModel.js | 8 -
.../js/models/ProcessWorkflow.js | 17 --
.../js/models/UserConfigurationData.js | 6 -
.../app/Http/Controllers/ExperimentController.php | 1 -
.../libraries/Airavata/Model/Experiment/Types.php | 46 ----
.../app/libraries/Airavata/Model/Process/Types.php | 241 ---------------------
.../app/libraries/ExperimentUtilities.php | 8 -
.../views/partials/experiment-inputs.blade.php | 12 -
.../src/interfaces/ResourceType.ts | 2 -
.../src/interfaces/StatusEnum.ts | 6 -
10 files changed, 347 deletions(-)
diff --git
a/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/ProcessModel.js
b/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/ProcessModel.js
index 6487f87fe..e097f632d 100644
---
a/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/ProcessModel.js
+++
b/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/ProcessModel.js
@@ -5,7 +5,6 @@ import OutputDataObjectType from "./OutputDataObjectType";
import ComputationalResourceSchedulingModel from
"./ComputationalResourceSchedulingModel";
import Task from "./Task";
import ErrorModel from "./ErrorModel";
-import ProcessWorkflow from "./ProcessWorkflow";
const FIELDS = [
"process_id",
@@ -57,17 +56,10 @@ const FIELDS = [
"email_addresses",
"input_storage_resource_id",
"output_storage_resource_id",
- "user_dn",
- "generate_cert",
"experiment_data_dir",
"user_name",
"use_user_cr_pref",
"group_resource_profile_id",
- {
- name: "process_workflows",
- type: ProcessWorkflow,
- list: true,
- },
];
export default class ProcessModel extends BaseModel {
diff --git
a/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/ProcessWorkflow.js
b/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/ProcessWorkflow.js
deleted file mode 100644
index 905f8dfe7..000000000
---
a/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/ProcessWorkflow.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import BaseModel from "./BaseModel";
-
-const FIELDS = [
- "process_id",
- "workflow_id",
- {
- name: "creation_time",
- type: "date",
- },
- "type",
-];
-
-export default class ProcessWorkflow extends BaseModel {
- constructor(data = {}) {
- super(FIELDS, data);
- }
-}
diff --git
a/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/UserConfigurationData.js
b/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/UserConfigurationData.js
index 3d651a883..230d6c1db 100644
---
a/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/UserConfigurationData.js
+++
b/airavata-django-portal/django_airavata/apps/api/static/django_airavata_api/js/models/UserConfigurationData.js
@@ -27,12 +27,6 @@ const FIELDS = [
type: "boolean",
default: false,
},
- "user_dn",
- {
- name: "generate_cert",
- type: "boolean",
- default: false,
- },
"input_storage_resource_id",
"output_storage_resource_id",
"experiment_data_dir",
diff --git a/airavata-php-gateway/app/Http/Controllers/ExperimentController.php
b/airavata-php-gateway/app/Http/Controllers/ExperimentController.php
index 16ed1f015..379432b87 100755
--- a/airavata-php-gateway/app/Http/Controllers/ExperimentController.php
+++ b/airavata-php-gateway/app/Http/Controllers/ExperimentController.php
@@ -338,7 +338,6 @@ class ExperimentController extends BaseController
"experimentDescription" => $experiment->description,
"application" => $experiment->executionId,
"autoSchedule" =>
$experiment->userConfigurationData->airavataAutoSchedule,
- "userDN" => $experiment->userConfigurationData->userDN,
"userHasComputeResourcePreference" =>
$userHasComputeResourcePreference,
"useUserCRPref" =>
$experiment->userConfigurationData->useUserCRPref,
"allowedFileSize" => $this->getAllowedFileSize(),
diff --git
a/airavata-php-gateway/app/libraries/Airavata/Model/Experiment/Types.php
b/airavata-php-gateway/app/libraries/Airavata/Model/Experiment/Types.php
index 56f77cd6f..921b95530 100644
--- a/airavata-php-gateway/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/airavata-php-gateway/app/libraries/Airavata/Model/Experiment/Types.php
@@ -86,14 +86,6 @@ class UserConfigurationDataModel {
* @var bool
*/
public $throttleResources = false;
- /**
- * @var string
- */
- public $userDN = null;
- /**
- * @var bool
- */
- public $generateCert = false;
/**
* @var string
*/
@@ -135,14 +127,6 @@ class UserConfigurationDataModel {
'var' => 'throttleResources',
'type' => TType::BOOL,
),
- 6 => array(
- 'var' => 'userDN',
- 'type' => TType::STRING,
- ),
- 7 => array(
- 'var' => 'generateCert',
- 'type' => TType::BOOL,
- ),
8 => array(
'var' => 'storageId',
'type' => TType::STRING,
@@ -177,12 +161,6 @@ class UserConfigurationDataModel {
if (isset($vals['throttleResources'])) {
$this->throttleResources = $vals['throttleResources'];
}
- if (isset($vals['userDN'])) {
- $this->userDN = $vals['userDN'];
- }
- if (isset($vals['generateCert'])) {
- $this->generateCert = $vals['generateCert'];
- }
if (isset($vals['storageId'])) {
$this->storageId = $vals['storageId'];
}
@@ -253,20 +231,6 @@ class UserConfigurationDataModel {
$xfer += $input->skip($ftype);
}
break;
- case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userDN);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->generateCert);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 8:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->storageId);
@@ -336,16 +300,6 @@ class UserConfigurationDataModel {
$xfer += $output->writeBool($this->throttleResources);
$xfer += $output->writeFieldEnd();
}
- if ($this->userDN !== null) {
- $xfer += $output->writeFieldBegin('userDN', TType::STRING, 6);
- $xfer += $output->writeString($this->userDN);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->generateCert !== null) {
- $xfer += $output->writeFieldBegin('generateCert', TType::BOOL, 7);
- $xfer += $output->writeBool($this->generateCert);
- $xfer += $output->writeFieldEnd();
- }
if ($this->storageId !== null) {
$xfer += $output->writeFieldBegin('storageId', TType::STRING, 8);
$xfer += $output->writeString($this->storageId);
diff --git
a/airavata-php-gateway/app/libraries/Airavata/Model/Process/Types.php
b/airavata-php-gateway/app/libraries/Airavata/Model/Process/Types.php
index 555ff92cf..ae27d220c 100644
--- a/airavata-php-gateway/app/libraries/Airavata/Model/Process/Types.php
+++ b/airavata-php-gateway/app/libraries/Airavata/Model/Process/Types.php
@@ -17,150 +17,6 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
use Thrift\Exception\TApplicationException;
-class ProcessWorkflow {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $processId = null;
- /**
- * @var string
- */
- public $workflowId = null;
- /**
- * @var int
- */
- public $creationTime = null;
- /**
- * @var string
- */
- public $type = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'processId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'workflowId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'creationTime',
- 'type' => TType::I64,
- ),
- 4 => array(
- 'var' => 'type',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['processId'])) {
- $this->processId = $vals['processId'];
- }
- if (isset($vals['workflowId'])) {
- $this->workflowId = $vals['workflowId'];
- }
- if (isset($vals['creationTime'])) {
- $this->creationTime = $vals['creationTime'];
- }
- if (isset($vals['type'])) {
- $this->type = $vals['type'];
- }
- }
- }
-
- public function getName() {
- return 'ProcessWorkflow';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->processId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->workflowId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->creationTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->type);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('ProcessWorkflow');
- if ($this->processId !== null) {
- $xfer += $output->writeFieldBegin('processId', TType::STRING, 1);
- $xfer += $output->writeString($this->processId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->workflowId !== null) {
- $xfer += $output->writeFieldBegin('workflowId', TType::STRING, 2);
- $xfer += $output->writeString($this->workflowId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 3);
- $xfer += $output->writeI64($this->creationTime);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->type !== null) {
- $xfer += $output->writeFieldBegin('type', TType::STRING, 4);
- $xfer += $output->writeString($this->type);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
/**
* ProcessModel: A structure holding the process details. The infromation is
derived based on user provided
* configuration data or system inferred information from scheduling
and QoS parameters.
@@ -249,14 +105,6 @@ class ProcessModel {
* @var string
*/
public $storageResourceId = null;
- /**
- * @var string
- */
- public $userDn = null;
- /**
- * @var bool
- */
- public $generateCert = false;
/**
* @var string
*/
@@ -273,10 +121,6 @@ class ProcessModel {
* @var string
*/
public $groupResourceProfileId = null;
- /**
- * @var \Airavata\Model\Process\ProcessWorkflow[]
- */
- public $processWorkflows = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -387,14 +231,6 @@ class ProcessModel {
'var' => 'storageResourceId',
'type' => TType::STRING,
),
- 20 => array(
- 'var' => 'userDn',
- 'type' => TType::STRING,
- ),
- 21 => array(
- 'var' => 'generateCert',
- 'type' => TType::BOOL,
- ),
22 => array(
'var' => 'experimentDataDir',
'type' => TType::STRING,
@@ -411,15 +247,6 @@ class ProcessModel {
'var' => 'groupResourceProfileId',
'type' => TType::STRING,
),
- 26 => array(
- 'var' => 'processWorkflows',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Process\ProcessWorkflow',
- ),
- ),
);
}
if (is_array($vals)) {
@@ -480,12 +307,6 @@ class ProcessModel {
if (isset($vals['storageResourceId'])) {
$this->storageResourceId = $vals['storageResourceId'];
}
- if (isset($vals['userDn'])) {
- $this->userDn = $vals['userDn'];
- }
- if (isset($vals['generateCert'])) {
- $this->generateCert = $vals['generateCert'];
- }
if (isset($vals['experimentDataDir'])) {
$this->experimentDataDir = $vals['experimentDataDir'];
}
@@ -498,9 +319,6 @@ class ProcessModel {
if (isset($vals['groupResourceProfileId'])) {
$this->groupResourceProfileId = $vals['groupResourceProfileId'];
}
- if (isset($vals['processWorkflows'])) {
- $this->processWorkflows = $vals['processWorkflows'];
- }
}
}
@@ -722,20 +540,6 @@ class ProcessModel {
$xfer += $input->skip($ftype);
}
break;
- case 20:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userDn);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 21:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->generateCert);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 22:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->experimentDataDir);
@@ -764,24 +568,6 @@ class ProcessModel {
$xfer += $input->skip($ftype);
}
break;
- case 26:
- if ($ftype == TType::LST) {
- $this->processWorkflows = array();
- $_size36 = 0;
- $_etype39 = 0;
- $xfer += $input->readListBegin($_etype39, $_size36);
- for ($_i40 = 0; $_i40 < $_size36; ++$_i40)
- {
- $elem41 = null;
- $elem41 = new \Airavata\Model\Process\ProcessWorkflow();
- $xfer += $elem41->read($input);
- $this->processWorkflows []= $elem41;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -965,16 +751,6 @@ class ProcessModel {
$xfer += $output->writeString($this->storageResourceId);
$xfer += $output->writeFieldEnd();
}
- if ($this->userDn !== null) {
- $xfer += $output->writeFieldBegin('userDn', TType::STRING, 20);
- $xfer += $output->writeString($this->userDn);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->generateCert !== null) {
- $xfer += $output->writeFieldBegin('generateCert', TType::BOOL, 21);
- $xfer += $output->writeBool($this->generateCert);
- $xfer += $output->writeFieldEnd();
- }
if ($this->experimentDataDir !== null) {
$xfer += $output->writeFieldBegin('experimentDataDir', TType::STRING,
22);
$xfer += $output->writeString($this->experimentDataDir);
@@ -995,23 +771,6 @@ class ProcessModel {
$xfer += $output->writeString($this->groupResourceProfileId);
$xfer += $output->writeFieldEnd();
}
- if ($this->processWorkflows !== null) {
- if (!is_array($this->processWorkflows)) {
- throw new TProtocolException('Bad type in structure.',
TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('processWorkflows', TType::LST, 26);
- {
- $output->writeListBegin(TType::STRUCT, count($this->processWorkflows));
- {
- foreach ($this->processWorkflows as $iter48)
- {
- $xfer += $iter48->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
diff --git a/airavata-php-gateway/app/libraries/ExperimentUtilities.php
b/airavata-php-gateway/app/libraries/ExperimentUtilities.php
index fd7bd6f36..e5648d99f 100755
--- a/airavata-php-gateway/app/libraries/ExperimentUtilities.php
+++ b/airavata-php-gateway/app/libraries/ExperimentUtilities.php
@@ -331,10 +331,6 @@ class ExperimentUtilities
$userConfigData->computationalResourceScheduling = $scheduling;
$userConfigData->storageId =
Config::get('pga_config.airavata')['gateway-data-store-resource-id'];
$userConfigData->airavataAutoSchedule =
isset($_POST['enable-auto-scheduling']) ? true : false;
- if (isset($_POST["userDN"])) {
- $userConfigData->generateCert = 1;
- $userConfigData->userDN = $_POST["userDN"];
- }
$userConfigData->useUserCRPref = isset($_POST['use-user-cr-pref']) ?
true : false;
if
(isset(Config::get('pga_config.airavata')['group-resource-profile-id'])) {
$userConfigData->groupResourceProfileId =
Config::get('pga_config.airavata')['group-resource-profile-id'];
@@ -1408,10 +1404,6 @@ class ExperimentUtilities
$userConfigDataUpdated->computationalResourceScheduling =
$schedulingUpdated;
$userConfigDataUpdated->airavataAutoSchedule =
isset($_POST['enable-auto-scheduling']) ? true : false;
- if (isset($input["userDN"])) {
- $userConfigDataUpdated->generateCert = 1;
- $userConfigDataUpdated->userDN = $input["userDN"];
- }
$userConfigDataUpdated->useUserCRPref =
isset($_POST['use-user-cr-pref']) ? true : false;
if
(isset(Config::get('pga_config.airavata')['group-resource-profile-id'])) {
$userConfigDataUpdated->groupResourceProfileId =
Config::get('pga_config.airavata')['group-resource-profile-id'];
diff --git
a/airavata-php-gateway/resources/views/partials/experiment-inputs.blade.php
b/airavata-php-gateway/resources/views/partials/experiment-inputs.blade.php
index 4c48fbd69..7913e7ae2 100644
--- a/airavata-php-gateway/resources/views/partials/experiment-inputs.blade.php
+++ b/airavata-php-gateway/resources/views/partials/experiment-inputs.blade.php
@@ -126,16 +126,4 @@
<button type="button" class="addEmail btn btn-default">Add another
Email</button>
</div>
</div>
-
- @if( $expInputs["advancedOptions"])
- <h3>Advanced Options</h3>
-
- <div class="form-group well">
- <h4>Enter UserDN</h4>
-
- <div class="userdninfo">
- <input type="text" class="form-control" name="userDN"
placeholder="user" value="{{$expInputs['userDN']}}"/>
- </div>
- </div>
- @endif
</div>
diff --git a/airavata-research-portal/src/interfaces/ResourceType.ts
b/airavata-research-portal/src/interfaces/ResourceType.ts
index 32d4f697a..eadf6fe13 100644
--- a/airavata-research-portal/src/interfaces/ResourceType.ts
+++ b/airavata-research-portal/src/interfaces/ResourceType.ts
@@ -1,6 +1,5 @@
import { PrivacyEnum } from "./PrivacyEnum";
import { ResourceTypeEnum } from "./ResourceTypeEnum";
-import { StatusEnum } from "./StatusEnum";
import { Tag } from "./TagType";
// import { User } from "./UserType";
@@ -11,7 +10,6 @@ export interface Resource {
headerImage: string;
authors: string[];
tags: Tag[];
- status: StatusEnum;
privacy: PrivacyEnum;
type: ResourceTypeEnum;
}
diff --git a/airavata-research-portal/src/interfaces/StatusEnum.ts
b/airavata-research-portal/src/interfaces/StatusEnum.ts
deleted file mode 100644
index a080046b3..000000000
--- a/airavata-research-portal/src/interfaces/StatusEnum.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum StatusEnum {
- NONE = "NONE",
- PENDING = "PENDING",
- VERIFIED = "VERIFIED",
- REJECTED = "REJECTED",
-}
\ No newline at end of file
