From 6cc3eef482f53d563f99f17d96802afa3f77c571 Mon Sep 17 00:00:00 2001
From: Teisha McRae <mcraeteisha@gmail.com>
Date: Tue, 5 Sep 2023 14:32:43 -0400
Subject: [PATCH 1/4] Add assetName and assetType to AddToProjectModal.vue

Add a checkbox for copying assets
---
 .../components/shared/AddToProjectModal.vue   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/shared/AddToProjectModal.vue b/resources/js/components/shared/AddToProjectModal.vue
index cdb8f77890..4e9bafab3e 100644
--- a/resources/js/components/shared/AddToProjectModal.vue
+++ b/resources/js/components/shared/AddToProjectModal.vue
@@ -10,7 +10,12 @@
         size="md"
       >
         <template>
-            <required></required>
+            <div class="d-flex justify-content-between pb-3">
+              <h6>
+                <span class="text-capitalize">{{ assetType }}:</span> {{ assetName }}
+              </h6>
+              <required></required>
+            </div>
             <project-select
                 v-model="projects"
                 :label="$t('Select Project')"
@@ -19,6 +24,14 @@
                 name="proeject"
                 :errors="addError.project"
             />
+            <b-form-group>
+              <b-form-checkbox
+                v-model="copyAsset"
+                class="pt-3"
+              >
+                Use a copy of this asset
+              </b-form-checkbox>
+            </b-form-group>
         </template>
       </modal>
     </div>
@@ -39,6 +52,7 @@
       return {
         errors: {},
         projects: [],
+        copyAsset: false,
         addError: {},
         showModal: false,
         disabled: true,
@@ -56,8 +70,8 @@
       watch: {
         projects() {
             this.customModalButtons[1].disabled = this.projects.length > 0 ? false : true;
-        }
-      },  
+        },
+      },
       methods: {
         show() {
           this.customModalButtons[1].disabled = this.projects.length > 0 ? false : true;
@@ -97,7 +111,6 @@
 </script>
   
 <style scoped>
-
     .overflow-modal {
     max-height: 30vh;
     overflow-y: auto;

From 99de342503a97841e5398fdc2f3c59893d3c6bd4 Mon Sep 17 00:00:00 2001
From: Teisha McRae <mcraeteisha@gmail.com>
Date: Wed, 6 Sep 2023 12:44:43 -0400
Subject: [PATCH 2/4] Add tooltip to copyAsset option; format assetType

---
 .../components/shared/AddToProjectModal.vue   | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/resources/js/components/shared/AddToProjectModal.vue b/resources/js/components/shared/AddToProjectModal.vue
index 4e9bafab3e..c9b585caa4 100644
--- a/resources/js/components/shared/AddToProjectModal.vue
+++ b/resources/js/components/shared/AddToProjectModal.vue
@@ -12,24 +12,30 @@
         <template>
             <div class="d-flex justify-content-between pb-3">
               <h6>
-                <span class="text-capitalize">{{ assetType }}:</span> {{ assetName }}
+                <span class="text-capitalize">{{ formatAssetType(assetType) }}:</span> {{ assetName }}
               </h6>
               <required></required>
             </div>
             <project-select
-                v-model="projects"
-                :label="$t('Select Project')"
-                api-get="projects"
-                api-list="projects"
-                name="proeject"
-                :errors="addError.project"
+              required
+              v-model="projects"
+              :label="$t('Select Project')"
+              api-get="projects"
+              api-list="projects"
+              name="proeject"
+              :errors="addError.project"
             />
             <b-form-group>
               <b-form-checkbox
                 v-model="copyAsset"
                 class="pt-3"
               >
-                Use a copy of this asset
+                <span
+                v-b-tooltip.hover.bottom
+                :title="$t('Use a copy if you are planning on making changes to this asset.')"
+                >
+                  Use a copy of this asset
+                </span>
               </b-form-checkbox>
             </b-form-group>
         </template>
@@ -58,13 +64,13 @@
         disabled: true,
         customModalButtons: [
           {"content": "Cancel", "action": "close", "variant": "outline-secondary", "disabled": false, "hidden": false},
-          {"content": "Assign", "action": "addToProject", "variant": "primary", "disabled": true, "hidden": false},
+          {"content": "Add", "action": "addToProject", "variant": "primary", "disabled": true, "hidden": false},
         ],
       }
     },
       computed: {
         title() {
-          return this.$t('Assign to Project');
+          return this.$t('Add to a Project');
         },
       },
       watch: {
@@ -106,6 +112,9 @@
             }
           });
         },
+        formatAssetType(assetType) {
+          return assetType.replace(/-/g, " ");
+        },
       },
     };
 </script>

From 92a92181b3c0edf1deb63bb43e89f6d2d1129676 Mon Sep 17 00:00:00 2001
From: Teisha McRae <mcraeteisha@gmail.com>
Date: Wed, 6 Sep 2023 12:45:20 -0400
Subject: [PATCH 3/4] Update ellipsis menu action content and icon for Add to
 Project

---
 resources/js/processes/components/ProcessesListing.vue      | 2 +-
 resources/js/processes/screens/components/ScreenListing.vue | 4 ++--
 resources/js/processes/scripts/components/ScriptListing.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/js/processes/components/ProcessesListing.vue b/resources/js/processes/components/ProcessesListing.vue
index d8ac135027..7f495179cd 100644
--- a/resources/js/processes/components/ProcessesListing.vue
+++ b/resources/js/processes/components/ProcessesListing.vue
@@ -95,7 +95,7 @@
         { value: "edit-designer", content: "Edit Process", link: true, href:"/modeler/{{id}}", permission: "edit-processes", icon: "fas fa-edit", conditional: "if(status == 'ACTIVE' or status == 'INACTIVE', true, false)"},
         { value: "create-template", content: "Save as Template", permission: "create-process-templates", icon: "fas fa-layer-group" },
         { value: "create-pm-block", content: "Save as PM Block", permission: "create-pm-blocks", icon: "fas nav-icon fa-cube" },
-        { value: "add-to-project", content: "Assign to Project", icon: "fas nav-icon fa-folder" },
+        { value: "add-to-project", content: "Add to Project", icon: "fas fa-folder-plus" },
         { value: "edit-item", content: "Configure", link: true, href:"/processes/{{id}}/edit", permission: "edit-processes", icon: "fas fa-cog", conditional: "if(status == 'ACTIVE' or status == 'INACTIVE', true, false)"},
         { value: "view-documentation", content: "View Documentation", link: true, href:"/modeler/{{id}}/print", permission: "view-processes", icon: "fas fa-sign", conditional: "isDocumenterInstalled"},
         { value: "remove-item", content: "Archive", permission: "archive-processes", icon: "fas fa-archive", conditional: "if(status == 'ACTIVE' or status == 'INACTIVE', true, false)" },
diff --git a/resources/js/processes/screens/components/ScreenListing.vue b/resources/js/processes/screens/components/ScreenListing.vue
index f5a2cc4387..a1f470ca4b 100644
--- a/resources/js/processes/screens/components/ScreenListing.vue
+++ b/resources/js/processes/screens/components/ScreenListing.vue
@@ -123,8 +123,8 @@ export default {
         },
         { 
           value: "add-to-project", 
-          content: "Assign to Project",
-          icon: "fas nav-icon fa-folder" 
+          content: "Add to Project",
+          icon: "fas fa-folder-plus"
         },
         {
           value: "duplicate-item",
diff --git a/resources/js/processes/scripts/components/ScriptListing.vue b/resources/js/processes/scripts/components/ScriptListing.vue
index ad19e4d4f2..f5d42ef168 100644
--- a/resources/js/processes/scripts/components/ScriptListing.vue
+++ b/resources/js/processes/scripts/components/ScriptListing.vue
@@ -120,8 +120,8 @@ export default {
         },
         { 
           value: "add-to-project", 
-          content: "Assign to Project",
-          icon: "fas nav-icon fa-folder" 
+          content: "Add to Project",
+          icon: "fas fa-folder-plus" 
         },
         {
           value: "duplicate-item",

From a5268c566814057bd1ce2874f800ab94365b6c8e Mon Sep 17 00:00:00 2001
From: Teisha McRae <mcraeteisha@gmail.com>
Date: Wed, 6 Sep 2023 16:39:54 -0400
Subject: [PATCH 4/4] Change 'name' to 'title' for Scripts and Screens; add
 todo notes

---
 resources/js/components/shared/AddToProjectModal.vue     | 9 ++++++++-
 .../js/processes/screens/components/ScreenListing.vue    | 6 +++---
 .../js/processes/scripts/components/ScriptListing.vue    | 6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/shared/AddToProjectModal.vue b/resources/js/components/shared/AddToProjectModal.vue
index c9b585caa4..c0c08a9816 100644
--- a/resources/js/components/shared/AddToProjectModal.vue
+++ b/resources/js/components/shared/AddToProjectModal.vue
@@ -22,7 +22,7 @@
               :label="$t('Select Project')"
               api-get="projects"
               api-list="projects"
-              name="proeject"
+              name="project"
               :errors="addError.project"
             />
             <b-form-group>
@@ -90,8 +90,15 @@
         },
         clear() {
           this.projects = [];
+          this.copyAsset = false;
+        },
+        validateProject() {
+          //TODO: ADD FUNCTIONALITY TO CHECK IF ASSET EXISTS ON A PROJECT
         },
         addToProject() {
+          // if (this.copyAsset) {
+          //   //TODO: ADD FUNCTIONALITY FOR COPYING AN ASSET
+          // }
           let formData = new FormData();
           formData.append("asset_type", this.assetType);
           formData.append("asset_id", this.assetId);
diff --git a/resources/js/processes/screens/components/ScreenListing.vue b/resources/js/processes/screens/components/ScreenListing.vue
index a1f470ca4b..8fe95b46e8 100644
--- a/resources/js/processes/screens/components/ScreenListing.vue
+++ b/resources/js/processes/screens/components/ScreenListing.vue
@@ -236,9 +236,9 @@ export default {
           }
         });
     },
-    showAddToProjectModal(name, id) {        
+    showAddToProjectModal(title, id) {        
       this.screenId = id;
-      this.assetName = name;
+      this.assetName = title;
       this.$refs["add-to-project-modal"].show();
     },
     onAction(actionType, data, index) {
@@ -275,7 +275,7 @@ export default {
           );
             break;
             case 'add-to-project':
-              this.showAddToProjectModal(data.name, data.id);
+              this.showAddToProjectModal(data.title, data.id);
             break;
         }
     } else {
diff --git a/resources/js/processes/scripts/components/ScriptListing.vue b/resources/js/processes/scripts/components/ScriptListing.vue
index f5d42ef168..6767f1be3d 100644
--- a/resources/js/processes/scripts/components/ScriptListing.vue
+++ b/resources/js/processes/scripts/components/ScriptListing.vue
@@ -247,7 +247,7 @@ export default {
           );
           break;
         case 'add-to-project':
-          this.showAddToProjectModal(data.name, data.id);
+          this.showAddToProjectModal(data.title, data.id);
           break;
       }
     },
@@ -277,9 +277,9 @@ export default {
           this.loading = false;
         });
     },
-    showAddToProjectModal(name, id) {        
+    showAddToProjectModal(title, id) {        
       this.assetId = id;
-      this.assetName = name;
+      this.assetName = title;
       this.$refs["add-to-project-modal"].show();
     },
   },