From 43826b184b5b1d308b0fd260cf34d31196aae3e1 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 7 Jun 2019 12:36:25 -0700 Subject: [PATCH] moved utilities --- .../metadata/configuration/reducer/configuration.reducer.ts | 4 ---- ui/src/app/metadata/configuration/reducer/index.ts | 2 +- ui/src/app/metadata/domain/utility/configuration.spec.ts | 0 .../service/utility.ts => domain/utility/configuration.ts} | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 ui/src/app/metadata/domain/utility/configuration.spec.ts rename ui/src/app/metadata/{configuration/service/utility.ts => domain/utility/configuration.ts} (96%) diff --git a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts index 3acc42338..c526aa22b 100644 --- a/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts +++ b/ui/src/app/metadata/configuration/reducer/configuration.reducer.ts @@ -22,24 +22,20 @@ export function reducer(state = initialState, action: ConfigurationActionsUnion) ...state, schema: action.payload }; - break; case ConfigurationActionTypes.SET_DEFINITION: return { ...state, definition: action.payload }; - break; case ConfigurationActionTypes.SET_METADATA: return { ...state, model: action.payload }; - break; case ConfigurationActionTypes.CLEAR: return { ...initialState }; - break; default: { return state; } diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts index 3fb2ae27d..e8ba98467 100644 --- a/ui/src/app/metadata/configuration/reducer/index.ts +++ b/ui/src/app/metadata/configuration/reducer/index.ts @@ -5,7 +5,7 @@ import * as fromRoot from '../../../app.reducer'; import * as fromConfiguration from './configuration.reducer'; import { WizardStep } from '../../../wizard/model'; -import * as utils from '../service/utility'; +import * as utils from '../../domain/utility/configuration'; import { getSplitSchema } from '../../../wizard/reducer'; export interface ConfigurationState { diff --git a/ui/src/app/metadata/domain/utility/configuration.spec.ts b/ui/src/app/metadata/domain/utility/configuration.spec.ts new file mode 100644 index 000000000..e69de29bb diff --git a/ui/src/app/metadata/configuration/service/utility.ts b/ui/src/app/metadata/domain/utility/configuration.ts similarity index 96% rename from ui/src/app/metadata/configuration/service/utility.ts rename to ui/src/app/metadata/domain/utility/configuration.ts index ee329c3b1..0cd0a7a45 100644 --- a/ui/src/app/metadata/configuration/service/utility.ts +++ b/ui/src/app/metadata/domain/utility/configuration.ts @@ -1,4 +1,4 @@ -import { Property } from '../../domain/model/property'; +import { Property } from '../model/property'; export function getDefinition(path: string, definitions: any): any { let def = path.split('/').pop();