You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@superset.apache.org by GitBox <gi...@apache.org> on 2020/10/08 22:33:59 UTC
[GitHub] [incubator-superset] nytai commented on a change in pull request #11189: feat: CSS Templates List
nytai commented on a change in pull request #11189:
URL: https://github.com/apache/incubator-superset/pull/11189#discussion_r502048698
##########
File path: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx
##########
@@ -0,0 +1,187 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useMemo } from 'react';
+import { t } from '@superset-ui/core';
+import moment from 'moment';
+import { useListViewResource } from 'src/views/CRUD/hooks';
+import withToasts from 'src/messageToasts/enhancers/withToasts';
+import SubMenu from 'src/components/Menu/SubMenu';
+import { IconName } from 'src/components/Icon';
+import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
+// import ListView, { Filters } from 'src/components/ListView';
Review comment:
nit: commented out code
##########
File path: superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplatesList_spec.jsx
##########
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import thunk from 'redux-thunk';
+import configureStore from 'redux-mock-store';
+import fetchMock from 'fetch-mock';
+import { styledMount as mount } from 'spec/helpers/theming';
+
+import CssTemplatesList from 'src/views/CRUD/csstemplates/CssTemplatesList';
+import SubMenu from 'src/components/Menu/SubMenu';
+import ListView from 'src/components/ListView';
+// import Filters from 'src/components/ListView/Filters';
+import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
+// import { act } from 'react-dom/test-utils';
+
+// store needed for withToasts(DatabaseList)
Review comment:
nit: incorrect comment
##########
File path: superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplatesList_spec.jsx
##########
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import thunk from 'redux-thunk';
+import configureStore from 'redux-mock-store';
+import fetchMock from 'fetch-mock';
+import { styledMount as mount } from 'spec/helpers/theming';
+
+import CssTemplatesList from 'src/views/CRUD/csstemplates/CssTemplatesList';
+import SubMenu from 'src/components/Menu/SubMenu';
+import ListView from 'src/components/ListView';
+// import Filters from 'src/components/ListView/Filters';
Review comment:
nit: commented out code
##########
File path: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx
##########
@@ -0,0 +1,187 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useMemo } from 'react';
+import { t } from '@superset-ui/core';
+import moment from 'moment';
+import { useListViewResource } from 'src/views/CRUD/hooks';
+import withToasts from 'src/messageToasts/enhancers/withToasts';
+import SubMenu from 'src/components/Menu/SubMenu';
+import { IconName } from 'src/components/Icon';
+import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
+// import ListView, { Filters } from 'src/components/ListView';
+import ListView from 'src/components/ListView';
+
+const PAGE_SIZE = 25;
+
+interface CssTemplatesListProps {
+ addDangerToast: (msg: string) => void;
+ addSuccessToast: (msg: string) => void;
+}
+
+type TemplateObject = {
+ id?: number;
+ changed_on_delta_humanized: string;
+ created_on: string;
+ created_by: {
+ id: number;
+ first_name: string;
+ last_name: string;
+ };
+ css: string;
+ template_name: string;
+};
+
+function CssTemplatesList({
+ addDangerToast,
+ addSuccessToast,
+}: CssTemplatesListProps) {
+ const {
+ state: {
+ loading,
+ resourceCount: templatesCount,
+ resourceCollection: templates,
+ },
+ hasPerm,
+ fetchData,
+ // refreshData,
+ } = useListViewResource<TemplateObject>(
+ 'css_template',
+ t('css templates'),
+ addDangerToast,
+ );
+
+ const canCreate = hasPerm('can_add');
+ const canEdit = hasPerm('can_edit');
+ const canDelete = hasPerm('can_delete');
+
+ const initialSort = [{ id: 'template_name', desc: true }];
+ const columns = useMemo(
+ () => [
+ {
+ accessor: 'template_name',
+ Header: t('Name'),
+ },
+ {
+ Cell: ({
+ row: {
+ original: { created_on: createdOn },
+ },
+ }: any) => {
+ const date = new Date(createdOn);
+ const utc = new Date(
+ Date.UTC(
+ date.getFullYear(),
+ date.getMonth(),
+ date.getDate(),
+ date.getHours(),
+ date.getMinutes(),
+ date.getSeconds(),
+ date.getMilliseconds(),
+ ),
+ );
+
+ return moment(utc).fromNow();
+ },
+ Header: t('Created On'),
+ accessor: 'created_on',
+ size: 'xl',
+ },
+ {
+ accessor: 'created_by',
+ disableSortBy: true,
+ Header: t('Created By'),
+ Cell: ({
+ row: {
+ original: { created_by: createdBy },
+ },
+ }: any) =>
+ createdBy ? `${createdBy.first_name} ${createdBy.last_name}` : '',
+ size: 'xl',
+ },
+ {
+ Cell: ({
+ row: {
+ original: { changed_on_delta_humanized: changedOn },
+ },
+ }: any) => changedOn,
+ Header: t('Last Modified'),
+ accessor: 'changed_on_delta_humanized',
+ size: 'xl',
+ },
+ {
+ Cell: ({ row: { original } }: any) => {
+ const handleEdit = () => {}; // handleDatabaseEdit(original);
+ const handleDelete = () => {}; // openDatabaseDeleteModal(original);
+
+ const actions = [
+ canEdit
+ ? {
+ label: 'edit-action',
+ tooltip: t('Edit template'),
+ placement: 'bottom',
+ icon: 'edit' as IconName,
+ onClick: handleEdit,
+ }
+ : null,
+ canDelete
+ ? {
+ label: 'delete-action',
+ tooltip: t('Delete template'),
+ placement: 'bottom',
+ icon: 'trash' as IconName,
+ onClick: handleDelete,
+ }
+ : null,
+ ].filter(item => !!item);
+
+ if (!canEdit && !canDelete) {
+ return null;
+ }
+
+ return <ActionsBar actions={actions as ActionProps[]} />;
+ },
+ Header: t('Actions'),
+ id: 'actions',
+ disableSortBy: true,
+ size: 'xl',
+ },
+ ],
+ [canDelete, canCreate],
+ );
+
+ return (
+ <>
+ <SubMenu name={t('CSS Templates')} />
+ <ListView<TemplateObject>
+ className="css-templates-list-view"
+ columns={columns}
+ count={templatesCount}
+ data={templates}
+ fetchData={fetchData}
+ // filters={filters}
Review comment:
nit: commented out code
##########
File path: superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx
##########
@@ -0,0 +1,187 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useMemo } from 'react';
+import { t } from '@superset-ui/core';
+import moment from 'moment';
+import { useListViewResource } from 'src/views/CRUD/hooks';
+import withToasts from 'src/messageToasts/enhancers/withToasts';
+import SubMenu from 'src/components/Menu/SubMenu';
+import { IconName } from 'src/components/Icon';
+import ActionsBar, { ActionProps } from 'src/components/ListView/ActionsBar';
+// import ListView, { Filters } from 'src/components/ListView';
+import ListView from 'src/components/ListView';
+
+const PAGE_SIZE = 25;
+
+interface CssTemplatesListProps {
+ addDangerToast: (msg: string) => void;
+ addSuccessToast: (msg: string) => void;
+}
+
+type TemplateObject = {
+ id?: number;
+ changed_on_delta_humanized: string;
+ created_on: string;
+ created_by: {
+ id: number;
+ first_name: string;
+ last_name: string;
+ };
+ css: string;
+ template_name: string;
+};
+
+function CssTemplatesList({
+ addDangerToast,
+ addSuccessToast,
+}: CssTemplatesListProps) {
+ const {
+ state: {
+ loading,
+ resourceCount: templatesCount,
+ resourceCollection: templates,
+ },
+ hasPerm,
+ fetchData,
+ // refreshData,
+ } = useListViewResource<TemplateObject>(
+ 'css_template',
+ t('css templates'),
+ addDangerToast,
+ );
+
+ const canCreate = hasPerm('can_add');
+ const canEdit = hasPerm('can_edit');
+ const canDelete = hasPerm('can_delete');
+
+ const initialSort = [{ id: 'template_name', desc: true }];
+ const columns = useMemo(
+ () => [
+ {
+ accessor: 'template_name',
+ Header: t('Name'),
+ },
+ {
+ Cell: ({
+ row: {
+ original: { created_on: createdOn },
+ },
+ }: any) => {
+ const date = new Date(createdOn);
+ const utc = new Date(
+ Date.UTC(
+ date.getFullYear(),
+ date.getMonth(),
+ date.getDate(),
+ date.getHours(),
+ date.getMinutes(),
+ date.getSeconds(),
+ date.getMilliseconds(),
+ ),
+ );
+
+ return moment(utc).fromNow();
+ },
+ Header: t('Created On'),
+ accessor: 'created_on',
+ size: 'xl',
+ },
+ {
+ accessor: 'created_by',
+ disableSortBy: true,
+ Header: t('Created By'),
+ Cell: ({
+ row: {
+ original: { created_by: createdBy },
+ },
+ }: any) =>
+ createdBy ? `${createdBy.first_name} ${createdBy.last_name}` : '',
+ size: 'xl',
+ },
+ {
+ Cell: ({
+ row: {
+ original: { changed_on_delta_humanized: changedOn },
+ },
+ }: any) => changedOn,
+ Header: t('Last Modified'),
+ accessor: 'changed_on_delta_humanized',
+ size: 'xl',
+ },
+ {
+ Cell: ({ row: { original } }: any) => {
+ const handleEdit = () => {}; // handleDatabaseEdit(original);
+ const handleDelete = () => {}; // openDatabaseDeleteModal(original);
Review comment:
nit: incorrectly named and commented out code
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org