diff --git a/ui/package.json b/ui/package.json index 722fd2792b..7fe16bd10c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -22,14 +22,7 @@ "sentry:sourcemaps": "sentry-cli releases -o ${SENTRY_ORG} -p ${SENTRY_PROJECT} files ${CDS_VERSION} upload-sourcemaps --url-prefix=${SENTRY_CDS_PREFIX_URL}" }, "lint-staged": { - "linters": { - "*.ts": "ng lint" - }, - "relative": true, - "fileFlag": "--lint-file-patterns", - "ignore": [ - "**/*.spec.ts" - ] + "*.{js,scss,ts,html}": "tslint" }, "private": true, "dependencies": { @@ -51,6 +44,7 @@ "@ngxs/logger-plugin": "3.7.0", "@ngxs/store": "3.7.0", "@richardlt/ng2-semantic-ui": "0.10.0-alpha.6-fork-5", + "@sgu/ng-semantic": "1.1.18", "@swimlane/ngx-charts": "16.0.0", "@types/dagre-d3": "0.6.2", "@types/js-yaml": "3.12.2", @@ -79,7 +73,6 @@ "modernizr": "3.7.1", "moment": "2.24.0", "ng-event-source": "1.0.14", - "ng-semantic": "https://github.com/sguiheux/ngSemantic/tarball/sgu-master", "ng2-codemirror-typescript": "3.0.1", "ng2-completer": "2.0.8", "ng2-dragula-sgu": "3.0.2", @@ -140,7 +133,7 @@ "karma-jasmine": "4.0.0", "karma-jasmine-html-reporter": "1.5.0", "karma-junit-reporter": "1.2.0", - "lint-staged": "git+https://github.com/bnjjj/lint-staged.git#master", + "lint-staged": "^12.0.2", "ts-node": "8.3.0", "tslint": "6.1.0", "typescript": "4.0.2", diff --git a/ui/src/app/shared/modal/warning/warning.component.ts b/ui/src/app/shared/modal/warning/warning.component.ts index 763cd4ccc3..f5306a1aad 100644 --- a/ui/src/app/shared/modal/warning/warning.component.ts +++ b/ui/src/app/shared/modal/warning/warning.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; -import { SemanticModalComponent } from 'ng-semantic/ng-semantic'; +import { SemanticModalComponent } from '@sgu/ng-semantic'; @Component({ selector: 'app-warning-modal', diff --git a/ui/src/app/shared/requirements/form/requirements.form.component.ts b/ui/src/app/shared/requirements/form/requirements.form.component.ts index 8154e43046..355e131b8c 100644 --- a/ui/src/app/shared/requirements/form/requirements.form.component.ts +++ b/ui/src/app/shared/requirements/form/requirements.form.component.ts @@ -5,7 +5,7 @@ import { Requirement } from 'app/model/requirement.model'; import { WorkerModel } from 'app/model/worker-model.model'; import { RequirementStore } from 'app/service/requirement/requirement.store'; import { RequirementEvent } from 'app/shared/requirements/requirement.event.model'; -import { SemanticModalComponent } from 'ng-semantic/ng-semantic'; +import { SemanticModalComponent } from '@sgu/ng-semantic'; import { finalize, first } from 'rxjs/operators'; export const OSArchitecture = 'os-architecture'; diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts index d6b4834f72..880fec5aa5 100644 --- a/ui/src/app/shared/shared.module.ts +++ b/ui/src/app/shared/shared.module.ts @@ -5,6 +5,7 @@ import { RouterModule } from '@angular/router'; import { NguiAutoCompleteComponent, NguiAutoCompleteModule } from '@ngui/auto-complete'; import { TranslateModule } from '@ngx-translate/core'; import { SuiModule } from '@richardlt/ng2-semantic-ui'; +import { NgxSemanticModule } from '@sgu/ng-semantic'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AuthenticationGuard } from 'app/guard/authentication.guard'; import { FeatureGuard } from 'app/guard/feature.guard'; @@ -22,7 +23,6 @@ import { WorkflowWizardNodeConditionComponent } from 'app/shared/workflow/wizard import { WorkflowWizardOutgoingHookComponent } from 'app/shared/workflow/wizard/outgoinghook/wizard.outgoinghook.component'; import { WorkflowRunJobVariableComponent } from 'app/views/workflow/run/node/pipeline/variables/job.variables.component'; import { WorkflowRunJobComponent } from 'app/views/workflow/run/node/pipeline/workflow-run-job/workflow-run-job.component'; -import { NgSemanticModule } from 'ng-semantic/ng-semantic'; import { CodemirrorModule } from 'ng2-codemirror-typescript/Codemirror'; import { DragulaModule } from 'ng2-dragula-sgu'; import { NgxAutoScroll, NgxAutoScrollModule } from 'ngx-auto-scroll'; @@ -118,7 +118,7 @@ import { ZoneComponent } from './zone/zone.component'; imports: [ CommonModule, ClipboardModule, - NgSemanticModule, + NgxSemanticModule, FormsModule, TranslateModule, DragulaModule.forRoot(), @@ -286,7 +286,7 @@ import { ZoneComponent } from './zone/zone.component'; MenuComponent, MomentModule, NgForNumber, - NgSemanticModule, + NgxSemanticModule, NgxAutoScroll, PaginationComponent, ParameterFormComponent, diff --git a/ui/src/app/shared/variable/list/variable.component.ts b/ui/src/app/shared/variable/list/variable.component.ts index 4dd0855da3..3cca7ac272 100644 --- a/ui/src/app/shared/variable/list/variable.component.ts +++ b/ui/src/app/shared/variable/list/variable.component.ts @@ -15,7 +15,7 @@ import { ProjectAuditService } from 'app/service/project/project.audit.service'; import { VariableService } from 'app/service/variable/variable.service'; import { Table } from 'app/shared/table/table'; import { VariableEvent } from 'app/shared/variable/variable.event.model'; -import { SemanticModalComponent } from 'ng-semantic/ng-semantic'; +import { SemanticModalComponent } from '@sgu/ng-semantic'; import { finalize } from 'rxjs/operators'; @Component({ diff --git a/ui/src/app/views/pipeline/show/workflow/pipeline.workflow.component.ts b/ui/src/app/views/pipeline/show/workflow/pipeline.workflow.component.ts index cc05ddde43..909ebf238c 100644 --- a/ui/src/app/views/pipeline/show/workflow/pipeline.workflow.component.ts +++ b/ui/src/app/views/pipeline/show/workflow/pipeline.workflow.component.ts @@ -15,7 +15,7 @@ import { ToastService } from 'app/shared/toast/ToastService'; import * as pipelineActions from 'app/store/pipelines.action'; import { PipelinesStateModel } from 'app/store/pipelines.state'; import cloneDeep from 'lodash-es/cloneDeep'; -import { SemanticModalComponent } from 'ng-semantic/ng-semantic'; +import { SemanticModalComponent } from '@sgu/ng-semantic'; import { DragulaService } from 'ng2-dragula-sgu'; import { Subscription } from 'rxjs'; import { finalize, first } from 'rxjs/operators'; diff --git a/ui/src/app/views/project/add/project.add.component.ts b/ui/src/app/views/project/add/project.add.component.ts index b4b0d2173a..a701909188 100644 --- a/ui/src/app/views/project/add/project.add.component.ts +++ b/ui/src/app/views/project/add/project.add.component.ts @@ -3,7 +3,7 @@ import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Store } from '@ngxs/store'; import { AddProject } from 'app/store/project.action'; -import { SemanticModalComponent } from 'ng-semantic/ng-semantic'; +import { SemanticModalComponent } from '@sgu/ng-semantic'; import { finalize, first } from 'rxjs/operators'; import { Group, GroupPermission } from '../../../model/group.model'; import { Project } from '../../../model/project.model'; diff --git a/ui/src/tsconfig.app.json b/ui/src/tsconfig.app.json index cbcf69e953..8c429ee0d2 100644 --- a/ui/src/tsconfig.app.json +++ b/ui/src/tsconfig.app.json @@ -18,14 +18,12 @@ }, "include": [ "**/*.ts", - "../node_modules/ng2-codemirror-typescript/**/*.ts", - "../node_modules/ng-semantic/**/*.ts" + "../node_modules/ng2-codemirror-typescript/**/*.ts" ], "exclude": [ "test.ts", "**/*.ngtypecheck.ts", "**/*.spec.ts", - "../node_modules/ng-semantic/demo/**/*.ts", "../node_modules/angular2-prettyjson/node_modules/**/*.ts", "../node_modules/angular2-prettyjson/**/*.ts" ], diff --git a/ui/src/tsconfig.spec.json b/ui/src/tsconfig.spec.json index f6d772897e..f017ebf524 100644 --- a/ui/src/tsconfig.spec.json +++ b/ui/src/tsconfig.spec.json @@ -24,11 +24,9 @@ ], "include": [ "**/*.spec.ts", - "../node_modules/ng2-codemirror-typescript/**/*.ts", - "../node_modules/ng-semantic/**/*.ts" + "../node_modules/ng2-codemirror-typescript/**/*.ts" ], "exclude": [ - "../node_modules/ng-semantic/demo/**/*.ts", "../node_modules/angular2-prettyjson/node_modules/**/*.ts", "../node_modules/angular2-prettyjson/**/*.ts" ]