Skip to content

Commit

Permalink
bump sdk, minor glitched on home, couple of missing strings.
Browse files Browse the repository at this point in the history
  • Loading branch information
cdujeu committed Mar 25, 2024
1 parent 9993121 commit fbef850
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 27 deletions.

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class AltDashboard extends React.Component {
</div>
</Paper>
<HomeSearchForm zDepth={0} {...this.props} style={styles.wsListsContainerStyle} fullScreen={fullScreen} fullScreenTransition={fullScreenTransition} onFocusChange={onFocusChange}>
<SmartRecents {...this.props} style={{maxWidth: 680, width:'100%', padding:'8px 0'}} emptyStateProps={{style:{backgroundColor:'transparent'}}}/>
<SmartRecents {...this.props} emptyStateProps={{style:{backgroundColor:'transparent'}}}/>
</HomeSearchForm>
</MasterLayout>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,17 @@ class SmartRecents extends React.Component{
render(){


const {pydio, style, muiTheme} = this.props;
const {pydio, muiTheme} = this.props;
const {nodes, loading, list} = this.state;

const style = {
display:(loading&&list)?'block':'flex',
padding:list?'4px 0':4,
flexWrap: 'wrap',
justifyContent:'flex-start',
maxWidth: 680,
width:'100%'
}
let phStyle = {margin:10,width:140, height: 160, padding: 6, display:'flex', flexDirection:'column', alignItems:'center', borderRadius: 6}
if(muiTheme.userTheme === 'mui3') {
phStyle.width = 160;
Expand Down Expand Up @@ -341,7 +349,7 @@ class SmartRecents extends React.Component{
{muiTheme.userTheme==='mui3' && <M3Tooltip title={<span style={{padding: '0 8px'}}>{pydio.MessageHash[list?'193':'192']}</span>}><span className={'mdi mdi-view-' + (list ? 'grid':'list')} onClick={()=>this.toggleList()} style={{cursor: 'pointer', fontSize: 16}}/></M3Tooltip>}
</div>
<div style={{overflowY: 'auto', flex: 1}}>
<div style={{display:(loading&&list)?'block':'flex', flexWrap: 'wrap', justifyContent:'center', ...style}}>
<div style={style}>
<PlaceHolder ready={!loading} showLoadingAnimation customPlaceholder={cardsPH}>
{cards}
</PlaceHolder>
Expand Down

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"ds.board.ds.legend": {
"other": "Datasources are concrete storage locations that are aggregated by Pydio into a global tree. They can be distributed accross many storage nodes as needed."
},
"ds.board.ds.internal.legend": {
"other": "Internal DataSources are used to store binaries like files versions"
},
"ds.board.ds.title": {
"other": "DataSources"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ class DataSourcesBoard extends React.Component {
</Paper>
{internalSources.length > 0 &&
<Fragment>
<div style={{padding: '0px 20px'}}>Internal DataSources are used to store binaries like files versions</div>
<div style={{padding: '0px 20px'}}>{m('board.ds.internal.legend')}</div>
<Paper {...blockProps} style={{...blockStyle}}>
<MaterialTable
data={internalSources}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class EncryptionKeys extends React.Component{
showCreateKey: null,
showImportKey: null,

m: id => props.pydio.MessageHash['ajxp_admin.ds.encryption.' + id] || id
m: id => props.pydio.MessageHash['ajxp_admin.ds.encryption.' + id] || props.pydio.MessageHash[id] || id
};
}

Expand All @@ -66,7 +66,7 @@ class EncryptionKeys extends React.Component{
request.StrPassword = this.refs['key-password-field'].getValue();
const confirm = this.refs['key-password-confirm'].getValue();
if(confirm !== request.StrPassword){
pydio.UI.displayMessage('ERROR', 'Warning, passwords differ!');
pydio.UI.displayMessage('ERROR', m('238'));
return;
}
api.exportEncryptionKey(request).then(response => {
Expand Down Expand Up @@ -174,26 +174,27 @@ class EncryptionKeys extends React.Component{
<ModernTextField
value={exportedKey.Content}
fullWidth={true}
variant={"v2"}
floatingLabelText={m('key.export.result.copy')}
multiLine={true}
ref="key-imported-field"
/>
);
dialogActions = [
<FlatButton label={"Close"} onClick={()=>{
<FlatButton label={m('86')} onClick={()=>{
clearTimeout(this.timeout);
this.setState({showExportKey:null, exportedKey:'', showDialog: false})}
}/>
];
} else {
dialogContent = (
<div>
<ModernTextField floatingLabelText={m('key.export.password')} ref="key-password-field" type={"password"} fullWidth={true}/>
<ModernTextField floatingLabelText={m('key.export.confirm')} ref="key-password-confirm" type={"password"} fullWidth={true}/>
<ModernTextField variant={"v2"} floatingLabelText={m('key.export.password')} ref="key-password-field" type={"password"} fullWidth={true}/>
<ModernTextField variant={"v2"} floatingLabelText={m('key.export.confirm')} ref="key-password-confirm" type={"password"} fullWidth={true}/>
</div>
);
dialogActions = [
<FlatButton label={pydio.MessageHash['54']} onClick={()=>{this.setState({showExportKey:null, showDialog: false})}}/>,
<FlatButton label={m('54')} onClick={()=>{this.setState({showExportKey:null, showDialog: false})}}/>,
<FlatButton label={m('key.export')} primary={true} onClick={()=>{this.exportKey()}}/>
];
}
Expand All @@ -203,28 +204,28 @@ class EncryptionKeys extends React.Component{
<div>
{!showImportKey.ID &&
<div>
<ModernTextField floatingLabelText={m('key.import.id')} ref="key-import-id" fullWidth={true}/>
<ModernTextField floatingLabelText={m('key.import.label')} ref="key-import-label" fullWidth={true}/>
<ModernTextField variant={"v2"} floatingLabelText={m('key.import.id')} ref="key-import-id" fullWidth={true}/>
<ModernTextField variant={"v2"} floatingLabelText={m('key.import.label')} ref="key-import-label" fullWidth={true}/>
</div>
}
<ModernTextField floatingLabelText={m('key.import.password')} ref="key-password-field" type={"password"} fullWidth={true}/>
<ModernTextField fullWidth={true} floatingLabelText={m('key.import.content')} multiLine={true} ref="key-imported-field"/>
<ModernTextField variant={"v2"} floatingLabelText={m('key.import.password')} ref="key-password-field" type={"password"} fullWidth={true}/>
<ModernTextField variant={"v2"} fullWidth={true} floatingLabelText={m('key.import.content')} multiLine={true} ref="key-imported-field"/>
</div>
);
dialogActions =[
<FlatButton label={pydio.MessageHash['54']} onClick={()=>{this.setState({showImportKey:null, showDialog: false})}}/>,
<FlatButton label={m('54')} onClick={()=>{this.setState({showImportKey:null, showDialog: false})}}/>,
<FlatButton label={m('key.import')} primary={true} onClick={()=>{this.importKey()}}/>
];
} else if(showCreateKey) {
dialogTitle = "Create a Key";
dialogTitle = m('key.create');
dialogContent = (
<div>
<ModernTextField floatingLabelText={m('key.import.id')} ref="createKeyId" fullWidth={true}/>
<ModernTextField floatingLabelText={m('key.import.label')} ref="createKeyLabel" fullWidth={true}/>
<ModernTextField variant={"v2"} floatingLabelText={m('key.import.id')} ref="createKeyId" fullWidth={true}/>
<ModernTextField variant={"v2"} floatingLabelText={m('key.import.label')} ref="createKeyLabel" fullWidth={true}/>
</div>
);
dialogActions = [
<FlatButton label={pydio.MessageHash['54']} onClick={()=>{this.setState({showCreateKey:null, showDialog: false})}}/>,
<FlatButton label={m('54')} onClick={()=>{this.setState({showCreateKey:null, showDialog: false})}}/>,
<FlatButton label={m('key.create')} primary={true} onClick={()=>{this.createKey()}}/>
];
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/front-srv/assets/gui.ajax/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@mui/lab": "5.0.0-alpha.124",
"@mui/material": "^5.11.10",
"aws-sdk": "^2.847.0",
"cells-sdk": "4.4.0-rc2",
"cells-sdk": "4.4.0",
"classnames": "~2.1.3",
"clipboard": "^1.5.8",
"color": "^1.0.3",
Expand Down

Large diffs are not rendered by default.

Binary file modified frontend/front-srv/assets/gui.ajax/res/dist/core/pydio.min.js.gz
Binary file not shown.
8 changes: 4 additions & 4 deletions frontend/front-srv/assets/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit fbef850

Please sign in to comment.