Merge branch 'master' into ba-meyer-master

TYueksel · web-flow · commit 3b34747a0c43 · 2021-10-21T20:03:39.000+02:00
diff --git a/.docker/features.json b/.docker/features.json
@@ -1,10 +1,10 @@
 {
-  "features": {
-    "designModel": false,
-    "patternCandidate": false,
-    "patternViews": false,
-    "issue": false,
-    "editing": true,
-    "showSettings": false
-  }
+    "features": {
+        "designModel": false,
+        "patternCandidate": false,
+        "patternViews": true,
+        "issue": false,
+        "editing": true,
+        "showSettings": false
+      }
 }
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "lodash": "^4.17.21",
     "madr": "2.1.2",
     "markdown-it": "10.0.0",
-    "markdown-it-katex": "^2.0.3",
+    "markdown-it-katexx": "3.2.0 ",
     "mathjs": "^7.0.2",
     "ngx-cookie-service": "2.1.0",
     "ngx-md": "8.1.6",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -63,10 +63,16 @@ export class AppComponent implements OnInit {
       () => (this.loading = false),
       (error: HttpErrorResponse) => {
         this.loading = false;
-        this.toasterService.popAsync(
-          'error', 'Error while loading config from config server, using default values instead' + error.message).subscribe(
-          () => console.log('default values applied')
-        )
+        if(error.status === globals.statusCodeNotFound){
+          this.configService.getDefaultConfiguration(); 
+          console.log('default values applied') 
+        }
+        else{
+          this.toasterService.popAsync(
+            'error', 'Error while loading config from config server, using default values instead' + error.message).subscribe(
+            () => console.log('default values applied')
+          )
+        }
       }
     );
     this.auth.user.subscribe(_user => {
diff --git a/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts b/src/app/core/component/markdown-content-container/markdown-pattern-sectioncontent/markdown-pattern-section-content.component.ts
@@ -3,7 +3,7 @@ import { DataChange, DataRenderingComponent } from '../interfaces/DataRenderingC
 import { MatDialog } from '@angular/material/dialog';
 import { DialogData, MdEditorComponent } from '../../md-editor/md-editor.component';
 import * as MarkdownIt from 'markdown-it';
-import * as markdownitKatex from 'markdown-it-katex';
+import * as markdownitKatex from 'markdown-it-katexx';
 import { ImageService } from '../../../service/image.service';
 import * as d3 from 'd3';
 import { MatSnackBar } from '@angular/material/snack-bar';
@@ -56,7 +56,8 @@ export class MarkdownPatternSectionContentComponent extends DataRenderingCompone
 
   ngAfterViewInit() {
     this.markdown = new MarkdownIt();
-    this.markdown.use(markdownitKatex);
+    this.markdown.set({ breaks: true });
+    this.markdown.use(markdownitKatex.default, { throwOnError: false, errorColor: ' #cc0000' });
     this.changeText(this.renderedData);
   }
 
diff --git a/src/app/core/directives/pattern-atlas-ui-repository-configuration.service.ts b/src/app/core/directives/pattern-atlas-ui-repository-configuration.service.ts
@@ -40,11 +40,11 @@ interface EtcdNode {
 
 const initialValues: PatternAtlasUiConfiguration = {
   features: {
-    designModel: false,
+    designModel: true,
     patternCandidate: true,
     patternViews: true,
     issue: true,
-    showSettings: false,
+    showSettings: true,
     editing: true
   },
 };
@@ -82,6 +82,10 @@ export class PatternAtlasUiRepositoryConfigurationService {
       );
   }
 
+  getDefaultConfiguration():Observable<PatternAtlasUiConfiguration>{
+    return this.http.get<PatternAtlasUiConfiguration>(environment.defaultFeatures);
+  }
+
   applyConfig(feature: UiFeatures, checked: boolean): Observable<string> {
     const url = environment.CONFIG_SERVER_URL + '/features/' + feature;
 
diff --git a/src/app/globals.ts b/src/app/globals.ts
@@ -24,5 +24,6 @@ export const globals = {
     patternViews: 'pattern-views',
     patternViewURI: 'pattern-view-uri',
     designModels: 'design-models'
-  }
+  },
+  statusCodeNotFound : 404
 };
diff --git a/src/app/pattern-language-management/create-pattern/create-pattern.component.ts b/src/app/pattern-language-management/create-pattern/create-pattern.component.ts
@@ -10,7 +10,7 @@ import { PatternLanguageService } from '../../core/service/pattern-language.serv
 import PatternLanguage from '../../core/model/hal/pattern-language.model';
 import PatternSectionSchema from '../../core/model/hal/pattern-section-schema.model';
 import * as MarkdownIt from 'markdown-it';
-import * as markdownitKatex from 'markdown-it-katex';
+import * as markdownitKatex from 'markdown-it-katexx';
 import { PatternService } from '../../core/service/pattern.service';
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/internal/operators';
 import { globals } from '../../globals';
@@ -92,7 +92,8 @@ export class CreatePatternComponent implements OnInit {
   ngOnInit() {
     this.patternLanguageId = UriConverter.doubleDecodeUri(this.activatedRoute.snapshot.paramMap.get(globals.pathConstants.patternLanguageId));
     this.markdown = new MarkdownIt();
-    this.markdown.use(markdownitKatex);
+    this.markdown.set({ breaks: true });
+    this.markdown.use(markdownitKatex.default, { throwOnError: false, errorColor: ' #cc0000' });
 
     const patternLanguageObservable = UriConverter.isUUID(this.patternLanguageId) ?
       this.patternLanguageService.getPatternLanguageById(this.patternLanguageId)
diff --git a/src/assets/settings_features/default_features.json b/src/assets/settings_features/default_features.json
@@ -0,0 +1,10 @@
+{
+  "features": {
+    "designModel": false,
+    "patternCandidate": false,
+    "patternViews": true,
+    "issue": false,
+    "editing": true,
+    "showSettings": false
+  }
+}
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -28,5 +28,6 @@ export const environment = {
     window['env'] && window['env']['CONFIG_SERVER_HOST_NAME'] &&
     window['env']['CONFIG_SERVER_PORT']
       ? `http://${window['env']['CONFIG_SERVER_HOST_NAME']}:${window['env']['CONFIG_SERVER_PORT']}/v2/keys`
-      : 'http://localhost:2379/v2/keys'
+      : 'http://localhost:2379/v2/keys',
+  defaultFeatures: 'assets/settings_features/default_features.json'
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -40,7 +40,8 @@ export const environment = {
     window['env'] && window['env']['CONFIG_SERVER_HOST_NAME'] &&
     window['env']['CONFIG_SERVER_PORT']
       ? `http://${window['env']['CONFIG_SERVER_HOST_NAME']}:${window['env']['CONFIG_SERVER_PORT']}/v2/keys`
-      : 'http://localhost:2379/v2/keys'
+      : 'http://localhost:2379/v2/keys',
+  defaultFeatures: 'assets/settings_features/default_features.json'
 };
 
 /*
diff --git a/yarn.lock b/yarn.lock
@@ -2701,7 +2701,7 @@ chokidar@^2.0.3, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.1.1, chownr@^1.1.2:
+chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -2889,9 +2889,9 @@ color-name@^1.0.0, color-name@~1.1.4:
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-string@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
-  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
+  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -4697,7 +4697,7 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
+fs-minipass@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
   integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
@@ -6760,7 +6760,7 @@ minipass-pipeline@^1.2.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -6775,7 +6775,7 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.2.1:
+minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
   integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
@@ -6814,7 +6814,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1, mkdirp@~0.5.x:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1, mkdirp@~0.5.x:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -7566,9 +7566,9 @@ path-key@^2.0.0, path-key@^2.0.1:
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
@@ -8799,7 +8799,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -9795,17 +9795,17 @@ tapable@^1.0.0, tapable@^1.1.3:
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tar@^4.4.10:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  version "4.4.19"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
+  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
   dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
+    chownr "^1.1.4"
+    fs-minipass "^1.2.7"
+    minipass "^2.9.0"
+    minizlib "^1.3.3"
+    mkdirp "^0.5.5"
+    safe-buffer "^5.2.1"
+    yallist "^3.1.1"
 
 tar@^6.0.1:
   version "6.0.2"
@@ -10775,7 +10775,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
