From 2701df1e3b03c7c605ccf212a02987d53fbd0609 Mon Sep 17 00:00:00 2001 From: notoraptor Date: Wed, 17 Jul 2019 15:16:43 -0400 Subject: [web] Make button "Delete all" remove only orders from current se… (#49) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Make button "Delete all" remove only orders from current selected power. - Reorganize code - [web] Remove bugged and useless function gameReloaded() from game page. - This function caused error `engine.getPhaseType is not a function` for games with deadlines. - Move function saveGameToDisk into its own file. - [web] Add documentation to methods involved in orders management to help understand what happens. - Move methods getServerOrders() from game GUI component to game engine object. - Rename method onSetNoOrders to onSetEmptyOrdersSet. - Rename property in PowerActionsForm: onNoOrders => onPass. - [web] Update sending orders to send request clearOrders when local orders list is null. - Renamed local file: - components/power_order => power_orders - forms/power_actions_form => power_order_creation_form - Move power orders buttons bar to a separate file: - components/power_orders_actions_bar - [web] Improve messages about local/server defined orders. --- diplomacy/web/src/gui/core/table.jsx | 112 ----------------------------------- 1 file changed, 112 deletions(-) delete mode 100644 diplomacy/web/src/gui/core/table.jsx (limited to 'diplomacy/web/src/gui/core/table.jsx') diff --git a/diplomacy/web/src/gui/core/table.jsx b/diplomacy/web/src/gui/core/table.jsx deleted file mode 100644 index cb729e7..0000000 --- a/diplomacy/web/src/gui/core/table.jsx +++ /dev/null @@ -1,112 +0,0 @@ -// ============================================================================== -// Copyright (C) 2019 - Philip Paquette, Steven Bocco -// -// This program is free software: you can redistribute it and/or modify it under -// the terms of the GNU Affero General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) any -// later version. -// -// This program is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more -// details. -// -// You should have received a copy of the GNU Affero General Public License along -// with this program. If not, see . -// ============================================================================== -//// Tables. - -import React from "react"; -import PropTypes from 'prop-types'; - -class DefaultWrapper { - constructor(data) { - this.data = data; - this.get = this.get.bind(this); - } - - get(fieldName) { - return this.data[fieldName]; - } -} - -function defaultWrapper(data) { - return new DefaultWrapper(data); -} - -export class Table extends React.Component { - // className - // caption - // columns : {name: [title, order]} - // data: [objects with expected column names] - // wrapper: (optional) function to use to wrap one data entry into an object before accessing fields. - // Must return an instance with a method get(name). - // If provided: wrapper(data_entry).get(field_name) - // else: data_entry[field_name] - - constructor(props) { - super(props); - if (!this.props.wrapper) - this.props.wrapper = defaultWrapper; - } - - static getHeader(columns) { - const header = []; - for (let entry of Object.entries(columns)) { - const name = entry[0]; - const title = entry[1][0]; - const order = entry[1][1]; - header.push([order, name, title]); - } - header.sort((a, b) => { - let t = a[0] - b[0]; - if (t === 0) - t = a[1].localeCompare(b[1]); - if (t === 0) - t = a[2].localeCompare(b[2]); - return t; - }); - return header; - } - - static getHeaderLine(header) { - return ( - - {header.map((column, colIndex) => {column[2]})} - - ); - } - - static getBodyRow(header, row, rowIndex, wrapper) { - const wrapped = wrapper(row); - return ( - {header.map((headerColumn, colIndex) => {wrapped.get(headerColumn[1])})} - ); - } - - static getBodyLines(header, data, wrapper) { - return ({data.map((row, rowIndex) => Table.getBodyRow(header, row, rowIndex, wrapper))}); - } - - render() { - const header = Table.getHeader(this.props.columns); - return ( -
- - - {Table.getHeaderLine(header)} - {Table.getBodyLines(header, this.props.data, this.props.wrapper)} -
{this.props.caption} ({this.props.data.length})
-
- ); - } -} - -Table.propTypes = { - wrapper: PropTypes.func, - columns: PropTypes.object, - className: PropTypes.string, - caption: PropTypes.string, - data: PropTypes.array -}; -- cgit v1.2.3