From 280633d38835242a521116e848d0f7cbf811b33b Mon Sep 17 00:00:00 2001
From: Odei Maiz <maiz@itis.swiss>
Date: Tue, 13 Dec 2022 15:54:49 +0100
Subject: [PATCH 1/7] renamings

---
 .../class/osparc/component/metadata/ServicesInStudy.js      | 2 +-
 .../class/osparc/component/workbench/ServiceCatalog.js      | 2 +-
 .../client/source/class/osparc/dashboard/Dashboard.js       | 2 +-
 .../source/class/osparc/dashboard/ResourceMoreOptions.js    | 4 ++--
 .../client/source/class/osparc/dashboard/ServiceBrowser.js  | 4 ++--
 .../client/source/class/osparc/dashboard/StudyBrowser.js    | 6 +++---
 .../client/source/class/osparc/dashboard/TemplateBrowser.js | 2 +-
 .../client/source/class/osparc/desktop/StudyEditor.js       | 2 +-
 .../client/source/class/osparc/store/Store.js               | 5 +++--
 .../client/source/class/osparc/utils/Study.js               | 6 +++---
 10 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/services/static-webserver/client/source/class/osparc/component/metadata/ServicesInStudy.js b/services/static-webserver/client/source/class/osparc/component/metadata/ServicesInStudy.js
index 6e317e2accaa..5204274ced3b 100644
--- a/services/static-webserver/client/source/class/osparc/component/metadata/ServicesInStudy.js
+++ b/services/static-webserver/client/source/class/osparc/component/metadata/ServicesInStudy.js
@@ -42,7 +42,7 @@ qx.Class.define("osparc.component.metadata.ServicesInStudy", {
     const servicesInStudy = osparc.utils.Study.extractServices(this._studyData["workbench"]);
     if (servicesInStudy.length) {
       const store = osparc.store.Store.getInstance();
-      store.getServicesOnly()
+      store.getAllServices()
         .then(services => {
           this._services = services;
           this._populateLayout();
diff --git a/services/static-webserver/client/source/class/osparc/component/workbench/ServiceCatalog.js b/services/static-webserver/client/source/class/osparc/component/workbench/ServiceCatalog.js
index 62952c659b52..4814057a730a 100644
--- a/services/static-webserver/client/source/class/osparc/component/workbench/ServiceCatalog.js
+++ b/services/static-webserver/client/source/class/osparc/component/workbench/ServiceCatalog.js
@@ -204,7 +204,7 @@ qx.Class.define("osparc.component.workbench.ServiceCatalog", {
     __populateList: function(reload = false) {
       this.__allServicesList = [];
       let store = osparc.store.Store.getInstance();
-      store.getServicesOnly(reload)
+      store.getAllServices(reload)
         .then(services => {
           this.__allServicesList = osparc.utils.Services.convertObjectToArray(services);
           this.__updateList();
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js b/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
index c711515336c8..1bf1ad5297a2 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
@@ -142,7 +142,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
       const preResourcePromises = [];
       const store = osparc.store.Store.getInstance();
       preResourcePromises.push(store.getVisibleMembers());
-      preResourcePromises.push(store.getServicesOnly(true));
+      preResourcePromises.push(store.getAllServices(true));
       if (permissions.canDo("study.tag")) {
         preResourcePromises.push(osparc.data.Resources.get("tags"));
       }
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceMoreOptions.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceMoreOptions.js
index 523bca097f69..78efdf1ff595 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceMoreOptions.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceMoreOptions.js
@@ -86,7 +86,7 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
 
       // populate it with owned versions
       const store = osparc.store.Store.getInstance();
-      store.getServicesOnly(false)
+      store.getAllServices()
         .then(services => {
           const versions = osparc.utils.Services.getVersions(services, this.__resourceData["key"]);
           const selectBox = this.__serviceVersionSelector;
@@ -105,7 +105,7 @@ qx.Class.define("osparc.dashboard.ResourceMoreOptions", {
         if (selection && selection.length) {
           const serviceVersion = selection[0].getLabel();
           if (serviceVersion !== this.__resourceData["version"]) {
-            store.getServicesOnly(false)
+            store.getAllServices()
               .then(services => {
                 const serviceData = osparc.utils.Services.getFromObject(services, this.__resourceData["key"], serviceVersion);
                 console.log(serviceData);
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js
index 8c8dc8e303a6..91acd3dd4be3 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js
@@ -41,7 +41,7 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
       this._resourcesList = [];
       const preResourcePromises = [];
       const store = osparc.store.Store.getInstance();
-      preResourcePromises.push(store.getServicesOnly());
+      preResourcePromises.push(store.getAllServices());
       if (osparc.data.Permissions.getInstance().canDo("study.tag")) {
         preResourcePromises.push(osparc.data.Resources.get("tags"));
       }
@@ -61,7 +61,7 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
 
     __reloadServices: function() {
       const store = osparc.store.Store.getInstance();
-      store.getServicesOnly()
+      store.getAllServices()
         .then(services => {
           this.__servicesAll = services;
           const favServices = osparc.utils.Utils.localCache.getFavServices();
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
index 4c4cc2e336be..db3a93985d25 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
@@ -79,7 +79,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       const preResourcePromises = [];
       const store = osparc.store.Store.getInstance();
       preResourcePromises.push(store.getVisibleMembers());
-      preResourcePromises.push(store.getServicesOnly());
+      preResourcePromises.push(store.getAllServices());
       if (osparc.data.Permissions.getInstance().canDo("study.tag")) {
         preResourcePromises.push(osparc.data.Resources.get("tags"));
       }
@@ -408,7 +408,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
     __addNewS4LServiceButtons: function() {
       const store = osparc.store.Store.getInstance();
-      store.getServicesOnly(false)
+      store.getAllServices()
         .then(services => {
           // add new plus buttons if key services exists
           const newButtonsInfo = this.self().EXPECTED_S4L_SERVICE_KEYS;
@@ -420,7 +420,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
     __addNewS4LLiteServiceButtons: function() {
       const store = osparc.store.Store.getInstance();
-      store.getServicesOnly(false)
+      store.getAllServices()
         .then(services => {
           // add new plus buttons if key services exists
           const newButtonsInfo = this.self().EXPECTED_S4L_LIGHT_SERVICE_KEYS;
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js
index 099ef09e9494..28cb4d8b40d6 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js
@@ -24,7 +24,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
       this._resourcesList = [];
       const preResourcePromises = [];
       const store = osparc.store.Store.getInstance();
-      preResourcePromises.push(store.getServicesOnly());
+      preResourcePromises.push(store.getAllServices());
       if (osparc.data.Permissions.getInstance().canDo("study.tag")) {
         preResourcePromises.push(osparc.data.Resources.get("tags"));
       }
diff --git a/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js b/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
index 918ea2b624f3..8e9f06306884 100644
--- a/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
+++ b/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
@@ -142,7 +142,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
         };
         const promises = [
           osparc.data.Resources.getOne("studies", params),
-          osparc.store.Store.getInstance().getServicesOnly()
+          osparc.store.Store.getInstance().getAllServices()
         ];
         Promise.all(promises)
           .then(values => {
diff --git a/services/static-webserver/client/source/class/osparc/store/Store.js b/services/static-webserver/client/source/class/osparc/store/Store.js
index dc85620b1fe8..09a3246171f6 100644
--- a/services/static-webserver/client/source/class/osparc/store/Store.js
+++ b/services/static-webserver/client/source/class/osparc/store/Store.js
@@ -318,7 +318,7 @@ qx.Class.define("osparc.store.Store", {
      * This functions does the needed processing in order to have a working list of services and DAGs.
      * @param {Boolean} reload
      */
-    getServicesOnly: function(reload = false) {
+    getAllServices: function(reload = false, includeDeprecated = false) {
       return new Promise(resolve => {
         let allServices = [];
         osparc.data.Resources.get("services", null, !reload)
@@ -327,6 +327,7 @@ qx.Class.define("osparc.store.Store", {
           })
           .catch(err => console.error("getServices failed", err))
           .finally(() => {
+            console.log("getAllServices", allServices);
             const servicesObj = osparc.utils.Services.convertArrayToObject(allServices);
             osparc.utils.Services.servicesToCache(servicesObj, true);
             resolve(osparc.utils.Services.servicesCached);
@@ -348,7 +349,7 @@ qx.Class.define("osparc.store.Store", {
             });
           }
         });
-        this.getServicesOnly()
+        this.getAllServices()
           .then(services => {
             nodes.forEach(node => {
               if (osparc.utils.Services.getFromObject(services, node.key, node.version)) {
diff --git a/services/static-webserver/client/source/class/osparc/utils/Study.js b/services/static-webserver/client/source/class/osparc/utils/Study.js
index 072bd5cc1812..bdfd5aae4047 100644
--- a/services/static-webserver/client/source/class/osparc/utils/Study.js
+++ b/services/static-webserver/client/source/class/osparc/utils/Study.js
@@ -37,7 +37,7 @@ qx.Class.define("osparc.utils.Study", {
     getUnaccessibleServices: async function(workbench) {
       return new Promise(resolve => {
         const store = osparc.store.Store.getInstance();
-        store.getServicesOnly(false)
+        store.getAllServices()
           .then(allServices => {
             const unaccessibleServices = [];
             const services = new Set(this.extractServices(workbench));
@@ -58,7 +58,7 @@ qx.Class.define("osparc.utils.Study", {
     isWorkbenchUpdatable: async function(workbench) {
       return new Promise(resolve => {
         const store = osparc.store.Store.getInstance();
-        store.getServicesOnly(false)
+        store.getAllServices()
           .then(allServices => {
             const services = new Set(this.extractServices(workbench));
             const filtered = [];
@@ -126,7 +126,7 @@ qx.Class.define("osparc.utils.Study", {
     createStudyFromService: function(key, version) {
       return new Promise((resolve, reject) => {
         const store = osparc.store.Store.getInstance();
-        store.getServicesOnly()
+        store.getAllServices()
           .then(services => {
             if (key in services) {
               const service = version ? osparc.utils.Services.getFromObject(services, key, version) : osparc.utils.Services.getLatest(services, key);

From 191628710357192b636a2ba71e6fcdd437fd6175 Mon Sep 17 00:00:00 2001
From: Odei Maiz <maiz@itis.swiss>
Date: Tue, 13 Dec 2022 16:15:14 +0100
Subject: [PATCH 2/7] filter deprecated

---
 .../client/source/class/osparc/store/Store.js     | 15 +++++++++++----
 .../client/source/class/osparc/utils/Services.js  | 12 +-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/services/static-webserver/client/source/class/osparc/store/Store.js b/services/static-webserver/client/source/class/osparc/store/Store.js
index 09a3246171f6..4489b2452a7f 100644
--- a/services/static-webserver/client/source/class/osparc/store/Store.js
+++ b/services/static-webserver/client/source/class/osparc/store/Store.js
@@ -327,10 +327,17 @@ qx.Class.define("osparc.store.Store", {
           })
           .catch(err => console.error("getServices failed", err))
           .finally(() => {
-            console.log("getAllServices", allServices);
-            const servicesObj = osparc.utils.Services.convertArrayToObject(allServices);
-            osparc.utils.Services.servicesToCache(servicesObj, true);
-            resolve(osparc.utils.Services.servicesCached);
+            if (includeDeprecated) {
+              const nonDepServices = allServices.filter(service => !osparc.utils.Services.isDeprecated(service));
+              const servicesObj = osparc.utils.Services.convertArrayToObject(nonDepServices);
+              osparc.utils.Services.addTSRInfo(servicesObj);
+              resolve(servicesObj);
+            } else {
+              const servicesObj = osparc.utils.Services.convertArrayToObject(allServices);
+              osparc.utils.Services.addTSRInfo(servicesObj);
+              osparc.utils.Services.servicesCached = servicesObj;
+              resolve(servicesObj);
+            }
           });
       });
     },
diff --git a/services/static-webserver/client/source/class/osparc/utils/Services.js b/services/static-webserver/client/source/class/osparc/utils/Services.js
index 8e8e8b5fe64f..cde50622d258 100644
--- a/services/static-webserver/client/source/class/osparc/utils/Services.js
+++ b/services/static-webserver/client/source/class/osparc/utils/Services.js
@@ -67,16 +67,6 @@ qx.Class.define("osparc.utils.Services", {
 
     servicesCached: {},
 
-    addServiceToCache: function(service) {
-      this.servicesCached = Object.assign(this.servicesCached, service);
-    },
-
-    servicesToCache: function(services) {
-      this.servicesCached = {};
-      this.__addExtraInfo(services);
-      this.servicesCached = Object.assign(this.servicesCached, services);
-    },
-
     getTypes: function() {
       return Object.keys(this.TYPES);
     },
@@ -340,7 +330,7 @@ qx.Class.define("osparc.utils.Services", {
       return this.self().getLatest(this.servicesCached, "simcore/services/frontend/nodes-group");
     },
 
-    __addExtraInfo: function(services) {
+    addTSRInfo: function(services) {
       Object.values(services).forEach(serviceWVersion => {
         Object.values(serviceWVersion).forEach(service => {
           if (osparc.data.model.Node.isComputational(service)) {

From 9e1ea2262c15c1f760644e9da0cdbd6e5949be32 Mon Sep 17 00:00:00 2001
From: Odei Maiz <maiz@itis.swiss>
Date: Tue, 13 Dec 2022 16:31:56 +0100
Subject: [PATCH 3/7] do not list deprecated

---
 .../class/osparc/component/workbench/ServiceCatalog.js    | 2 +-
 .../client/source/class/osparc/dashboard/Dashboard.js     | 2 +-
 .../client/source/class/osparc/store/Store.js             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/static-webserver/client/source/class/osparc/component/workbench/ServiceCatalog.js b/services/static-webserver/client/source/class/osparc/component/workbench/ServiceCatalog.js
index 4814057a730a..67eeb741191a 100644
--- a/services/static-webserver/client/source/class/osparc/component/workbench/ServiceCatalog.js
+++ b/services/static-webserver/client/source/class/osparc/component/workbench/ServiceCatalog.js
@@ -204,7 +204,7 @@ qx.Class.define("osparc.component.workbench.ServiceCatalog", {
     __populateList: function(reload = false) {
       this.__allServicesList = [];
       let store = osparc.store.Store.getInstance();
-      store.getAllServices(reload)
+      store.getAllServices(reload, false)
         .then(services => {
           this.__allServicesList = osparc.utils.Services.convertObjectToArray(services);
           this.__updateList();
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js b/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
index 1bf1ad5297a2..e694f8df37ab 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
@@ -142,7 +142,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
       const preResourcePromises = [];
       const store = osparc.store.Store.getInstance();
       preResourcePromises.push(store.getVisibleMembers());
-      preResourcePromises.push(store.getAllServices(true));
+      preResourcePromises.push(store.getAllServices(true, true));
       if (permissions.canDo("study.tag")) {
         preResourcePromises.push(osparc.data.Resources.get("tags"));
       }
diff --git a/services/static-webserver/client/source/class/osparc/store/Store.js b/services/static-webserver/client/source/class/osparc/store/Store.js
index 75eded3d366a..17b2236a0e7b 100644
--- a/services/static-webserver/client/source/class/osparc/store/Store.js
+++ b/services/static-webserver/client/source/class/osparc/store/Store.js
@@ -328,14 +328,14 @@ qx.Class.define("osparc.store.Store", {
           .catch(err => console.error("getServices failed", err))
           .finally(() => {
             if (includeDeprecated) {
-              const nonDepServices = allServices.filter(service => !osparc.utils.Services.isDeprecated(service));
-              const servicesObj = osparc.utils.Services.convertArrayToObject(nonDepServices);
+              const servicesObj = osparc.utils.Services.convertArrayToObject(allServices);
               osparc.utils.Services.addTSRInfo(servicesObj);
+              osparc.utils.Services.servicesCached = servicesObj;
               resolve(servicesObj);
             } else {
-              const servicesObj = osparc.utils.Services.convertArrayToObject(allServices);
+              const nonDepServices = allServices.filter(service => !osparc.utils.Services.isDeprecated(service));
+              const servicesObj = osparc.utils.Services.convertArrayToObject(nonDepServices);
               osparc.utils.Services.addTSRInfo(servicesObj);
-              osparc.utils.Services.servicesCached = servicesObj;
               resolve(servicesObj);
             }
           });

From 616d27d2cfdfe7748000215730823009888e8307 Mon Sep 17 00:00:00 2001
From: Odei Maiz <maiz@itis.swiss>
Date: Tue, 13 Dec 2022 16:51:22 +0100
Subject: [PATCH 4/7] [skip ci] includeRetired

---
 .../client/source/class/osparc/dashboard/Dashboard.js       | 2 +-
 .../client/source/class/osparc/store/Store.js               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js b/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
index e694f8df37ab..1bf1ad5297a2 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
@@ -142,7 +142,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
       const preResourcePromises = [];
       const store = osparc.store.Store.getInstance();
       preResourcePromises.push(store.getVisibleMembers());
-      preResourcePromises.push(store.getAllServices(true, true));
+      preResourcePromises.push(store.getAllServices(true));
       if (permissions.canDo("study.tag")) {
         preResourcePromises.push(osparc.data.Resources.get("tags"));
       }
diff --git a/services/static-webserver/client/source/class/osparc/store/Store.js b/services/static-webserver/client/source/class/osparc/store/Store.js
index 17b2236a0e7b..bfc32f665912 100644
--- a/services/static-webserver/client/source/class/osparc/store/Store.js
+++ b/services/static-webserver/client/source/class/osparc/store/Store.js
@@ -318,7 +318,7 @@ qx.Class.define("osparc.store.Store", {
      * This functions does the needed processing in order to have a working list of services and DAGs.
      * @param {Boolean} reload
      */
-    getAllServices: function(reload = false, includeDeprecated = false) {
+    getAllServices: function(reload = false, includeRetired = true) {
       return new Promise(resolve => {
         let allServices = [];
         osparc.data.Resources.get("services", null, !reload)
@@ -327,13 +327,13 @@ qx.Class.define("osparc.store.Store", {
           })
           .catch(err => console.error("getServices failed", err))
           .finally(() => {
-            if (includeDeprecated) {
+            if (includeRetired) {
               const servicesObj = osparc.utils.Services.convertArrayToObject(allServices);
               osparc.utils.Services.addTSRInfo(servicesObj);
               osparc.utils.Services.servicesCached = servicesObj;
               resolve(servicesObj);
             } else {
-              const nonDepServices = allServices.filter(service => !osparc.utils.Services.isDeprecated(service));
+              const nonDepServices = allServices.filter(service => !osparc.utils.Services.isRetired(service));
               const servicesObj = osparc.utils.Services.convertArrayToObject(nonDepServices);
               osparc.utils.Services.addTSRInfo(servicesObj);
               resolve(servicesObj);

From 7f87893cdd0dd2e108737135deb0a272aa23eccc Mon Sep 17 00:00:00 2001
From: Odei Maiz <maiz@itis.swiss>
Date: Tue, 13 Dec 2022 17:06:07 +0100
Subject: [PATCH 5/7] filter also by uuid/key

---
 .../client/source/class/osparc/dashboard/CardBase.js             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js b/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
index b02e21d975b0..b5993df771f5 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
@@ -586,6 +586,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
 
     _filterText: function(text) {
       const checks = [
+        this.getUuid(),
         this.getTitle(),
         this.getDescription(),
         this.getOwner()

From 3ed3c6bdf66e04d5914de6ae55a0633918632608 Mon Sep 17 00:00:00 2001
From: Odei Maiz <maiz@itis.swiss>
Date: Tue, 13 Dec 2022 17:09:34 +0100
Subject: [PATCH 6/7] filter out

---
 .../client/source/class/osparc/dashboard/ServiceBrowser.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js
index b5567a04e362..dedb60ef1d2d 100644
--- a/services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js
+++ b/services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js
@@ -61,7 +61,7 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
 
     __reloadServices: function() {
       const store = osparc.store.Store.getInstance();
-      store.getAllServices()
+      store.getAllServices(false, false)
         .then(services => {
           this.__servicesAll = services;
           const favServices = osparc.utils.Utils.localCache.getFavServices();

From 2c0409b4e68a02fc32b7a832e8c30dcecb17d8ef Mon Sep 17 00:00:00 2001
From: Odei Maiz <maiz@itis.swiss>
Date: Tue, 13 Dec 2022 17:26:58 +0100
Subject: [PATCH 7/7] or Deprecated

---
 .../static-webserver/client/source/class/osparc/store/Store.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/static-webserver/client/source/class/osparc/store/Store.js b/services/static-webserver/client/source/class/osparc/store/Store.js
index bfc32f665912..e1de4d87c51a 100644
--- a/services/static-webserver/client/source/class/osparc/store/Store.js
+++ b/services/static-webserver/client/source/class/osparc/store/Store.js
@@ -333,7 +333,7 @@ qx.Class.define("osparc.store.Store", {
               osparc.utils.Services.servicesCached = servicesObj;
               resolve(servicesObj);
             } else {
-              const nonDepServices = allServices.filter(service => !osparc.utils.Services.isRetired(service));
+              const nonDepServices = allServices.filter(service => !(osparc.utils.Services.isRetired(service) || osparc.utils.Services.isDeprecated(service)));
               const servicesObj = osparc.utils.Services.convertArrayToObject(nonDepServices);
               osparc.utils.Services.addTSRInfo(servicesObj);
               resolve(servicesObj);