Skip to content

P
PERFORMA_REPLICA
Commit 536f2265 by GD-A-150752
Options

code-review fix

parent 566f0c81
Showing with 60 additions and 70 deletions
frontend/angular/src/app/app.service.ts
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { MessageTemplateModel } from "./models/messageTemplate.model";
import { PlaceholderOptionsEnum } from './models/placeholderOptions.enum';
import { TemplateTypeEnum } from './models/templateType.enum';
import { MessageTemplateModel } from "./models/message-template.model";
import { PlaceholderOptionsEnum } from './models/placeholder-options.enum';
import { TemplateTypeEnum } from './models/template-type.enum';
import { EnumService } from './oneit/services/enum.service';
import { SearchService } from './oneit/services/search.service';
import { UtilsService } from './oneit/services/utils.service';
......
frontend/angular/src/app/components/edit-message-template/edit-message-template.component.html
......@@ -71,15 +71,15 @@
#messageContent
fieldLabel="Message Content">
<p-header>
<span class="ql-formats">
<button class="ql-bold" aria-label="Bold"></button>
<button class="ql-italic" aria-label="Italic"></button>
<button class="ql-underline" aria-label="Underline"></button>
</span>
<span class="ql-formats">
<button class="ql-list" aria-label="Bullet" value="bullet"></button>
<button class="ql-link" aria-label="Link"></button>
</span>
<button class="ql-bold" aria-label="Bold"></button>
<button class="ql-italic" aria-label="Italic"></button>
<button class="ql-underline" aria-label="Underline"></button>
</span>
<span class="ql-formats">
<button class="ql-list" aria-label="Bullet" value="bullet"></button>
<button class="ql-link" aria-label="Link"></button>
</span>
</p-header>
</p-editor>
<textarea id="messageContentTxtAreaId" *ngIf="smsTemplateType()" pInputTextarea
......
frontend/angular/src/app/components/edit-message-template/edit-message-template.component.ts
......@@ -6,9 +6,9 @@ import { OverlayPanel } from 'primeng/overlaypanel';
import { Subscription } from 'rxjs/Subscription';
import { AppService } from '../../app.service';
import { SERVICES } from '../../constants';
import { MessageTemplateModel } from '../../models/messageTemplate.model';
import { PlaceholderOptionsEnum } from '../../models/placeholderOptions.enum';
import { TemplateTypeEnum } from '../../models/templateType.enum';
import { MessageTemplateModel } from '../../models/message-template.model';
import { PlaceholderOptionsEnum } from '../../models/placeholder-options.enum';
import { TemplateTypeEnum } from '../../models/template-type.enum';
import { SaveService } from '../../oneit/services/save.service';
import { UtilsService } from '../../oneit/services/utils.service';
import { AdminPortalLayoutService } from '../admin-portal/admin-portal-layout/admin-portal-layout.service';
......@@ -196,25 +196,19 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
const delta = {
ops: [
{retain: this.contentCursorPoint > 0 ? this.contentCursorPoint : this.contentCursorPoint + 1},
{insert: this.contentPlaceholder.Placeholder, attributes: {link: this.linkText}}
{insert: `\${Placeholder:${this.contentPlaceholder.Placeholder}}`, attributes: {link: this.linkText}}
]
};
if (this.contentCursorPoint === 0) {
this.ngZone.run(() => {
this.messageContentEditor.getQuill()
.insertText(this.contentCursorPoint, ' ');
this.contentCursorPoint++;
this.assignContent();
});
this.messageContentEditor.getQuill()
.insertText(this.contentCursorPoint, ' ');
this.contentCursorPoint++;
}
try {
this.ngZone.run(() => {
this.messageContentEditor.getQuill()
.updateContents(delta);
this.assignContent();
});
this.messageContentEditor.getQuill()
.updateContents(delta);
} catch (e) {
this.utilsService.handleError(e);
}
......@@ -253,13 +247,13 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
this.contentLinkModal.toggle(event, this.messageContentEditor.getQuill());
} else {
this.messageContentEditor.getQuill()
.insertText(this.contentCursorPoint, this.contentPlaceholder.Placeholder);
this.assignContent();
.insertText(this.contentCursorPoint, `\${Placeholder:${this.contentPlaceholder.Placeholder}}`);
}
} else {
const textarea: HTMLTextAreaElement = document.getElementById('messageContentTxtAreaId') as HTMLTextAreaElement;
this.setValueAndFocus(textarea, 'messageContentTxtArea', this.contentPlaceholder.Placeholder, 'MessageContent');
this.setValueAndFocus(textarea, 'messageContentTxtArea', `\${Placeholder:${this.contentPlaceholder.Placeholder}}`,
'MessageContent');
}
this.resetSelect('contentPlaceholderOptions');
......@@ -283,7 +277,7 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
this.messageTemplate.TemplateType = $event;
if (this.messageTemplate.MessageContent !== undefined) {
if (this.messageTemplate.TemplateType.Description === 'SMS') {
if (this.smsTemplateType()) {
this.temporaryMessageContent = this.messageTemplate.MessageContent;
this.messageTemplate.MessageContent = this.showPlainText(this.temporaryMessageContent);
} else {
......@@ -298,7 +292,7 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
option.Value === '-');
} else {
this.contentPlaceholderOptions = this.ContentPlaceholderOptionsEnum
.filter(option => option.ShowForContent && option.Value !== 'JOB_LINK' || option.Value === '-');
.filter(option => option.ShowForContent && !option.IsLink || option.Value === '-');
}
}
......@@ -309,7 +303,7 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
this.subjectPlaceholder = $event;
if (this.emailTemplateType() && this.subjectPlaceholder && this.subjectPlaceholder.Value) {
const input: HTMLInputElement = document.getElementById('subjectInputId') as HTMLInputElement;
this.setValueAndFocus(input, 'subjectInput', this.subjectPlaceholder.Placeholder, 'Subject');
this.setValueAndFocus(input, 'subjectInput', `\${Placeholder:${this.subjectPlaceholder.Placeholder}}`, 'Subject');
}
this.resetSelect('subjectPlaceholderOptions');
}
......@@ -376,6 +370,7 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
}
saveMessageTemplate(saveCopy = false): void {
this.assignContent();
this.utilsService.clearErrorMessages();
const service = `svc/${saveCopy ? SERVICES.SAVE_MESSAGE_AS_COPY : SERVICES.SAVE}`;
......
frontend/angular/src/app/components/edit-workflow-template/edit-workflow-template.component.html
......@@ -311,8 +311,7 @@
<div class="ui-helper-clearfix"
style="position: relative;height: 25px;">
<i class="{{getMessageClass(selectedMsg.value)}}"></i>
<div
class="dropdown-text">{{selectedMsg.label}}</div>
<div class="dropdown-text">{{selectedMsg.label}}</div>
</div>
</ng-template>
</p-dropdown>
......
frontend/angular/src/app/components/edit-workflow-template/edit-workflow-template.component.ts
......@@ -8,15 +8,15 @@ import { combineLatest } from 'rxjs/observable/combineLatest';
import { Subscription } from 'rxjs/Subscription';
import { AppService } from '../../app.service';
import { ASSOCS, SERVICES } from '../../constants';
import { ApplicantSourcesEnum } from '../../models/applicantSources.enum';
import { MessageTemplateModel } from '../../models/messageTemplate.model';
import { ResponseActionEnum } from '../../models/responseAction.enum';
import { StageTypeEnum } from '../../models/stageType.enum';
import { StepTypeEnum } from '../../models/stepType.enum';
import { WorkflowMessageModel } from '../../models/workflowMessage.model';
import { WorkflowStageModel } from '../../models/workflowStage.model';
import { WorkflowStepModel } from '../../models/workflowStep.model';
import { WorkflowTemplateModel } from '../../models/workflowTemplate.model';
import { ApplicantSourcesEnum } from '../../models/applicant-sources.enum';
import { MessageTemplateModel } from '../../models/message-template.model';
import { ResponseActionEnum } from '../../models/response-action.enum';
import { StageTypeEnum } from '../../models/stage-type.enum';
import { StepTypeEnum } from '../../models/step-type.enum';
import { WorkflowMessageModel } from '../../models/workflow-message.model';
import { WorkflowStageModel } from '../../models/workflow-stage.model';
import { WorkflowStepModel } from '../../models/workflow-step.model';
import { WorkflowTemplateModel } from '../../models/workflow-template.model';
import { SaveService } from '../../oneit/services/save.service';
import { UtilsService } from '../../oneit/services/utils.service';
import { AdminPortalLayoutService } from '../admin-portal/admin-portal-layout/admin-portal-layout.service';
......@@ -164,15 +164,12 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
}
reOrderStages(): void {
this.workflow.WorkFlowStages
.sort((a, b) => a.SortOrder < b.SortOrder ? -1 : a.SortOrder > b.SortOrder ? 1 : 0);
this.workflow.WorkFlowStages = this.utilsService.sort(this.workflow.WorkFlowStages, ['SortOrder'], [-1]);
this.filterStages();
}
reOrderSteps(): void {
this.workflow.WorkFlowStages.forEach(stage => {
stage.Steps.sort((a, b) => a.SortOrder < b.SortOrder ? -1 : a.SortOrder > b.SortOrder ? 1 : 0);
});
this.workflow.WorkFlowStages = this.utilsService.sort(this.workflow.WorkFlowStages, ['SortOrder'], [-1]);
}
isGeneric(stage: WorkflowStageModel): boolean {
......@@ -183,7 +180,6 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
this.preStages = this.filteredStages(true, false);
this.genericStages = this.filteredStages(false, false);
// .sort((a, b) => a.SortOrder < b.SortOrder ? -1 : a.SortOrder > b.SortOrder ? 1 : 0)
this.postStages = this.filteredStages(false, true);
}
......@@ -463,6 +459,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
this.utilsService.removeMultiRefObject(stage, this.workflow, 'WorkFlowStages', this.createdObjs,
this.updatedObjs, this.deletedObjs);
this.workflow.WorkFlowStages.forEach((stag, index) => stag.SortOrder = index + 1);
this.filterStages();
}
});
}
......@@ -498,7 +495,6 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
this.utilsService.addObjsToJSONByObjectID(this.updatedObjs, this.workflow.WorkFlowStages);
this.workflow.WorkFlowStages = this.workflow.WorkFlowStages || [];
this.workflow.WorkFlowStages.forEach(stage => {
this.updatedObjs[stage.ObjectID] = stage;
stage.Steps = stage.Steps || [];
stage.WorkFlowMessages = stage.WorkFlowMessages || [];
......@@ -533,7 +529,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
'ui-icon-sms';
}
saveWorkflowTemplate(saveCopy = false, testing = true): void {
saveWorkflowTemplate(saveCopy = false): void {
this.utilsService.clearErrorMessages();
const service = `svc/${saveCopy ? SERVICES.SAVE_MESSAGE_AS_COPY : SERVICES.SAVE}`;
......@@ -557,7 +553,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
}
onDragStart(item, list, listId): void {
this.draggingItem = list.find(listItem => listItem.ObjectID === item.ObjectID);
this.draggingItem = item;
this.draggingId = listId;
}
......
frontend/angular/src/app/components/edit-workflow-template/edit-workflow-template.service.ts
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { SERVICES } from '../../constants';
import { MessageTemplateModel } from '../../models/messageTemplate.model';
import { MessageTemplateModel } from '../../models/message-template.model';
import { SearchService } from '../../oneit/services/search.service';
import { UtilsService } from '../../oneit/services/utils.service';
......
frontend/angular/src/app/components/list-message-template/list-message-template.component.ts
......@@ -4,8 +4,8 @@ import { combineLatest } from 'rxjs/observable/combineLatest';
import { Subscription } from 'rxjs/Subscription';
import { AppService } from '../../app.service';
import { SEARCH, SERVICES } from '../../constants';
import { MessageTemplateModel } from '../../models/messageTemplate.model';
import { SorterModel } from '../../models/sorterModel';
import { MessageTemplateModel } from '../../models/message-template.model';
import { SorterModel } from '../../models/sorter-model';
import { SearchService } from '../../oneit/services/search.service';
import { UtilsService } from '../../oneit/services/utils.service';
import { AdminPortalLayoutService } from '../admin-portal/admin-portal-layout/admin-portal-layout.service';
......
frontend/angular/src/app/components/list-work-flows/list-work-flows.component.ts
......@@ -4,8 +4,8 @@ import { combineLatest } from 'rxjs/observable/combineLatest';
import { Subscription } from 'rxjs/Subscription';
import { AppService } from '../../app.service';
import { SEARCH, SERVICES } from '../../constants';
import { SorterModel } from '../../models/sorterModel';
import { WorkflowTemplateModel } from '../../models/workflowTemplate.model';
import { SorterModel } from '../../models/sorter-model';
import { WorkflowTemplateModel } from '../../models/workflow-template.model';
import { UtilsService } from '../../oneit/services/utils.service';
import { AdminPortalLayoutService } from '../admin-portal/admin-portal-layout/admin-portal-layout.service';
import { BaseComponent } from '../base/base.component';
......
frontend/angular/src/app/models/messageTemplate.model.ts → frontend/angular/src/app/models/message-template.model.ts
import { CLASSES } from '../constants';
import { ApplicationStatusEnum } from './applicationStatus.enum';
import { HiringTeamModel } from './hiringTeam.model';
import { TemplateTypeEnum } from './templateType.enum';
import { ApplicationStatusEnum } from './application-status.enum';
import { HiringTeamModel } from './hiring-team.model';
import { TemplateTypeEnum } from './template-type.enum';
export class MessageTemplateModel {
ObjectID: string;
......
frontend/angular/src/app/models/workflowMessage.model.ts → frontend/angular/src/app/models/workflow-message.model.ts
import { CLASSES } from '../constants';
import { MessageTemplateModel } from './messageTemplate.model';
import { ApplicantSourcesEnum } from './applicantSources.enum';
import { MessageTemplateModel } from './message-template.model';
import { ApplicantSourcesEnum } from './applicant-sources.enum';
export class WorkflowMessageModel {
ObjectID: string;
......
frontend/angular/src/app/models/workflowStage.model.ts → frontend/angular/src/app/models/workflow-stage.model.ts
import { CLASSES } from '../constants';
import { StageTypeEnum } from './stageType.enum';
import { WorkflowMessageModel } from './workflowMessage.model';
import { WorkflowStepModel } from './workflowStep.model';
import { StageTypeEnum } from './stage-type.enum';
import { WorkflowMessageModel } from './workflow-message.model';
import { WorkflowStepModel } from './workflow-step.model';
export class WorkflowStageModel {
ObjectID: string;
......
frontend/angular/src/app/models/workflowStep.model.ts → frontend/angular/src/app/models/workflow-step.model.ts
import { CLASSES } from '../constants';
import { StepTypeEnum } from './stepType.enum';
import { StepTypeEnum } from './step-type.enum';
export class WorkflowStepModel {
ObjectID: string;
......
frontend/angular/src/app/models/workflowTemplate.model.ts → frontend/angular/src/app/models/workflow-template.model.ts
import { CLASSES } from '../constants';
import { HiringTeamModel } from './hiringTeam.model';
import { ResponseActionEnum } from './responseAction.enum';
import { WorkflowMessageModel } from './workflowMessage.model';
import { WorkflowStageModel } from './workflowStage.model';
import { HiringTeamModel } from './hiring-team.model';
import { ResponseActionEnum } from './response-action.enum';
import { WorkflowMessageModel } from './workflow-message.model';
import { WorkflowStageModel } from './workflow-stage.model';
export class WorkflowTemplateModel {
ObjectID: string;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment