From 0806ed183542ce9aea00ad21bf145fa22510b0e3 Mon Sep 17 00:00:00 2001 From: Mike Napier Date: Wed, 9 May 2018 09:19:38 -0500 Subject: [PATCH 1/5] gitignore and updated package xml --- .gitignore | 1 + package.xml | 160 ++++++++++++++-------------------------------------- 2 files changed, 42 insertions(+), 119 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..70a0cb9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.apex \ No newline at end of file diff --git a/package.xml b/package.xml index cf0aea9..6838289 100644 --- a/package.xml +++ b/package.xml @@ -1,28 +1,6 @@ - CustomApplication - Sortable_Data_Grids_Lightning - - - AuraDefinitionBundle - ObjectHelper - SDGFieldChooser - SDGImportExport - evtRefreshSDG - sdg - sdgBase - sdgDatagridCell - sdgDesignerFieldFinder - sdgFilter - sdgFilterUpdate - sdgHelp - sdgList - sdgSortableColumn - sdgSortableColumnSort - - - ApexClass AuraFieldSelectOption AuraSelectOption AuraSelectOptionTest @@ -83,139 +61,83 @@ sdgTestData sdgVerification sdgVerificationTest + ApexClass - CustomMetadata - SDGDefaults.SDG_Designer_Actions - SDGDefaults.SDG_Designer_Fields + trgSDG + trgSDGField + ApexTrigger - FlexiPage - Sortable_Data_Grid_Action_Record_Page - Sortable_Data_Grid_Field_Record_Page - Sortable_Data_Grid_Record_Page + ObjectHelper + SDGFieldChooser + SDGImportExport + evtRefreshSDG + sdg + sdgBase + sdgDatagridCell + sdgDesignerFieldFinder + sdgFilter + sdgFilterUpdate + sdgHelp + sdgList + sdgSortableColumn + sdgSortableColumnSort + AuraDefinitionBundle - CustomLabels - CustomLabels + Sortable_Data_Grids_Lightning + CustomApplication - CustomLabel - * + CustomLabels + CustomLabels - Layout - SDGDefaults__mdt-Main - SDG_Action__c-SDG Action Layout - SDG_Field__c-Field Layout - SDG__c-SDG Layout - sdg_Preferences__c-Sortable Data Grid Preference Layout + SDGDefaults.SDG_Designer_Actions + SDGDefaults.SDG_Designer_Fields + CustomMetadata - CustomObject SDGDefaults__mdt SDG_Action__c SDG_Field__c SDG__c sdg_Preferences__c + CustomObject - CustomField - SDGDefaults__mdt.Definition__c - SDG_Action__c.Action_Order__c - SDG_Action__c.Action_Type__c - SDG_Action__c.Event_Payload__c - SDG_Action__c.Event__c - SDG_Action__c.Icon__c - SDG_Action__c.Requires_Createable__c - SDG_Action__c.Requires_Deletable__c - SDG_Action__c.Requires_Editable__c - SDG_Action__c.SDG__c - SDG_Field__c.APIName__c - SDG_Field__c.FieldOrder__c - SDG_Field__c.Field_Style__c - SDG_Field__c.Hide_Filter__c - SDG_Field__c.Override_Label__c - SDG_Field__c.is_valid_field__c - SDG_Field__c.sdg__c - SDG__c.All_Rows__c - SDG__c.Default_Sort__c - SDG__c.DisableSharing__c - SDG__c.Filter__c - SDG__c.Is_Valid__c - SDG__c.Parent_Field_Name__c - SDG__c.SDG_Tag__c - SDG__c.sObjectName__c - sdg_Preferences__c.Filters__c - sdg_Preferences__c.User__c - sdg_Preferences__c.sdgKey__c - - - ValidationRule - SDG_Action__c.Payload_must_end_with_brace - SDG_Action__c.Payload_must_start_with_brace - SDG__c.Make_sObjectName_Mandatory + SDG__c + CustomTab - FieldSet - SDG_Field__c.Default - SDG__c.default + Sortable_Data_Grid_Action_Record_Page + Sortable_Data_Grid_Field_Record_Page + Sortable_Data_Grid_Record_Page + FlexiPage - ListView - SDG__c.All + SDGDefaults__mdt-Main + SDG_Action__c-SDG Action Layout + SDG_Field__c-Field Layout + SDG__c-SDG Layout + sdg_Preferences__c-Sortable Data Grid Preference Layout + Layout - PermissionSet Edit_Sortable_Data_Grids Sortable_Data_Grids_ManageSharing View_Sortable_Data_Grids + PermissionSet - QuickAction SDG__c.Export_Wizard SDG__c.Help + QuickAction - CustomTab SDG__c - - - ApexTrigger - trgSDG - trgSDGField - - Workflow - SDG__c - - - WorkflowFieldUpdate - * - - - WorkflowKnowledgePublish - * - - - WorkflowTask - * - - - WorkflowAlert - * - - - WorkflowSend - * - - - WorkflowOutboundMessage - * - - - WorkflowRule - * 41.0 \ No newline at end of file From 93e465db00502d0ec546e4e2eeeb3d96fc8d735b Mon Sep 17 00:00:00 2001 From: Mike Napier Date: Fri, 11 May 2018 09:16:37 -0500 Subject: [PATCH 2/5] Fixed the ability to have filters. --- aura/sdg/sdgHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aura/sdg/sdgHelper.js b/aura/sdg/sdgHelper.js index d6a583f..09c9de4 100644 --- a/aura/sdg/sdgHelper.js +++ b/aura/sdg/sdgHelper.js @@ -83,7 +83,7 @@ for (var i = 0; i < fieldlistlength; i++) { var field = fields[i]; - if (field.canFilter) hasFilters === true; + if (field.canFilter) hasFilters = true; if ( field.FieldStyle && field.FieldStyle.startsWith("Summarize") From 409651314607da16bc843fdd71eefc5dad5dec5d Mon Sep 17 00:00:00 2001 From: Mike Napier Date: Fri, 11 May 2018 09:17:33 -0500 Subject: [PATCH 3/5] Fixed the email filter, previously was not apply any filter to the soql --- classes/sdgQueryBuilder.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sdgQueryBuilder.cls b/classes/sdgQueryBuilder.cls index a21383a..e1a42ac 100644 --- a/classes/sdgQueryBuilder.cls +++ b/classes/sdgQueryBuilder.cls @@ -30,7 +30,7 @@ global static string BuildFilterClause(String ColumnName, String FieldType, Stri if (string.isblank(filteroperator)) filteroperator = '='; - if (FieldType ==String.valueof(Schema.DisplayType.STRING)) + if (FieldType ==String.valueof(Schema.DisplayType.STRING) || FieldType ==String.valueof(Schema.DisplayType.EMAIL)) { if (String.isNotBlank(filtervalue.trim())) { From c04c430b0b5ccb0d013d25bbb21d6eae63bc9cff Mon Sep 17 00:00:00 2001 From: Mike Napier Date: Fri, 11 May 2018 09:18:18 -0500 Subject: [PATCH 4/5] Updated True/False labels to be Yes/No for an improved end user experience. --- labels/CustomLabels.labels | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/labels/CustomLabels.labels b/labels/CustomLabels.labels index 75c5c00..eda2f34 100644 --- a/labels/CustomLabels.labels +++ b/labels/CustomLabels.labels @@ -46,8 +46,8 @@ sdgFalse en_US false - False - False + No + No sdgFiltered @@ -228,8 +228,8 @@ sdgTrue en_US false - True - True + Yes + Yes sdgView_All From 84520a45ee037e1715d425c63e0cbdaffab12005 Mon Sep 17 00:00:00 2001 From: Mike Napier Date: Fri, 11 May 2018 09:18:43 -0500 Subject: [PATCH 5/5] Cleaned up the UI on filters to use much less space. --- aura/sdg/sdg.cmp | 4 --- aura/sdg/sdg.css | 2 +- aura/sdgFilter/sdgFilter.cmp | 29 +++++++++++---------- aura/sdgFilter/sdgFilter.css | 49 ++++++++++++++++++++++++++++++++++-- 4 files changed, 62 insertions(+), 22 deletions(-) diff --git a/aura/sdg/sdg.cmp b/aura/sdg/sdg.cmp index 219fdac..ad71610 100644 --- a/aura/sdg/sdg.cmp +++ b/aura/sdg/sdg.cmp @@ -161,18 +161,14 @@
- -
- -
diff --git a/aura/sdg/sdg.css b/aura/sdg/sdg.css index aa1c131..09798a2 100644 --- a/aura/sdg/sdg.css +++ b/aura/sdg/sdg.css @@ -172,7 +172,7 @@ font-size:0.9em; } .THIS .filter{ -width:100%; + display: inline-block; } .THIS .slds-table.narrow tr { diff --git a/aura/sdgFilter/sdgFilter.cmp b/aura/sdgFilter/sdgFilter.cmp index 6ae0845..470ae6d 100644 --- a/aura/sdgFilter/sdgFilter.cmp +++ b/aura/sdgFilter/sdgFilter.cmp @@ -60,8 +60,8 @@
-
- +
+ -
-
- - +
+ + +
-
+
-
-
- +
@@ -130,7 +128,7 @@ -
+
-
-
- - + +
+ + +
diff --git a/aura/sdgFilter/sdgFilter.css b/aura/sdgFilter/sdgFilter.css index 22b37d6..3388eea 100644 --- a/aura/sdgFilter/sdgFilter.css +++ b/aura/sdgFilter/sdgFilter.css @@ -1,3 +1,48 @@ -.THIS .filter_label { - text-align: left; +.THIS .slds-form-element__label { + display: block; } + +.THIS .slds-form-element__control, .THIS .slds-form-element, .THIS .slds-select_container, .THIS div.uiInput { + display: inline-block; +} + +.THIS .uiInputText.input, .THIS .uiInputNumber.input, .THIS .uiInputDate .input { + border-radius: 0 .25rem .25em 0; +} + +.THIS div.uiInputDate { + -webkit-box-flex: 1; + -webkit-flex-grow: 1; + -ms-flex-positive: 1; + flex-grow: 1; +} + +.THIS .sdg-combo-filter .slds-select { + border-radius: .25rem 0 0 .25em; +} + +.THIS .slds-select { + height: 36px; +} + +.THIS .sdg-combo-filter { + position: relative; + padding-top: 1.7em; +} + +.THIS .sdg-combo-filter label { + position: absolute; + top: -1.7em; +} + +.THIS .sdg-filter-input-text { + min-width: 200px; +} + +.THIS .sdg-filter-input-number { + min-width: 176px; +} + +.THIS .uiInput--datetime .datePicker-openIcon { + bottom: 11px; +} \ No newline at end of file