Skip to content

For JSImplementation-4 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2024
Merged

For JSImplementation-4 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion force-app/main/default/lwc/logFileProcessor/logFileProcessor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export default class LogFileProcessor extends LightningElement {
stdExpCount = 0;
codeUnitsCount = 0;
methodUnitsCount = 0;
eventsPicklistValues = new Set();
execAnonyCount = 0;
fileData;
fileMetadata = {
Expand Down Expand Up @@ -115,6 +116,7 @@ export default class LogFileProcessor extends LightningElement {
if (this.STD_EXP_MATCHER.test(line)) {
this.stdExpCount++;
const lineEvent = line.split("|")[1];
this.eventsPicklistValues.add(lineEvent);
/*
* If the current line is only codeunit or Methodunit then
* process regex else directly push the line to corresponding * CU / MU
Expand Down Expand Up @@ -419,9 +421,11 @@ export default class LogFileProcessor extends LightningElement {
this.fileMetadata.nofCodeUnits = this.codeUnitsCount;
this.fileMetadata.nofMethodUnits = this.methodUnitsCount;
this.fileMetadata.nofLines = this.fileData.length;
// console.log("Event Picklist Values: ", this.eventsPicklistValues);
const payload = {
fileMetadata: this.fileMetadata,
fileData: this.fileDataPartial
fileData: this.fileDataPartial,
eventsPicklistValues: Array.from(this.eventsPicklistValues)
};
publish(this.messageContext, STATE, payload);
}
Expand Down
20 changes: 16 additions & 4 deletions force-app/main/default/lwc/logPreviewer/logPreviewer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,23 @@ <h1>
class="slds-show slds-text-body_small"
>{filter.field}</span
>
<span
class="slds-show filter-body"
>{filter.operator}
{filter.value}</span

<template
lwc:if={filter.isPicklist}
>
<span
class="slds-show filter-body"
>{filter.operator}
{filter.filterValues}</span
>
</template>
<template lwc:else>
<span
class="slds-show filter-body"
>{filter.operator}
{filter.value}</span
>
</template>
</button>
<button
class="slds-button slds-button_icon slds-button_icon slds-button_icon-small"
Expand Down
147 changes: 103 additions & 44 deletions force-app/main/default/lwc/logPreviewer/logPreviewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ import STATE from "@salesforce/messageChannel/App_Service__c";
* id:1,
* field:"Created Date",
* operator:"Equals",
* isPicklist:false,
* value:"2019-12-18T22:00:00.000Z",
* filterValues: [
"HEAP_ALLOCATE",
"CODE_UNIT_STARTED",
"CODE_UNIT_FINISHED"
],
* isActive:true,
* isEdited:false,
* filterItemClass:"slds-filters__item slds-grid slds-grid_vertical-align-center filter-being-edited"
Expand All @@ -23,7 +29,9 @@ export default class LogPreviewer extends LightningElement {
isLoading = false;
fieldValue;
operatorValue;
filterValue;
filterValue = "";
filterPickListValue = [];
filterPickListMaster = [];
fileDataSub = null;
isFilterEditing = false;
isFilterPopOverShowing = false;
Expand All @@ -36,13 +44,15 @@ export default class LogPreviewer extends LightningElement {
];
}
get operatorOptions() {
// { label: "Equals", value: "Equals" },
// { label: "Not Equals", value: "Not Equals" },
// { label: "Greater Than", value: "Greater Than" },
// { label: "Greater Than or Equal", value: "Greater Than or Equal" },
// { label: "Less Than", value: "Less Than" },
// { label: "Less Than or Equal", value: "Less Than or Equal" },
// { label: "Contains", value: "Contains" }
/*
{ label: "Equals", value: "Equals" },
{ label: "Not Equals", value: "Not Equals" },
{ label: "Greater Than", value: "Greater Than" },
{ label: "Greater Than or Equal", value: "Greater Than or Equal" },
{ label: "Less Than", value: "Less Than" },
{ label: "Less Than or Equal", value: "Less Than or Equal" },
{ label: "Contains", value: "Contains" }
*/

if (this.fieldValue === "Line") {
return [
Expand All @@ -58,21 +68,24 @@ export default class LogPreviewer extends LightningElement {
}

get isFilterValuePicklist() {
return this.fieldValue === "Event";
return this.fieldValue === "Event" && this.filterPickListMaster.length > 0;
}
get filterValueOptions() {
return [
{ label: "HEAP_ALLOCATE", value: "HEAP_ALLOCATE" },
{ label: "CODE_UNIT_STARTED", value: "CODE_UNIT_STARTED" },
{ label: "CODE_UNIT_FINISHED", value: "CODE_UNIT_FINISHED" }
];
let options = this.filterPickListMaster;
return options.map((item) => ({
...item,
selected: this.filterPickListValue.includes(item.value)
}));
}

@track activeFilters = [
{
id: 0,
field: "Line",
operator: "Equals",
value: "2019-12-18T22:00:00.000Z",
isPicklist: false,
filterValues: [],
isEdited: false,
isActive: true,
filterItemClass:
Expand All @@ -82,7 +95,13 @@ export default class LogPreviewer extends LightningElement {
id: 1,
field: "Event",
operator: "Equals",
value: ["HEAP_ALLOCATE", "CODE_UNIT_STARTED", "CODE_UNIT_FINISHED"],
isPicklist: true,
value: "",
filterValues: [
"HEAP_ALLOCATE",
"CODE_UNIT_STARTED",
"CODE_UNIT_FINISHED"
],
isEdited: false,
isActive: true,
filterItemClass:
Expand Down Expand Up @@ -130,6 +149,8 @@ export default class LogPreviewer extends LightningElement {
const height = this.popoverTop - popoverHeight;
popover.style.top = `${height}px `;
}

console.log("Rerendering: ", this.activeFilters);
}

get hasActiveFilters() {
Expand All @@ -153,7 +174,7 @@ export default class LogPreviewer extends LightningElement {

setFileData(message) {
if (message !== null && message !== undefined) {
// console.log("[LogPreviewer.js] setFileData called");
// console.log("[LogPreviewer.js] setFileData called", message);
if (message.fileData !== undefined && message.fileData !== null) {
this.fileData = message.fileData;
this.pageNumber = 1;
Expand All @@ -163,6 +184,16 @@ export default class LogPreviewer extends LightningElement {
if (message.fileMetadata !== undefined && message.fileMetadata !== null) {
this.fileMetadata = message.fileMetadata;
}
if (
message.eventsPicklistValues !== undefined &&
message.eventsPicklistValues !== null
) {
if (Array.isArray(message.eventsPicklistValues)) {
this.filterPickListMaster = message.eventsPicklistValues.map(
(str) => ({ value: str, label: str })
);
}
}
}
}
onLinesPerPageChange(event) {
Expand Down Expand Up @@ -207,6 +238,7 @@ export default class LogPreviewer extends LightningElement {
this.calculations();
}
}

closeFilter() {
this.filterClass =
"slds-panel slds-size_medium slds-panel_docked slds-panel_docked-right slds-panel_drawer filter-panel slds-hidden";
Expand All @@ -228,25 +260,28 @@ export default class LogPreviewer extends LightningElement {
this.activeFilters.forEach((filter) => {
filter.id = idx++;
});
this.currentEditFilterIdx = 0;
}

addFilter() {
if (!this.isFilterEditing) {
this.isFilterEditing = true;
this.isFilterPopOverShowing = true;
this.currentEditFilterIdx = this.activeFilters.length;
const newFilter = {
id: this.activeFilters.length,
field: "New Filter",
operator: "",
value: "",
isActive: false,
isEdited: true,
filterItemClass:
"slds-filters__item slds-grid slds-grid_vertical-align-center filter-being-edited"
};
this.activeFilters.push(newFilter);
}
// if (!this.isFilterEditing) {
this.isFilterEditing = true;
this.isFilterPopOverShowing = true;
this.currentEditFilterIdx = this.activeFilters.length;
const newFilter = {
id: this.activeFilters.length,
field: "New Filter",
operator: "",
value: "",
isPicklist: false,
filterValues: [],
isActive: false,
isEdited: true,
filterItemClass:
"slds-filters__item slds-grid slds-grid_vertical-align-center filter-being-edited"
};
this.activeFilters.push(newFilter);
// }
}

removeAllFilters() {
Expand All @@ -263,18 +298,26 @@ export default class LogPreviewer extends LightningElement {

saveFilterEdit() {
this.isFilterEditing = false;
this.isFilterPopOverShowing = false;
this.handlePopoverClose();
let idxToRemove = [];
for (let i = 0; i < this.activeFilters.length; i++) {
let filter = this.activeFilters[i];
if (
filter.field !== "New Filter" &&
filter.field === "Line" &&
filter.operator !== "" &&
filter.value !== ""
) {
filter.isActive = true;
filter.filterItemClass =
"slds-filters__item slds-grid slds-grid_vertical-align-center";
} else if (
filter.field === "Event" &&
filter.operator !== "" &&
filter.filterValues.length > 0
) {
filter.isActive = true;
filter.filterItemClass =
"slds-filters__item slds-grid slds-grid_vertical-align-center";
} else {
//Addition pop all filters where isactive=false
idxToRemove.push(i);
Expand All @@ -292,16 +335,21 @@ export default class LogPreviewer extends LightningElement {
this.currentEditFilterIdx = event.currentTarget.dataset.id;
this.fieldValue = this.activeFilters[this.currentEditFilterIdx].field;
this.operatorValue = this.activeFilters[this.currentEditFilterIdx].operator;
if (
typeof this.activeFilters[this.currentEditFilterIdx].value === "string"
) {

if (Array.isArray(this.activeFilters[this.currentEditFilterIdx].value)) {
//this is for picklist
this.filterValue = "";
this.filterPickListValue =
this.activeFilters[this.currentEditFilterIdx].filterValues;
} else {
// this.reRenderVal = !this.reRenderVal;
console.log(
"typeof",
typeof this.activeFilters[this.currentEditFilterIdx].value
"reRenderVal; ",
this.activeFilters[this.currentEditFilterIdx].value,
"rerender item:",
this.activeFilters[this.currentEditFilterIdx]
);
this.reRenderVal = !this.reRenderVal;
this.filterValue = this.activeFilters[this.currentEditFilterIdx].value;
console.log("reRenderVal; ", this.filterValue);
}
console.log("Filter ID;" + event.currentTarget.dataset.id);
this.activeFilters[this.currentEditFilterIdx].filterItemClass =
Expand All @@ -319,6 +367,8 @@ export default class LogPreviewer extends LightningElement {
console.log("Field Selected ", event.detail.value);
this.fieldValue = this.activeFilters[this.currentEditFilterIdx].field =
event.detail.value;
this.activeFilters[this.currentEditFilterIdx].isPicklist =
this.fieldValue === "Event" ? true : false;
}

handleOperatorChange(event) {
Expand All @@ -329,15 +379,24 @@ export default class LogPreviewer extends LightningElement {
}

handleFilterValueChange(event) {
console.log("Filter Value Selected ", event.detail);
this.filterValue = event.detail;
// this.filterValue = event.detail;
if (this.currentEditFilterIdx < this.activeFilters.length) {
this.filterPickListValue = this.activeFilters[
this.currentEditFilterIdx
].filterValues = event.detail.map((filter) => {
return filter.value;
});
}

console.log("Selected items: ", this.filterPickListValue);
}

handlePopoverClose() {
this.isFilterPopOverShowing = false;
this.fieldValue = null;
this.operatorValue = null;
this.filterValue = null;
this.filterValue = "";
this.filterPickListValue = [];
}

handleFilterTextChange(event) {
Expand Down
20 changes: 11 additions & 9 deletions force-app/main/default/lwc/multiSelectComboboxItem/multiSelectComboboxItem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@
class="slds-media slds-listbox__option list-box-option slds-listbox__option_plain slds-media_small"
role="option"
>
<span class="slds-media__figure">
<lightning-icon
icon-name="utility:check"
size="x-small"
alternative-text="Selected"
class="slds-icon slds-icon--selected slds-icon--x-small slds-icon-text-default slds-var-m-right_x-small"
>
</lightning-icon>
</span>
<template lwc:if={item.selected}>
<span class="slds-media__figure">
<lightning-icon
icon-name="utility:check"
size="x-small"
alternative-text="Selected"
class="slds-icon slds-icon--selected slds-icon--x-small slds-icon-text-default slds-var-m-right_x-small"
>
</lightning-icon>
</span>
</template>
<span class="slds-media__body">
<span class="slds-truncate" title={item.value}>{item.label}</span>
</span>
Expand Down
4 changes: 4 additions & 0 deletions force-app/main/default/messageChannels/App_Service.messageChannel-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,9 @@
<fieldName>fileMetadata</fieldName>
<description>This is the raw file metadata</description>
</lightningMessageFields>
<lightningMessageFields>
<fieldName>eventsPicklistValues</fieldName>
<description>This contains all unique events</description>
</lightningMessageFields>

</LightningMessageChannel>
Loading