这是indexloc提供的服务，不要输入任何密码
Skip to content

fix console left sidebar flashing issue #2286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 29, 2019
Merged

fix console left sidebar flashing issue #2286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2ddb573
fix console left sidebar flashing issue
arvi3411301 May 27, 2019
87dd9e1
fix console test
arvi3411301 May 27, 2019
794bc5c
Merge branch 'master' into fix-console-sidebar
arvi3411301 May 29, 2019
a736837
on schema change, dispatch setUntrackedRelations to reset untracked r…
arvi3411301 May 29, 2019
abaf2c0
.
rikinsk May 29, 2019
4bdad1f
make loadSchema function usage consistent
rikinsk May 29, 2019
90b6a2c
fix path
rikinsk May 29, 2019
002fe26
.
rikinsk May 29, 2019
3541fe4
.
rikinsk May 29, 2019
534497d
.
rikinsk May 29, 2019
ad408fd
Merge branch 'master' into fix-console-sidebar
rikinsk May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions console/cypress/integration/data/insert-browse/spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export const passSearchTables = () => {
validateCT(getTableName(0, testName), 'success');
cy.get(getElementFromAlias('search-tables')).type('0');
cy.get(getElementFromAlias('table-links')).should('not.contain', '1');
cy.get(getElementFromAlias('search-tables')).type('{home}{del}');
};

export const checkInsertRoute = () => {
Expand Down
1 change: 0 additions & 1 deletion console/cypress/integration/data/insert-browse/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
deleteBITestTable,
checkInsertRoute,
failBIWrongDataType,
failBINullKeys,
failBIUniqueKeys,
passBIInsert20Rows,
checkBrowseRoute,
Expand Down
9 changes: 4 additions & 5 deletions console/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// import GraphiQL parts
import GraphiQLWrapper from './src/components/ApiExplorer/GraphiQLWrapper/GraphiQLWrapper';
import GraphiQLWrapper from './src/components/Services/ApiExplorer/GraphiQLWrapper/GraphiQLWrapper';

// import Data Tab parts
import dataRouter from './src/components/Services/Data/DataRouter';
Expand All @@ -8,8 +8,7 @@ import dataHeaders from './src/components/Services/Data/Common/Headers';
import { handleMigrationErrors } from './src/components/Services/Data/TableModify/ModifyActions';
import {
fetchSchemaList,
loadSchema,
loadUntrackedSchema,
updateSchemaInfo,
UPDATE_CURRENT_SCHEMA,
UPDATE_DATA_HEADERS,
ACCESS_KEY_ERROR,
Expand All @@ -28,7 +27,7 @@ import routes from './src/routes';
import globals from './src/Globals';
import endpoints from './src/Endpoints';
import mainState from './src/components/Main/State';
import { changeRequestHeader } from './src/components/ApiExplorer/Actions';
import { changeRequestHeader } from './src/components/Services/ApiExplorer/Actions';
import { validateLogin } from './src/components/Main/Actions';

const filterQueryScss = require('./src/components/Common/FilterQuery/FilterQuery.scss');
Expand All @@ -39,7 +38,7 @@ export { GraphiQLWrapper };

// export Data Tab parts
export { dataRouter, dataReducer };
export { fetchSchemaList, loadSchema, loadUntrackedSchema };
export { fetchSchemaList, updateSchemaInfo };
export { UPDATE_CURRENT_SCHEMA, UPDATE_DATA_HEADERS, ACCESS_KEY_ERROR };
export { dataHeaders };

Expand Down
10 changes: 0 additions & 10 deletions console/src/components/Common/Layout/LeftSubSidebar/LeftSubSidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
line-height: 26px;
}

.changeSchema {
margin-left: 10px;
width: auto;
}

.sidebar {
height: calc(100vh - 26px);
overflow: auto;
Expand Down Expand Up @@ -178,11 +173,6 @@
}
}

.heading_tooltip {
display: inline-block;
padding-right: 10px;
}

.activeTable {
a {
// border-left: 4px solid #FFC627;
Expand Down
4 changes: 2 additions & 2 deletions console/src/components/Services/Data/Add/AddActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import defaultState from './AddState';

import _push from '../push';
import { loadUntrackedRelations, makeMigrationCall } from '../DataActions';
import { updateSchemaInfo, makeMigrationCall } from '../DataActions';
import {
showSuccessNotification,
showErrorNotification,
Expand Down Expand Up @@ -268,7 +268,7 @@ const createTableSql = () => {
dispatch({ type: REQUEST_SUCCESS });
dispatch({ type: SET_DEFAULTS });
dispatch(setTable(state.tableName.trim()));
dispatch(loadUntrackedRelations()).then(() =>
dispatch(updateSchemaInfo()).then(() =>
dispatch(
_push(
'/schema/' +
Expand Down
6 changes: 3 additions & 3 deletions console/src/components/Services/Data/Add/AddExistingTableViewActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import defaultState from './AddExistingTableViewState';
import _push from '../push';
import {
loadUntrackedRelations,
updateSchemaInfo,
fetchTrackedFunctions,
makeMigrationCall,
} from '../DataActions';
Expand Down Expand Up @@ -58,7 +58,7 @@ const addExistingTableSql = () => {
const errorMsg = 'Adding existing table/view failed';
const customOnSuccess = () => {
dispatch({ type: REQUEST_SUCCESS });
dispatch(loadUntrackedRelations()).then(() => {
dispatch(updateSchemaInfo()).then(() => {
const newTable = getState().tables.allSchemas.find(
t =>
t.table_name === state.tableName.trim() &&
Expand Down Expand Up @@ -213,7 +213,7 @@ const addAllUntrackedTablesSql = tableList => {
const customOnSuccess = () => {
dispatch(showSuccessNotification('Existing table/view added!'));
dispatch({ type: REQUEST_SUCCESS });
dispatch(loadUntrackedRelations()).then(() => {
dispatch(updateSchemaInfo()).then(() => {
dispatch(_push('/schema/' + currentSchema));
});
return;
Expand Down
4 changes: 2 additions & 2 deletions console/src/components/Services/Data/Common/ReusableComponents/ForeignKeySelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import styles from '../../../../Common/TableCommon/Table.scss';
import { fkViolationOnUpdate, fkViolationOnDelete } from './Tooltips';
import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
import { loadSchema } from '../../DataActions';
import { updateSchemaInfo } from '../../DataActions';

const violiationActions = [
'restrict',
Expand Down Expand Up @@ -36,7 +36,7 @@ const ForeignKeySelector = ({
}
newFks[index].refSchemaName = event.target.value;
dispatch(setForeignKeys(newFks));
dispatch(loadSchema({ schemas: [event.target.value] }));
dispatch(updateSchemaInfo({ schemas: [event.target.value] }));
};
return (
<div className={`${styles.add_mar_bottom}`}>
Expand Down
Loading