@dnv-plant/typescriptpws 1.0.77 → 1.0.78

package/src/constants.ts

@@ -1,7 +1,7 @@
 /***********************************************************************
  * This file has been auto-generated by a code generation tool.
- * Version:   1.0.77
- * Date/time: 18 Jun 2025 15:16:45
+ * Version:   1.0.78
+ * Date/time: 20 Jun 2025 16:35:06
  * Template:  templates/typescriptpws/constants.razor.
  ***********************************************************************/
 

package/src/entities.ts

@@ -1,7 +1,7 @@
 /***********************************************************************
  * This file has been auto-generated by a code generation tool.
- * Version:   1.0.77
- * Date/time: 18 Jun 2025 15:16:46
+ * Version:   1.0.78
+ * Date/time: 20 Jun 2025 16:35:07
  * Template:  templates/typescriptpws/entities.razor.
  ***********************************************************************/
 

package/src/entity-schemas.ts

@@ -1,7 +1,7 @@
 /***********************************************************************
  * This file has been auto-generated by a code generation tool.
- * Version:   1.0.77
- * Date/time: 18 Jun 2025 15:16:47
+ * Version:   1.0.78
+ * Date/time: 20 Jun 2025 16:35:08
  * Template:  templates/typescriptpws/entityschemas.razor.
  ***********************************************************************/
 

package/src/enums.ts

@@ -1,7 +1,7 @@
 /***********************************************************************
  * This file has been auto-generated by a code generation tool.
- * Version:   1.0.77
- * Date/time: 18 Jun 2025 15:16:46
+ * Version:   1.0.78
+ * Date/time: 20 Jun 2025 16:35:07
  * Template:  templates/typescriptpws/enums.razor.
  ***********************************************************************/
 

package/src/materials.ts

@@ -1,7 +1,7 @@
 /***********************************************************************
  * This file has been auto-generated by a code generation tool.
- * Version:   1.0.77
- * Date/time: 18 Jun 2025 15:16:45
+ * Version:   1.0.78
+ * Date/time: 20 Jun 2025 16:35:06
  * Template:  templates/typescriptpws/materials.razor.
  ***********************************************************************/
 
@@ -149,30 +149,20 @@ export class MaterialEntityDescriptorSchema {
 }
 
 async function getDataFromUrl<T>(url: string, schemaClass: SchemaClass, many: boolean = false): Promise<T | T[]> {
-  try {
-    const response = await getRequest(url);
-
-    if (response.status !== 200) {
-      throw new Error(`Failed to get data: ${response.status} ${response.statusText}`);
-    }
-
-    const data = response.data;
+  const { data} = await getRequest(url);
 
-    // Access the Joi schema from the schema class
-    const validationSchema = many ? Joi.array().items(schemaClass.schema) : schemaClass.schema;
+  // Access the Joi schema from the schema class
+  const validationSchema = many ? Joi.array().items(schemaClass.schema) : schemaClass.schema;
 
-    // Validate the data
-    const { error, value } = validationSchema.validate(data, { abortEarly: false });
-
-    if (error) {
-      const errorMessages = error.details.map((e: { message: any }) => e.message).join(", ");
-      throw new Error(`Error retrieving data: ${errorMessages}`);
-    }
+  // Validate the data
+  const { error, value } = validationSchema.validate(data, { abortEarly: false });
 
-    return value;
-  } catch (err: unknown) {
-    throw new Error(`Error retrieving data: ${err instanceof Error ? err.message : "Unknown error"}`);
+  if (error) {
+    const errorMessages = error.details.map((e: { message: any }) => e.message).join(", ");
+    throw new Error(`Error retrieving data: ${errorMessages}`);
   }
+
+  return value;
 }
 
 export async function getAllCasIds(): Promise<MaterialCasIdInfo[]> {
@@ -279,41 +269,33 @@ export async function getComponentByCasId(casId: number) {
 
 export async function storeDataAndGetResponse<T>(url: string, data: any, schemaClass: SchemaClass): Promise<T> {
   // Serialize the data using the schema
-
-  const { error, value } = schemaClass.schema.validate(data);
-  if (error) {
-    throw new Error(`Validation error: ${error.details[0].message}`);
+  const { error: reqErr, value: payload } = schemaClass.schema.validate(data);
+  if (reqErr) {
+    throw new Error(`Validation error (request): ${reqErr.details[0].message}`);
   }
 
-  const jsonText = JSON.stringify(value);
+  const { status: postStatus, headers } = await postRequest(
+    url,
+    JSON.stringify(payload)
+  );
 
-  // Send a POST request
-  const postResponse = await postRequest(url, jsonText);
+  if (postStatus !== 201) {
+    throw new Error(`Expected 201 from POST, got ${postStatus}`);
+  }
 
-  // Check if the response status is 201 (created)
-  if (postResponse.status === 201) {
-    const materialUrl = postResponse.headers["location"];
-    if (!materialUrl) {
-      throw new Error("Failed to store data: no location header in response");
-    }
+  const location = headers.location ?? headers.Location; // header name can vary
+  if (!location) {
+    throw new Error("POST succeeded but no Location header returned");
+  }
 
-    // Send a GET request to the material URL
-    const getResponse = await getRequest(materialUrl);
-
-    // Check if the GET request is successful
-    if (getResponse.status === 200) {
-      // Validate and parse the response data using the schema
-      const { error, value } = schemaClass.schema.validate(getResponse.data);
-      if (error) {
-        throw new Error(`Validation error: ${error.details[0].message}`);
-      }
-      return value;
-    } else {
-      throw new Error(`Failed to retrieve data: ${getResponse.status} ${getResponse.statusText}`);
-    }
-  } else {
-    throw new Error(`Failed to store data: ${postResponse.status} ${postResponse.statusText}`);
+  const { data: fetched } = await getRequest(location);
+
+  const { error: respErr, value: parsed } = schemaClass.schema.validate(fetched);
+  if (respErr) {
+    throw new Error(`Validation error (response): ${respErr.details[0].message}`);
   }
+
+  return parsed as T;
 }
 
 export async function storeMaterialComponentData(
@@ -350,29 +332,15 @@ export async function storeMaterialComponentAndCreateMaterial(
   }
 }
 
-export async function updateMaterialComponent(materialComponentData: MaterialComponentData): Promise<boolean> {
-  try {
-    // Generate the URL
-    const apiTarget = getMaterialsApiTarget();
-    const clientAliasId = getClientAliasId();
-    const url = `${apiTarget}components?clientId=${clientAliasId}`;
-
-    // Serialize the data
-    const jsonText = JSON.stringify(materialComponentData);
+export async function updateMaterialComponent(data: MaterialComponentData): Promise<boolean> {
+  const url = `${getMaterialsApiTarget()}components?clientId=${getClientAliasId()}`;
+  const { status, statusText } = await putRequest(url, JSON.stringify(data));
 
-    // Send a PUT request
-    const response = await putRequest(url, jsonText);
-
-    // Check if the response status is 204 (no content)
-    if (response.status === 204) {
-      return true;
-    } else {
-      throw new Error(`Failed to update material component: ${response.status} ${response.statusText}`);
-    }
-  } catch (error: unknown) {
-    const errorMessage = error instanceof Error ? error.message : "Unknown error";
-    throw new Error(`Error updating material component: ${errorMessage}`);
-  }
+  // Check if the response status is 204 (no content)
+  if (status !== 204) {
+    throw new Error(`Failed to update material component: ${status} ${statusText}`);
+  } 
+  return true;
 }
 
 export async function getMaterials(): Promise<Material[]> {

package/src/utilities.ts

@@ -1,7 +1,7 @@
 /***********************************************************************
  * This file has been auto-generated by a code generation tool.
- * Version:   1.0.77
- * Date/time: 18 Jun 2025 15:16:44
+ * Version:   1.0.78
+ * Date/time: 20 Jun 2025 16:35:05
  * Template:  templates/typescriptpws/utilities.razor.
  ***********************************************************************/
 
@@ -56,108 +56,49 @@ function getHeaders(accessToken: string) {
 }
 
 // Post JSON to URL and time the call
-export async function postRequest(
-  url: string,
-  data: string
-): Promise<AxiosResponse> {
-  try {
-    const accessToken = getAccessToken();
-
-    if (!accessToken) {
-      throw new Error("Access token not found");
-    }
-
-    const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
-
-    if (!hasExpired) {
-      const response = await axios.post(url, data, {
-        headers: getHeaders(accessToken),
-      });
-      return response;
-    } else {
-      console.log(`Your access token has expired: ${expiryDate}`);
-      throw new Error("Expired access token");
-    }
-  } catch (error: unknown) {
-    if (axios.isAxiosError(error)) {
-      console.error(
-        "Error during HTTP request:",
-        error.response?.data || error.message
-      );
-      throw error;
-    } else {
-      console.error("Unexpected error:", error);
-      throw new Error("Unexpected error occurred");
-    }
+export async function postRequest<T>(url: string, data: string): Promise<AxiosResponse<T>> {
+  const accessToken = getAccessToken();
+  if (!accessToken) {
+    throw new Error("Access token not found");
+  }
+
+  const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
+  if (hasExpired) {
+    throw new Error(`Expired access token (${expiryDate})`);
   }
+
+  return axios.post(url, data, { headers: getHeaders(accessToken) });
 }
 
 // Put JSON to URL and time the call
-export async function putRequest(url: string, data: string) {
-  try {
-    const accessToken = getAccessToken();
-
-    if (!accessToken) {
-      throw new Error("Access token not found");
-    }
-
-    const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
-
-    if (!hasExpired) {
-      const response = await axios.put(url, data, {
-        headers: getHeaders(accessToken),
-      });
-      return response;
-    } else {
-      console.log(`Your access token has expired: ${expiryDate}`);
-      throw new Error("Expired access token");
-    }
-  } catch (error: unknown) {
-    if (axios.isAxiosError(error)) {
-      console.error(
-        "Error during HTTP request:",
-        error.response?.data || error.message
-      );
-      throw error;
-    } else {
-      console.error("Unexpected error:", error);
-      throw new Error("Unexpected error occurred");
-    }
+export async function putRequest<T>(url: string, data: string): Promise<AxiosResponse<T>> {
+  const accessToken = getAccessToken();
+  if (!accessToken) {
+    throw new Error("Access token not found");
+  }
+
+  const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
+  if (hasExpired) {
+    throw new Error(`Expired access token (${expiryDate})`);
   }
+
+  return axios.put(url, data, { headers: getHeaders(accessToken) });
 }
 
 // Get data from URL
-export async function getRequest(url: string) {
-  try {
-    const accessToken = getAccessToken();
-
-    if (!accessToken) {
-      throw new Error("Access token not found");
-    }
-
-    const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
-
-    if (!hasExpired) {
-      const response = await axios.get(url, {
-        headers: getHeaders(accessToken),
-      });
-      return response;
-    } else {
-      console.log(`Your access token has expired: ${expiryDate}`);
-      throw new Error("Expired access token");
-    }
-  } catch (error: unknown) {
-    if (axios.isAxiosError(error)) {
-      console.error(
-        "Error during HTTP request:",
-        error.response?.data || error.message
-      );
-      throw error;
-    } else {
-      console.error("Unexpected error:", error);
-      throw new Error("Unexpected error occurred");
-    }
+export async function getRequest<T>(url: string): Promise<AxiosResponse<T>> {
+  const accessToken = getAccessToken();
+  if (!accessToken) {
+    throw new Error("Access token not found");
   }
+
+  const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
+  if (hasExpired) {
+    console.log(`Your access token has expired: ${expiryDate}`);
+    throw new Error("Expired access token");
+  }
+
+  return axios.get(url, { headers: getHeaders(accessToken) });
 }
 
 // Get platform, expiry date and token expiration status