fix(proposal_logbook): inifinite logbook fech loop after RxJS upgrade… (

#1625) * fix(proposal_logbook): inifinite logbook fech loop after RxJS upgrade to v7.4.0 * Exclude cy.js from typescript compiler
SciCatProject · Nov 1, 2024 · dbc0c31 · dbc0c31
1 parent 2ae03e8
commit dbc0c31
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 31 deletions.
diff --git a/cypress/e2e/datasets/datasets-attachment.cy.js b/cypress/e2e/datasets/datasets-attachment.cy.js
@@ -1,4 +1,3 @@
-/// <reference types="cypress" />
 var path = require("path");
 
 describe("Dataset attachments", () => {

diff --git a/cypress/e2e/datasets/datasets-datafiles.cy.js b/cypress/e2e/datasets/datasets-datafiles.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Dataset datafiles", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));

diff --git a/cypress/e2e/datasets/datasets-general.cy.js b/cypress/e2e/datasets/datasets-general.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Datasets general", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));

diff --git a/cypress/e2e/datasets/datasets-keyword.cy.js b/cypress/e2e/datasets/datasets-keyword.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Datasets", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));

diff --git a/cypress/e2e/datasets/datasets-metadata.cy.js b/cypress/e2e/datasets/datasets-metadata.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Datasets", () => {
   const metadataName = "some name";
   const metadataValue = "some value";

diff --git a/cypress/e2e/datasets/datasets-public.cy.js b/cypress/e2e/datasets/datasets-public.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Datasets", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));

diff --git a/cypress/e2e/datasets/datasets-publish.cy.js b/cypress/e2e/datasets/datasets-publish.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Datasets", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));

diff --git a/cypress/e2e/datasets/datasets-reduce.cy.js b/cypress/e2e/datasets/datasets-reduce.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Datasets", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));

diff --git a/cypress/e2e/datasets/datasets-share.cy.js b/cypress/e2e/datasets/datasets-share.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Datasets", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));

diff --git a/cypress/e2e/other/elastic-search.cy.js b/cypress/e2e/other/elastic-search.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Elastic search", () => {
   const randomText1 =
     "$PDfUCt+qX*5Km=ezGQF ELASTIC_SEARCH_vg+Mgga2#vEe=u!dQ!V+ fp$q6tz8y%hyaHzbx2X+ Vz6shS8ejGCQN3h%TEST 6j2&eqYT7GCR+CpqqD5n";

diff --git a/cypress/e2e/other/policy-delegate.cy.js b/cypress/e2e/other/policy-delegate.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Policies", () => {
   beforeEach(() => {
     cy.login(Cypress.env("username"), Cypress.env("password"));

diff --git a/cypress/e2e/other/users-login.cy.js b/cypress/e2e/other/users-login.cy.js
@@ -1,5 +1,3 @@
-/// <reference types="cypress" />
-
 describe("Users Login", () => {
   const username = Cypress.env("username");
   const password = Cypress.env("password");

diff --git a/src/app/proposals/proposal-logbook/proposal-logbook.component.ts b/src/app/proposals/proposal-logbook/proposal-logbook.component.ts
@@ -8,7 +8,7 @@ import {
 } from "@angular/core";
 import { Store } from "@ngrx/store";
 import { Logbook } from "shared/sdk";
-import { Subscription } from "rxjs";
+import { Observable, Subscription, take } from "rxjs";
 import { selectCurrentLogbook } from "state-management/selectors/logbooks.selectors";
 import {
   fetchLogbookAction,
@@ -41,10 +41,12 @@ export interface LogbookData {
 export class ProposalLogbookComponent
   implements OnInit, OnDestroy, AfterViewChecked
 {
+  logbook$: Observable<Logbook | null> =
+    this.store.select(selectCurrentLogbook);
   appConfig = this.appConfigService.getConfig();
   subscriptions: Subscription[] = [];
 
-  @Input() logbook: LogbookData;
+  @Input() logbook: LogbookData | null = null; // Still accepting input from parent if provided
 
   constructor(
     public appConfigService: AppConfigService,
@@ -86,11 +88,13 @@ export class ProposalLogbookComponent
   }
 
   ngOnInit() {
-    this.subscriptions.push(
-      this.store.select(selectCurrentLogbook).subscribe((logbook) => {
-        this.store.dispatch(fetchLogbookAction({ name: logbook.name }));
-      }),
-    );
+    if (!this.logbook) {
+      this.logbook$.pipe(take(1)).subscribe((logbook) => {
+        if (logbook && logbook.name) {
+          this.store.dispatch(fetchLogbookAction({ name: logbook.name }));
+        }
+      });
+    }
   }
 
   ngAfterViewChecked() {

diff --git a/tsconfig.json b/tsconfig.json
@@ -29,5 +29,5 @@
     "strictInputAccessModifiers": true,
     "strictTemplates": true
   },
-  "exclude": ["cypress/**/*.ts", "cypress.config.ts"]
+  "exclude": ["cypress/**/*.js", "cypress.config.ts"]
 }