Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-3235

Browse Source
This commit is contained in:
Timo Bejan 2022-01-19 08:37:07 +02:00
parent 0572cbcdce
commit e1f18d6c2d
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts
View File

@ -6,7 +6,7 @@ import { BaseDialogComponent, shareDistinctLast, Toaster } from '@iqser/common-u
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { AppStateService } from '@state/app-state.service'; import { AppStateService } from '@state/app-state.service';
import { toKebabCase } from '@utils/functions'; import { toSnakeCase } from '@utils/functions';
import { DictionaryService } from '@shared/services/dictionary.service'; import { DictionaryService } from '@shared/services/dictionary.service';
import { Dictionary, IDictionary } from '@red/domain'; import { Dictionary, IDictionary } from '@red/domain';
import { UserService } from '@services/user.service'; import { UserService } from '@services/user.service';
@ -126,7 +126,7 @@ export class AddEditDictionaryDialogComponent extends BaseDialogComponent {
private _toTechnicalName(value: string) { private _toTechnicalName(value: string) {
const existingTechnicalNames = Object.keys(this._appStateService.dictionaryData[this._dossierTemplateId]); const existingTechnicalNames = Object.keys(this._appStateService.dictionaryData[this._dossierTemplateId]);
const baseTechnicalName = toKebabCase(value.trim()); const baseTechnicalName = toSnakeCase(value.trim());
let technicalName = baseTechnicalName; let technicalName = baseTechnicalName;
let suffix = 1; let suffix = 1;
while (existingTechnicalNames.includes(technicalName)) { while (existingTechnicalNames.includes(technicalName)) {

1
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/annotations-list/annotations-list.component.ts
View File

@ -41,7 +41,6 @@ export class AnnotationsListComponent implements OnChanges {
if (this.canMultiSelect && ($event.ctrlKey || $event.metaKey) && this.selectedAnnotations.length > 0) { if (this.canMultiSelect && ($event.ctrlKey || $event.metaKey) && this.selectedAnnotations.length > 0) {
this.multiSelectService.activate(); this.multiSelectService.activate();
} }
console.log('emit', annotation);
this.selectAnnotations.emit([annotation]); this.selectAnnotations.emit([annotation]);
} }
} }

4
apps/red-ui/src/app/utils/functions.ts
View File

@ -98,9 +98,9 @@ export function removeBraces(str: any): string {
return str.replace(/[{}]/g, ''); return str.replace(/[{}]/g, '');
} }
export function toKebabCase(str: string): string { export function toSnakeCase(str: string): string {
return str return str
.replace(/([a-z])([A-Z])/g, '$1-$2') .replace(/([a-z])([A-Z])/g, '$1-$2')
.replace(/[\s_]+/g, '-') .replace(/[\s_]+/g, '_')
.toLowerCase(); .toLowerCase();
} }