Merge pull request #9 from dockersamples/new-schema-support

New schema support

Author: mikesir87

Dockerfile

@@ -23,7 +23,7 @@ LABEL org.opencontainers.image.title="Labspaces" \
     com.docker.extension.publisher-url="https://github.com/dockersamples/labspace-extension" \
     com.docker.extension.additional-urls="[{\"title\":\"Create your own Labspace\",\"url\":\"https://github.com/dockersamples/labspace-starter\"}]" \
     com.docker.extension.categories="cloud-development" \
-    com.docker.extension.changelog="- Persist filter settings and a few minor bug fixes"
+    com.docker.extension.changelog="- Support for new labspace.yaml schema"
 COPY beaker.svg /
 COPY metadata.json /
 COPY --from=build /usr/local/app/dist /ui

src/CatalogContext.jsx

@@ -77,7 +77,10 @@ export function CatalogContextProvider({ children }) {
     const allLabspaces = [...customLabspaces];
     catalogDetails.forEach((catalog) => {
       catalog.labspaces.forEach((labspace) => {
-        allLabspaces.push({ ...labspace, catalog: { name: catalog.name, url: catalog.url } });
+        allLabspaces.push({
+          ...labspace,
+          catalog: { name: catalog.name, url: catalog.url },
+        });
       });
     });
     return allLabspaces.sort((a, b) => {

src/Home.jsx

@@ -39,7 +39,11 @@ export function Home() {
       <RunningNotice
         hasLabspace={hasLabspace}
         isRunning={!!runningLabspace}
-        labspaceTitle={runningLabspace ? runningLabspace.title : ""}
+        labspaceTitle={
+          runningLabspace
+            ? (runningLabspace?.metadata?.title ?? runningLabspace.title)
+            : ""
+        }
         onRemove={stopLabspace}
         isStopping={stoppingLabspace}
       />

src/components/Catalog/CatalogSidebar.jsx

@@ -8,7 +8,7 @@ export function CatalogSidebar({ onFilterChange }) {
   const { catalogs, tags } = useCatalogs();
   const [searchTerm, setSearchTerm] = useState("");
   const [activeCategory, setActiveCategory] = useState(
-    localStorage.getItem("labspaces.activeCategory") || null
+    localStorage.getItem("labspaces.activeCategory") || null,
   );
   const [selectedCatalogs, setSelectedCatalogs] = useState(
     localStorage.getItem("labspaces.selectedCatalogs")
@@ -20,8 +20,7 @@ export function CatalogSidebar({ onFilterChange }) {
   useEffect(() => {
     if (activeCategory)
       localStorage.setItem("labspaces.activeCategory", activeCategory);
-    else
-      localStorage.removeItem("labspaces.activeCategory");
+    else localStorage.removeItem("labspaces.activeCategory");
   }, [activeCategory]);
 
   useEffect(() => {