bo/worklenz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #51 from Worklenz/development

Browse Source 
Development
This commit is contained in:
Chamika J
2024-09-30 15:28:35 +05:30
committed by GitHub
parent 5cce1f2d2c 12c04d0798
commit a8e9ad68bf
9 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worklenz-frontend/angular.json
View File

@@ -36,13 +36,20 @@
"glob": "**/*",
"input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
"output": "/assets/"
},
{
"glob": "**/*",
"input": "node_modules/tinymce",
"output": "/tinymce/"
}
],
"styles": [
"src/theme.less",
"src/styles.scss"
],
"scripts": [],
"scripts": [
"node_modules/tinymce/tinymce.min.js"
],
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json",
"allowedCommonJsDependencies": [

8
worklenz-frontend/package-lock.json generated
View File

@@ -36,7 +36,7 @@
"ngx-doc-viewer": "^15.0.1",
"ngx-socket-io": "^4.5.1",
"rxjs": "~7.4.0",
"tinymce": "^6.7.3",
"tinymce": "^6.8.3",
"tslib": "^2.6.1",
"zone.js": "^0.13.1"
},
@@ -15327,9 +15327,9 @@
"dev": true
},
"node_modules/tinymce": {
"version": "6.7.3",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.7.3.tgz",
"integrity": "sha512-J7WmYIi/gt1RvZ6Ap2oQiUjzAoiS9pfV+d4GnKuZuPu8agmlAEAInNmMvMjfCNBzHv4JnZXY7qlHUAI0IuYQVA=="
"version": "6.8.3",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.8.3.tgz",
"integrity": "sha512-3fCHKAeqT+xNwBVESf6iDbDV0VNwZNmfrkx9c/6Gz5iB8piMfaO6s7FvoiTrj1hf1gVbfyLTnz1DooI6DhgINQ=="
},
"node_modules/tmp": {
"version": "0.2.1",

2
worklenz-frontend/package.json
View File

@@ -45,7 +45,7 @@
"ngx-doc-viewer": "^15.0.1",
"ngx-socket-io": "^4.5.1",
"rxjs": "~7.4.0",
"tinymce": "^6.7.3",
"tinymce": "^6.8.3",
"tslib": "^2.6.1",
"zone.js": "^0.13.1"
},

1
worklenz-frontend/src/app/administrator/components/task-view/task-view-description/task-view-description.component.html
View File

@@ -11,7 +11,6 @@
class="description-editor"
[class.editing]="isEditing"
[init]="CONFIG"
[apiKey]="apiKey"
[(ngModel)]="service.model.task.description"
(onBlur)="onDescriptionInputBlur()"
#descriptionEditor

3
worklenz-frontend/src/app/administrator/components/task-view/task-view-description/task-view-description.component.ts
View File

@@ -25,8 +25,9 @@ export class TaskViewDescriptionComponent implements OnInit, OnDestroy {
@ViewChild("descriptionInput", {static: false}) descriptionInput!: ElementRef;
@ViewChild("descriptionEditor", {static: false}) descriptionEditor!: EditorComponent;
readonly apiKey = "4nquevykvy1i0q0v62ksxuu3nz1muy8i5fsqpj3wp9qm2mgp";
readonly CONFIG = {
base_url: '/tinymce',
suffix: '.min',
plugins: "lists link code wordcount",
toolbar: 'blocks bold italic underline strikethrough | checklist numlist bullist link | alignleft aligncenter alignright alignjustify',
menubar: false,

109
worklenz-frontend/src/app/administrator/components/task-view/task-view.module.ts
View File

@@ -51,7 +51,7 @@ import {NzPopconfirmModule} from 'ng-zorro-antd/popconfirm';
import {NzCardModule} from "ng-zorro-antd/card";
import {NzTableModule} from "ng-zorro-antd/table";
import {NzProgressModule} from "ng-zorro-antd/progress";
import {EditorModule} from '@tinymce/tinymce-angular';
import {EditorModule, TINYMCE_SCRIPT_SRC} from '@tinymce/tinymce-angular';
import {TaskViewTimeLogComponent} from './task-view-time-log/task-view-time-log.component';
import {NzListModule} from "ng-zorro-antd/list";
import {NzEmptyModule} from "ng-zorro-antd/empty";
@@ -99,60 +99,61 @@ import {TaskCommentMentionPipe} from "@pipes/task-comment-mention.pipe";
TaskViewComponent
],
providers: [
SearchByNamePipe
SearchByNamePipe,
{ provide: TINYMCE_SCRIPT_SRC, useValue: 'tinymce/tinymce.min.js' }
],
imports: [
CommonModule,
NzDrawerModule,
NzSkeletonModule,
NzFormModule,
FormsModule,
NzInputModule,
NzSelectModule,
NzTabsModule,
NzTagModule,
NzCollapseModule,
NzDropDownModule,
AvatarsComponent,
NzAvatarModule,
NzTypographyModule,
NzCheckboxModule,
SearchByNamePipe,
NzToolTipModule,
NzDatePickerModule,
NzInputNumberModule,
NzIconModule,
NzBadgeModule,
NzDividerModule,
FromNowPipe,
ReactiveFormsModule,
TaskPriorityLabelComponent,
NzButtonModule,
NzCommentModule,
RouterLink,
NzSpaceModule,
NzMentionModule,
NzAffixModule,
NzNoAnimationModule,
NzPopconfirmModule,
NzCardModule,
NzTableModule,
NzProgressModule,
EditorModule,
NzListModule,
NzEmptyModule,
TaskTimerComponent,
FirstCharUpperPipe,
TaskListAddTaskInputComponent,
SafeStringPipe,
DateFormatterPipe,
NgxDocViewerModule,
NzModalModule,
NzSpinModule,
NzTimelineModule,
NzTimePickerModule,
TaskCommentMentionPipe
]
imports: [
CommonModule,
NzDrawerModule,
NzSkeletonModule,
NzFormModule,
FormsModule,
NzInputModule,
NzSelectModule,
NzTabsModule,
NzTagModule,
NzCollapseModule,
NzDropDownModule,
AvatarsComponent,
NzAvatarModule,
NzTypographyModule,
NzCheckboxModule,
SearchByNamePipe,
NzToolTipModule,
NzDatePickerModule,
NzInputNumberModule,
NzIconModule,
NzBadgeModule,
NzDividerModule,
FromNowPipe,
ReactiveFormsModule,
TaskPriorityLabelComponent,
NzButtonModule,
NzCommentModule,
RouterLink,
NzSpaceModule,
NzMentionModule,
NzAffixModule,
NzNoAnimationModule,
NzPopconfirmModule,
NzCardModule,
NzTableModule,
NzProgressModule,
EditorModule,
NzListModule,
NzEmptyModule,
TaskTimerComponent,
FirstCharUpperPipe,
TaskListAddTaskInputComponent,
SafeStringPipe,
DateFormatterPipe,
NgxDocViewerModule,
NzModalModule,
NzSpinModule,
NzTimelineModule,
NzTimePickerModule,
TaskCommentMentionPipe
]
})
export class TaskViewModule {
}

1
worklenz-frontend/src/app/administrator/settings/project-template-edit-view/components/phase-settings-drawer/phase-settings-drawer.component.ts
View File

@@ -4,7 +4,6 @@ import {ProjectTemplateService} from "@services/project-template.service";
import {PtTaskPhasesApiService} from "@api/pt-task-phases-api.service";
import {ITaskPhase} from "@interfaces/api-models/task-phase";
import {PhaseColorCodes} from "@shared/constants";
import {load} from "@angular-devkit/build-angular/src/utils/server-rendering/esm-in-memory-file-loader";
@Component({
selector: 'worklenz-phase-settings-drawer',

1
worklenz-frontend/src/app/administrator/settings/project-template-edit-view/components/row/task-description/task-description.component.html
View File

@@ -21,7 +21,6 @@
class="description-editor-list"
[class.editing]="isEditing"
[init]="CONFIG"
[apiKey]="apiKey"
[(ngModel)]="task.description"
(onBlur)="submit()"
#descriptionEditor

3
worklenz-frontend/src/app/administrator/settings/project-template-edit-view/components/row/task-description/task-description.component.ts
View File

@@ -28,8 +28,9 @@ export class TaskDescriptionComponent implements OnInit, OnDestroy {
show = false;
loading = false;
readonly apiKey = "4nquevykvy1i0q0v62ksxuu3nz1muy8i5fsqpj3wp9qm2mgp";
readonly CONFIG = {
base_url: '/tinymce',
suffix: '.min',
plugins: "lists link code wordcount",
toolbar: 'blocks bold italic underline strikethrough | checklist numlist bullist link | alignleft aligncenter alignright alignjustify',
menubar: false,