Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: add communityTemplate feature flag and put copypasted container in it

pull/18365/head
Bucky Schwarz 2020-06-03 16:30:50 -07:00 committed by Bucky Schwarz
parent 22e135c06a
commit 925354f951
4 changed files with 133 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flags.yml
View File

@ -28,6 +28,14 @@
contact: Gavin Cabbage
lifetime: permanent
- name: Community Templates
description: Replace current template uploading functionality with community driven templates
key: communityTemplates
default: false
expose: true
contact: Bucky, Johnny Steenbergen (Berg)
lifetime: permanent
- name: Frontend Example
description: A temporary frontend example integer flag
key: frontendExample

16
kit/feature/list.go
View File

@ -30,6 +30,20 @@ func BackendExample() BoolFlag {
return backendExample
}
var communityTemplates = MakeBoolFlag(
"Community Templates",
"communityTemplates",
"Bucky, Johnny Steenbergen (Berg)",
false,
Permanent,
true,
)
// CommunityTemplates - Replace current template uploading functionality with community driven templates
func CommunityTemplates() BoolFlag {
return communityTemplates
}
var frontendExample = MakeIntFlag(
"Frontend Example",
"frontendExample",
@ -131,6 +145,7 @@ func NewLabelPackage() BoolFlag {
var all = []Flag{
appMetrics,
backendExample,
communityTemplates,
frontendExample,
pushDownWindowAggregateCount,
pushDownWindowAggregateRest,
@ -143,6 +158,7 @@ var all = []Flag{
var byKey = map[string]Flag{
"appMetrics": appMetrics,
"backendExample": backendExample,
"communityTemplates": communityTemplates,
"frontendExample": frontendExample,
"pushDownWindowAggregateCount": pushDownWindowAggregateCount,
"pushDownWindowAggregateRest": pushDownWindowAggregateRest,

63
ui/src/index.tsx
View File

@ -48,6 +48,7 @@ import NewVEO from 'src/dashboards/components/NewVEO'
import OnboardingWizardPage from 'src/onboarding/containers/OnboardingWizardPage'
import BucketsIndex from 'src/buckets/containers/BucketsIndex'
import TemplatesIndex from 'src/templates/containers/TemplatesIndex'
import {CommunityTemplatesIndex} from 'src/templates/containers/CommunityTemplatesIndex'
import TelegrafsPage from 'src/telegrafs/containers/TelegrafsPage'
import ClientLibrariesPage from 'src/clientLibraries/containers/ClientLibrariesPage'
import ClientCSharpOverlay from 'src/clientLibraries/components/ClientCSharpOverlay'
@ -423,27 +424,51 @@ class Root extends PureComponent {
component={UpdateVariableOverlay}
/>
</Route>
<Route
path="templates"
component={TemplatesIndex}
>
{isFlagEnabled('communityTemplates') ? (
<Route
path="import"
component={TemplateImportOverlay}
/>
path="templates"
component={CommunityTemplatesIndex}
>
<Route
path="import"
component={TemplateImportOverlay}
/>
<Route
path=":id/export"
component={TemplateExportOverlay}
/>
<Route
path=":id/view"
component={TemplateViewOverlay}
/>
<Route
path=":id/static/view"
component={StaticTemplateViewOverlay}
/>
</Route>
) : (
<Route
path=":id/export"
component={TemplateExportOverlay}
/>
<Route
path=":id/view"
component={TemplateViewOverlay}
/>
<Route
path=":id/static/view"
component={StaticTemplateViewOverlay}
/>
</Route>
path="templates"
component={TemplatesIndex}
>
<Route
path="import"
component={TemplateImportOverlay}
/>
<Route
path=":id/export"
component={TemplateExportOverlay}
/>
<Route
path=":id/view"
component={TemplateViewOverlay}
/>
<Route
path=":id/static/view"
component={StaticTemplateViewOverlay}
/>
</Route>
)}
<Route path="labels" component={LabelsIndex} />
<Route path="about" component={OrgProfilePage}>
<Route

65
ui/src/templates/containers/CommunityTemplatesIndex.tsx Normal file
View File

@ -0,0 +1,65 @@
import React, {Component} from 'react'
import {withRouter, WithRouterProps} from 'react-router'
import {connect} from 'react-redux'
// Components
import {ErrorHandling} from 'src/shared/decorators/errors'
import {Page} from '@influxdata/clockface'
import SettingsTabbedPage from 'src/settings/components/SettingsTabbedPage'
import SettingsHeader from 'src/settings/components/SettingsHeader'
import TemplatesPage from 'src/templates/components/TemplatesPage'
import GetResources from 'src/resources/components/GetResources'
// Utils
import {pageTitleSuffixer} from 'src/shared/utils/pageTitles'
import {getOrg} from 'src/organizations/selectors'
// Types
import {AppState, Organization, ResourceType} from 'src/types'
interface StateProps {
org: Organization
}
type Props = WithRouterProps & StateProps
@ErrorHandling
class CTI extends Component<Props> {
componentDidMount() {
// eslint-disable-next-line no-console
console.log('CommunityTemplatesIndex - the flag is working')
}
public render() {
const {org, children} = this.props
return (
<>
<Page titleTag={pageTitleSuffixer(['Templates', 'Settings'])}>
<SettingsHeader />
<SettingsTabbedPage activeTab="templates" orgID={org.id}>
<GetResources resources={[ResourceType.Templates]}>
<TemplatesPage onImport={this.handleImport} />
</GetResources>
</SettingsTabbedPage>
</Page>
{children}
</>
)
}
private handleImport = () => {
const {router, org} = this.props
router.push(`/orgs/${org.id}/settings/templates/import`)
}
}
const mstp = (state: AppState): StateProps => {
return {
org: getOrg(state),
}
}
export const CommunityTemplatesIndex = connect<StateProps, {}, {}>(
mstp,
null
)(withRouter<{}>(CTI))