@praxisui/core 1.0.0-beta.3 → 1.0.0-beta.5

package/fesm2022/praxisui-core.mjs

@@ -1127,20 +1127,14 @@ class GenericCrudService {
         const schemaId = buildSchemaId({ path, operation, schemaType, includeInternalSchemas: false, tenant, locale, apiOrigin });
         const headersBase = composeHeadersWithVersion(entry);
         return from(this._schemaCache.get(schemaId)).pipe(concatMap((cached) => {
-            let headers = headersBase;
+            let headers = (headersBase instanceof HttpHeaders ? headersBase : new HttpHeaders(headersBase));
             if (cached?.schemaHash) {
-                headers = (headersBase instanceof HttpHeaders ? headersBase : new HttpHeaders(headersBase))
-                    .set('If-None-Match', `"${cached.schemaHash}"`)
-                    .set('Accept-Language', locale || '')
-                    .set('X-Tenant', tenant || '');
-            }
-            else {
-                headers = (headersBase instanceof HttpHeaders ? headersBase : new HttpHeaders(headersBase));
-                if (locale)
-                    headers = headers.set('Accept-Language', locale);
-                if (tenant)
-                    headers = headers.set('X-Tenant', tenant);
+                headers = headers.set('If-None-Match', `"${cached.schemaHash}"`);
             }
+            if (locale)
+                headers = headers.set('Accept-Language', locale);
+            if (tenant)
+                headers = headers.set('X-Tenant', tenant);
             console.debug('[CRUD:Service] getSchema (filtered fallback):request', { filteredUrl, path, hasCached: !!cached });
             return this.http.get(filteredUrl, { params: httpParams, headers, observe: 'response' });
         }), concatMap((resp) => {
@@ -1217,9 +1211,9 @@ class GenericCrudService {
             catch { }
             return of(this.schemaNormalizer.normalizeSchema(body));
         }), 
-        // Angular HttpClient treats 304 as error; handle cache reuse here
+        // Angular HttpClient treats 304 as error; also handle status 0 (CORS/network) by reusing cache
         catchError((err) => {
-            if (err?.status === 304) {
+            if (err?.status === 304 || err?.status === 0) {
                 return from(this._schemaCache.get(schemaId)).pipe(concatMap((cached) => {
                     if (cached?.schema) {
                         try {
@@ -1437,9 +1431,9 @@ class GenericCrudService {
             this._schemaCache.set(schemaId, entryToCache);
             return of(this.schemaNormalizer.normalizeSchema(body));
         }), 
-        // Angular HttpClient may surface 304 as error; handle reuse and refetch
+        // Angular HttpClient may surface 304 as error; also handle status 0 (CORS/network) by reusing cache
         catchError((err) => {
-            if (err?.status === 304) {
+            if (err?.status === 304 || err?.status === 0) {
                 return from(this._schemaCache.get(schemaId)).pipe(concatMap((cached) => {
                     if (cached?.schema) {
                         try {