@stack-spot/portal-network 0.16.0 → 0.17.0

package/src/client/types.ts

@@ -1,7 +1,6 @@
 import { RequestOpts } from '@oazapfts/runtime'
-import { AccountScmInfoSaveRequest, AccountScmInfoUpdateRequest, AccountScmStatusResponse, IdResponse } from '../api/account'
+import { AccountScmInfoSaveRequest, AccountScmInfoUpdateRequest, AccountScmStatusResponse } from '../api/account'
 import { AllocationCostRequest, AllocationCostResponse, ChargePeriod, getAllocationCostFilters, ManagedService, ServiceResource } from '../api/cloudServices'
-import { EnvironmentReadResponse, WorkspaceReadResponse } from '../api/workspace'
 
 interface BaseSMCStatus {
   /**
@@ -116,18 +115,3 @@ export type FixVariables<
 
 export type ReplaceResult<T extends (...args: any[]) => Promise<any>, Fix> = (...args: Parameters<T>) => Promise<Fix>
 
-
-export interface FixedWorkspaceReadResponse extends Omit<WorkspaceReadResponse, 'id' | 'name'> {
-  id: string,
-  name: string,
-}
-
-export interface FixedEnvironmentReadResponse extends Omit<EnvironmentReadResponse, 'id' | 'name'> {
-  id: string,
-  name: string,
-}
-
-export interface FixedIdResponse extends Omit<IdResponse, 'id'> {
-  id: string,
-}
-

package/src/client/workspace.ts

@@ -2,9 +2,12 @@ import { HttpError } from '@oazapfts/runtime'
 import {
   save5 as createEmbeddedLink,
   defaults,
+  delete1,
+  deleteAccountWorkflow,
   delete6 as deleteApplicationEmbeddedLinks,
   deleteConnectionInterfaceAttributesFromEnvironment, deleteConnectionInterfaceFromAllEnvironments,
   delete4 as deleteEmbeddedLink,
+  findAll,
   getEmbeddedLinks1 as getAllApplicationEmbeddedLinks,
   getApplication,
   getEmbeddedLink1 as getApplicationEmbeddedLinks,
@@ -13,11 +16,16 @@ import {
   getDependencyTree1,
   getEmbeddedLink, getEmbeddedLinks, getEnvironment, getEnvironments,
   getSharedInfrastructure,
+  getV1WorkspacesByWorkspaceIdVariablesAndName,
   getWorkspaceForId,
   getWorkspaces,
+  listAccountWorkflows,
+  listWorkflowByStackIdAndWorkflowType,
   save,
+  save1,
   save8 as saveApplicationEmbeddedLinks,
   save9 as saveEnvironment,
+  update,
   update1,
   update2,
   update6,
@@ -34,7 +42,6 @@ import { DefaultAPIError } from '../error/DefaultAPIError'
 import { workspaceDictionary } from '../error/dictionary/workspace'
 import { StackspotAPIError } from '../error/StackspotAPIError'
 import { ReactQueryNetworkClient } from '../network/ReactQueryNetworkClient'
-import { FixedEnvironmentReadResponse, FixedIdResponse, FixedWorkspaceReadResponse, ReplaceResult } from './types'
 
 class WorkspaceClient extends ReactQueryNetworkClient {
   constructor() {
@@ -78,12 +85,12 @@ class WorkspaceClient extends ReactQueryNetworkClient {
   /**
    * Gets all environments
    */
-  environments = this.query(getEnvironments as unknown as ReplaceResult<typeof getEnvironments, FixedEnvironmentReadResponse[]>)
+  environments = this.query(getEnvironments)
 
   /**
    * Gets environment by Id
    */
-  environment = this.query(getEnvironment as unknown as ReplaceResult<typeof getEnvironment, FixedEnvironmentReadResponse>)
+  environment = this.query(getEnvironment)
 
   /**
    * Creates an environment
@@ -158,23 +165,26 @@ class WorkspaceClient extends ReactQueryNetworkClient {
   /**
    * Gets all workspaces
    */
-  workspaces = this.query(getWorkspaces as unknown as ReplaceResult<typeof getWorkspaces, FixedWorkspaceReadResponse[]>)
+  workspaces = this.query(getWorkspaces)
 
   /**
    * Gets a workspace
    */
-  workspace = this.query(getWorkspaceForId as unknown as ReplaceResult<typeof getWorkspaceForId, FixedWorkspaceReadResponse>)
+  workspace = this.query(getWorkspaceForId)
 
   /**
    * Creates a workspace
    */
-  createWorkspace = this.mutation(save  as unknown as ReplaceResult<typeof save, FixedIdResponse>)
+  createWorkspace = this.mutation(save)
 
   /**
    * Updates a workspace
    */
   updateWorkspace = this.mutation(update1)  
   
+
+  //App and infra
+
   /**
    * Gets an application
    */
@@ -205,6 +215,41 @@ class WorkspaceClient extends ReactQueryNetworkClient {
    */
   updateInfra = this.mutation(update2)
 
+  // Workflow
+  /**
+   * Gets a workflow by stack id
+   */
+  workflowsByStackId = this.query(listWorkflowByStackIdAndWorkflowType)
+  /**
+   * Gets account workflows
+   */
+  accountWorkflows = this.query(listAccountWorkflows)
+  /**
+   * Removes account workflow
+   */
+  deleteAccountWorkflow = this.mutation(deleteAccountWorkflow)
+
+  // Variable
+  /**
+   * Gets all workspace variables
+   */
+  variables = this.query(findAll)
+  /**
+   * Creates a workspace variable
+   */
+  createVariable = this.mutation(save1)
+  /**
+   * Gets a variable by name
+   */
+  variable = this.query(getV1WorkspacesByWorkspaceIdVariablesAndName)
+  /**
+   * Updates a workspace variable
+   */
+  updateVariable = this.mutation(update)
+  /**
+   * Deletes a workspace variable
+   */
+  deleteVariable = this.mutation(delete1)
   
 }
 

package/src/error/DefaultAPIError.ts

@@ -15,14 +15,14 @@ const fieldDictionary = {
   wks: workspaceFields,
 }
 
-function getTitle(raw: ErrorResponse, dictionary: Dictionary, language: Language) {
+function getTitle(status: number, raw: ErrorResponse, dictionary: Dictionary, language: Language) {
   if (dictionary[language][raw.code]) return dictionary[language][raw.code]
-  if (!ignoredDescriptions.includes(raw.details)) return raw.details
-  return (baseDictionary as Dictionary)[language][raw.status] || baseDictionary[language].defaultTitle
+  if (raw.details && !ignoredDescriptions.includes(raw.details)) return raw.details
+  return (baseDictionary as Dictionary)[language][status] || baseDictionary[language].defaultTitle
 }
 
-function createMessage(raw: ErrorResponse, dictionary: Dictionary, language: Language) {
-  const title = getTitle(raw, dictionary, language)
+function createMessage(status: number, raw: ErrorResponse, dictionary: Dictionary, language: Language) {
+  const title = getTitle(status, raw, dictionary, language)
   if (!raw.validationDetails?.length) return title
   const api = raw.code?.split(/[-_]/)[0]
   const details = raw.validationDetails?.map((detail) => {
@@ -67,7 +67,7 @@ export class DefaultAPIError extends StackspotAPIError {
     super({
       status: status,
       code: rawResponse.code,
-      message: language => createMessage(rawResponse, dictionary, language),
+      message: language => createMessage(status, rawResponse, dictionary, language),
       headers,
     })
     this.raw = rawResponse