Merge GT-2095-Tool-Groups into staging

CruGlobal · Nov 14, 2023 · cd68683 · cd68683
2 parents aecddd5 + d86181e
commit cd68683
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/app/components/edit-tool-group-resource/tool-group-resource.component.html b/src/app/components/edit-tool-group-resource/tool-group-resource.component.html
@@ -1,8 +1,8 @@
 <div class="modal-header">
-  <h5>Connect Resources</h5>
+  <h5>Connect Tools</h5>
 </div>
 <div class="modal-body">
-  <div class="tools" style="max-height: calc(100vh - 350px); overflow-y: auto">
+  <div class="tools" style="max-height: calc(100vh - 350px); overflow-y: auto; overflow-x: hidden;">
     <admin-tool-group-tool-reuseable
       *ngFor="let tool of tools"
       [tool]="tool"
@@ -12,7 +12,7 @@ <h5>Connect Resources</h5>
     ></admin-tool-group-tool-reuseable>
   </div>
 
-  <button (click)="addResource()" class="btn btn-default">Add Resource</button>
+  <button (click)="addResource()" class="btn btn-default">Add Tool</button>
 
   <div class="row">
     <div class="col">

diff --git a/src/app/components/edit-tool-group-rule-reuseable/tool-group-rule-reuseable.component.html b/src/app/components/edit-tool-group-rule-reuseable/tool-group-rule-reuseable.component.html
@@ -42,7 +42,7 @@
         (ngModelChange)="handleNegativeRuleChange($event)"
       />
       <label class="custom-control-label" for="{{ negativeInputId }}"
-        >Check this to reverse this rule filters</label
+        >Exclude {{ name }} Selected</label
       >
     </div>
   </div>

diff --git a/src/app/components/edit-tool-group/edit-tool-group.component.html b/src/app/components/edit-tool-group/edit-tool-group.component.html
@@ -71,6 +71,10 @@ <h5 *ngIf="isNewToolGroup">New Tool Group</h5>
       </ngb-alert>
     </div>
   </div>
+
+  <div *ngIf="isNewToolGroup">
+    <i style="font-size: 14px;">Once this Tool Group is created, you'll be able to add tools.</i>
+  </div>
 </div>
 
 <div class="modal-footer" style="justify-content: space-between">

diff --git a/src/app/components/tool-group/tool-group.component.html b/src/app/components/tool-group/tool-group.component.html
@@ -167,9 +167,9 @@
           <div
             class="card-header d-flex justify-content-between align-items-center"
           >
-            <span class="h5 mb-0">Resources</span>
+            <span class="h5 mb-0">Tools</span>
             <button class="btn btn-secondary" (click)="addResource()">
-              <i class="fa fa-file"></i> Add/Edit Resources
+              <i class="fa fa-file"></i> Add/Edit Tools
             </button>
           </div>