Bump @tootallnate/once, jest-environment-jsdom and jest-preset-angular in /gui-js

Doxyversion

@@ -1 +1 @@
-PROJECT_NAME=Minsky: 3.23.0
+PROJECT_NAME=Minsky: 3.22.0-beta.2

Makefile

@@ -8,7 +8,6 @@ export AEGIS
 export MXE
 export OPENMP
 export OPT
-#export FLAGS
 export CPLUSPLUS
 
 # root directory for ecolab include files and libraries
@@ -224,7 +223,10 @@ ifeq ($(CPLUSPLUS),clang++)
 FLAGS+=-Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-defaulted-function-deleted -Wno-uninitialized
 endif
 
-ifdef OPENMP
+# enable OPENMP by default
+#ifdef OPENMP
+# Default compiler on MacOSX does not support OpenMP. Sigh!
+ifneq ($(OS),Darwin)
 FLAGS+=-fopenmp
 LIBS+=-fopenmp
 endif
@@ -300,7 +302,7 @@ MXE_DLLS=libboost_thread-mt-x64 libbrotlidec libbrotlicommon libbz2 libcairo-2 \
 libcroco-0 libcrypto-3-x64 \
 libexpat-1 libffi libfontconfig-1 libfreetype-6 libfribidi-0 libgcc_s_seh-1 \
 libgdk_pixbuf-2 libgio-2 libglib-2 libgmodule-2 \
-libgobject-2 libgsl-27 libgslcblas-0 libharfbuzz-0 libiconv-2 libintl-8 \
+libgobject-2 libgomp-1 libgsl-27 libgslcblas-0 libharfbuzz-0 libiconv-2 libintl-8 \
 libjpeg-9 liblzma-5 libpango-1 libpangocairo-1 libpangoft2-1 libpangowin32-1 \
 libpcre2-8-0 libpixman-1-0 libpng16-16 libreadline8 librsvg-2-2 libssl-3-x64 \
 libstdc++-6 libtermcap libwinpthread-1 libxml2-16 tcl86 zlib1 \
@@ -490,7 +492,7 @@ node-api.o: node-api.cc
 $(EXES):
 
 tests: $(EXES)
-	cd test; $(MAKE)
+	cd test; $(MAKE) $(MAKEOVERRIDES) CPLUSPLUS="$(CPLUSPLUS)"
 
 BASIC_CLEAN=rm -rf *.o *~ "\#*\#" core *.d *.cd *.rcd *.tcd *.xcd *.gcda *.gcno *.so *.dll *.dylib
 

doc/version.tex

@@ -1 +1 @@
-\author{Version 3.23.0}
+\author{Version 3.22.0-beta.2}

engine/minskyTensorOps.cc

@@ -1560,24 +1560,24 @@ namespace minsky
     double operator[](size_t i) const override {
       if (chainChecked)
         return chain.empty()? nan(""): (*chain.back())[i];
-      else
-        { // first time through since reset, check the chain doesn't change
-          lock_guard lock(chainMutex); // mutex rather than critical, for possible rescursion
-          double v=nan("");
-          if (!chain.empty())
+      // first time through since reset, check the chain doesn't change
+      lock_guard lock(chainMutex); // mutex rather than critical, for possible rescursion
+      if (chainChecked) // in case we were waiting on another thread at the mutex
+        return chain.empty()? nan(""): (*chain.back())[i];
+      double v=nan("");
+      if (!chain.empty())
+        {
+          v=(*chain.back())[i];
+          if (m_timestamp<chain.back()->timestamp())
             {
+              const_cast<Ravel&>(ravel).populateHypercube(arg->hypercube());
+              chain=ravel::createRavelChain(ravel.getState(), arg);
+              m_timestamp=Timestamp::clock::now();
+              chainChecked=true;
               v=(*chain.back())[i];
-              if (m_timestamp<chain.back()->timestamp())
-                {
-                  const_cast<Ravel&>(ravel).populateHypercube(arg->hypercube());
-                  chain=ravel::createRavelChain(ravel.getState(), arg);
-                  m_timestamp=Timestamp::clock::now();
-                  chainChecked=true;
-                  v=(*chain.back())[i];
-                }
             }
-          return v;
         }
+      return v;
     }
     size_t size() const override {return chain.empty()? 1: chain.back()->size();}
     const Index& index() const override

gui-js/apps/minsky-web/src/app/app.component.spec.ts

@@ -1,5 +1,5 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideRouter } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { AppComponent } from './app.component';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog'
@@ -8,8 +8,12 @@ describe('AppComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        providers: [{ provide: MatDialog, useValue: {} }, { provide: MatDialogRef, useValue: {} }],
-        imports: [RouterTestingModule, TranslateModule.forRoot(), AppComponent],
+        providers: [
+          { provide: MatDialog, useValue: {} }, 
+          { provide: MatDialogRef, useValue: {} },
+          provideRouter([])
+        ],
+        imports: [TranslateModule.forRoot(), AppComponent],
       }).compileComponents();
     })
   );

gui-js/apps/minsky-web/src/app/app.component.ts

@@ -6,7 +6,8 @@ import { TranslateService } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
 import { HeaderComponent } from '../../../../libs/ui-components/src/lib/header/header.component';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-
+import { NavigationEnd } from '@angular/router';
+import { filter, first } from 'rxjs/operators';
 
 @Component({
     selector: 'minsky-root',
@@ -55,8 +56,7 @@ export class AppComponent implements OnInit, DoCheck {
   }
 
   async ngDoCheck() {
-    if(this.loading && this.router.url !== '/') {
-      this.loading = false;
+    if(this.loading) {
       this.updatePubTabs();
       this.cdRef.detectChanges();
 
@@ -94,7 +94,14 @@ export class AppComponent implements OnInit, DoCheck {
   async ngOnInit() {
     this.electronService.on(events.CHANGE_MAIN_TAB, ()=>this.changeTab('minsky.canvas'));
     this.electronService.on(events.PUB_TAB_REMOVED, ()=>this.updatePubTabs());
-  }
+    // stop spinner after first successful navigation
+    this.router.events
+      .pipe(filter(e => e instanceof NavigationEnd), first())
+      .subscribe(() => {
+        this.loading = false;
+        this.updatePubTabs();
+        this.cdRef.detectChanges();
+      });  }
 
   async updatePubTabs() {
     let pubTabs=await this.electronService.minsky.publicationTabs.$properties();

gui-js/apps/minsky-web/src/main.ts

@@ -7,7 +7,7 @@ import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 
 import { AppRoutingModule } from './app/app-routing.module';
 
-import { withInterceptorsFromDi, provideHttpClient, HttpClient, HttpClientModule } from '@angular/common/http';
+import { withInterceptorsFromDi, provideHttpClient, HttpClient, } from '@angular/common/http';
 import { provideAnimations } from '@angular/platform-browser/animations';
 import { bootstrapApplication } from '@angular/platform-browser';
 
@@ -27,7 +27,6 @@ bootstrapApplication(AppComponent, {
         deps: [HttpClient],
       },
     }),
-    HttpClientModule,
     AppRoutingModule)
 ]
 })

gui-js/apps/minsky-web/src/test-setup.ts

@@ -4,4 +4,16 @@ globalThis.ngJest = {
       errorOnUnknownProperties: true,
     },
   };
-  import 'jest-preset-angular/setup-jest';
+import 'jest-preset-angular/setup-env/zone';
+import '../../../libs/shared/src/test-setup';
+
+import { TestBed } from '@angular/core/testing';
+import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+
+// Initialize the Angular testing environment for Jest.
+// Without this, TestBed.configureTestingModule() throws:
+// "Need to call TestBed.initTestEnvironment() first"
+TestBed.initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+);

gui-js/apps/minsky-web/tsconfig.app.json

@@ -2,9 +2,10 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": []
+    "types": [],
+    "moduleResolution": "bundler"
   },
   "files": ["src/main.ts"],
   "include": ["src/**/*.d.ts"],
   "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
-}
+}

gui-js/apps/minsky-web/tsconfig.spec.json

@@ -2,7 +2,8 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "types": ["jest", "node"]
+    "types": ["jest", "node"],
+    "moduleResolution": "bundler"
   },
   "files": ["src/test-setup.ts"],
   "include": [
@@ -11,4 +12,4 @@
     "src/**/*.spec.ts",
     "src/**/*.d.ts"
   ]
-}
+}

gui-js/libs/menu/src/lib/file/about/about.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, VERSION } from '@angular/core';
+import { Component, OnInit, VERSION, ChangeDetectorRef } from '@angular/core';
 import { ElectronService } from '@minsky/core';
 import { version } from '@minsky/shared';
 
@@ -14,15 +14,16 @@ export class AboutComponent implements OnInit {
   frontEndVersion: string;
   ravelVersion: string;
 
-  constructor(private electronService: ElectronService){}
+  constructor(private electronService: ElectronService, private cdRef: ChangeDetectorRef,){}
 
   ngOnInit(): void {
     (async () => {
       let minsky=this.electronService.minsky;
       this.ravelVersion = await minsky.ravelVersion();
       this.minskyVersion = await minsky.minskyVersion();
       this.frontEndVersion=version;
-    })();
+      // Ensure UI updates even if backend calls resolve outside Angular's zone.
+      this.cdRef.detectChanges();    })();
   }
 
   async closeWindow() {this.electronService.closeWindow();}

gui-js/libs/shared/src/lib/constants/version.ts

@@ -1 +1 @@
-export const version="3.23.0";
+export const version="3.22.0-beta.2";

gui-js/libs/shared/src/test-setup.ts

@@ -1,4 +1,4 @@
-import 'jest-preset-angular/setup-jest';
+import 'jest-preset-angular/setup-env/zone';
 import JSON5 from 'json5';
 import {CppClass} from '@minsky/shared';