+
{this.props.uploading ? (
) : label ? (
diff --git a/src/components/Pill/Pill.react.js b/src/components/Pill/Pill.react.js
index 45c6aa9d5a..81d7fe5818 100644
--- a/src/components/Pill/Pill.react.js
+++ b/src/components/Pill/Pill.react.js
@@ -10,7 +10,7 @@ import styles from 'components/Pill/Pill.scss';
import Icon from "components/Icon/Icon.react";
//TODO: refactor, may want to move onClick outside or need to make onClick able to handle link/button a11y
-let Pill = ({ value, onClick, fileDownloadLink, followClick = false }) => (
+let Pill = ({ value, onClick, fileDownloadLink, followClick = false, shrinkablePill = false }) => (
(
].join(" ")}
onClick={!followClick && onClick ? onClick : null}
>
- {value}
+ {value}
{followClick && (
!e.metaKey && onClick()}>
diff --git a/src/components/Pill/Pill.scss b/src/components/Pill/Pill.scss
index 95987e52a6..91744f68d1 100644
--- a/src/components/Pill/Pill.scss
+++ b/src/components/Pill/Pill.scss
@@ -9,9 +9,8 @@
.pill {
@include MonospaceFont;
- display: flex;
- justify-content: space-between;
- align-items: center;
+ position: relative;
+ display: inline-block;
color: #0E69A1;
height: 20px;
line-height: 20px;
@@ -22,6 +21,8 @@
text-overflow: ellipsis;
white-space: nowrap;
& a {
+ position: absolute;
+ right: 0;
height: 20px;
width: 20px;
background: #d6e5f2;
@@ -31,6 +32,14 @@
transform: rotate(316deg);
}
}
+ & .pillText {
+ position: absolute;
+ left: 0;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ width: 75%;
+ }
}
.content {
diff --git a/src/dashboard/Data/ApiConsole/GraphQLConsole.react.js b/src/dashboard/Data/ApiConsole/GraphQLConsole.react.js
index d082c819af..10cf3ae2ee 100644
--- a/src/dashboard/Data/ApiConsole/GraphQLConsole.react.js
+++ b/src/dashboard/Data/ApiConsole/GraphQLConsole.react.js
@@ -29,16 +29,18 @@ export default class GraphQLConsole extends Component {
);
} else {
- const headers = {
+ const parseHeaders = {
'X-Parse-Application-Id': applicationId,
'X-Parse-Master-Key': masterKey
}
if (clientKey) {
- headers['X-Parse-Client-Key'] = clientKey
+ parseHeaders['X-Parse-Client-Key'] = clientKey
}
content = (
{
+ headers={JSON.stringify(parseHeaders)}
+ headerEditorEnabled={true}
+ fetcher={async (graphQLParams, {headers}) => {
const data = await fetch(
graphQLServerURL,
{
diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index b6e91ea62c..38669f2471 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -29,6 +29,7 @@ import prettyNumber from 'lib/prettyNumber';
import queryFromFilters from 'lib/queryFromFilters';
import React from 'react';
import RemoveColumnDialog from 'dashboard/Data/Browser/RemoveColumnDialog.react';
+import PointerKeyDialog from 'dashboard/Data/Browser/PointerKeyDialog.react';
import SidebarAction from 'components/Sidebar/SidebarAction';
import stringCompare from 'lib/stringCompare';
import styles from 'dashboard/Data/Browser/Browser.scss';
@@ -58,6 +59,7 @@ class Browser extends DashboardView {
showExportDialog: false,
showAttachRowsDialog: false,
showEditRowDialog: false,
+ showPointerKeyDialog: false,
rowsToDelete: null,
rowsToExport: null,
@@ -141,6 +143,8 @@ class Browser extends DashboardView {
this.addEditCloneRows = this.addEditCloneRows.bind(this);
this.abortAddRow = this.abortAddRow.bind(this);
this.saveNewRow = this.saveNewRow.bind(this);
+ this.showPointerKeyDialog = this.showPointerKeyDialog.bind(this);
+ this.onChangeDefaultKey = this.onChangeDefaultKey.bind(this);
this.saveEditCloneRow = this.saveEditCloneRow.bind(this);
this.abortEditCloneRow = this.abortEditCloneRow.bind(this);
this.cancelPendingEditRows = this.cancelPendingEditRows.bind(this);
@@ -451,7 +455,7 @@ class Browser extends DashboardView {
});
},
error => {
- let msg = typeof error === "string" ? error : error.message;
+ let msg = typeof error === 'string' ? error : error.message;
if (msg) {
msg = msg[0].toUpperCase() + msg.substr(1);
}
@@ -471,7 +475,7 @@ class Browser extends DashboardView {
this.setState(state);
},
error => {
- let msg = typeof error === "string" ? error : error.message;
+ let msg = typeof error === 'string' ? error : error.message;
if (msg) {
msg = msg[0].toUpperCase() + msg.substr(1);
}
@@ -1419,6 +1423,10 @@ class Browser extends DashboardView {
});
}
+ showPointerKeyDialog() {
+ this.setState({ showPointerKeyDialog: true });
+ }
+
closeEditRowDialog() {
this.setState({
showEditRowDialog: false,
@@ -1435,6 +1443,16 @@ class Browser extends DashboardView {
this.setState({showPermissionsDialog: opened});
}
+ async onChangeDefaultKey (name) {
+ ColumnPreferences.setPointerDefaultKey(
+ this.context.currentApp.applicationId,
+ this.props.params.className,
+ name
+ );
+ this.setState({ showPointerKeyDialog: false });
+ }
+
+
renderContent() {
let browser = null;
let className = this.props.params.className;
@@ -1513,6 +1531,7 @@ class Browser extends DashboardView {
onExportSelectedRows={this.showExportSelectedRowsDialog}
onSaveNewRow={this.saveNewRow}
+ onShowPointerKey={this.showPointerKeyDialog}
onAbortAddRow={this.abortAddRow}
onSaveEditCloneRow={this.saveEditCloneRow}
onAbortEditCloneRow={this.abortEditCloneRow}
@@ -1552,7 +1571,18 @@ class Browser extends DashboardView {
}
}
let extras = null;
- if (this.state.showCreateClassDialog) {
+ if(this.state.showPointerKeyDialog){
+ let currentColumns = this.getClassColumns(className).map(column => column.name);
+ extras = (
+ this.setState({ showPointerKeyDialog: false })}
+ onConfirm={this.onChangeDefaultKey} />
+ );
+ }
+ else if (this.state.showCreateClassDialog) {
extras = (
: }
{enableClassManipulation ? : }
+
)}
-
+
);
};
diff --git a/src/dashboard/Data/Browser/DataBrowser.react.js b/src/dashboard/Data/Browser/DataBrowser.react.js
index 9415dd4876..785815466a 100644
--- a/src/dashboard/Data/Browser/DataBrowser.react.js
+++ b/src/dashboard/Data/Browser/DataBrowser.react.js
@@ -300,10 +300,11 @@ export default class DataBrowser extends React.Component {
render() {
let { className, count, disableSecurityDialog, onCancelPendingEditRows, editCloneRows, ...other } = this.props;
- const { preventSchemaEdits } = this.context.currentApp;
+ const { preventSchemaEdits, applicationId } = this.context.currentApp;
return (
0;
+ let currentColumns = [...this.props.currentColumns, 'objectId'];
+ if (hasColumns) {
+ content = (
+
+ }
+ input={
+ this.setState({ name: name })}>
+ {currentColumns.map((t) => )}
+
+ } />
+ )
+ }
+ return (
+ {
+ this.props.onConfirm(this.state.name);
+ }}
+ customFooter={hasColumns ? null :
+
+
+
+ }>
+ {content}
+
+ );
+ }
+}
diff --git a/src/dashboard/Data/Browser/RemoveColumnDialog.react.js b/src/dashboard/Data/Browser/RemoveColumnDialog.react.js
index 725f3b5ec3..de2506df20 100644
--- a/src/dashboard/Data/Browser/RemoveColumnDialog.react.js
+++ b/src/dashboard/Data/Browser/RemoveColumnDialog.react.js
@@ -64,4 +64,4 @@ export default class RemoveColumnDialog extends React.Component {
);
}
-}
\ No newline at end of file
+}
diff --git a/src/lib/ColumnPreferences.js b/src/lib/ColumnPreferences.js
index 13bc46381b..76c02a9a11 100644
--- a/src/lib/ColumnPreferences.js
+++ b/src/lib/ColumnPreferences.js
@@ -139,6 +139,25 @@ export function updateCachedColumns(appId, className) {
return order;
}
+export function setPointerDefaultKey( appId, className, name ) {
+ localStorage.setItem(pointerKeyPath(appId, className), name);
+ // remove old pointer key.
+ localStorage.removeItem(className);
+}
+
+export async function getPointerDefaultKey( appId, className ) {
+ let pointerKey = await localStorage.getItem(pointerKeyPath(appId, className));
+ if ( !pointerKey ) {
+ // old pointer key.
+ pointerKey = await localStorage.getItem(className) || 'objectId';
+ }
+ return pointerKey;
+}
+
function path(appId, className) {
return `ParseDashboard:${VERSION}:${appId}:${className}`;
}
+
+function pointerKeyPath( appId, className ) {
+ return `ParseDashboard:${VERSION}:${appId}:${className}::defaultPointerKey`;
+}
diff --git a/webpack/base.config.js b/webpack/base.config.js
index 671b9eb4d7..ebf1470661 100644
--- a/webpack/base.config.js
+++ b/webpack/base.config.js
@@ -20,7 +20,8 @@ module.exports = {
context: path.join(__dirname, '../src'),
output: {
filename: '[name].bundle.js',
- publicPath: 'bundles/'
+ publicPath: 'bundles/',
+ assetModuleFilename: 'img/[hash][ext]'
},
resolve: {
modules: [__dirname,path.join(__dirname, '../src'), path.join(__dirname, '../node_modules')]
@@ -67,10 +68,10 @@ module.exports = {
use: [ 'style-loader', 'css-loader' ]
}, {
test: /\.png$/,
- use: { loader: 'file-loader?name=img/[hash].[ext]' }
+ type: 'asset/resource'
}, {
test: /\.jpg$/,
- use: { loader: 'file-loader?name=img/[hash].[ext]' }
+ type: 'asset/resource'
}, {
test: /\.flow$/,
use: 'null-loader'