Features in settings default selection change (#123)

* changes in ui to load features from assets in case backend fetch fail

* Update features.json

* package changes

* correcting the package changes

* review_comments

* review comments

* renaming the constant

* Update app.component.ts

Author: emymaria

.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
+      }
 }

package.json

@@ -37,7 +37,7 @@
     "lodash": "^4.17.21",
     "madr": "2.1.2",
     "markdown-it": "10.0.0",
-    "markdown-it-katex": "github:MicroDroid/markdown-it-katex",
+    "markdown-it-katexx": "3.2.0 ",
     "mathjs": "^7.0.2",
     "ngx-cookie-service": "2.1.0",
     "ngx-md": "8.1.6",

src/app/app.component.ts

@@ -68,10 +68,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')
+          )
+        }
       }
     );
   }

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);
   }
 

src/app/core/directives/pattern-atlas-ui-repository-configuration.service.ts

@@ -40,11 +40,11 @@ interface EtcdNode {
 
 const initialValues: PatternAtlasUiConfiguration = {
   features: {
-    designModel: false,
-    patternCandidate: false,
-    patternViews: false,
-    issue: false,
-    showSettings: false,
+    designModel: true,
+    patternCandidate: true,
+    patternViews: true,
+    issue: true,
+    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;
 

src/app/globals.ts

@@ -24,5 +24,6 @@ export const globals = {
     patternViews: 'pattern-views',
     patternViewURI: 'pattern-view-uri',
     designModels: 'design-models'
-  }
+  },
+  statusCodeNotFound : 404
 };

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)

src/assets/settings_features/default_features.json

@@ -0,0 +1,10 @@
+{
+  "features": {
+    "designModel": false,
+    "patternCandidate": false,
+    "patternViews": true,
+    "issue": false,
+    "editing": true,
+    "showSettings": false
+  }
+}

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'
 };

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'
 };
 
 /*