@appscode/design-system 1.0.43-alpha.217 → 1.0.43-alpha.219

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appscode/design-system",
-  "version": "1.0.43-alpha.217",
+  "version": "1.0.43-alpha.219",
   "description": "A design system for Appscode websites and dashboards made using Bulma",
   "main": "main.scss",
   "scripts": {

package/plugins/caching.ts

@@ -18,7 +18,7 @@ function getRequestInterceptor(config: AxiosRequestConfig) {
 
     const suffix = `${user}.${cluster}.${group}.${version}.${resource}${
       namespace ? ".ns." + namespace : ""
-    }${params?.q ? ".q." + md5(params?.q).toString() : ""}`;
+    }${params ? ".q." + md5(stringify(params)).toString() : ""}`;
 
     if (_recurringCall) {
       // always send latest date time as ctag
@@ -36,6 +36,13 @@ function getResponseInterceptor(resp: AxiosResponse) {
   // get call
   const { config, headers } = resp;
   const { url, _recurringCall, params } = config;
+
+  // queryParams without ctag
+  const queryParamsWithoutCtag = Object.keys(params).reduce((ob, key) => {
+    if (key !== "ctag") return { ...ob, [key]: params[key] };
+    else return { ...ob };
+  }, {});
+
   const matchListApi = url?.match(resourceListApiRgx);
   if (matchListApi) {
     // url matches list / render api call
@@ -45,7 +52,9 @@ function getResponseInterceptor(resp: AxiosResponse) {
 
     const suffix = `${user}.${cluster}.${group}.${version}.${resource}${
       namespace ? ".ns." + namespace : ""
-    }${params?.q ? ".q." + md5(params?.q).toString() : ""}`;
+    }${
+      params ? ".q." + md5(stringify(queryParamsWithoutCtag)).toString() : ""
+    }`;
 
     const storageKey = `etag.${suffix}`;
     // local storage etag
@@ -53,7 +62,7 @@ function getResponseInterceptor(resp: AxiosResponse) {
     // etag in header
     const headerEtag = headers?.["etag"];
 
-    // window.console.log({ eTag, headerEtag, _recurringCall, url })
+    // window.console.log({ eTag, headerEtag, _recurringCall, url });
 
     if (_recurringCall) {
       // for recurring api call
@@ -140,17 +149,61 @@ export function handleCacheFromYamls(
         const groupKind = `${group || "core"}/${kind}`;
         const gvr = (gkToGvrMap && gkToGvrMap[groupKind]) || "";
 
-        const storageKey = `ctag.${user}.${cluster}.${gvr.replaceAll(
+        const storageKeyPrefix = `ctag.${user}.${cluster}.${gvr.replaceAll(
           "/",
           "."
         )}`;
 
         // clear list cache for all namespaces
-        localStorage.setItem(storageKey, new Date().getTime().toString());
-
+        localStorage.setItem(
+          `${storageKeyPrefix}.q.${md5(
+            stringify({ convertToTable: true })
+          ).toString()}`,
+          new Date().getTime().toString()
+        );
         // clear list cache for specific namespace
         localStorage.setItem(
-          `${storageKey}.ns.${namespace || "default"}`,
+          `${storageKeyPrefix}.ns.${namespace || "default"}.q.${md5(
+            stringify({ convertToTable: true })
+          ).toString()}`,
+          new Date().getTime().toString()
+        );
+
+        // clear for genericresources and resourcesummaries
+        localStorage.setItem(
+          `ctag.${user}.${cluster}.core.k8s.appscode.com.v1alpha1.resourcesummaries.q.${md5(
+            stringify({
+              convertToTable: true,
+              labelSelector: `k8s.io/group=${group}`,
+            })
+          ).toString()}`,
+          new Date().getTime().toString()
+        );
+        localStorage.setItem(
+          `ctag.${user}.${cluster}.core.k8s.appscode.com.v1alpha1.resourcesummaries.q.${md5(
+            stringify({
+              convertToTable: true,
+              labelSelector: `k8s.io/group-kind=${kind}.${group}`,
+            })
+          ).toString()}`,
+          new Date().getTime().toString()
+        );
+        localStorage.setItem(
+          `ctag.${user}.${cluster}.core.k8s.appscode.com.v1alpha1.genericresources.q.${md5(
+            stringify({
+              convertToTable: true,
+              labelSelector: `k8s.io/group=${group}`,
+            })
+          ).toString()}`,
+          new Date().getTime().toString()
+        );
+        localStorage.setItem(
+          `ctag.${user}.${cluster}.core.k8s.appscode.com.v1alpha1.genericresources.q.${md5(
+            stringify({
+              convertToTable: true,
+              labelSelector: `k8s.io/group-kind=${kind}.${group}`,
+            })
+          ).toString()}`,
           new Date().getTime().toString()
         );
       }