airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata-django-portal] 01/03: AIRAVATA-2876 Rename deployment_id to deploymentId
Date Fri, 21 Sep 2018 17:51:54 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit e4978b0c1081edcff759951bbc99b7dad22991a9
Author: Marcus Christie <machrist@iu.edu>
AuthorDate: Fri Sep 21 11:46:08 2018 -0400

    AIRAVATA-2876 Rename deployment_id to deploymentId
---
 .../applications/ApplicationDeploymentEditor.vue   |   2 +-
 .../applications/ApplicationDeploymentsList.vue    |   4 +-
 .../applications/ApplicationEditorContainer.vue    |   7 +-
 .../static/django_airavata_admin/src/router.js     | 138 ++++++++++++---------
 4 files changed, 87 insertions(+), 64 deletions(-)

diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
index c898a1d..700d176 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
@@ -63,7 +63,7 @@ export default {
     value: {
       type: models.ApplicationDescriptionDefinition
     },
-    deployment_id: {
+    deploymentId: {
       type: String,
       required: true
     },
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentsList.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentsList.vue
index ff33354..8944b26 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentsList.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentsList.vue
@@ -5,11 +5,11 @@
 
         <b-table striped hover :fields="fields" :items="slotProps.items" sort-by="computeHostId">
           <template slot="action" slot-scope="data">
-            <router-link v-if="!data.item.userHasWriteAccess" :to="{name: 'application_deployment',
params: {id: id, deployment_id: data.item.appDeploymentId, readonly: true}}">
+            <router-link v-if="!data.item.userHasWriteAccess" :to="{name: 'application_deployment',
params: {id: id, deploymentId: data.item.appDeploymentId, readonly: true}}">
               View
               <i class="fa fa-eye" aria-hidden="true"></i>
             </router-link>
-            <router-link v-if="data.item.userHasWriteAccess && data.item.appDeploymentId"
:to="{name: 'application_deployment', params: {id: id, deployment_id: data.item.appDeploymentId,
readonly: false}}">
+            <router-link v-if="data.item.userHasWriteAccess && data.item.appDeploymentId"
:to="{name: 'application_deployment', params: {id: id, deploymentId: data.item.appDeploymentId,
readonly: false}}">
               Edit
               <i class="fa fa-edit" aria-hidden="true"></i>
             </router-link>
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationEditorContainer.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationEditorContainer.vue
index b83bc1c..288e125 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationEditorContainer.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationEditorContainer.vue
@@ -52,8 +52,7 @@ export default {
   name: "application-editor-container",
   props: {
     id: String,
-    // TODO: camelCase this
-    deployment_id: String,
+    deploymentId: String,
     hostId: String
   },
   components: {
@@ -116,8 +115,8 @@ export default {
       }
     },
     initializeDeploymentEditing() {
-      if (this.deployment_id) {
-        this.startEditingExistingDeployment(this.deployment_id);
+      if (this.deploymentId) {
+        this.startEditingExistingDeployment(this.deploymentId);
       } else if (this.hostId) {
         this.startEditingNewDeployment(this.hostId);
       }
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/router.js b/django_airavata/apps/admin/static/django_airavata_admin/src/router.js
index 43583ee..10cacd8 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/router.js
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/router.js
@@ -1,127 +1,151 @@
-import ApplicationDeploymentEditor from './components/applications/ApplicationDeploymentEditor.vue'
-import ApplicationDeployments from './components/admin/ApplicationDeployments.vue'
-import ApplicationDeploymentsList from './components/applications/ApplicationDeploymentsList.vue'
-import ApplicationDetails from './components/admin/ApplicationDetails.vue'
-import ApplicationEditorContainer from './components/applications/ApplicationEditorContainer.vue'
-import ApplicationInterface from './components/admin/ApplicationInterface.vue'
-import ApplicationInterfaceEditor from './components/applications/ApplicationInterfaceEditor.vue'
-import ApplicationModuleEditor from './components/applications/ApplicationModuleEditor.vue'
-import ApplicationsDashboard from './components/dashboards/ApplicationsDashboard.vue'
-import ComputePreference from './components/admin/group_resource_preferences/ComputePreference'
-import ComputeResourcePreferenceDashboard from './components/dashboards/ComputeResourcePreferenceDashboard'
-import CredentialStoreDashboard from './components/dashboards/CredentialStoreDashboard'
-import ExperimentsDashboard from './components/dashboards/ExperimentDashboard.vue'
-import GroupComputeResourcePreference from './components/admin/group_resource_preferences/GroupComputeResourcePreference'
-import NewApplication from './components/admin/NewApplication.vue'
-import VueRouter from 'vue-router'
-
+import ApplicationDeploymentEditor from "./components/applications/ApplicationDeploymentEditor.vue";
+import ApplicationDeployments from "./components/admin/ApplicationDeployments.vue";
+import ApplicationDeploymentsList from "./components/applications/ApplicationDeploymentsList.vue";
+import ApplicationDetails from "./components/admin/ApplicationDetails.vue";
+import ApplicationEditorContainer from "./components/applications/ApplicationEditorContainer.vue";
+import ApplicationInterface from "./components/admin/ApplicationInterface.vue";
+import ApplicationInterfaceEditor from "./components/applications/ApplicationInterfaceEditor.vue";
+import ApplicationModuleEditor from "./components/applications/ApplicationModuleEditor.vue";
+import ApplicationsDashboard from "./components/dashboards/ApplicationsDashboard.vue";
+import ComputePreference from "./components/admin/group_resource_preferences/ComputePreference";
+import ComputeResourcePreferenceDashboard from "./components/dashboards/ComputeResourcePreferenceDashboard";
+import CredentialStoreDashboard from "./components/dashboards/CredentialStoreDashboard";
+import ExperimentsDashboard from "./components/dashboards/ExperimentDashboard.vue";
+import GroupComputeResourcePreference from "./components/admin/group_resource_preferences/GroupComputeResourcePreference";
+import NewApplication from "./components/admin/NewApplication.vue";
+import VueRouter from "vue-router";
 
 const routes = [
   {
-    path: '/new/application', component: NewApplication, name: 'newapp',
+    path: "/new/application",
+    component: NewApplication,
+    name: "newapp",
     children: [
       {
-        path: 'details',
+        path: "details",
         component: ApplicationDetails,
-        name: 'details',
-
-      }, {
-        path: 'interface',
+        name: "details"
+      },
+      {
+        path: "interface",
         component: ApplicationInterface,
-        name: 'interface'
-      }, {
-        path: 'deployments',
+        name: "interface"
+      },
+      {
+        path: "deployments",
         component: ApplicationDeployments,
-        name: 'deployments'
+        name: "deployments"
       }
     ]
   },
   {
-    path: '/applications/new', component: ApplicationEditorContainer, name: 'new_application',
+    path: "/applications/new",
+    component: ApplicationEditorContainer,
+    name: "new_application",
     children: [
       // TODO: Maybe only have the module route for a new application, save it
       // and then replace the URL with the module id
       {
-        path: '', components: {
+        path: "",
+        components: {
           module: ApplicationModuleEditor
         },
-        name: 'new_application_module'
-      },
+        name: "new_application_module"
+      }
     ]
   },
   {
-    path: '/applications/:id', component: ApplicationEditorContainer, name: 'application',
+    path: "/applications/:id",
+    component: ApplicationEditorContainer,
+    name: "application",
     props: true,
     children: [
       {
-        path: '', components: {
+        path: "",
+        components: {
           module: ApplicationModuleEditor
         },
-        name: 'application_module'
+        name: "application_module"
       },
       {
-        path: 'interface', components: {
+        path: "interface",
+        components: {
           interface: ApplicationInterfaceEditor
         },
-        name: 'application_interface'
+        name: "application_interface"
       },
       {
-        path: 'deployments', components: {
+        path: "deployments",
+        components: {
           deployments: ApplicationDeploymentsList
         },
-        name: 'application_deployments',
+        name: "application_deployments",
         props: {
           deployments: true
         }
       },
       {
-        path: 'deployments/new/:hostId', components: {
+        path: "deployments/new/:hostId",
+        components: {
           deployment: ApplicationDeploymentEditor
         },
-        name: 'new_application_deployment',
+        name: "new_application_deployment"
       },
       {
-        path: 'deployments/:deployment_id', components: {
+        path: "deployments/:deploymentId",
+        components: {
           deployment: ApplicationDeploymentEditor
         },
-        name: 'application_deployment',
+        name: "application_deployment",
         props: {
           deployment: true
         }
-      },
+      }
     ]
   },
-  { path: '/applications', component: ApplicationsDashboard },
-  { path: '/experiments', component: ExperimentsDashboard, name: 'experiments_dashboard'
},
+  { path: "/applications", component: ApplicationsDashboard },
   {
-    path: '/group-resource-profiles/new', component: GroupComputeResourcePreference, name:
'new_group_resource_preference',
+    path: "/experiments",
+    component: ExperimentsDashboard,
+    name: "experiments_dashboard"
+  },
+  {
+    path: "/group-resource-profiles/new",
+    component: GroupComputeResourcePreference,
+    name: "new_group_resource_preference",
     props: true
   },
   {
-    path: '/group-resource-profiles/:id', component: GroupComputeResourcePreference, name:
'group_resource_preference',
+    path: "/group-resource-profiles/:id",
+    component: GroupComputeResourcePreference,
+    name: "group_resource_preference",
     props: true
   },
   {
-    path: '/group-resource-profiles/new/compute-preferences/:host_id', component: ComputePreference,
name: 'compute_preference_for_new_group_resource_profile',
+    path: "/group-resource-profiles/new/compute-preferences/:host_id",
+    component: ComputePreference,
+    name: "compute_preference_for_new_group_resource_profile",
     props: true
   },
   {
-    path: '/group-resource-profiles/:id/compute-preferences/:host_id', component: ComputePreference,
name: 'compute_preference',
+    path: "/group-resource-profiles/:id/compute-preferences/:host_id",
+    component: ComputePreference,
+    name: "compute_preference",
     props: true
   },
   {
-    path: '/group-resource-profiles',
+    path: "/group-resource-profiles",
     component: ComputeResourcePreferenceDashboard,
-    name: 'group_resource_preference_dashboard',
+    name: "group_resource_preference_dashboard"
   },
   {
-    path: '/credential/store',
+    path: "/credential/store",
     component: CredentialStoreDashboard,
-    name: 'credential_store'
-  },
+    name: "credential_store"
+  }
 ];
 export default new VueRouter({
-  mode: 'history',
-  base: '/admin/',
-  routes: routes,
+  mode: "history",
+  base: "/admin/",
+  routes: routes
 });


Mime
View raw message