Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

Commit

Permalink
Merge pull request #343 from blafond/TTOOLS-616
Browse files Browse the repository at this point in the history
  • Loading branch information
@pure-bot
pure-bot[bot] authored May 23, 2019
2 parents 2025b97 + cf41280 commit 1847913
Show file tree
Hide file tree
Showing 8 changed files with 983 additions and 706 deletions.
17 changes: 16 additions & 1 deletion app/ui-react/syndesis/src/modules/data/locales/data-translations.en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,21 @@
"viewSqlFormSqlStatement": "SQL Statement",
"viewSqlFormSqlStatementDescription": "Enter SQL query and click SUBMIT (i.e. SELECT a, b FROM view1)",
"queryResultsTableEmptyStateInfo": "Query has not yet been executed.\nSelect view, enter SQL query and click 'Submit'",
"queryResultsTableEmptyStateTitle": "NO DATA AVAILABLE"
"queryResultsTableEmptyStateTitle": "NO DATA AVAILABLE",
"queryViewFailed": "An error occurred querying the selected view. Details: {{details}}",
"queryViewSuccess": "The selected view was successfully queried.",
"createVirtualizationSuccess": "{{name}} virtualization created.",
"publishVirtualizationSuccess": "Virtualization {{name}} was submitted for publishing.",
"publishVirtualizatioFailed": "Publishing failed for virtualization {{name}}. Details: {{details}}",
"unpublishVirtualizationSuccess": "Virtualizaton {{name}} was unpublished.",
"unpublishVirtualizationFailed": "Unpublish virtualization {{name}} failed. Details: {{details}}",
"deleteVirtualizationSuccess": "Virtualization {{name}} was deleted.",
"deleteVirtualizationFailed": "Delete virtualization {{name}} failed. Details: {{details}}",
"deleteViewSuccess": "View {{name}} was deleted.",
"deleteViewFailed": "Delete view {{name}} failed. Details: {{details}}",
"importViewsSuccess": "Import data source completed for virtualization {{name}}.",
"importViewsFailed": "Import data source failed for virtualization {{name}}. Details: {{details}}",
"createViewSuccess": "Created view named: {{name}}.",
"createViewFailed": "Create view failed. Details: {{details}}"
}
}
17 changes: 16 additions & 1 deletion app/ui-react/syndesis/src/modules/data/locales/data-translations.it.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,21 @@
"viewSqlFormSqlStatement": "SQL Statement",
"viewSqlFormSqlStatementDescription": "Enter SQL query and click SUBMIT (i.e. SELECT a, b FROM view1)",
"queryResultsTableEmptyStateInfo": "Query has not yet been executed.\nSelect view, enter SQL query and click 'Submit'",
"queryResultsTableEmptyStateTitle": "NO DATA AVAILABLE"
"queryResultsTableEmptyStateTitle": "NO DATA AVAILABLE",
"queryViewFailed": "An error occurred querying the selected view. Details: {{details}}",
"queryViewSuccess": "The selected view was successfully queried.",
"createVirtualizationSuccess": "{{name}} virtualization created.",
"publishVirtualizationSuccess": "Virtualization {{name}} was submitted for publishing.",
"publishVirtualizatioFailed": "Publishing failed for virtualization {{name}}. Details: {{details}}",
"unpublishVirtualizationSuccess": "Virtualizaton {{name}} was unpublished.",
"unpublishVirtualizationFailed": "Unpublish virtualization {{name}} failed. Details: {{details}}",
"deleteVirtualizationSuccess": "Virtualization {{name}} was deleted.",
"deleteVirtualizationFailed": "Delete virtualization {{name}} failed. Details: {{details}}",
"deleteViewSuccess": "View {{name}} was deleted.",
"deleteViewFailed": "Delete view {{name}} failed. Details: {{details}}",
"importViewsSuccess": "Import data source completed for virtualization {{name}}.",
"importViewsFailed": "Import data source failed for virtualization {{name}}. Details: {{details}}",
"createViewSuccess": "Created view named: {{name}}.",
"createViewFailed": "Create view failed. Details: {{details}}"
}
}
182 changes: 99 additions & 83 deletions app/ui-react/syndesis/src/modules/data/pages/VirtualizationCreatePage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { WithRouteData } from '@syndesis/utils';
import * as React from 'react';
import { Translation } from 'react-i18next';
import { Link } from 'react-router-dom';
import { AppContext } from '../../../app';
import { AppContext, UIContext } from '../../../app';
import i18n from '../../../i18n';
import resolvers from '../../resolvers';

Expand Down Expand Up @@ -47,93 +47,109 @@ export class VirtualizationCreatePage extends React.Component {
};

return (
<WithRouteData<null, null>>
{(p, s, { history }) => (
<AppContext.Consumer>
{({ user }) => (
<WithVirtualizationHelpers>
{({ createVirtualization }) => {
const handleCreate = async (value: any) => {
const virtualization = await createVirtualization(
user.username || 'developer',
value.virtName,
value.virtDescription
);
// TODO: post toast notification
history.push(
resolvers.data.virtualizations.views.root({
virtualization,
})
);
};
return (
<Translation ns={['data', 'shared']}>
{t => (
<>
<Breadcrumb>
<Link
data-testid={'virtualization-create-page-home'}
to={resolvers.dashboard.root()}
>
{t('shared:Home')}
</Link>
<Link
data-testid={
'virtualization-create-page-virtualizations'
}
to={resolvers.data.root()}
>
{t('shared:DataVirtualizations')}
</Link>
<span>
{t(
'data:virtualization.createDataVirtualizationTitle'
)}
</span>
</Breadcrumb>
<PageSection variant={'light'}>
<h1 className="pf-c-title pf-m-xl">
{t(
'data:virtualization.createDataVirtualizationTitle'
)}
</h1>
</PageSection>
<PageSection>
<AutoForm
definition={formDefinition}
initialValue={''}
i18nRequiredProperty={t(
'data:virtualization.requiredPropertyText'
)}
validate={validate}
onSave={handleCreate}
>
{({ fields, handleSubmit }) => (
<form onSubmit={handleSubmit}>
{fields}
<button
type="submit"
<Translation ns={['data', 'shared']}>
{t => (
<UIContext.Consumer>
{({ pushNotification }) => {
return (
<WithRouteData<null, null>>
{(p, s, { history }) => (
<AppContext.Consumer>
{({ user }) => (
<WithVirtualizationHelpers>
{({ createVirtualization }) => {
const handleCreate = async (value: any) => {
const virtualization = await createVirtualization(
user.username || 'developer',
value.virtName,
value.virtDescription
);
pushNotification(
t(
'virtualization.createVirtualizationSuccess',
{
name: value.virtName,
}
),
'success'
);
history.push(
resolvers.data.virtualizations.views.root({
virtualization,
})
);
};
return (
<>
<Breadcrumb>
<Link
data-testid={
'virtualization-create-page-create'
'virtualization-create-page-home'
}
className="btn btn-primary"
to={resolvers.dashboard.root()}
>
{t('shared:Create')}
</button>
</form>
)}
</AutoForm>
</PageSection>
</>
{t('shared:Home')}
</Link>
<Link
data-testid={
'virtualization-create-page-virtualizations'
}
to={resolvers.data.root()}
>
{t('shared:DataVirtualizations')}
</Link>
<span>
{t(
'data:virtualization.createDataVirtualizationTitle'
)}
</span>
</Breadcrumb>
<PageSection variant={'light'}>
<h1 className="pf-c-title pf-m-xl">
{t(
'data:virtualization.createDataVirtualizationTitle'
)}
</h1>
</PageSection>
<PageSection>
<AutoForm
definition={formDefinition}
initialValue={''}
i18nRequiredProperty={t(
'data:virtualization.requiredPropertyText'
)}
validate={validate}
onSave={handleCreate}
>
{({ fields, handleSubmit }) => (
<form onSubmit={handleSubmit}>
{fields}
<button
type="submit"
data-testid={
'virtualization-create-page-create'
}
className="btn btn-primary"
>
{t('shared:Create')}
</button>
</form>
)}
</AutoForm>
</PageSection>
</>
);
}}
</WithVirtualizationHelpers>
)}
</Translation>
);
}}
</WithVirtualizationHelpers>
)}
</AppContext.Consumer>
</AppContext.Consumer>
)}
</WithRouteData>
);
}}
</UIContext.Consumer>
)}
</WithRouteData>
</Translation>
);
}
}
Loading

0 comments on commit 1847913

Please sign in to comment.