Do not list deprecated or retired services (ITISFoundation#3670)

odeimaiz · web-flow · commit e64d5bca06b8 · 2022-12-14T08:29:23.000Z
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
@@ -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
@@ -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, false)
         .then(services => {
           this.__allServicesList = osparc.utils.Services.convertObjectToArray(services);
           this.__updateList();
diff --git 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()
diff --git 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
@@ -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
@@ -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(false, false)
         .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
@@ -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
@@ -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
@@ -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
@@ -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, includeRetired = true) {
       return new Promise(resolve => {
         let allServices = [];
         osparc.data.Resources.get("services", null, !reload)
@@ -327,9 +327,17 @@ qx.Class.define("osparc.store.Store", {
           })
           .catch(err => console.error("getServices failed", err))
           .finally(() => {
-            const servicesObj = osparc.utils.Services.convertArrayToObject(allServices);
-            osparc.utils.Services.servicesToCache(servicesObj, true);
-            resolve(osparc.utils.Services.servicesCached);
+            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.isRetired(service) || osparc.utils.Services.isDeprecated(service)));
+              const servicesObj = osparc.utils.Services.convertArrayToObject(nonDepServices);
+              osparc.utils.Services.addTSRInfo(servicesObj);
+              resolve(servicesObj);
+            }
           });
       });
     },
@@ -348,7 +356,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/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)) {
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {`
`142`	`142`	`const preResourcePromises = [];`
`143`	`143`	`const store = osparc.store.Store.getInstance();`
`144`	`144`	`preResourcePromises.push(store.getVisibleMembers());`
`145`		`- preResourcePromises.push(store.getServicesOnly(true));`
	`145`	`+ preResourcePromises.push(store.getAllServices(true));`
`146`	`146`	`if (permissions.canDo("study.tag")) {`
`147`	`147`	`preResourcePromises.push(osparc.data.Resources.get("tags"));`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {`
`24`	`24`	`this._resourcesList = [];`
`25`	`25`	`const preResourcePromises = [];`
`26`	`26`	`const store = osparc.store.Store.getInstance();`
`27`		`- preResourcePromises.push(store.getServicesOnly());`
	`27`	`+ preResourcePromises.push(store.getAllServices());`
`28`	`28`	`if (osparc.data.Permissions.getInstance().canDo("study.tag")) {`
`29`	`29`	`preResourcePromises.push(osparc.data.Resources.get("tags"));`
`30`	`30`	`}`