Hierarchy of graph-diagonal states based on quantum discord and entanglement classification